From 38a40fefc0c7c6afb17958f6827304dbefda9873 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期二, 24 六月 2025 08:58:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/system/zhiye/index.vue | 95 ++++++++++++++++-------------------------------
1 files changed, 32 insertions(+), 63 deletions(-)
diff --git a/src/views/system/zhiye/index.vue b/src/views/system/zhiye/index.vue
index f053973..9459fcc 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>
@@ -761,7 +758,7 @@
tuantiSelect,
deptTreeSelect,
projectGetList,
- getOrderzhiye,
+ getOrder,
getProParentIdDxList,
getProSonDxList,
getCusIdcard,
@@ -2383,8 +2380,7 @@
}
});
},
-
- Package() {
+Package() {
this.activeNames = "first";
if (this.form.cusSex == "鐢�") {
this.form.cusSex = 0;
@@ -2399,7 +2395,7 @@
sex: cusSex,
dwId: this.form.firmId || "",
};
- if (this.form.tjType == 1) {
+ if (this.form.tjType == 6) {
if (!this.form.firmId && !this.form.firmName) {
this.$message({
type: "warning",
@@ -2428,9 +2424,7 @@
} catch (error) { }
this.loading = false;
});
- }
-
- else {
+ } else {
this.taocan = true;
this.loading = true;
tuantiSelect(param).then((res) => {
@@ -2482,6 +2476,7 @@
// 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁
handleSelectionChange(selection, row) {
+ console.log(selection)
this.tableData = selection;
if (selection.length > 1) {
let del_row = selection.shift();
@@ -2526,37 +2521,6 @@
});
}
if (selection[0]) {
- // this.DataList = [];
- // this.data = JSON.parse(JSON.stringify(this.dXData));
- // selection[0].tjProjectList.forEach((selectionitem) => {
- // this.Treedata.forEach((item) => {
- // if (selectionitem.proName == item.proName) {
- // item.disabled = true;
- // item.tjProjectList = [];
- // }
- // if (item.tjProjectList) {
- // item.tjProjectList.forEach((item1) => {
- // if (selectionitem.proName == item1.proName) {
- // item1.disabled = true;
- // item1.tjProjectList = [];
- // }
- // if (item1.tjProjectList) {
- // item1.tjProjectList.forEach((item2) => {
- // if (selectionitem.proName == item2.proName) {
- // item2.disabled = true;
- // item2.tjProjectList = [];
- // }
- // });
- // }
- // });
- // }
- // });
- // this.TreedataList.forEach((item3) => {
- // if (item3.proParentId == selectionitem.proId) {
- // item.disabled = true;
- // }
- // });
- // });
} else {
this.treedataList = JSON.parse(JSON.stringify(this.dXData));
return;
@@ -2905,6 +2869,7 @@
// 椤圭洰鎻愪氦
submit() {
+
if (this.form.cusIdcard) {
var cusId = this.form.cusIdcard;
} else {
@@ -2964,6 +2929,15 @@
this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
}).catch(() => {
this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+ });
+ }
+
+ // 濡傛灉 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);
+ }
});
}
@@ -3096,7 +3070,7 @@
};
}
- getOrderzhiye(data).then((res) => {
+ getOrder(data).then((res) => {
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
this.tjNumbers = res.msg;
this.charge = true;
@@ -3269,7 +3243,14 @@
},
listgetOrder(data) {
- getOrderzhiye(data).then((res) => {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍔犺浇涓紝璇风◢绛夛紒',
+ spinner: 'el-icon-loading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ });
+ getOrder(data).then((res) => {
+ loading.close();
this.$modal.msgSuccess("鎻愪氦鎴愬姛");
//璋冩帴鍙ｆ樉绀哄妫�鍗�
const tjNumber = res.msg;
@@ -3281,8 +3262,7 @@
this.$tab.refreshPage();
},
- // 鏈�鍚庢彁浜ゆ寜閽�
- submitPrice() {
+ submitPrice() {
let _this = this;
this.loadingSubmit = true;
if (_this.tjCategory !== "") {
@@ -3333,12 +3313,11 @@
discount: item.discount,
parentProId: item.parentProId,
cusIdCard: item.cusId,
- yhj: item.nowPrice
+ yhj: item.nowPrice,
})); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
gaibianzhekou(newArray).then((res) => {
this.loadingSubmit = false;
if (res.code === 200) {
-
let data;
if (pacId || this.tjOrderList.length > 0) {
@@ -3353,10 +3332,6 @@
firmId: this.form.firmId,
firmName: this.form.firmName,
firmDeptName: this.form.firmDeptName,
- zhiyeJhgly: this.form.zhiyeJhgly,
- zhiyeKsjhrq: this.form.zhiyeKsjhrq,
- zhiyeGh: this.form.zhiyeGh,
- zhiyeCj: this.form.zhiyeCj
};
this.listgetOrder(data);
@@ -3371,12 +3346,6 @@
firmId: this.form.firmId,
firmName: this.form.firmName,
firmDeptName: this.form.firmDeptName,
- zhiyeJhgly: this.form.zhiyeJhgly,
- zhiyeKsjhrq: this.form.zhiyeKsjhrq,
- zhiyeGh: this.form.zhiyeGh,
- zhiyeCj: this.form.zhiyeCj
-
-
};
this.listgetOrder(data);
} else {
--
Gitblit v1.8.0