From 9ed599516f100d0f3e949b9517cfbfbb6459c4d8 Mon Sep 17 00:00:00 2001
From: qinxianzhangyao <11053546+qinxianzhangyao@user.noreply.gitee.com>
Date: 星期五, 08 十二月 2023 15:01:49 +0800
Subject: [PATCH] qxtj
---
src/views/doctor/check/index.vue | 16
src/views/doctor/checkAll/index.vue | 21
src/views/hosp/harmType/index.vue | 126 +++++++---
src/views/hosp/order/index.vue | 492 +++++++---------------------------------
src/api/hosp/harmType.js | 7
src/components/Historicalreport/index.vue | 3
6 files changed, 207 insertions(+), 458 deletions(-)
diff --git a/src/api/hosp/harmType.js b/src/api/hosp/harmType.js
index 9d0aa6d..9c1b4a7 100644
--- a/src/api/hosp/harmType.js
+++ b/src/api/hosp/harmType.js
@@ -36,9 +36,10 @@
}
// 鍒犻櫎鑱屼笟鐥�
-export function delHarmType(aid) {
+export function delHarmType(ids) {
return request({
- url: '/hosp/harmType/' + aid,
- method: 'delete'
+ url: '/hosp/harmType/remove',
+ method: 'delete',
+ data:ids
})
}
diff --git a/src/components/Historicalreport/index.vue b/src/components/Historicalreport/index.vue
index ef36f12..d915861 100644
--- a/src/components/Historicalreport/index.vue
+++ b/src/components/Historicalreport/index.vue
@@ -30,7 +30,8 @@
props: {
reportHistorydata: {
- type: Array,
+ type: Array,//鏁扮粍绫诲瀷
+ default: () => []
}
},
diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue
index 49aa703..216cb0c 100644
--- a/src/views/doctor/check/index.vue
+++ b/src/views/doctor/check/index.vue
@@ -37,8 +37,14 @@
<el-table-column label="鍑虹敓鏃ユ湡" align="center" prop="cusBrithday" width="100px" />
<el-table-column label="鐢佃瘽" align="center" prop="cusPhone" width="100px" />
<el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" />
- <el-table-column label="鐧昏鏃堕棿" align="center" prop="createTime" width="160px" />
- <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" width="100px" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="tjTime" width="160px">
+
+ </el-table-column>
+ <el-table-column label="浣撴鏃堕棿" align="center" prop="tjTime" width="100px">
+ <template slot-scope="scope">
+ <span>{{ parseTime(scope.row.tjTime, '{y}-{m}-{d}') }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鏈椤�" prop="notCheckeds" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔" align="center" width="130px">
<template slot-scope="scope">
@@ -373,7 +379,7 @@
</div>
</el-col>
<el-col :span="6">
- <Historicalreport :reportHistorydata="reportHistorydata"></Historicalreport>
+ <Historicalreport :reportHistorydata="reportHistorydata"></Historicalreport>
</el-col>
</el-row>
@@ -450,7 +456,7 @@
export default {
dicts: ["sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"],
name: "check",
- components: { Public ,Historicalreport},
+ components: { Public, Historicalreport },
data() {
return {
selected: false,
@@ -666,7 +672,7 @@
}
})
- }else {
+ } else {
let data = {
proId: this.focusrow.proId,
cusId: this.tableAll.cusId,
diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue
index e9c4083..ea00391 100644
--- a/src/views/doctor/checkAll/index.vue
+++ b/src/views/doctor/checkAll/index.vue
@@ -241,8 +241,9 @@
border: 1px solid #dfe6ec;
border-collapse: collapse;
width: 200px;
- ">
- <el-input v-model="item.parentAdvice" disabled></el-input>
+
+ " v-if="item.parentAdvice">
+ <el-input v-model="item.parentAdvice[index]" disabled></el-input>
<!-- <el-select v-model="item.value" multiple filterable placeholder="璇烽�夋嫨" style="width: 100%" @change="xiAoJieChange($event, item)">
<el-option v-for="item1 in item.parentAdvice" :key="item1.id" :label="item1.title" :value="item1.id">
</el-option>
@@ -300,9 +301,9 @@
</el-col>
<el-col :span="6">
<div v-if="hosproy">
- <Historicalreport :reportHistorydata="reportHistorydata"></Historicalreport>
+ <Historicalreport :reportHistorydata="reportHistorydata"></Historicalreport>
</div>
-
+
<div class="hist3" v-if="wenzhen">
<span class="txt">闂瘖淇℃伅</span>
<el-form ref="form" :model="formobj" label-width="100px" :inline="true" size="mini">
@@ -398,7 +399,8 @@
<el-input v-model="formobj.yinjiuyear" style="width: 70px" />骞�
</el-form-item>
<el-form-item label="鍏朵粬" prop="qita">
- <el-input v-model="formobj.qita" placeholder="璇疯緭鍏ュ叾浠�" type="textarea" style="width: 600px" rows="2" />
+ <el-input v-model="formobj.qita" placeholder="璇疯緭鍏ュ叾浠�" type="textarea" style="width: 600px"
+ rows="2" />
</el-form-item>
</div>
</el-collapse-item>
@@ -538,15 +540,15 @@
ViewPdf, Historicalreport
},
dicts: [
- "dict_tjtype","sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"
+ "dict_tjtype", "sys_user_sex", "sys_yes_no", "tj_result_type", "lj_positive"
],
name: "checkAll",
data() {
return {
sex: true,
activeName: "1",
- wenzhen:false,
- hosproy:true,
+ wenzhen: false,
+ hosproy: true,
remarks: "",
remark: "",
proIds: "",
@@ -597,7 +599,6 @@
// 缁戝畾鍗曢�夋寜閽�
tjStatus: "0",
total: 0,
- value2: [],
CompanyList: [],
CheckBox: {},
startTime: [],
@@ -767,7 +768,7 @@
this.loading = false
if (res.data[0] != null) {
this.reportHistorydata = res.data
- }else{
+ } else {
this.reportHistorydata = []
}
})
diff --git a/src/views/hosp/harmType/index.vue b/src/views/hosp/harmType/index.vue
index 7bf4da3..2e48918 100644
--- a/src/views/hosp/harmType/index.vue
+++ b/src/views/hosp/harmType/index.vue
@@ -1,26 +1,19 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="${comment}" prop="harmpinyin">
- <el-input v-model="queryParams.harmpinyin" placeholder="璇疯緭鍏�${comment}" clearable
+
+ <el-form-item label="缂栫爜" prop="harmCode">
+ <el-input v-model="queryParams.harmCode" placeholder="璇疯緭鍏ョ紪鐮�" clearable @keyup.enter.native="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鍚嶇О" prop="harmType">
+ <el-input v-model="queryParams.harmType" placeholder="璇疯緭鍏ヨ亴涓氱梾鎷奸煶鐮�" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="${comment}" prop="sort">
- <el-input v-model="queryParams.sort" placeholder="璇疯緭鍏�${comment}" clearable
+ <el-form-item label="鎷奸煶鐮�" prop="harmPinYin">
+ <el-input v-model="queryParams.harmPinYin" placeholder="璇疯緭鍏ヨ亴涓氱梾鎷奸煶鐮�" clearable
@keyup.enter.native="handleQuery" />
</el-form-item>
- <el-form-item label="${comment}" prop="externalcode">
- <el-input v-model="queryParams.externalcode" placeholder="璇疯緭鍏�${comment}" clearable
- @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="${comment}" prop="harmcode">
- <el-input v-model="queryParams.harmcode" placeholder="璇疯緭鍏�${comment}" clearable
- @keyup.enter.native="handleQuery" />
- </el-form-item>
- <el-form-item label="${comment}" prop="protection">
- <el-input v-model="queryParams.protection" placeholder="璇疯緭鍏�${comment}" clearable
- @keyup.enter.native="handleQuery" />
- </el-form-item>
+
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
@@ -51,17 +44,14 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="harmTypeList" @selection-change="handleSelectionChange">
+ <el-table v-loading="loading" :data="harmTypeList" @selection-change="handleSelectionChange" border>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="${comment}" align="center" prop="aid" />
- <el-table-column label="${comment}" align="center" prop="harmpinyin" />
- <el-table-column label="${comment}" align="center" prop="harmtype" />
- <el-table-column label="${comment}" align="center" prop="sort" />
- <el-table-column label="${comment}" align="center" prop="harminfo" />
- <el-table-column label="${comment}" align="center" prop="externalcode" />
- <el-table-column label="${comment}" align="center" prop="harmcode" />
- <el-table-column label="${comment}" align="center" prop="type" />
- <el-table-column label="${comment}" align="center" prop="protection" />
+ <el-table-column label="鎺掑簭" align="center" prop="sort" />
+ <el-table-column label="鑱屼笟鐥呯紪鐮�" align="center" prop="harmCode" />
+ <el-table-column label="鑱屼笟鐥呭悕绉�" align="center" prop="harmType" />
+ <el-table-column label="鑱屼笟鐥呮嫾闊崇爜" align="center" prop="harmPinYin" />
+ <el-table-column label="淇℃伅" align="center" prop="harmInfo" />
+ <el-table-column label="闃叉姢鎺柦" align="center" prop="protection" />
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -74,29 +64,37 @@
</el-table-column>
</el-table>
- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
- @pagination="getList" />
+ <div class="pag">
+ <div class="pag1">
+ <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize" @pagination="getList" />
+ </div>
+ </div>
+
<!-- 娣诲姞鎴栦慨鏀硅亴涓氱梾瀵硅瘽妗� -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="${comment}" prop="harmpinyin">
- <el-input v-model="form.harmpinyin" placeholder="璇疯緭鍏�${comment}" />
+ <el-form-item label="鎺掑簭" prop="sort">
+ <el-input v-model="form.sort" placeholder="璇疯緭鍏ユ帓搴�" />
</el-form-item>
- <el-form-item label="${comment}" prop="sort">
- <el-input v-model="form.sort" placeholder="璇疯緭鍏�${comment}" />
+ <el-form-item label="缂栫爜" prop="harmCode">
+ <el-input v-model="form.harmCode" placeholder="璇疯緭鍏ョ紪鐮�" />
</el-form-item>
- <el-form-item label="${comment}" prop="harminfo">
- <el-input v-model="form.harminfo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
+ <el-form-item label="鎷奸煶鐮�" prop="harmPinYin">
+ <el-input v-model="form.harmPinYin" placeholder="璇疯緭鍏ユ嫾闊崇爜" />
</el-form-item>
- <el-form-item label="${comment}" prop="externalcode">
- <el-input v-model="form.externalcode" placeholder="璇疯緭鍏�${comment}" />
+ <el-form-item label="鍚嶇О" prop="harmType">
+ <el-input v-model="form.harmType" placeholder="璇疯緭鍏ユ嫾闊崇爜" />
</el-form-item>
- <el-form-item label="${comment}" prop="harmcode">
- <el-input v-model="form.harmcode" placeholder="璇疯緭鍏�${comment}" />
+
+ <el-form-item label="淇℃伅" prop="harmInfo">
+ <el-input v-model="form.harmInfo" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" />
</el-form-item>
- <el-form-item label="${comment}" prop="protection">
- <el-input v-model="form.protection" placeholder="璇疯緭鍏�${comment}" />
+
+
+ <el-form-item label="闃叉姢鎺柦" prop="protection">
+ <el-input v-model="form.protection" placeholder="璇疯緭鍏ラ槻鎶ゆ帾鏂�" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -203,6 +201,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
+ this.ids = []
this.ids = selection.map(item => item.aid)
this.single = selection.length !== 1
this.multiple = !selection.length
@@ -225,12 +224,42 @@
},
/** 鎻愪氦鎸夐挳 */
submitForm() {
-
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ if (this.form.aid != null) {
+ updateHarmType(this.form).then((response) => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ } else {
+ addHarmType(this.form).then((response) => {
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ this.open = false;
+ this.getList();
+ });
+ }
+ }
+ });
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
+ if (row) {
+ this.ids = []
+ this.ids.push(row.aid)
+ }
-
+ const ids = this.ids;
+ this.$modal
+ .confirm('鏄惁纭鍒犻櫎advice缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
+ .then(function () {
+ return delHarmType(ids);
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ })
+ .catch(() => { });
},
@@ -246,3 +275,16 @@
}
;
</script>
+
+
+<style>
+.pag {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+}
+
+.pag1 {
+ width: 30%;
+}
+</style>
diff --git a/src/views/hosp/order/index.vue b/src/views/hosp/order/index.vue
index 9f9542a..6746f97 100644
--- a/src/views/hosp/order/index.vue
+++ b/src/views/hosp/order/index.vue
@@ -1,47 +1,18 @@
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- size="small"
- :inline="true"
- v-show="showSearch"
- label-width="68px"
- >
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="濮撳悕" prop="name">
- <el-input
- ref="inputName"
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- style="width: 120px"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input ref="inputName" v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" style="width: 120px" clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="浣撴鍙�" prop="tjNum">
- <el-input
- ref="inputName"
- v-model="queryParams.tjNum"
- placeholder="璇疯緭鍏ヤ綋妫�鍙�"
- style="width: 170px"
- clearable
- @keyup.enter.native="handleQuery"
- />
+ <el-input ref="inputName" v-model="queryParams.tjNum" placeholder="璇疯緭鍏ヤ綋妫�鍙�" style="width: 170px" clearable
+ @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="鐧昏鏃堕棿" prop="createTimeList">
- <el-date-picker
- v-model="createTimeList"
- type="datetimerange"
- align="right"
- :picker-options="pickerOptions"
- style="width: 300px"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="['00:00:00', '23:00:00']"
- format="yyyy-MM-dd HH:mm"
- value-format="yyyy-MM-dd HH:mm"
- @change="dateChangebirthday1"
- >
+ <el-date-picker v-model="createTimeList" type="datetimerange" align="right" :picker-options="pickerOptions"
+ style="width: 300px" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :default-time="['00:00:00', '23:00:00']"
+ format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" @change="dateChangebirthday1">
</el-date-picker>
</el-form-item>
<!-- <el-form-item label="鐧昏鏃堕棿" prop="createTime">
@@ -55,182 +26,68 @@
</el-date-picker>
</el-form-item> -->
<el-form-item label="鎶ュ憡鏃堕棿" prop="reportTimeList">
- <el-date-picker
- clearable
- v-model="reportTimeList"
- @change="dateChangebirthday2"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :picker-options="pickerOptions"
- value-format="yyyy-MM-dd"
- placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�"
- style="width: 240px"
- >
+ <el-date-picker clearable v-model="reportTimeList" @change="dateChangebirthday2" type="daterange"
+ range-separator="-" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡" :picker-options="pickerOptions"
+ value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鍑烘姤鍛婃椂闂�" style="width: 240px">
</el-date-picker>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
- <el-button
- type="primary"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['hosp:order:export']"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" icon="el-icon-download" size="mini" @click="handleExport"
+ v-hasPermi="['hosp:order:export']">瀵煎嚭</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- size="mini"
- @click="handleProject1"
- :disabled="single"
- v-hasPermi="['hosp:order:export']"
- >琛ュ綍椤圭洰</el-button
- >
+ <el-button type="primary" size="mini" @click="handleProject1" :disabled="single"
+ v-hasPermi="['hosp:order:export']">琛ュ綍椤圭洰</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- size="mini"
- @click="handleReport1"
- :disabled="single"
- v-hasPermi="['hosp:order:export']"
- >鎵撳嵃瀵艰瘖鍗�</el-button
- >
+ <el-button type="primary" size="mini" @click="handleReport1" :disabled="single"
+ v-hasPermi="['hosp:order:export']">鎵撳嵃瀵艰瘖鍗�</el-button>
</el-col>
<el-col :span="1.5">
- <el-button
- type="primary"
- size="mini"
- @click="handleUpdate1"
- :disabled="single"
- v-hasPermi="['hosp:order:export']"
- >璁㈠崟鏄庣粏</el-button
- >
+ <el-button type="primary" size="mini" @click="handleUpdate1" :disabled="single"
+ v-hasPermi="['hosp:order:export']">璁㈠崟鏄庣粏</el-button>
</el-col>
- <right-toolbar
- :showSearch.sync="showSearch"
- @queryTable="getList"
- ></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<template>
- <el-table
- border
- v-loading="loading"
- :data="orderList"
- @selection-change="handleSelectionChange"
- >
- <el-table-column
- type="selection"
- width="40px"
- align="center"
- fixed="left"
- />
+ <el-table border v-loading="loading" :data="orderList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="40px" align="center" fixed="left" />
<!-- <el-table-column label="涓婚敭id" align="center" prop="orderId" /> -->
<!-- <el-table-column label="鐢ㄦ埛id" align="center" prop="userId" /> -->
- <el-table-column
- label="搴忓彿"
- align="center"
- prop="newID"
- width="50px"
- fixed="left"
- />
- <el-table-column
- label="濮撳悕"
- align="center"
- prop="tjCustomerName"
- fixed="left"
- width="100px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鎬у埆"
- align="center"
- prop="tjCustomerSex"
- width="50px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="搴忓彿" align="center" prop="newID" width="50px" fixed="left" />
+ <el-table-column label="濮撳悕" align="center" prop="tjCustomerName" fixed="left" width="100px"
+ :show-overflow-tooltip="true" />
+ <el-table-column label="鎬у埆" align="center" prop="tjCustomerSex" width="50px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.tjCustomerSex == '0'">鐢�</span>
<span v-if="scope.row.tjCustomerSex == '1'">濂�</span>
</template>
</el-table-column>
- <el-table-column
- label="骞撮緞"
- align="center"
- prop="tjCustomerAge"
- width="55px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鐢佃瘽"
- align="center"
- prop="tjCustomerPhone"
- :show-overflow-tooltip="true"
- width="110px"
- />
- <el-table-column
- label="浣撴绫诲瀷"
- align="center"
- prop="tjType"
- width="80px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="骞撮緞" align="center" prop="tjCustomerAge" width="55px" :show-overflow-tooltip="true" />
+ <el-table-column label="鐢佃瘽" align="center" prop="tjCustomerPhone" :show-overflow-tooltip="true" width="110px" />
+ <el-table-column label="浣撴绫诲瀷" align="center" prop="tjType" width="80px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span v-if="scope.row.tjType == '2'">涓汉</span>
<span v-if="scope.row.tjType == '1'">鍥㈤槦</span>
</template>
</el-table-column>
- <el-table-column
- label="浣撴鍙�"
- align="center"
- prop="tjNumber"
- :show-overflow-tooltip="true"
- width="160px"
- />
+ <el-table-column label="浣撴鍙�" align="center" prop="tjNumber" :show-overflow-tooltip="true" width="160px" />
<!-- <el-table-column label="娴佹按鍙�" align="center" prop="tjSerialNumber" /> -->
- <el-table-column
- label="鎵�閫夊椁�"
- align="center"
- prop="pacName"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鐧昏鏃堕棿"
- align="center"
- prop="createTime"
- width="155px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="鎵�閫夊椁�" align="center" prop="pacName" :show-overflow-tooltip="true" />
+ <el-table-column label="鐧昏鏃堕棿" align="center" prop="createTime" width="155px" :show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
- <el-table-column
- label="瀹屾垚鏃堕棿"
- align="center"
- prop="finishTime"
- width="155px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" width="155px" :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.finishTime) }}</span>
</template> -->
@@ -240,33 +97,16 @@
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column> -->
- <el-table-column
- label="鎶ュ憡鏃堕棿"
- align="center"
- prop="reportTime"
- width="155px"
- height="10px"
- :show-overflow-tooltip="true"
- >
+ <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reportTime" width="155px" height="10px"
+ :show-overflow-tooltip="true">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.reportTime) }}</span>
</template> -->
</el-table-column>
<!-- <el-table-column label="鍒涘缓浜�" align="center" prop="createBy" /> -->
<!-- <el-table-column label="鏇存柊浜�" align="center" prop="updateBy" /> -->
- <el-table-column
- label="鍗曚綅宸ュ彿"
- align="center"
- prop="firmWorkId"
- width="100px"
- :show-overflow-tooltip="true"
- />
- <el-table-column
- label="鍗曚綅鍚嶇О"
- align="center"
- prop="dictCompName"
- :show-overflow-tooltip="true"
- />
+ <el-table-column label="鍗曚綅宸ュ彿" align="center" prop="firmWorkId" width="100px" :show-overflow-tooltip="true" />
+ <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="dictCompName" :show-overflow-tooltip="true" />
<!-- <el-table-column label="閮ㄩ棬鍚�" align="center" prop="firmDeptName" /> -->
<!-- <el-table-column label="瀹㈡埛鐓х墖" align="center" prop="photo" /> -->
@@ -277,31 +117,13 @@
}}</span>
</template>
</el-table-column> -->
- <el-table-column
- fixed="right"
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
- height="10px"
- width="114px"
- >
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width" height="10px"
+ width="114px">
<template slot-scope="scope">
- <el-button
- size="mini"
- type="text"
- icon="el-icon-document"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['hosp:order:edit']"
- title="璁㈠崟娴佹按"
- ></el-button>
- <el-button
- size="mini"
- type="text"
- icon="el-icon-edit"
- @click="handleProject(scope.row)"
- v-hasPermi="['hosp:order:edit']"
- title="琛ュ綍椤圭洰"
- ></el-button>
+ <el-button size="mini" type="text" icon="el-icon-document" @click="handleUpdate(scope.row)"
+ v-hasPermi="['hosp:order:edit']" title="璁㈠崟娴佹按"></el-button>
+ <el-button size="mini" type="text" icon="el-icon-edit" @click="handleProject(scope.row)"
+ v-hasPermi="['hosp:order:edit']" title="琛ュ綍椤圭洰"></el-button>
<!-- <el-button type="text" size="mini" class="btn" icon="el-icon-download" title="涓嬭浇瀵艰瘖鍗�" @click="
daoZhenDan,
LoadFileImg(scope.row);
@@ -318,7 +140,7 @@
title="浣撴鎶ュ憡"
@click="viewReport(scope.row)"
></el-button> -->
- <!-- <el-button
+ <!-- <el-button
type="text"
size="mini"
class="btn"
@@ -327,15 +149,9 @@
v-if="scope.row.tjCategory == '02'"
@click="viewReport(scope.row)"
></el-button> -->
-
- <el-button
- type="text"
- size="mini"
- class="btn"
- icon="el-icon-download"
- title="瀵艰瘖鍗�"
- @click="handleReport(scope.row)"
- ></el-button>
+
+ <el-button type="text" size="mini" class="btn" icon="el-icon-download" title="瀵艰瘖鍗�"
+ @click="handleReport(scope.row)"></el-button>
<!-- <button @click="downLoadFileImg(scope.row)">鏌ョ湅鎶ュ憡</button> -->
</template>
@@ -345,16 +161,9 @@
<div class="pag">
<div class="pag1">
- <el-pagination
- background
- @size-change="handleSizeChange"
- @current-change="handleCurrentChange"
- :current-page="queryParams.pageNum"
- :page-sizes="[10, 20, 30, 40]"
- :page-size="queryParams.pageSize"
- layout="total, sizes, prev, pager, next, jumper"
- :total="total"
- >
+ <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChange"
+ :current-page="queryParams.pageNum" :page-sizes="[10, 20, 30, 40]" :page-size="queryParams.pageSize"
+ layout="total, sizes, prev, pager, next, jumper" :total="total">
</el-pagination>
<!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> -->
@@ -376,56 +185,27 @@
</span>
</el-dialog> -->
- <el-dialog
- title="PDF 棰勮"
- :visible.sync="dialogVisible"
- :close-on-click-modal="false"
- >
+ <el-dialog title="PDF 棰勮" :visible.sync="dialogVisible" :close-on-click-modal="false">
<div class="main">
- <iframe
- id="printIframe"
- :src="url"
- frameborder="0"
- style="width: 100%; height: 100%"
- ></iframe>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
- <el-dialog
- title="瀵艰瘖鍗�"
- :visible.sync="daoZhenDan"
- :close-on-click-modal="false"
- >
+ <el-dialog title="瀵艰瘖鍗�" :visible.sync="daoZhenDan" :close-on-click-modal="false">
<div class="main">
- <iframe
- id="printIframe"
- :src="url"
- frameborder="0"
- style="width: 100%; height: 100%"
- ></iframe>
+ <iframe id="printIframe" :src="url" frameborder="0" style="width: 100%; height: 100%"></iframe>
</div>
</el-dialog>
<!-- 娣诲姞琛ュ綍椤圭洰 -->
- <el-dialog
- :title="title"
- :visible.sync="Projectopen"
- width="980px"
- style="height: 860px"
- append-to-body
- >
+ <el-dialog :title="title" :visible.sync="Projectopen" width="980px" style="height: 860px" append-to-body>
<el-row type="flex" class="row-bg" justify="space-around">
<el-col :span="6">
<div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
<div class="tab3">
<div class="outside1">
- <el-tree
- :data="Treedata"
- show-checkbox
- node-key="proId"
- :props="defaultProps"
- @check-change="handleCurrentChecked"
- >
+ <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
+ @check-change="handleCurrentChecked">
</el-tree>
</div>
</div>
@@ -447,81 +227,43 @@
<div class="outside">
<el-form :inline="true" class="outside1">
<el-form-item label="鍘熶环">
- <el-input
- placeholder="鍘熶环"
- :value="TotalPrice1"
- disabled
- style="width: 90px"
- ></el-input>
+ <el-input placeholder="鍘熶环" :value="TotalPrice1" disabled style="width: 90px"></el-input>
</el-form-item>
<el-form-item label="鎶樻墸璁惧畾">
- <el-input
- style="width: 90px"
- type="number"
- v-model="discount"
- :value="discount"
- ></el-input>
+ <el-input style="width: 90px" type="number" v-model="discount" :value="discount"></el-input>
</el-form-item>
<el-form-item label="搴斾粯閲戦">
- <el-input
- placeholder="搴斾粯閲戦"
- :value="TotalPrice1 * (discount / 10)"
- style="width: 90px"
- ></el-input>
+ <el-input placeholder="搴斾粯閲戦" :value="TotalPrice1 * (discount / 10)" style="width: 90px"></el-input>
</el-form-item>
<el-form-item label="浠樻绫诲瀷" prop="payType">
- <el-select
- style="width: 120px"
- v-model="payType"
- placeholder="璇烽�夋嫨浠樻绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 120px" v-model="payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- @click="submitPrice"
- :disabled="confirm"
- style="margin-top: 34px"
- >鏀惰垂</el-button
- >
+ <el-button type="primary" @click="submitPrice" :disabled="confirm"
+ style="margin-top: 34px">鏀惰垂</el-button>
</el-form-item>
</el-form>
</div>
<div style="text-align: center; margin-bottom: 10px">
宸查�夐」鐩垪琛�
</div>
- <div
- style="
+ <div style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
- "
- >
+ ">
<el-collapse v-model="activeName" accordion>
<div v-for="(item, index) in DataList" :key="index">
<el-collapse-item>
<template slot="title">
{{ item.proName + "(" + "鍘熶环" + item.proPrice + ")" }}
</template>
- <el-table
- :data="item.tjProjectList"
- border
- style="width: 100%"
- height="250"
- >
- <el-table-column
- prop="proName"
- label="椤圭洰"
- width="180"
- >
+ <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
+ <el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proPrice" label="鍘熶环">
</el-table-column>
@@ -533,11 +275,7 @@
<div>
<el-collapse-item title="璇烽�夋嫨椤圭洰">
<el-table :data="DataList" border style="width: 100%">
- <el-table-column
- prop="proName"
- label="椤圭洰"
- width="180"
- >
+ <el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="ordPrice" label="鍘熶环">
</el-table-column>
@@ -553,25 +291,14 @@
</el-dialog>
<!-- 娣诲姞琛ュ綍椤圭洰 -->
- <el-dialog
- :title="title"
- :visible.sync="Projectopen1"
- width="980px"
- style="height: 860px"
- append-to-body
- >
+ <el-dialog :title="title" :visible.sync="Projectopen1" width="980px" style="height: 860px" append-to-body>
<el-row type="flex" class="row-bg" justify="space-around">
<el-col :span="6">
<div style="text-align: center; margin-bottom: 10px;margin-top:10px">椤圭洰鍒楄〃</div>
<div class="tab3">
<div class="outside1">
- <el-tree
- :data="Treedata"
- show-checkbox
- node-key="proId"
- :props="defaultProps"
- @check-change="handleCurrentChecked"
- >
+ <el-tree :data="Treedata" show-checkbox node-key="proId" :props="defaultProps"
+ @check-change="handleCurrentChecked">
</el-tree>
</div>
</div>
@@ -593,76 +320,42 @@
<div class="outside">
<el-form :inline="true" class="outside1">
<el-form-item label="鍘熶环">
- <el-input
- placeholder="鍘熶环"
- :value="TotalPrice1"
- disabled
- style="width: 90px"
- ></el-input>
+ <el-input placeholder="鍘熶环" :value="TotalPrice1" disabled style="width: 90px"></el-input>
</el-form-item>
<el-form-item label="鎶樻墸璁惧畾">
- <el-input
- style="width: 90px"
- type="number"
- v-model="discount"
- :value="discount"
- ></el-input>
+ <el-input style="width: 90px" type="number" v-model="discount" :value="discount"></el-input>
</el-form-item>
<el-form-item label="搴斾粯閲戦">
- <el-input
- placeholder="搴斾粯閲戦"
- :value="TotalPrice1 * (discount / 10)"
- style="width: 90px"
- ></el-input>
+ <el-input placeholder="搴斾粯閲戦" :value="TotalPrice1 * (discount / 10)" style="width: 90px"></el-input>
</el-form-item>
<el-form-item label="浠樻绫诲瀷" prop="payType">
- <el-select
- style="width: 120px"
- v-model="payType"
- placeholder="璇烽�夋嫨浠樻绫诲瀷"
- >
- <el-option
- v-for="dict in dict.type.dict_pay_type"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- ></el-option>
+ <el-select style="width: 120px" v-model="payType" placeholder="璇烽�夋嫨浠樻绫诲瀷">
+ <el-option v-for="dict in dict.type.dict_pay_type" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item>
- <el-button
- type="primary"
- @click="submitPrice1"
- :disabled="confirm"
- style="margin-top: 34px"
- >鏀惰垂</el-button
- >
+ <el-button type="primary" @click="submitPrice1" :disabled="confirm"
+ style="margin-top: 34px">鏀惰垂</el-button>
</el-form-item>
</el-form>
</div>
<div style="text-align: center; margin-bottom: 10px">
宸查�夐」鐩垪琛�
</div>
- <div
- style="
+ <div style="
padding: 0px 6px;
border: 1px solid #e6ebf5;
max-height: 420px;
overflow: auto;
- "
- >
+ ">
<el-collapse v-model="activeName" accordion>
<div v-for="(item, index) in DataList" :key="index">
<el-collapse-item>
<template slot="title">
{{ item.proName + "(" + "鍘熶环" + item.proPrice + ")" }}
</template>
- <el-table
- :data="item.tjProjectList"
- border
- style="width: 100%"
- height="250"
- >
+ <el-table :data="item.tjProjectList" border style="width: 100%" height="250">
<el-table-column prop="proName" label="椤圭洰" width="180">
</el-table-column>
<el-table-column prop="proPrice" label="鍘熶环">
@@ -909,10 +602,15 @@
},
/** 鏌ヨ浣撴璁板綍鍒楄〃 */
getList() {
- this.queryParams.djbeginTime = this.startTime[0];
- this.queryParams.djendTime = this.startTime[1];
- this.queryParams.bgbeginTime = this.startTime1[0];
- this.queryParams.bgendTime = this.startTime1[1];
+ if (this.startTime) {
+ this.queryParams.djbeginTime = this.startTime[0];
+ this.queryParams.djendTime = this.startTime[1];
+ }
+ if (this.startTime1) {
+ this.queryParams.bgbeginTime = this.startTime1[0];
+ this.queryParams.bgendTime = this.startTime1[1];
+ }
+
this.loading = true;
getOrderList(this.queryParams).then((response) => {
this.orderList = response.data.list;
--
Gitblit v1.8.0