From bbbc81e677639ccc30944eb84de36c3bb5867256 Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期四, 05 六月 2025 16:26:42 +0800 Subject: [PATCH] 1 --- src/views/doctor/checkAll/index.vue | 482 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 303 insertions(+), 179 deletions(-) diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue index 03cf96c..1dcb6d9 100644 --- a/src/views/doctor/checkAll/index.vue +++ b/src/views/doctor/checkAll/index.vue @@ -1,6 +1,7 @@ <template> <div class="mainbox"> - <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px"> + <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px" + v-if="tjStatus == 0"> <el-form-item label="濮撳悕" prop="name"> <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="submitForm"></el-input> @@ -21,10 +22,68 @@ <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" /> </el-select> </el-form-item> + <el-form-item label="浣撴绫诲埆"> + <el-select style="width: 200px" v-model="queryParams.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆"> + <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> + </el-select> + <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> --> + </el-form-item> <el-form-item> <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button> <el-button size="mini" @click="resetQuery">閲嶇疆</el-button> </el-form-item> + </el-form> + + + <el-form :model="queryParams" ref="tableList" :inline="true" label-width="76px" style="margin-top: 10px" + v-if="tjStatus == 1"> + <el-form-item label="濮撳悕" prop="name"> + <el-input v-model="queryParams.name" style="width: 120px" placeholder="璇疯緭鍏ュ鍚�" clearable + @keyup.enter.native="submitForm"></el-input> + </el-form-item> + <el-form-item label="浣撴鍙�" prop="tjNumber"> + <el-input ref="inputName" v-model="queryParams.tjNumber" style="width: 180px" placeholder="璇疯緭鍏ヤ綋妫�鍙�" clearable + @keyup.enter.native="submitForm" @blur="hb"></el-input> + </el-form-item> + + <el-form-item label="鍗曚綅鍚嶇О" prop="tjCompName" style="margin-left: 20px"> + <el-select :remote-method="getRemoteData" v-model="queryParams.tjCompName" value-key="drugManufacturerId" + style="width: 180px" remote filterable placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="searchSelect"> + <el-option v-for="dict in CompanyList" :key="dict.drugManufacturerId" :label="dict.cnName" :value="dict" /> + </el-select> + </el-form-item> + <el-form-item label="瀹℃牳鍖诲笀" prop="shys"> + <el-input ref="inputName" v-model="queryParams.shys" style="width: 180px" placeholder="璇疯緭鍏ュ鏍稿尰甯�" clearable + @keyup.enter.native="submitForm"></el-input> + </el-form-item> + <el-form-item label="浣撴绫诲埆"> + <el-select style="width: 200px" v-model="queryParams.tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆"> + <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label" + :value="dict.value"></el-option> + </el-select> + <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> --> + </el-form-item> + <el-form-item> + <el-button type="primary" size="mini" @click="submitForm" style="margin-right: 15px">鎼滅储</el-button> + <el-button size="mini" @click="resetQuery">閲嶇疆</el-button> + <el-button type="primary" size="mini" @click="toggleCollapse" style="margin-right: 15px" + v-show="isCollapsed == 0">楂樼骇鎼滅储</el-button> + <el-button type="primary" size="mini" @click="toggleCollapse3" style="margin-right: 15px" + v-show="isCollapsed == 1">楂樼骇鎼滅储</el-button> + </el-form-item> + <el-row v-show="isCollapsed == 1" :gutter="20"> + <el-col :span="8"> + <el-form-item label="浣撴鏃堕棿" prop="tjTime"> + <el-date-picker v-model="startTime" type="datetimerange" align="right" :picker-options="pickerOptions" + style="width: 310px" 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-col> + </el-row> + </el-form> <el-radio-group v-model="tjStatus" @input="radioChange" style="margin-left: 20px"> @@ -51,11 +110,13 @@ <el-table-column label="鐢佃瘽" align="center" prop="cusPhone" :show-overflow-tooltip="true" width="130px" /> <el-table-column label="瀹℃牳鏃堕棿" align="center" prop="shsj" :show-overflow-tooltip="true" width="180px" /> <el-table-column label="瀹屾垚鏃堕棿" align="center" prop="finishTime" :show-overflow-tooltip="true" width="160px" /> - <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px"> - <template slot-scope="scope"> + <el-table-column label="鐘舵��" align="center" prop="tjStatus" :show-overflow-tooltip="true" width="120px" + v-if="tjStatus == 0"> + <template slot-scope="scope" v-if="tjStatus == 0"> <span>{{ scope.row.tjStatus == "1" ? "宸插鏍�" : "鏈鏍�" }}</span> </template> </el-table-column> + <el-table-column label="瀹℃牳鍖诲笀" align="center" prop="shys" width="120px" v-if="tjStatus == 1" /> <el-table-column label="鍗曚綅鍚嶇О" align="center" prop="tjCompName" :show-overflow-tooltip="true" /> <el-table-column label="浣撴绫诲埆" align="center" prop="tjCategory"> <template slot-scope="scope"> @@ -96,10 +157,8 @@ <tr style="border: 1px solid #dfe6ec; border-collapse: collapse; height: 36px;"> <td style="border: 1px solid #dfe6ec; border-collapse: collapse">濮撳悕锛�</td> <td style="border: 1px solid #dfe6ec; border-collapse: collapse">{{ tableAll.cusName }}</td> - <td style="border: 1px solid #dfe6ec; border-collapse: collapse">鎬у埆锛�</td> - <td style="border: 1px solid #dfe6ec; border-collapse: collapse"> - {{ tableAll.cusSex == 0 ? "鐢�" : tableAll.cusSex == 1 ? "濂�" : "鏈煡" }} - </td> + <td style="border: 1px solid #dfe6ec; border-collapse: collapse">鎬у埆锛歿{ tableAll.cusSex == 0 ? "鐢�" : tableAll.cusSex == 1 ? "濂�" : "鏈煡" }}</td> + <td style="border: 1px solid #dfe6ec; border-collapse: collapse">骞撮緞锛歿{ tableAll.age }}</td> </tr> <tr style="border: 1px solid #dfe6ec; border-collapse: collapse; height: 36px;"> <td style="border: 1px solid #dfe6ec; border-collapse: collapse">浣撴鍗曞彿锛�</td> @@ -226,16 +285,15 @@ </table> </div> </div> - <div class="section-title">鑱屼笟鐥呮�绘</div> - <el-form ref="numberValidateForm" label-width="80px" class="demo-ruleForm"> + <div v-if="tableAll && tableAll.tjCategory === '02'" class="section-title">鑱屼笟鐥呮�绘</div> + <el-form v-if="tableAll && tableAll.tjCategory === '02'" ref="numberValidateForm" label-width="80px" + class="demo-ruleForm"> <el-form-item label="妫�鏌ョ粨璁�"> - <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea1" :rows="3" - style="width: 96%"></el-input> + <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="zhiyeJl" :rows="3" style="width: 96%"></el-input> </el-form-item> <el-form-item label="浣撴缁撴灉"> - <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="res" :rows="3" style="width: 96%"></el-input> + <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="zhiyeJg" :rows="3" style="width: 96%"></el-input> </el-form-item> - </el-form> <div style="margin: 0 0px 10px 15px" v-if="tjproject != '1'"> <el-button type="primary" @click="propoChange">蹇嵎寤鸿</el-button> @@ -400,32 +458,31 @@ 椤圭洰閫夋嫨 </span> <div v-if="xmChange.length > 0" style="display: flex;"> - <div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ xmChange[0].pro_name || "" }}</div> - <div style="margin:0 40px ;font-size: 0.8vw;">浠锋牸锛歿{ xmChange[0].price || "" }}</div> + <div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ xmChange[0].proName || "" }}</div> + <div style="margin:0 80px ;font-size: 0.8vw;">浠锋牸锛歿{ xmChange[0].price || "" }}</div> </div> <div v-else style="display: flex;"> <div style="margin:0 40px;font-size: 0.8vw;">椤圭洰鍚嶇О锛歿{ }}</div> - <div style="margin:0 40px ;font-size: 0.8vw;">浠锋牸锛歿{ }}</div> + <div style="margin:0 80px ;font-size: 0.8vw;">浠锋牸锛歿{ }}</div> </div> <el-button type="primary" size="mini" @click="handleaddClick()">娣诲姞</el-button> </div> - <el-table :row-style="redxiangmu" :data="fcList" style="width: 100%"> + <el-table :row-style="redxiangmu" :data="fcList" style="width: 100%" border> <el-table-column type="selection" width="40" align="center" /> - <el-table-column label="搴忓彿" align="center" prop="index" /> - <el-table-column label="鍚嶇О" align="center" prop="pro_name" width="100px" /> + <el-table-column label="搴忓彿" align="center" prop="newID" /> + <el-table-column label="鍚嶇О" align="center" prop="proName" width="100px" /> <el-table-column label="浠锋牸" align="center" prop="price" /> - <el-table-column label="绉戝" align="center" prop="dept_name" /> + <el-table-column label="绉戝" align="center" prop="deptName" /> <el-table-column label="鎿嶄綔" align="center" width="130px"> <template slot-scope="scope"> - <el-button type="primary" icon="el-icon-share" size="mini" @click="handledeleteClick(scope.row)" - title="鍒犻櫎"></el-button> + <el-button type="primary" size="mini" @click="handledeleteClick(scope.row)">鍒犻櫎</el-button> </template> </el-table-column> </el-table> </div> </template> - <template v-if="wenzhen"> + <template v-if="status1 == 3"> <div class="hist3"> <span class="txt">闂瘖淇℃伅</span> <el-form ref="form" :model="formobj" label-width="100px" :inline="true" size="mini"> @@ -725,9 +782,9 @@ <el-table :data="datasList" ref="elTable" v-loading="loading" @selection-change="handlexmChange" border height="320px"> <el-table-column type="selection" width="40" align="center" /> - <el-table-column label="鍚嶇О" align="center" prop="pro_name" width="100px" /> + <el-table-column label="鍚嶇О" align="center" prop="proName" width="100px" /> <el-table-column label="浠锋牸" align="center" prop="price" /> - <el-table-column label="绉戝" align="center" prop="dept_name" /> + <el-table-column label="绉戝" align="center" prop="deptName" /> </el-table> </div> @@ -764,7 +821,8 @@ isPdfOrJimu, addOrder, addOrder1, - getFcList, UpdFcPro + getFcList, + UpdFcPro } from "@/api/doctor/checkAll"; import { getInfoById } from "@/api/hosp/history"; import { getInfo } from "@/api/login"; @@ -792,6 +850,7 @@ Prescription, }, dicts: [ + "dict_team", "dict_tjtype", "sys_user_sex", "sys_yes_no", @@ -805,14 +864,15 @@ name: "checkAll", data() { return { - res: '鏈彂鐜扮洰鏍囨�х柧鐥�', + zhiyeJl: '', // 鍒濆鍖栨鏌ョ粨璁轰负绌� + zhiyeJg: '', // 鍒濆鍖栦綋妫�缁撴灉涓洪粯璁ゅ�� selectedAdvice: null, activeAdviceIndex: 0, advicerulesList: [], xmChange: [], showjianyi: false, - adviceLoading: false, // 鎺у埗琛ㄦ牸鍔犺浇鐘舵�� - adviceEmptyText: '鏆傛棤鏁版嵁', // 鑷畾涔夌┖鏁版嵁鎻愮ず + adviceLoading: false, + adviceEmptyText: '鏆傛棤鏁版嵁', total1: 0, forms: { pacName: "" @@ -822,9 +882,9 @@ queryParams1: { pageNum: 1, pageSize: 10, - zyzd: '', // 寤鸿鍚嶇О + zyzd: '', }, - adviceCache: new Map(), // 缂撳瓨寤鸿鏁版嵁 + adviceCache: new Map(), addNewDialogVisible: false, newItem: { parentName: '', @@ -848,7 +908,6 @@ jianqians: false, sex: true, activeName: "1", - wenzhen: false, hosproy: true, remarks: "", remark: "", @@ -908,6 +967,7 @@ Testitems: [], CheckBox: {}, startTime: [], + isCollapsed: 0, textarea1: "", loading: true, selectLettercurrent: " ", @@ -929,6 +989,8 @@ compId: null, name: null, checkStatus: null, + shys: null, + tjCategory: null }, formobj: {}, yichangList: [], @@ -965,10 +1027,10 @@ }, created() { + console.log(this.dict.type.dict_tjtype, "鑱屼笟浣撴"); this.getConfigKey(); this.getdate(); }, - mounted() { this.$nextTick(() => { this.$refs.inputName.focus(); @@ -986,10 +1048,10 @@ this.queryParams1.pageNum = 1; this.queryParams1.pageSize = 10; this.queryParams1.zyzd = ''; - this.selectedAdvice = null; // 閲嶇疆閫変腑寤鸿 - this.advicerulesList = []; // 娓呯┖寤鸿鍒楄〃 + this.selectedAdvice = null; + this.advicerulesList = []; this.total1 = 0; - this.adviceCache.clear(); // 娓呯┖缂撳瓨 + this.adviceCache.clear(); this.filterAdvices(); this.showjianyi = true; }, @@ -1000,10 +1062,8 @@ this.queryParams1.pageNum = 1; } - // 鐢熸垚缂撳瓨 key锛屼粎浣跨敤 zyzd 鍜屽垎椤靛弬鏁� const cacheKey = `${this.queryParams1.zyzd || ''}_${this.queryParams1.pageNum}_${this.queryParams1.pageSize}`; - // 妫�鏌ョ紦瀛� if (this.adviceCache.has(cacheKey)) { const cachedData = this.adviceCache.get(cacheKey); this.advicerulesList = cachedData.rows; @@ -1012,7 +1072,6 @@ return; } - // 鏄剧ず鍔犺浇鐘舵�� this.adviceLoading = true; this.adviceEmptyText = '鍔犺浇涓�...'; @@ -1021,13 +1080,11 @@ this.advicerulesList = response.rows || []; this.total1 = response.total || 0; - // 瀛樺叆缂撳瓨 this.adviceCache.set(cacheKey, { rows: this.advicerulesList, total: this.total1, }); - // 鏇存柊绌烘暟鎹彁绀� this.adviceEmptyText = this.advicerulesList.length === 0 ? '鏆傛棤鍖归厤鐨勫缓璁�' : '鏆傛棤鏁版嵁'; }) .catch((error) => { @@ -1040,10 +1097,18 @@ .finally(() => { this.adviceLoading = false; }); - }, 800), // 闃叉姈鏃堕棿涓� 800ms + }, 800), handleCurrentChangeAdvice(currentRow) { this.selectedAdvice = currentRow; + }, + + + toggleCollapse3() { + this.isCollapsed = 0; + }, + toggleCollapse() { + this.isCollapsed = 1; }, applySelectedAdvice() { @@ -1059,7 +1124,6 @@ } }, - // 鍙栨秷閫夋嫨骞跺叧闂璇濇 cancelAdviceDialog() { this.showjianyi = false; this.selectedAdvice = null; @@ -1070,7 +1134,6 @@ this.adviceCache.clear(); }, - // 鍏抽棴瀵硅瘽妗嗗墠鐨勭‘璁� handleCloseAdviceDialog(done) { if (this.selectedAdvice) { this.$confirm('鎮ㄥ凡閫夋嫨涓�鏉″缓璁紝纭畾瑕佸叧闂悧锛�', '鎻愮ず', { @@ -1198,6 +1261,7 @@ this.newItem.jcxm = value; } }, + change(val) { console.log('閫変腑鐨勫�兼槸锛�', val); }, @@ -1260,52 +1324,50 @@ }, handleQuery() { - this.xmopen = true + this.xmopen = true; let data = { tjNum: this.tjNumber, type: 0 - } + }; getFcList(data).then(res => { - this.datasList = res.data - }) + this.datasList = res.data; + }); }, handleaddClick() { - console.log(this.xmChange) + console.log(this.xmChange); let data = { - orderId: this.xmChange[0].order_id, + orderId: this.xmChange[0].orderId, data: [{ - proId: this.xmChange[0].pro_id, + proId: this.xmChange[0].proId, type: 1 }] - } - UpdFcPro(data).then(res => { - - }) + }; + UpdFcPro(data).then(res => { }); }, handledeleteClick() { - - UpdFcPro(data).then(res => { - - }) + UpdFcPro(data).then(res => { }); }, handlexmChange(selection) { - this.xmChange = [] - this.xmChange = selection + this.xmChange = []; + this.xmChange = selection; if (selection.length > 1) { let del_row = selection.shift(); - this.$refs.elTable.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑 + this.$refs.elTable.toggleRowSelection(del_row, false); } }, + submitFormxm() { - this.xmopen = false + this.xmopen = false; }, + cancels() { - this.xmopen = false - this.xmChange = [] + this.xmopen = false; + this.xmChange = []; }, + getExpends() { this.expends = this.yichangList.flatMap(item => item.sone.map(soneItem => soneItem.orderDetailId) @@ -1329,15 +1391,22 @@ }, xiangmuqingkuang() { - cSWebGetPro(this.tjNumber).then((res) => { - this.status1 = 1; - this.wenzhen = false - this.statusList = res.data; - - if (this.statusList.length == 0) { - this.$message.msgSuccess("鏆傛棤椤圭洰鎯呭喌"); - } - }); + this.loading = true; + cSWebGetPro(this.tjNumber) + .then((res) => { + this.status1 = 1; + this.statusList = res.data; + if (this.statusList.length == 0) { + this.$message.success("鏆傛棤椤圭洰鎯呭喌"); + } + }) + .catch((error) => { + console.error('鑾峰彇椤圭洰鎯呭喌澶辫触:', error); + this.$message.error('鑾峰彇椤圭洰鎯呭喌澶辫触'); + }) + .finally(() => { + this.loading = false; + }); }, guanbi() { @@ -1345,40 +1414,51 @@ }, yichangjieguo() { + this.loading = true; this.status1 = 0; - let _this = this; yichang({ tjNum: this.tjNumber, - }).then((res) => { - this.yichangList = res.data; - - this.yichangList.forEach((item) => { - item.sone.forEach((soneItem) => { - if (!Array.isArray(soneItem.advices) || soneItem.advices.length === 0) { - soneItem.advices = [{ bt: "", nr: "" }]; - } + }) + .then((res) => { + this.yichangList = res.data; + this.yichangList.forEach((item) => { + item.sone.forEach((soneItem) => { + if (!Array.isArray(soneItem.advices) || soneItem.advices.length === 0) { + soneItem.advices = [{ bt: "", nr: "" }]; + } + }); }); + if (!this.yichangList) { + this.$message.warning("鏆傛棤寮傚父鎶ュ憡"); + } + }) + .catch((error) => { + console.error('鑾峰彇寮傚父缁撴灉澶辫触:', error); + this.$message.error('鑾峰彇寮傚父缁撴灉澶辫触'); + }) + .finally(() => { + this.loading = false; }); - - if (!this.yichangList) { - _this.$message({ - type: "warning", - message: "鏆傛棤寮傚父鎶ュ憡", - }); - } - }); }, fuchaxiangmu() { + this.loading = true; this.status1 = 2; - this.wenzhen = false let data = { tjNum: this.tjNumber, type: 1 - } - getFcList(data).then(res => { - this.fcList = res.data - }) + }; + getFcList(data) + .then((res) => { + this.fcList = res.data; + }) + .catch((error) => { + console.error('鑾峰彇澶嶆煡椤圭洰澶辫触:', error); + this.$message.error('鑾峰彇澶嶆煡椤圭洰澶辫触'); + }) + .finally(() => { + this.loading = false; + }); }, getdate() { @@ -1495,82 +1575,110 @@ }, Graphicreport() { + this.loading = true; let dictType = "dict_ageunit"; - getDicts(dictType).then((res) => { - if (res.code == 200) { - res.data.forEach((item) => { - if (this.tableAll.age_unit == item.dictValue) { - this.tableAll.age_unit = item.dictLabel; - } - }); - let dictTypes = "sys_user_sex"; - getDicts(dictTypes).then((res) => { - if (res.code == 200) { - res.data.forEach((item) => { - if (this.tableAll.cusSex == item.dictValue) { - this.tableAll.cusSex = item.dictLabel; - } - }); - let data = { - patname: this.tableAll.cusName, - sex: this.tableAll.cusSex, - patage: this.tableAll.age, - patagename: this.tableAll.age_unit, - patbirth: this.tableAll.cusBrithday, - }; - getTjYxjcList(data).then((res) => { - this.baogao = res.data; - }); - this.$refs.bbb.open = true; - this.$refs.bbb.title = "鎶ュ憡瀛楀吀"; - } - }); - } - }); + getDicts(dictType) + .then((res) => { + if (res.code == 200) { + res.data.forEach((item) => { + if (this.tableAll.age_unit == item.dictValue) { + this.tableAll.age_unit = item.dictLabel; + } + }); + let dictTypes = "sys_user_sex"; + return getDicts(dictTypes); + } else { + throw new Error('鑾峰彇骞撮緞鍗曚綅瀛楀吀澶辫触'); + } + }) + .then((res) => { + if (res.code == 200) { + res.data.forEach((item) => { + if (this.tableAll.cusSex == item.dictValue) { + this.tableAll.cusSex = item.dictLabel; + } + }); + let data = { + patname: this.tableAll.cusName, + sex: this.tableAll.cusSex, + patage: this.tableAll.age, + patagename: this.tableAll.age_unit, + patbirth: this.tableAll.cusBrithday, + }; + return getTjYxjcList(data); + } else { + throw new Error('鑾峰彇鎬у埆瀛楀吀澶辫触'); + } + }) + .then((res) => { + this.baogao = res.data; + this.$refs.bbb.open = true; + this.$refs.bbb.title = "鎶ュ憡瀛楀吀"; + }) + .catch((error) => { + console.error('鐢熸垚鍥炬枃鎶ュ憡澶辫触:', error); + this.$message.error('鐢熸垚鍥炬枃鎶ュ憡澶辫触'); + }) + .finally(() => { + this.loading = false; + }); }, historicalreport() { this.loading = true; - this.wenzhen = false; - this.hosproy = true; let data = { cusId: this.tableAll.cusId, }; - reportHistory(data).then((res) => { - this.loading = false; - if (res.data[0] != null) { - this.reportHistorydata = res.data; - } else { - this.reportHistorydata = []; - } - }); + reportHistory(data) + .then((res) => { + if (res.data[0] != null) { + this.reportHistorydata = res.data; + } else { + this.reportHistorydata = []; + } + }) + .catch((error) => { + console.error('鑾峰彇鍘嗗彶鎶ュ憡澶辫触:', error); + this.$message.error('鑾峰彇鍘嗗彶鎶ュ憡澶辫触'); + }) + .finally(() => { + this.loading = false; + }); }, medicalhistory() { - this.wenzhen = true; - this.hosproy = false; + this.loading = true; + this.status1 = 3; let tjNumber = this.tableAll.tjNumber; - getInfoById(tjNumber).then((response) => { - this.formobj = response.data; - if (this.formobj.xiyan == null) { - this.formobj.xiyan = "1"; - } - if (this.formobj.xiyanpinlv == null) { - this.formobj.xiyanpinlv = "0"; - } - if (this.formobj.xiyanyear == null) { - this.formobj.xiyanyear = "0"; - } - if (this.formobj.yinjiu == null) { - this.formobj.yinjiu = "1"; - } - if (this.formobj.yinjiupinlv == null) { - this.formobj.yinjiupinlv = "0"; - } - if (this.formobj.yinjiuyear == null) { - this.formobj.yinjiuyear = "0"; - } - }); + getInfoById(tjNumber) + .then((response) => { + this.formobj = response.data; + if (this.formobj.xiyan == null) { + this.formobj.xiyan = "1"; + } + if (this.formobj.xiyanpinlv == null) { + this.formobj.xiyanpinlv = "0"; + } + if (this.formobj.xiyanyear == null) { + this.formobj.xiyanyear = "0"; + } + if (this.formobj.yinjiu == null) { + this.formobj.yinjiu = "1"; + } + if (this.formobj.yinjiupinlv == null) { + this.formobj.yinjiupinlv = "0"; + } + if (this.formobj.yinjiuyear == null) { + this.formobj.yinjiuyear = "0"; + } + }) + .catch((error) => { + console.error('鑾峰彇鑱屼笟鐥呭彶澶辫触:', error); + this.$message.error('鑾峰彇鑱屼笟鐥呭彶澶辫触'); + }) + .finally(() => { + this.loading = false; + }); }, downLoadFileImg(row) { @@ -1733,7 +1841,19 @@ resetQuery() { this.startTime = []; - this.resetForm("tableList"); + this.queryParams = { + page: 1, + pageSize: 10, + tjNumber: "", + beginTime: null, + endTime: null, + compId: null, + name: null, + checkStatus: null, + shys: null, + tjCategory: null + }, + this.resetForm("tableList"); this.submitForm(); }, @@ -1798,11 +1918,17 @@ for (let i = 0; i < this.changedate.length; i++) { this.remark = this.changedate[i].remark; } + // 鍥炴樉 zhiyeJl 鍜� zhiyeJg + this.zhiyeJl = this.changedate[0].zhiyejl || ''; + this.zhiyeJg = this.changedate[0].zhiyejg || '鏈彂鐜扮洰鏍囨�х柧鐥�'; } else { this.$message({ type: "warning", message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁", }); + // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈� + this.zhiyeJl = ''; + this.zhiyeJg = '鏈彂鐜扮洰鏍囨�х柧鐥�'; } }); }); @@ -1837,11 +1963,17 @@ this.changedate.forEach((item) => { this.textarea1 = item.checkAdvice || ""; }); + // 鍥炴樉 zhiyeJl 鍜� zhiyeJg + this.zhiyeJl = this.changedate[0].zhiyejl || ''; + this.zhiyeJg = this.changedate[0].zhiyejg || '鏈彂鐜扮洰鏍囨�х柧鐥�'; } else { this.$message({ type: "warning", message: "璇ュ鎴锋病鏈変綋妫�椤圭洰鏁版嵁", }); + // 濡傛灉娌℃湁鏁版嵁锛屾竻绌哄瓧娈� + this.zhiyeJl = ''; + this.zhiyeJg = '鏈彂鐜扮洰鏍囨�х柧鐥�'; } }); }); @@ -1893,7 +2025,6 @@ handleClose1(done) { this.jianqians = false; - this.wenzhen = false; this.flags = false; done(); }, @@ -1906,10 +2037,9 @@ tjNumber, advice, checkStatus: 1, + zhiyeJl: this.zhiyeJl, // 娣诲姞妫�鏌ョ粨璁� + zhiyeJg: this.zhiyeJg // 娣诲姞浣撴缁撴灉 }; - - console.log(this.yichangList, 6644); - let dataList = this.yichangList .map((item) => { return item.sone.map((soneItem) => ({ @@ -1923,14 +2053,17 @@ dw: soneItem.proAdvice, })); }) - .flat(); // 浣跨敤 flat() 鏂规硶灏嗗祵濂楁暟缁勫睍骞� + .flat(); + this.loading = true; getTjdetailList(data) .then((response) => { if (response.code === 200) { this.$modal.msgSuccess("鎻愪氦鎴愬姛"); + // 娓呯┖瀛楁 + this.zhiyeJl = ''; + this.zhiyeJg = ''; - // 鍑嗗鐢熸垚鎶ュ憡鐨勮姹傛暟鎹� let reportData = { userId: this.userId, tjNumber: tjNumber, @@ -1938,12 +2071,8 @@ id: this.MsgId, }; - // 璋冪敤 addOrderPromise - console.log(dataList, 5555); - addOrder(dataList) .then((res) => { - console.log(res, 999); if (res.code == 200) { gettoPdf(tjNumber) .then((res) => { @@ -1969,41 +2098,36 @@ remarks, }, ]; - return getModified(updateOrderRemarkVos); // 杩斿洖 Promise + return getModified(updateOrderRemarkVos); }); - // 绛夊緟鎵�鏈夎姹傚畬鎴� Promise.all([statePromise, ...updatePromises]) .then(() => { - // 鎵�鏈夎姹傚畬鎴愶紝鍏抽棴 loading this.loading = false; - // 鏇存柊鍒嗛〉淇℃伅 this.queryParams.page = 1; this.queryParams.pageSize = 10; this.submitForm(); this.$forceUpdate(); }) .catch((error) => { - // 澶勭悊閿欒鎯呭喌 this.loading = false; console.error("鍙戠敓閿欒:", error); }); } }) .catch((error) => { - // 濡傛灉 addOrderPromise 澶辫触锛屽鐞嗛敊璇� this.loading = false; console.error("addOrderPromise 澶辫触:", error); }); } else { - // 鎻愪氦澶辫触锛屽叧闂� loading this.loading = false; + this.$modal.msgError("鎻愪氦澶辫触"); } }) .catch((error) => { - // 鎻愪氦璇锋眰澶辫触锛屽叧闂� loading this.loading = false; console.error("鎻愪氦璇锋眰澶辫触:", error); + this.$modal.msgError("鎻愪氦璇锋眰澶辫触"); }); }, -- Gitblit v1.8.0