From 18f35fe78de41a1b240758c91e05380decb48978 Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期五, 25 七月 2025 17:39:59 +0800 Subject: [PATCH] 1 --- src/views/doctor/checkAll/index.vue | 95 ++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 77 insertions(+), 18 deletions(-) diff --git a/src/views/doctor/checkAll/index.vue b/src/views/doctor/checkAll/index.vue index 327ec5e..8235084 100644 --- a/src/views/doctor/checkAll/index.vue +++ b/src/views/doctor/checkAll/index.vue @@ -733,6 +733,7 @@ placeholder="璇疯緭鍏ュ唴瀹�" v-model="textarea1" :autosize="{ minRows: minRows, maxRows: maxRows }" + style="font-size: 16px" ></el-input> </el-form-item> </el-form> @@ -778,6 +779,7 @@ style="width: 100%" :header-cell-style="{ background: '#67C23A' }" :row-key="getRowKeys" + :expand-row-keys="expends" > <!-- :expand-row-keys="expends" --> <el-table-column type="expand"> @@ -2150,6 +2152,8 @@ status1: 0, viewportHeight: 0, expends: [], + expandRowKeys: [], + shouldExpand: false, }; }, @@ -2580,6 +2584,15 @@ yichangjieguo() { this.loading = true; this.status1 = 0; + getConfigKey("kzycxmsfzk").then((res) => { + this.shouldExpand = res.msg; + // 鍙湁Y/y鎵嶅睍寮�锛屽叾瀹冿紙鍖呮嫭绌恒�丯銆乶ull銆乽ndefined锛夐兘涓嶅睍寮� + if (this.shouldExpand === "Y") { + this.getExpends(); + } else { + this.expends = []; + } + }); yichang({ tjNum: this.tjNumber, }) @@ -2598,15 +2611,24 @@ if (!this.yichangList) { this.$message.warning("鏆傛棤寮傚父鎶ュ憡"); } + // 杩欓噷涔熷彲浠ユ牴鎹畇houldExpand鍐嶈皟鐢ㄤ竴娆etExpends锛岀‘淇濇暟鎹凡鍔犺浇 + if (this.shouldExpand === "Y" || this.shouldExpand === "y") { + this.getExpends(); + } else { + this.expends = []; + } }) .catch((error) => { + this.isLoading = false; console.error("鑾峰彇寮傚父缁撴灉澶辫触:", error); this.$message.error("鑾峰彇寮傚父缁撴灉澶辫触"); }) .finally(() => { + this.isLoading = false; this.loading = false; }); }, + fuchaxiangmu() { this.loading = true; @@ -2934,10 +2956,9 @@ propoChange() { this.cusobj = { sex: this.tableAll.cusSex, isZj: 0 }; + this.$refs.proposal.clearSearchFields(); getConfigKey("mrzscyjy").then((res) => { this.mrjy = res.msg; // 浼氳Е鍙� watch 鈫� 璁剧疆 tjproposal = "1" - // console.log(res, 4444); - // 绛夋暟鎹姸鎬佸噯澶囧ソ鍚庡啀鎵撳紑寮圭獥 this.$refs.proposal.title = "寤鸿鏂规"; this.$refs.proposal.open = true; @@ -3132,18 +3153,18 @@ this.qingkong(); this.$refs.Pre.open = false; this.tableAll = row; - let dict = "dict_tjtype" - getDicts(dict).then(res => { - if (res.code == 200) { - res.data.forEach((item) => { - if (this.tableAll.tjCategory == item.dictValue) { - this.tableAll.tjCategory = item.dictLabel; - } - }); - } else { - throw new Error('鑾峰彇浣撴绫诲瀷瀛楀吀澶辫触'); - } - }) + let dict = "dict_tjtype"; + getDicts(dict).then((res) => { + if (res.code == 200) { + res.data.forEach((item) => { + if (this.tableAll.tjCategory == item.dictValue) { + this.tableAll.tjCategory = item.dictLabel; + } + }); + } else { + throw new Error("鑾峰彇浣撴绫诲瀷瀛楀吀澶辫触"); + } + }); this.tjproject = "0"; this.tjNumber = this.tableAll.tjNumber; @@ -3165,7 +3186,7 @@ this.isLoading = true; this.drawer = true; getupdateCheckType(this.tjNumber).then((response) => { - this.isLoading = false; + // this.isLoading = false; this.changedate = response.data; if (this.changedate) { this.changedate.forEach((item) => { @@ -3220,7 +3241,7 @@ this.isLoading = true; this.drawer = true; getupdateCheckType(this.tjNumber).then((response) => { - this.isLoading = false; + // this.isLoading = false; this.changedate = response.data; if (this.changedate) { for (let i = 0; i < this.changedate.length; i++) { @@ -3347,7 +3368,45 @@ id: this.MsgId, }; - addOrder(dataList) + /* gettoPdf(tjNumber) + .then((res) => { + this.$modal.msgSuccess("宸茬敓鎴愭姤鍛婏紒璇峰墠寰�鎶ュ憡鏍告敹椤甸潰纭锛�"); + }) + .catch(() => { + this.$modal.msgError( + "鎵撳嵃鎶ュ憡澶辫触锛岃鍓嶅線鎶ュ憡鎵撳嵃椤甸潰琛ユ墦鎶ュ憡锛�" + ); + }); */ + const statePromise = getfiedState(reportData).then(() => { + this.drawer = false; + }); + const updatePromises = this.changedate.map((item) => { + this.proIds = item.parentId; + let remarks = item.remark; + let updateOrderRemarkVos = [ + { + tjNumber, + proId: this.proIds.toString(), + remarks, + }, + ]; + return getModified(updateOrderRemarkVos); + }); + + Promise.all([statePromise, ...updatePromises]) + .then(() => { + this.loading = false; + this.queryParams.page = 1; + this.queryParams.pageSize = 10; + this.submitForm(); + this.$forceUpdate(); + }) + .catch((error) => { + this.loading = false; + console.error("鍙戠敓閿欒:", error); + }); + + /* addOrder(dataList) .then((res) => { if (res.code == 200) { // gettoPdf(tjNumber) @@ -3394,7 +3453,7 @@ .catch((error) => { this.loading = false; console.error("addOrderPromise 澶辫触:", error); - }); + }); */ } else { this.loading = false; this.$modal.msgError("鎻愪氦澶辫触"); -- Gitblit v1.8.0