From 392133f4cda2641a2c4297656a50fc75f45b6971 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 23 五月 2025 17:26:32 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/system/zhiye/index.vue | 125 +++++++++++------------------------------
1 files changed, 35 insertions(+), 90 deletions(-)
diff --git a/src/views/system/zhiye/index.vue b/src/views/system/zhiye/index.vue
index f053973..1ae360c 100644
--- a/src/views/system/zhiye/index.vue
+++ b/src/views/system/zhiye/index.vue
@@ -488,20 +488,20 @@
@blur="numberChangeXianPrice(discount, discount)" />
</el-form-item>
<el-form-item label="鎺ュ宸ラ緞骞�" prop="zhiyeJhgln" label-width="84px">
- <el-input v-model="form.zhiyeJhgln" type="number" style="width: 140px"/>
+ <el-input v-model="form.zhiyeJhgln" type="number" style="width: 140px" />
</el-form-item>
<el-form-item label="鎺ュ宸ラ緞鏈�" prop="zhiyeJhgln" label-width="84px">
- <el-input v-model="form.zhiyeJhgly" style="width: 140px" type="number" />
+ <el-input v-model="form.zhiyeJhgly" style="width: 140px" type="number" />
</el-form-item>
<el-form-item label="寮�濮嬫帴瀹虫棩鏈�" prop="zhiyeKsjhrq" label-width="100px">
- <el-date-picker clearable v-model="form.zhiyeKsjhrq" type="date"
- value-format="yyyy-MM-dd" style="width: 200px" />
+ <el-date-picker clearable v-model="form.zhiyeKsjhrq" type="date" value-format="yyyy-MM-dd"
+ style="width: 200px" />
</el-form-item>
<el-form-item label="宸ュ彿" label-width="50px">
- <el-input v-model="form.zhiyeGh" />
+ <el-input v-model="form.zhiyeGh" />
</el-form-item>
<el-form-item label="杞﹂棿" label-width="106px">
- <el-input v-model="form.zhiyeCj" />
+ <el-input v-model="form.zhiyeCj" />
</el-form-item>
<br />
@@ -550,9 +550,6 @@
font-size: 16px;
margin-right: 20px;
">
- <span v-if="this.tableData1[0]">{{
- this.tableData1[0].pacName || ""
- }}</span>
宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
}}</span>鏉�
</div>
@@ -2394,90 +2391,29 @@
let cusSex = this.form.cusSex;
this.datekey = Date.now();
//鍏ㄩ儴濂楅
-
- let param = {
- sex: cusSex,
- dwId: this.form.firmId || "",
- };
- if (this.form.tjType == 1) {
- if (!this.form.firmId && !this.form.firmName) {
- this.$message({
- type: "warning",
- message: "璇峰厛缁存姢鍗曚綅锛�",
- });
- } else if (!this.form.firmId && this.form.firmName) {
- this.taocan = true;
- this.loading = true;
- deptTreeSelect(cusSex).then((response) => {
- this.newpacName = response.rows;
- try {
- if (this.tableData1.length >= 1) {
- this.newpacName.forEach((item3) => {
- this.tableData1.forEach((item4) => {
- item4.list.forEach((item6) => {
- if (item6.pacName === item3.pacName) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(item3, true);
- });
- throw Error();
- }
+ this.taocan = true;
+ this.loading = true;
+ deptTreeSelect(cusSex).then((response) => {
+ this.newpacName = response.rows;
+ try {
+ if (this.tableData1.length >= 1) {
+ this.newpacName.forEach((item3) => {
+ this.tableData1.forEach((item4) => {
+ item4.list.forEach((item6) => {
+ if (item6.pacName === item3.pacName) {
+ this.$nextTick(() => {
+ this.$refs.tb.toggleRowSelection(item3, true);
});
- });
- });
- }
- } catch (error) { }
- this.loading = false;
- });
- }
-
- else {
- this.taocan = true;
- this.loading = true;
- tuantiSelect(param).then((res) => {
- this.newpacName = res.data;
- try {
- if (this.tableData1.length >= 1) {
- this.newpacName.forEach((item3) => {
- this.tableData1.forEach((item4) => {
- item4.list.forEach((item6) => {
- if (item6.pacName === item3.pacName) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(item3, true);
- });
- throw Error();
- }
- });
- });
- });
- }
- } catch (error) { }
- this.loading = false;
- });
- }
- } else {
- this.taocan = true;
- this.loading = true;
- deptTreeSelect(cusSex).then((response) => {
- this.newpacName = response.rows;
- try {
- if (this.tableData1.length >= 1) {
- this.newpacName.forEach((item3) => {
- this.tableData1.forEach((item4) => {
- item4.list.forEach((item6) => {
- if (item6.pacName === item3.pacName) {
- this.$nextTick(() => {
- this.$refs.tb.toggleRowSelection(item3, true);
- });
- throw Error();
- }
- });
+ throw Error();
+ }
});
});
- }
- } catch (error) { }
- this.loading = false;
- });
- }
+ });
+ }
+ } catch (error) { }
+ this.loading = false;
+ });
+
},
// 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
@@ -2967,6 +2903,15 @@
});
}
+ // 濡傛灉 tjCategory 涓� "02"锛岀‘淇濋�変腑鐨勫椁愯娣诲姞鍒� tableData1
+ if (this.tjCategory === "02" && this.tableData.length > 0) {
+ this.tableData.forEach((item) => {
+ if (!this.tableData1.some((existingItem) => existingItem.pacId === item.pacId)) {
+ this.tableData1.push(item);
+ }
+ });
+ }
+
this.taocan = false;
this.defaultKeys = [];
this.DataLists = [];
--
Gitblit v1.8.0