From 01c3a2e0238539b19781048259c0df84a76d46fa Mon Sep 17 00:00:00 2001 From: qx <1084500556@qq.com> Date: 星期一, 18 八月 2025 17:17:39 +0800 Subject: [PATCH] qx --- src/views/doctor/check/index.vue | 732 ++++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 500 insertions(+), 232 deletions(-) diff --git a/src/views/doctor/check/index.vue b/src/views/doctor/check/index.vue index e26b2b1..39698cd 100644 --- a/src/views/doctor/check/index.vue +++ b/src/views/doctor/check/index.vue @@ -202,14 +202,14 @@ element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative"> <div style="font-size: 14px"> <table style=" - width: 96%; - height: 70px; - margin: 10px 10px; - margin-bottom: 10px; - border: 1px solid #dfe6ec; - border-collapse: collapse; - font-size: 16px; - " cellspacing="4"> + width: 96%; + height: 70px; + margin: 10px 10px; + margin-bottom: 10px; + border: 1px solid #dfe6ec; + border-collapse: collapse; + font-size: 16px; + " cellspacing="4"> <caption style="background-color: #f8f8f9; font-size: 18px"> 濉啓{{ tableAll.cusName @@ -285,16 +285,17 @@ <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150"> <template slot-scope="{ row, $index }"> <el-input type="textarea" autosize size="mini" v-model="row.proResult" - :ref="`input-item${index}-row${$index}`" - @keydown.enter.native="keyInputConfirm($event, index, $index)" @focus="handleFocus(row)" - @blur="handleInputConfirm(row)" @input="vale($event, row)" + :ref="`input-item${index}-row${$index}`" @keydown.enter.native=" + keyInputConfirm($event, index, $index) + " @focus="handleFocus(row)" @blur="handleInputConfirm(row)" @input="vale($event, row)" :disabled="row.project.proName === 'BMI'"></el-input> </template> </el-table-column> <el-table-column prop="exceptionDesc" label="寮傚父" width="55px" align="center"> <template slot-scope="scope"> - <el-checkbox v-model="scope.row.exceptionDesc" @change="changDesc(scope.row)" - :disabled="scope.row.project.sfcyyc === 1 || scope.row.project.proName === 'BMI'"></el-checkbox> + <el-checkbox v-model="scope.row.exceptionDesc" @change="changDesc(scope.row)" :disabled="scope.row.project.sfcyyc === 1 || + scope.row.project.proName === 'BMI' + "></el-checkbox> </template> </el-table-column> <el-table-column label="瑙勫垯" width="70"> @@ -306,9 +307,7 @@ </el-table-column> <el-table-column label="鍙傝�冭寖鍥�" width="70" align="center"> <template slot-scope="scope"> - {{ scope.row.project.proScope }} - </template> </el-table-column> <el-table-column prop="conclusion" label="缁撴灉缁撹" width="200"> @@ -347,38 +346,38 @@ <div style="font-size: 14px; overflow-y: auto; height: 286px" class="a"> <table style=" - width: 96%; - margin: 4px 10px; - border: 1px solid #dfe6ec; - border-collapse: collapse; - " cellspacing="4"> - <tr style=" + width: 96%; + margin: 4px 10px; border: 1px solid #dfe6ec; border-collapse: collapse; - "> - <td style=" + " cellspacing="4"> + <tr style=" border: 1px solid #dfe6ec; border-collapse: collapse; "> + <td style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> 鐥呯閫夋嫨锛� </td> <td @click="bzxz" style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2"> </el-input> </td> <td style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> 涓绘鍖诲笀锛� </td> <td style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList" @change="selName" filterable> <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" @@ -388,19 +387,19 @@ </td> </tr> <tr style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> - <td style=" border: 1px solid #dfe6ec; border-collapse: collapse; "> + <td style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> 寤鸿锛� </td> <td style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - " colspan="2"> + border: 1px solid #dfe6ec; + border-collapse: collapse; + " colspan="2"> <div style="margin: 0 0px 10px 15px"> <el-button type="primary" @click="propoChange" style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button> @@ -433,9 +432,9 @@ <el-table-column prop="proResult" label="妫�娴嬬粨鏋�" width="150"> <template slot-scope="{ row, $index }"> <el-input type="textarea" autosize size="mini" v-model="row.proResult" - :ref="`input-item${index}-row${$index}`" - @keydown.enter.native="keyInputConfirm($event, index, $index)" @focus="handleFocus(row)" - @blur="handleInputConfirm(row)" @input="vale($event, row)" + :ref="`input-item${index}-row${$index}`" @keydown.enter.native=" + keyInputConfirm($event, index, $index) + " @focus="handleFocus(row)" @blur="handleInputConfirm(row)" @input="vale($event, row)" :disabled="row.project.proName === 'BMI'"></el-input> </template> </el-table-column> @@ -484,25 +483,25 @@ <div style="font-size: 14px; overflow-y: auto; height: 286px"> <table style=" - width: 96%; - margin: 4px 10px; - border: 1px solid #dfe6ec; - border-collapse: collapse; - " cellspacing="4"> - <tr style=" + width: 96%; + margin: 4px 10px; border: 1px solid #dfe6ec; border-collapse: collapse; - "> - <td style=" + " cellspacing="4"> + <tr style=" border: 1px solid #dfe6ec; border-collapse: collapse; "> + <td style=" + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> 鐥呯閫夋嫨锛� </td> <td style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> <el-input type="textarea" placeholder="璇烽�夋嫨鍐呭" v-model="titles" rows="2"> </el-input> <!-- <el-select @@ -524,15 +523,15 @@ </el-select> --> </td> <td style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> 涓绘鍖诲笀锛� </td> <td style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> <el-select v-model="doctorName" placeholder="璇烽�夋嫨" style="width: 100%" v-if="deptAdviceList" @change="selName" filterable> <el-option v-for="item in userList" :key="item.userId" :label="item.nickName" @@ -542,9 +541,9 @@ </td> </tr> <tr style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> <div style="margin: 0 0px 10px 15px"> <el-button type="primary" @click="propoChange" style="margin-top: 10px; height: 37px">蹇嵎寤鸿</el-button> @@ -552,15 +551,15 @@ style="margin-top: 10px; height: 37px">鐢熸垚寤鸿</el-button> </div> <td style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - "> + border: 1px solid #dfe6ec; + border-collapse: collapse; + "> 寤鸿锛� </td> <td style=" - border: 1px solid #dfe6ec; - border-collapse: collapse; - " colspan="2"> + border: 1px solid #dfe6ec; + border-collapse: collapse; + " colspan="2"> <el-input type="textarea" placeholder="璇疯緭鍏ュ唴瀹�" v-model="proParentList.remark" rows="7"> </el-input> </td> @@ -780,7 +779,7 @@ </el-tab-pane> </el-tabs> <span slot="footer" class="dialog-footer"> - <el-button @click="taocan = false">鍙� 娑�</el-button> + <el-button @click="quxiao">鍙� 娑�</el-button> <el-button type="primary" @click="queding">纭� 瀹�</el-button> </span> </el-dialog> @@ -909,6 +908,7 @@ hzReplyLogsList: [], hasdeptList: [], radio: "", + lastClickedTab: null, nums: "", proParentList: [], tjNumber: "", @@ -978,20 +978,20 @@ methods: { getBMIStatus(row) { const bmi = parseFloat(row.proResult); - if (isNaN(bmi) || !row.proResult) return ''; // 澶勭悊鏃犳晥鎴栫┖鐨凚MI鍊� + if (isNaN(bmi) || !row.proResult) return ""; // 澶勭悊鏃犳晥鎴栫┖鐨凚MI鍊� if (bmi > 28) { row.exceptionDesc = true; // 鑷姩鍕鹃�夊紓甯稿閫夋 - row.conclusion = '鍋忛珮'; // 璁剧疆缁撹 - return '鍋忛珮'; + row.conclusion = "鍋忛珮"; // 璁剧疆缁撹 + return "鍋忛珮"; } if (bmi < 12) { row.exceptionDesc = true; // 鑷姩鍕鹃�夊紓甯稿閫夋 - row.conclusion = '鍋忎綆'; // 璁剧疆缁撹 - return '鍋忎綆'; + row.conclusion = "鍋忎綆"; // 璁剧疆缁撹 + return "鍋忎綆"; } row.exceptionDesc = false; // 姝e父鑼冨洿鍐呭彇娑堝嬀閫� - row.conclusion = '姝e父'; // 璁剧疆缁撹 - return '姝e父'; + row.conclusion = "姝e父"; // 璁剧疆缁撹 + return "姝e父"; }, // 璁$畻 BMI calculateBMI(height, weight) { @@ -1001,28 +1001,30 @@ const bmi = weightInKg / (heightInMeters * heightInMeters); return bmi.toFixed(1); // 淇濈暀涓�浣嶅皬鏁� } - return ''; + return ""; }, // 瀹炴椂鏇存柊 BMI vale(value, row) { - this.minedis = false - if (row.project.proName === '韬珮' || row.project.proName === '浣撻噸') { + this.minedis = false; + if (row.project.proName === "韬珮" || row.project.proName === "浣撻噸") { const heightRow = this.proParentList.sons.find( - item => item.project.proName === '韬珮' + (item) => item.project.proName === "韬珮" ); const weightRow = this.proParentList.sons.find( - item => item.project.proName === '浣撻噸' + (item) => item.project.proName === "浣撻噸" ); const bmiRow = this.proParentList.sons.find( - item => item.project.proName === 'BMI' + (item) => item.project.proName === "BMI" ); if (heightRow && weightRow && bmiRow) { - const height = row.project.proName === '韬珮' ? value : heightRow.proResult; - const weight = row.project.proName === '浣撻噸' ? value : weightRow.proResult; + const height = + row.project.proName === "韬珮" ? value : heightRow.proResult; + const weight = + row.project.proName === "浣撻噸" ? value : weightRow.proResult; const bmi = this.calculateBMI(height, weight); - bmiRow.proResult = bmi || ''; // 瀹炴椂鏇存柊BMI鍊� + bmiRow.proResult = bmi || ""; // 瀹炴椂鏇存柊BMI鍊� this.getBMIStatus(bmiRow); // 妫�鏌MI鐘舵�佸苟鏇存柊寮傚父澶嶉�夋 } } @@ -1031,7 +1033,6 @@ this.focusrow = row; this.proResult = row; const pattern3 = new RegExp("[0-9]+"); - if (row.proResult) { } if (pattern3.test(row.proResult)) { let data = { proId: this.focusrow.proId, @@ -1056,37 +1057,53 @@ this.focusrow.exceptionDesc = false; } } - if (this.autorule.length !== 0 && (this.autorule[0] || this.autorule[0].nr)) { + if ( + this.autorule.length !== 0 && + (this.autorule[0] || this.autorule[0].nr) + ) { this.focusrow.proAdvice = this.autorule[0].nr; } this.autorule.forEach((item) => { - this.focusrow.conclusion += this.focusrow.conclusion ? item.bz : item.bz; + this.focusrow.conclusion += this.focusrow.conclusion + ? item.bz + : item.bz; }); } }); + } else { + if (this.focusrow.proResult != this.focusrow.project.proDefault) { + const substrings = ["姝e父", "鏈寮傚父", "闃存��", "鏈鏄庢樉寮傚父", "鏃�"]; + let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub)); + if (containsAllSubstrings) { + this.focusrow.exceptionDesc = false; + } else { + this.focusrow.exceptionDesc = true; + } + } else { + this.focusrow.exceptionDesc = false; + } } }, - // 杈撳叆纭鏃舵洿鏂� BMI handleInputConfirm(row) { if (row.proResult) { - if (row.project.proName === '韬珮' || row.project.proName === '浣撻噸') { + if (row.project.proName === "韬珮" || row.project.proName === "浣撻噸") { const heightRow = this.proParentList.sons.find( - item => item.project.proName === '韬珮' + (item) => item.project.proName === "韬珮" ); const weightRow = this.proParentList.sons.find( - item => item.project.proName === '浣撻噸' + (item) => item.project.proName === "浣撻噸" ); const bmiRow = this.proParentList.sons.find( - item => item.project.proName === 'BMI' + (item) => item.project.proName === "BMI" ); if (heightRow && weightRow && bmiRow) { const height = heightRow.proResult; const weight = weightRow.proResult; const bmi = this.calculateBMI(height, weight); - bmiRow.proResult = bmi || ''; + bmiRow.proResult = bmi || ""; this.getBMIStatus(bmiRow); // 妫�鏌MI鐘舵�佸苟鏇存柊寮傚父澶嶉�夋 } } @@ -1094,6 +1111,7 @@ // 鐜版湁鐨勮鍒欐鏌ラ�昏緫淇濇寔涓嶅彉 this.focusrow = row; this.proResult = row; + const pattern3 = new RegExp("[0-9]+"); if (pattern3.test(row.proResult)) { let data = { @@ -1119,14 +1137,32 @@ this.focusrow.exceptionDesc = false; } } - if (this.autorule.length !== 0 && (this.autorule[0] || this.autorule[0].nr)) { + if ( + this.autorule.length !== 0 && + (this.autorule[0] || this.autorule[0].nr) + ) { this.focusrow.proAdvice = this.autorule[0].nr; } this.autorule.forEach((item) => { - this.focusrow.conclusion += this.focusrow.conclusion ? item.bz : item.bz; + this.focusrow.conclusion += this.focusrow.conclusion + ? item.bz + : item.bz; }); } }); + } else { + if (this.focusrow.proResult != this.focusrow.project.proDefault) { + const substrings = ["姝e父", "鏈寮傚父", "闃存��", "鏈鏄庢樉寮傚父", "鏃�"]; + let containsAllSubstrings = substrings.some(sub => this.focusrow.proResult.includes(sub)); + if (containsAllSubstrings) { + this.focusrow.exceptionDesc = false; + } else { + this.focusrow.exceptionDesc = true; + } + } else { + this.focusrow.exceptionDesc = false; + } + } this.rows.push(row); }, @@ -1137,21 +1173,25 @@ tjNumber: this.tjNumber, proParentId: this.nums, }; + getParentId(data).then((response) => { if (response.data != {}) { this.proParentList = response.data; const heightRow = this.proParentList.sons.find( - item => item.project.proName === '韬珮' + (item) => item.project.proName === "韬珮" ); const weightRow = this.proParentList.sons.find( - item => item.project.proName === '浣撻噸' + (item) => item.project.proName === "浣撻噸" ); const bmiRow = this.proParentList.sons.find( - item => item.project.proName === 'BMI' + (item) => item.project.proName === "BMI" ); if (heightRow && weightRow && bmiRow) { - const bmi = this.calculateBMI(heightRow.proResult, weightRow.proResult); - bmiRow.proResult = bmi || ''; + const bmi = this.calculateBMI( + heightRow.proResult, + weightRow.proResult + ); + bmiRow.proResult = bmi || ""; } this.proParentList.xiaoJie.forEach((item) => { this.titles += item.title + ","; @@ -1160,6 +1200,7 @@ this.loading = false; this.value = []; + if (this.proParentList.xiaoJieIds != null) { if (this.proParentList.xiaoJieIds.length != 0) { this.proParentList.xiaoJieIds.forEach((item2) => { @@ -1182,9 +1223,13 @@ if (item.isReturn == 1) item.isReturn = true; if (item.isReturn == 0) item.isReturn = false; if (item.exceptionDesc == "1") item.exceptionDesc = true; - if (item.exceptionDesc == "0" || item.project.sfcyyc == 1) item.exceptionDesc = false; + if (item.exceptionDesc == "0" || item.project.sfcyyc == 1) + item.exceptionDesc = false; }); - if (this.proParentList.xiaoJie && this.proParentList.xiaoJie.length != 0) { + if ( + this.proParentList.xiaoJie && + this.proParentList.xiaoJie.length != 0 + ) { this.Parent.forEach((item3) => { if (item3.proId === this.nums) { this.proParentList.remark = item3.remark; @@ -1214,12 +1259,12 @@ this.$refs.bbb.open = false; } }); - } }, handleChangesZt(params) { this.curindex.proResult = params.map((item) => item.ruleStr).join(","); + this.handleInputConfirm(this.curindex, params); }, @@ -1256,7 +1301,7 @@ this.getbzlist(); }, - bzxz() { + /* bzxz() { this.taocan = true; let data = { proId: this.proId, tjNum: this.tableAll.tjNumber }; getAdviceByTjNumAndPro(data).then((res) => { @@ -1269,6 +1314,54 @@ }); } }); + }, */ + bzxz() { + this.taocan = true; + var deptAdviceList1 = [] + // let data = { proId: this.proId, tjNum: this.tableAll.tjNumber }; + // getAdviceByTjNumAndPro(data).then((res) => { + // if (res.data) { + // this.deptAdviceList3 = res.data; + if (this.proParentList.xiaoJieIds.length != 0) { + if (this.vaids.length != 0) { + const result = this.vaids.reduce((acc, item) => { + const matches = this.deptAdviceList.filter(items => { + return item == items.id; // 鎴� === 鏍规嵁闇�姹� + }); + return acc.concat(matches); + }, []); + deptAdviceList1 = result; + + return this.deptAdviceList1 = [ + ...new Set(deptAdviceList1), + ]; + } else { + this.proParentList.xiaoJieIds.forEach(item => { + this.deptAdviceList.forEach((items) => { + if (item == items.id) { + deptAdviceList1.push(items) + } + }); + }) + return this.deptAdviceList1 = [ + ...new Set(deptAdviceList1), + ]; + } + + + } else if (this.proParentList.xiaoJieIds == null) { + this.deptAdviceList1 = [] + } + + // this.deptAdviceList1 = [ + // ...new Set(this.deptAdviceList2.concat(this.deptAdviceList3)), + // ]; + // this.deptAdviceList3.forEach((items) => { + // this.idss.push(items.id); + // this.remakes += items.advice + ","; + // }); + // } + // }); }, result() { @@ -1306,29 +1399,49 @@ handleDelete(row) { this.deptAdviceList1.forEach((item, index) => { - if (item.id == row.id) this.deptAdviceList1.splice(index, 1); + if (item.id == row.id) { + this.deptAdviceList1.splice(index, 1); + this.$refs.multipleTable.toggleRowSelection(item, false); + } }); }, handleSelectionChanges(selection) { - this.deptAdviceList2 = this.deptAdviceList1; + if (this.deptAdviceList1.length != 0) { + this.deptAdviceList2 = this.deptAdviceList1; + } if (selection.length > 1) { const del_row = selection.shift(); this.$refs.multipleTable.toggleRowSelection(del_row, false); } selection.forEach((item) => this.deptAdviceList2.push(item)); - this.deptAdviceList1 = [...new Set(this.deptAdviceList2.concat(this.deptAdviceList3))]; + // this.deptAdviceList1 = [ + // ...new Set(this.deptAdviceList2), + // ]; + this.deptAdviceList1 = [ + ...new Set(this.deptAdviceList2.map((item) => JSON.stringify(item))), + ].map((str) => JSON.parse(str)); + // if( this.deptAdviceList1.length == 0){ + // this.deptAdviceList1 = selection + // }else{ + // selection.forEach((item) => this.deptAdviceList1.push(item)); + // } }, - + quxiao() { + this.taocan = false; + this.deptAdviceList1 = [] + }, queding() { if (this.proParentList.xiaoJie.length != 0) { this.remakes = ""; this.titles = ""; + this.vaids = [] this.deptAdviceList1.forEach((item1) => { if (this.proParentList.remark != null) { this.titles += item1.title + ","; this.remakes += item1.advice + ","; - this.proParentList.remark = this.proParentList.remark + this.remakes; + this.proParentList.remark = + this.proParentList.remark + this.remakes; this.value += item1.title + ","; this.vaids.push(item1.id); this.vaids1 = this.vaids.concat(this.idss); @@ -1356,6 +1469,7 @@ this.proParentList.remark = this.remakes; } this.taocan = false; + } }, @@ -1376,7 +1490,7 @@ }, handleClose() { - this.drawer = false; // 鍙叧闂娊灞夛紝涓嶅埛鏂伴〉闈㈡垨閲嶇疆鏁版嵁 + this.drawer = false; // 鍙叧闂娊灞夛紝涓嶅埛鏂伴〉闈㈡垨閲嶇疆鏁版嵁 }, handleClose1() { @@ -1388,8 +1502,6 @@ }, changDesc(item) { - - item.conclusion = item.exceptionDesc ? "寮傚父" : "姝e父"; }, @@ -1398,12 +1510,18 @@ }, sel(val) { + if (this.proParentList.xiaoJie.length != 0) { this.deptAdviceList.forEach((item) => { this.ids = item.id; val.forEach((item1) => { - if (item1 === item.id && !this.proParentList.remark.includes(item.title)) { - this.proParentList.remark = this.proParentList.remark ? this.proParentList.remark + item.title + "," : item.title + ","; + if ( + item1 === item.id && + !this.proParentList.remark.includes(item.title) + ) { + this.proParentList.remark = this.proParentList.remark + ? this.proParentList.remark + item.title + "," + : item.title + ","; } }); }); @@ -1412,8 +1530,13 @@ this.deptAdviceList.forEach((item) => { this.ids = item.id; val.forEach((item1) => { - if (item1 === item.id && !this.proParentList.remark.includes(item.title)) { - this.proParentList.remark = this.proParentList.remark ? this.proParentList.remark + item.title + "," : item.title + ","; + if ( + item1 === item.id && + !this.proParentList.remark.includes(item.title) + ) { + this.proParentList.remark = this.proParentList.remark + ? this.proParentList.remark + item.title + "," + : item.title + ","; } }); }); @@ -1421,18 +1544,17 @@ }, initInputDOM() { - const inputDoms = document.querySelectorAll('.el-input__inner'); - inputDoms.forEach((item, index) => item.setAttribute('data-index', index)); + const inputDoms = document.querySelectorAll(".el-input__inner"); + inputDoms.forEach((item, index) => + item.setAttribute("data-index", index) + ); this.inputDoms = inputDoms; }, - - - keyInputConfirm(event, index, currentRowIndex) { // 闃绘榛樿鍥炶溅琛屼负锛屾瘮濡傛彁浜よ〃鍗� event.preventDefault(); - event.stopPropagation() + event.stopPropagation(); const nextRowIndex = currentRowIndex + 1; // 璁$畻涓嬩竴琛岀储寮� // 濡傛灉涓嬩竴琛屽瓨鍦紝鍒欒仛鐒﹁琛岀殑杈撳叆妗� if (nextRowIndex < this.proParentList.sons.length) { @@ -1447,7 +1569,6 @@ } }); } - }, getList() { @@ -1457,7 +1578,8 @@ if (response.code == 200) { this.loading = false; if (response.data) { - this.tableList = response.data.date || response.data.customers || []; + this.tableList = + response.data.date || response.data.customers || []; this.total = response.data.total; } else { this.tableList = []; @@ -1472,7 +1594,14 @@ getProList(this.queryParams).then((response) => { if (response.code == 200) { this.loading = false; - this.tableList = response.data.date || response.data.customers || []; + // this.tableList = response.data.date || response.data.customers || []; + // this.total = response.data.total; + const list = response.data.date || response.data.customers || []; + // 缁欐瘡鏉℃暟鎹坊鍔� titles 瀛楁锛堝鏋滄病鏈夌殑璇濓級 + this.tableList = list.map((item) => ({ + ...item, + titles: item.titles || "", // 鍒濆鍖栦负绌哄瓧绗︿覆鎴栧凡鏈夊�� + })); this.total = response.data.total; } else { this.tableList = []; @@ -1490,7 +1619,14 @@ eventchange(data) { this.dataText = data; - data.forEach((item) => this.proParentList.remark += item.advice); + data.forEach((item) => { + if (item.advice) { + this.proParentList.remark += item.advice + } else if (item.jynr) { + this.proParentList.remark += item.jynr + } + }) + // data.forEach((item) => (this.proParentList.remark += item.jynr)); }, proposalChange() { @@ -1510,7 +1646,14 @@ getProList(this.queryParams).then((response) => { if (response.code == 200) { this.loading = false; - this.tableList = response.data.date || response.data.customers || []; + // this.tableList = response.data.date || response.data.customers || []; + // this.total = response.data.total; + const list = response.data.date || response.data.customers || []; + // 缁欐瘡鏉℃暟鎹坊鍔� titles 瀛楁锛堝鏋滄病鏈夌殑璇濓級 + this.tableList = list.map((item) => ({ + ...item, + titles: item.titles || "", // 鍒濆鍖栦负绌哄瓧绗︿覆鎴栧凡鏈夊�� + })); this.total = response.data.total; this.queryParams.tjNumber = ""; } else { @@ -1529,7 +1672,7 @@ this.open = true; this.form = row; this.form.hzDoctorId = this.info.userId; - getChildList().then((res) => this.deptList = res.data); + getChildList().then((res) => (this.deptList = res.data)); this.Hzlog(this.form.tjNumber); }, @@ -1583,7 +1726,8 @@ if (item.hzType != "0") { item.hzDeptIdList.forEach((item1) => { this.deptList.forEach((item2) => { - if (item1 == item2.deptId) item.hzDeptName += item2.deptName + ","; + if (item1 == item2.deptId) + item.hzDeptName += item2.deptName + ","; }); }); } @@ -1607,7 +1751,8 @@ submitFormapply() { let data = {}; this.userList.forEach((item1) => { - if (this.form.hzDoctorId == item1.userId) this.form.hzDoctorName = item1.nickName; + if (this.form.hzDoctorId == item1.userId) + this.form.hzDoctorName = item1.nickName; }); if (this.form.hzType != undefined) { this.$refs["form"].validate((valid) => { @@ -1707,7 +1852,10 @@ background: "rgba(0, 0, 0, 0.7)", }); setTimeout(() => loading.close(), 3000); - this.$message({ type: "warning", message: "鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�" }); + this.$message({ + type: "warning", + message: "鎶ュ憡姝e湪鐢熸垚锛岃涓ゅ垎閽熷悗棰勮锛�", + }); } else { this.dialogVisible = true; this.url = window.webkitURL.createObjectURL(response); @@ -1750,7 +1898,8 @@ } else { this.allList = []; if (selection[0]) { - if (selection[0].hzReplyLogsList) this.hzReplyLogsList = selection[0].hzReplyLogsList; + if (selection[0].hzReplyLogsList) + this.hzReplyLogsList = selection[0].hzReplyLogsList; } else { this.hzReplyLogsList = []; } @@ -1763,37 +1912,40 @@ this.loading = true; this.drawer = true; this.isLoading = true; - this.Parent = [] - this.tableAll = [] - this.proParentList = {} + this.titles = ""; + this.Parent = []; + this.tableAll = []; + this.proParentList = {}; this.$nextTick(() => this.initInputDOM()); this.tableAll = row; this.tjNumber = row.tjNumber; let num = 0; - getParentList(this.tjNumber).then((response) => { - if (response.data) { - this.loading = false; - this.isLoading = false; - this.Parent = response.data; - this.Parent.forEach((item) => { - if (item.type === 1) item.proName += " 鉁�"; - if (num === 0) { - this.nums = item.proId; - this.radio = item.proId; - this.proId = item.proId; - this.getParentIdsss(); - this.getbzlist(); - } - num = num + 1; - }); - } else { - this.loading = false; - this.Parent = []; - this.$modal.msgError("璇ョ瀹や笅鏃犻」鐩紒"); - } - }).catch((error) => { - this.$modal.msgError("鏁版嵁鍔犺浇澶辫触"); - }) + getParentList(this.tjNumber) + .then((response) => { + if (response.data) { + this.loading = false; + this.isLoading = false; + this.Parent = response.data; + this.Parent.forEach((item) => { + if (item.type === 1) item.proName += " 鉁�"; + if (num === 0) { + this.nums = item.proId; + this.radio = item.proId; + this.proId = item.proId; + this.getParentIdsss(); + this.getbzlist(); + } + num = num + 1; + }); + } else { + this.loading = false; + this.Parent = []; + this.$modal.msgError("璇ョ瀹や笅鏃犻」鐩紒"); + } + }) + .catch((error) => { + this.$modal.msgError("鏁版嵁鍔犺浇澶辫触"); + }) .finally(() => { this.loading = false; this.isLoading = false; // 纭繚鏈�缁堢姸鎬侀噸缃� @@ -1811,7 +1963,8 @@ if (item.hzType != "0") { item.hzDeptIdList.forEach((item1) => { this.deptList.forEach((item2) => { - if (item1 == item2.deptId) item.hzDeptName += item2.deptName + ","; + if (item1 == item2.deptId) + item.hzDeptName += item2.deptName + ","; }); }); } @@ -1821,15 +1974,22 @@ }, handleTabClick(tab, event) { + if (this.lastClickedTab == null) { + this.lastClickedTab = tab; + } this.Parent.forEach((item) => { if (tab.name == item.proId) this.Parentcheck = item; }); - this.$confirm("妫�娴嬪埌浣撴缁撴灉鏈彁浜わ紝鏄惁鍦ㄧ寮�璇ラ」鐩墠鎻愪氦淇敼锛�", "纭淇℃伅", { - distinguishCancelAndClose: true, - confirmButtonText: "鎻愪氦", - cancelButtonText: "涓嶄繚瀛橈紝绂诲紑", - }) + this.$confirm( + "妫�娴嬪埌浣撴缁撴灉鏈彁浜わ紝鏄惁鍦ㄧ寮�璇ラ」鐩墠鎻愪氦淇敼锛�", + "纭淇℃伅", + { + distinguishCancelAndClose: true, + confirmButtonText: "鎻愪氦", + cancelButtonText: "涓嶄繚瀛橈紝绂诲紑", + } + ) .then(() => { let tjNumber = this.tableAll.tjNumber; this.userList.forEach((item) => { @@ -1855,57 +2015,121 @@ // rulesList: item.rulesList, // }); }); - for (var i = 0; i < this.proParentList.sons.length; i++) { - //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓� - if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) { - this.$modal.msgError("璇峰~鍐欒祫鏂�"); - this.minedis = true - return - } else if (this.proParentList.sons[i].proResult.includes(" ")) { - this.$modal.msgError("璇锋煡鐪嬫槸鍚︽湁绌烘牸"); - this.minedis = true - return - } else { - this.minedis = false + // for (var i = 0; i < this.proParentList.sons.length; i++) { + // //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓� + // if ( + // this.proParentList.sons[i].project.proDefault != null || this.proParentList.sons[i].project.proDefault != "" + // ) { + // console.log(1111, this.proParentList.sons[i].project.proDefault) + + // if (this.proParentList.sons[i].proResult == "" || + // this.proParentList.sons[i].proResult == null) { + // this.radio = this.lastClickedTab.name; + // this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀~鍐欏畬鎴�"); + // this.minedis = true; + // return; + // } else if (this.proParentList.sons[i].proResult.includes(" ")) { + // this.$modal.msgError("璇锋鏌ラ」鐩槸鍚︽湁绌烘牸"); + // this.radio = this.lastClickedTab.name; + // this.minedis = true; + // return; + // } + // } else if ( + // this.proParentList.sons[i].project.proDefault == null || this.proParentList.sons[i].project.proDefault == "" + // ) { + // console.log(2222, this.tjOrderDetail) + // this.minedis = false; + // this.tjOrderDetail.push({ + // proAdvice: this.proParentList.sons[i].proAdvice, + // proName: this.proParentList.sons[i].project.proName, + // proId: this.proParentList.sons[i].project.proId, + // orderDetailId: this.proParentList.sons[i].orderDetailId, + // flowingWaterId: this.proParentList.sons[i].flowingWaterId, + // proResult: this.proParentList.sons[i].proResult, + // tjStatus: 1, + // isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0, + // exceptionDesc: + // this.proParentList.sons[i].exceptionDesc === true ? 1 : 0, + // conclusion: this.proParentList.sons[i].conclusion, + // rulesList: this.proParentList.sons[i].rulesList, + // }); + // } + // } + // 浼樺寲鍚庣殑琛ㄥ崟楠岃瘉閫昏緫 + for (const item of this.proParentList.sons) { + const { project, proResult } = item; + + // 蹇呭~椤归獙璇� + if (project.proDefault) { + console.log('蹇呭~椤规鏌�:', project.proDefault); + + if (!proResult || proResult.trim() === '') { + this.radio = this.lastClickedTab.name; + this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀~鍐欏畬鎴�"); + this.minedis = true; + return; + } + + if (proResult.includes(' ')) { + this.$modal.msgError("璇锋鏌ラ」鐩槸鍚︽湁绌烘牸"); + this.radio = this.lastClickedTab.name; + this.minedis = true; + return; + } + } + + // 闈炲繀濉」鏁版嵁澶勭悊 + if (!project.proDefault) { + console.log('闈炲繀濉」澶勭悊:', this.tjOrderDetail); + this.minedis = false; + this.tjOrderDetail.push({ - proAdvice: this.proParentList.sons[i].proAdvice, - proName: this.proParentList.sons[i].project.proName, - proId: this.proParentList.sons[i].project.proId, - orderDetailId: this.proParentList.sons[i].orderDetailId, - flowingWaterId: this.proParentList.sons[i].flowingWaterId, - proResult: this.proParentList.sons[i].proResult, + proAdvice: item.proAdvice, + proName: project.proName, + proId: project.proId, + orderDetailId: item.orderDetailId, + flowingWaterId: item.flowingWaterId, + proResult: proResult, tjStatus: 1, - isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0, - exceptionDesc: this.proParentList.sons[i].exceptionDesc === true ? 1 : 0, - conclusion: this.proParentList.sons[i].conclusion, - rulesList: this.proParentList.sons[i].rulesList, + isReturn: item.isReturn ? 1 : 0, + exceptionDesc: item.exceptionDesc ? 1 : 0, + conclusion: item.conclusion, + rulesList: item.rulesList }); } } if (this.minedis == false) { - var data = [{ - tjNumber, - proId: this.proId, - remark: this.proParentList.remark, - proName: this.proName, - summaryList: this.value, - doctorName: this.doctorName, - tjOrderDetailList: this.tjOrderDetail, - }]; - getaddRemark(data).then((res) => this.$modal.msgSuccess("鎻愪氦鎴愬姛")); + var data = [ + { + tjNumber, + proId: this.proId, + remark: this.proParentList.remark, + proName: this.proName, + summaryList: this.vaids, + doctorName: this.doctorName, + tjOrderDetailList: this.tjOrderDetail, + }, + ]; + getaddRemark(data).then((res) => + this.$modal.msgSuccess("鎻愪氦鎴愬姛") + ); this.proName = this.Parentcheck.proName; this.nums = tab.name; this.proId = tab.name; + this.lastClickedTab = tab; this.getParentIdsss(); this.getbzlist(); } }) .catch((action) => { - if (action === "cancel") this.$message({ type: "warning", message: "鏀惧純淇濆瓨骞剁寮�" }); + if (action === "cancel") + this.$message({ type: "warning", message: "鏀惧純淇濆瓨骞剁寮�" }); this.proName = this.Parentcheck.proName; this.nums = tab.name; this.proId = tab.name; + this.lastClickedTab = tab; + this.minedis = false this.getParentIdsss(); this.getbzlist(); }); @@ -1923,46 +2147,91 @@ if (item1 === item) item = item1; }); } + }); + // for (var i = 0; i < this.proParentList.sons.length; i++) { + // //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓� + // if ( + // this.proParentList.sons[i].proResult == "" || + // this.proParentList.sons[i].proResult == null + // ) { + // this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀~鍐欏畬鎴�"); + // this.minedis = true; + // return; + // } else if (this.proParentList.sons[i].proResult.includes(" ")) { + // this.$modal.msgError("璇锋鏌ュ~鍐欓」鐩腑鏄惁鏈夌┖鏍�"); + // this.minedis = true; + // return; + // } else { + // this.minedis = false; + // this.tjOrderDetail.push({ + // proAdvice: this.proParentList.sons[i].proAdvice, + // proName: this.proParentList.sons[i].project.proName, + // proId: this.proParentList.sons[i].project.proId, + // orderDetailId: this.proParentList.sons[i].orderDetailId, + // flowingWaterId: this.proParentList.sons[i].flowingWaterId, + // proResult: this.proParentList.sons[i].proResult, + // tjStatus: 1, + // isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0, + // exceptionDesc: + // this.proParentList.sons[i].exceptionDesc === true ? 1 : 0, + // conclusion: this.proParentList.sons[i].conclusion, + // rulesList: this.proParentList.sons[i].rulesList, + // }); + // } + // } + for (const item of this.proParentList.sons) { + const { project, proResult } = item; - }) - for (var i = 0; i < this.proParentList.sons.length; i++) { - //鍒ゆ柇鏂版暟缁勬槸鍚︽湁杩欎釜鍏冪礌鍊硷紝娌℃湁鐨勮瘽锛屽氨鎶奱rr[i]缁檖ush鍒版柊鏁扮粍newArr涓� - if (this.proParentList.sons[i].proResult == "" || this.proParentList.sons[i].proResult == null) { - this.$modal.msgError("璇峰~鍐欒祫鏂�"); - this.minedis = true - return - } else if (this.proParentList.sons[i].proResult.includes(" ")) { - this.$modal.msgError("璇锋煡鐪嬫槸鍚︽湁绌烘牸"); - this.minedis = true - return - } else { - this.minedis = false + // 蹇呭~椤归獙璇� + if (project.proDefault) { + console.log('蹇呭~椤规鏌�:', project.proDefault); + + if (!proResult || proResult.trim() === '') { + this.$modal.msgError("璇锋鏌ラ」鐩槸鍚﹀~鍐欏畬鎴�"); + this.minedis = true; + return; + } + + if (proResult.includes(' ')) { + this.$modal.msgError("璇锋鏌ラ」鐩槸鍚︽湁绌烘牸"); + this.minedis = true; + return; + } + } + + // 闈炲繀濉」鏁版嵁澶勭悊 + if (!project.proDefault) { + console.log('闈炲繀濉」澶勭悊:', this.tjOrderDetail); + this.minedis = false; this.tjOrderDetail.push({ - proAdvice: this.proParentList.sons[i].proAdvice, - proName: this.proParentList.sons[i].project.proName, - proId: this.proParentList.sons[i].project.proId, - orderDetailId: this.proParentList.sons[i].orderDetailId, - flowingWaterId: this.proParentList.sons[i].flowingWaterId, - proResult: this.proParentList.sons[i].proResult, + proAdvice: item.proAdvice, + proName: project.proName, + proId: project.proId, + orderDetailId: item.orderDetailId, + flowingWaterId: item.flowingWaterId, + proResult: proResult, tjStatus: 1, - isReturn: this.proParentList.sons[i].isReturn === true ? 1 : 0, - exceptionDesc: this.proParentList.sons[i].exceptionDesc === true ? 1 : 0, - conclusion: this.proParentList.sons[i].conclusion, - rulesList: this.proParentList.sons[i].rulesList, + isReturn: item.isReturn ? 1 : 0, + exceptionDesc: item.exceptionDesc ? 1 : 0, + conclusion: item.conclusion, + rulesList: item.rulesList }); } } if (this.minedis == false) { - let data = [{ - tjNumber, - proId: this.proId, - remark: this.proParentList.remark, - proName: this.proName, - summaryList: this.vaids1, - doctorName: this.doctorName, - tjOrderDetailList: this.tjOrderDetail, - }]; + let data = [ + { + tjNumber, + proId: this.proId, + remark: this.proParentList.remark, + proName: this.proName, + summaryList: this.vaids, + doctorName: this.doctorName, + tjOrderDetailList: this.tjOrderDetail, + }, + ]; + getaddRemark(data).then((res) => { this.$modal.msgSuccess("鎻愪氦鎴愬姛"); this.rows = []; // 鎻愪氦鎴愬姛鍚庢竻绌� this.rows @@ -1970,7 +2239,6 @@ }); this.handleClose(); } - }, }, }; -- Gitblit v1.8.0