From 4c4abb59d6ee838c61b851fcc7be93c0522c39c4 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期五, 04 七月 2025 16:36:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/system/tijian/index.vue | 278 +++++++++++++++++++++++++++----------------------------
1 files changed, 137 insertions(+), 141 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index cd4fb93..f175afb 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -1711,46 +1711,57 @@
},
/** 鐧昏鎻愪氦鎸夐挳 */
/** 鐧昏鎻愪氦鎸夐挳 */
- submitForm() {
- let _this = this;
- if (!this.form.cusPhone || !this.form.cusName) {
- this.$message.warning("璇峰～閫夊繀濉」");
- } else {
- this.$refs["form"].validate((valid) => {
- if (valid) {
- // 鍒涘缓琛ㄥ崟鏁版嵁鐨勫壇鏈苟鍘婚櫎绌烘牸
- const formData = { ...this.form };
- formData.cusName = formData.cusName ? formData.cusName.replace(/\s/g, '') : '';
- formData.cusPhone = formData.cusPhone ? formData.cusPhone.replace(/\s/g, '') : '';
- formData.cusIdcard = formData.cusIdcard ? formData.cusIdcard.replace(/\s/g, '') : '';
+ submitForm() {
+ let _this = this;
+ if (!this.form.cusPhone || !this.form.cusName) {
+ this.$message.warning("璇峰～閫夊繀濉」");
+ return;
+ }
- // 澶勭悊鎬у埆鍊�
- if (formData.cusSex === "濂�") {
- formData.cusSex = 1;
- }
- if (formData.cusSex === "鐢�") {
- formData.cusSex = 0;
- }
- if (formData.cusSex === "鏈煡") {
- formData.cusSex = 2;
- }
- if (formData.tjType === "") {
- formData.tjType = this.dict.type.dict_team[0].value;
+ this.$refs["form"].validate((valid) => {
+ if (valid) {
+ // 鍒涘缓琛ㄥ崟鏁版嵁鐨勫壇鏈苟鍘婚櫎绌烘牸
+ const formData = { ...this.form };
+ formData.cusName = formData.cusName ? formData.cusName.replace(/\s/g, '') : '';
+ formData.cusPhone = formData.cusPhone ? formData.cusPhone.replace(/\s/g, '') : '';
+ formData.cusIdcard = formData.cusIdcard ? formData.cusIdcard.replace(/\s/g, '') : '';
+ // 娣诲姞 sfzImg 瀛楁
+ formData.sfzImg = this.imageUrl || ''; // 浣跨敤 base64 鏍煎紡鐨勫ご鍍忔暟鎹紝鑻ヤ负绌哄垯浼犵┖瀛楃涓�
- }
-
- addCustomer(formData).then((response) => {
- this.responseList = response.data;
- this.form.tjType = this.dict.type.dict_team[0].value;
- this.$modal.msgSuccess("鏂板鎴愬姛");
- _this.tcShow = true;
- _this.isDisabled = true;
- _this.top = false;
- });
- }
- });
+ // 澶勭悊鎬у埆鍊�
+ if (formData.cusSex === "濂�") {
+ formData.cusSex = 1;
}
- },
+ if (formData.cusSex === "鐢�") {
+ formData.cusSex = 0;
+ }
+ if (formData.cusSex === "鏈煡") {
+ formData.cusSex = 2;
+ }
+ if (formData.tjType === "") {
+ formData.tjType = this.dict.type.dict_team[0].value;
+ }
+
+ // 鍙�夛細妫�鏌� sfzImg 鏄惁瀛樺湪
+ if (!formData.sfzImg) {
+ this.$message.warning("璇峰厛鑾峰彇韬唤璇佸ご鍍�");
+ return;
+ }
+
+ addCustomer(formData).then((response) => {
+ this.responseList = response.data;
+ this.form.tjType = this.dict.type.dict_team[0].value;
+ this.$modal.msgSuccess("鏂板鎴愬姛");
+ _this.tcShow = true;
+ _this.isDisabled = true;
+ _this.top = false;
+ }).catch((error) => {
+ this.$modal.msgError("鐧昏澶辫触锛岃妫�鏌ユ暟鎹�");
+ console.error("Error in addCustomer:", error);
+ });
+ }
+ });
+},
getmailType() {
if (this.getType == "2") {
@@ -2240,11 +2251,6 @@
handleChangesName(params) {
this.form.cusIdcard = params[0].sfzh;
this.handleQuery();
- },
-
- // 涓婁紶澶村儚
- handleAvatarSuccess(res, file) {
- this.imageUrl = URL.createObjectURL(file.raw);
},
beforeAvatarUpload(file) {
const isJPG = file.type === "image/jpeg";
@@ -3249,110 +3255,100 @@
},
// 鏈�鍚庢彁浜ゆ寜閽�
- submitPrice() {
- let _this = this;
- this.loadingSubmit = true;
- if (_this.tjCategory !== "") {
- let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
- if (this.responseList.cusId) {
- var userId = this.responseList.cusId;
- } else {
- var userId = _this.form.cusId;
- }
- let tjType = _this.form.tjType;
- if (this.tableData[0]) {
- var pacId = this.tableData[0].pacId;
- }
+ submitPrice() {
+ let _this = this;
+ this.loadingSubmit = true;
+ if (_this.tjCategory !== "") {
+ let List = _this.tableData1; // 鍗曚釜椤圭洰淇℃伅
+ if (this.responseList.cusId) {
+ var userId = this.responseList.cusId;
+ } else {
+ var userId = _this.form.cusId;
+ }
+ let tjType = _this.form.tjType;
+ if (this.tableData[0]) {
+ var pacId = this.tableData[0].pacId;
+ }
- //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
- List.forEach((item) => {
- if (item.list) {
- item.list.forEach((item1) => {
- this.tjOrderList.push({
- proName: item1.proName,
- proPrice: item1.nowPrice,
- proId: item1.proId,
- });
- });
- } else if (item.tjProjectList) {
- item.tjProjectList.forEach((item1) => {
- this.tjOrderList.push({
- proName: item1.proName,
- proPrice: item1.priceNow,
- proId: item1.proId,
- });
- });
- } else {
- this.tjOrderList.push({
- proName: item.proName,
- proPrice: item.ysPrice,
- proId: item.proId,
- });
- }
+ // tjOrderList 澶勭悊
+ List.forEach((item) => {
+ if (item.list) {
+ item.list.forEach((item1) => {
+ this.tjOrderList.push({
+ proName: item1.proName,
+ proPrice: item1.nowPrice,
+ proId: item1.proId,
+ });
});
- let copeWith = this.TotalPrice1;
- let paidIn = this.TotalPrice.toString();
- let discount = this.discount;
- this.tjFlowingWater = { copeWith, paidIn, discount };
- const newArray = this.tableData1
- .filter((item) => item.discount < 10) // 杩囨护鍑� discount < 10 鐨勯」
- .map((item) => ({
- discount: item.discount,
- parentProId: item.parentProId,
- cusIdCard: item.cusId,
- yhj: item.nowPrice
- })); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
- gaibianzhekou(newArray).then((res) => {
- this.loadingSubmit = false;
- if (res.code === 200) {
-
- let data;
-
- if (pacId || this.tjOrderList.length > 0) {
- data = {
- photo: this.srcUrl,
- pacId,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- tjCategory: this.tjCategory,
- firmId: this.form.firmId,
- firmName: this.form.firmName,
- firmDeptName: this.form.firmDeptName,
- };
-
- this.listgetOrder(data);
- } else if (pacId || this.tjOrderList.length > 0) {
- data = {
- photo: this.srcUrl,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- tjCategory: this.tjCategory,
- firmId: this.form.firmId,
- firmName: this.form.firmName,
- firmDeptName: this.form.firmDeptName,
- };
- this.listgetOrder(data);
- } else {
- this.loadingSubmit = false;
- this.$message({
- type: "warning ",
- message: "璇烽�夋嫨濂楅!",
- });
- }
- } else {
- this.loadingSubmit = false;
- this.$modal.msgError("鏀瑰彉鎶樻墸閿欒");
- }
+ } else if (item.tjProjectList) {
+ item.tjProjectList.forEach((item1) => {
+ this.tjOrderList.push({
+ proName: item1.proName,
+ proPrice: item1.priceNow,
+ proId: item1.proId,
+ });
});
} else {
- this.loadingSubmit = false;
- this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
+ this.tjOrderList.push({
+ proName: item.proName,
+ proPrice: item.ysPrice,
+ proId: item.proId,
+ });
}
- },
+ });
+
+ let copeWith = this.TotalPrice1;
+ let paidIn = this.TotalPrice.toString();
+ let discount = this.discount;
+ this.tjFlowingWater = { copeWith, paidIn, discount };
+
+ const newArray = this.tableData1
+ .filter((item) => item.discount < 10)
+ .map((item) => ({
+ discount: item.discount,
+ parentProId: item.parentProId,
+ cusIdCard: item.cusId,
+ yhj: item.nowPrice,
+ }));
+
+ gaibianzhekou(newArray).then((res) => {
+ this.loadingSubmit = false;
+ if (res.code === 200) {
+ let data;
+
+ if (pacId || this.tjOrderList.length > 0) {
+ data = {
+ photo: this.srcUrl, // 淇濈暀鍘熸湁 photo 瀛楁锛堝鏋滃悗绔粛闇�瑕侊級
+ sfzImg: this.imageUrl, // 娣诲姞 sfzImg 瀛楁锛屼紭鍏堜娇鐢ㄦ湇鍔″櫒URL锛岃嫢鏃犲垯浣跨敤base64
+ pacId,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ tjCategory: this.tjCategory,
+ firmId: this.form.firmId,
+ firmName: this.form.firmName,
+ firmDeptName: this.form.firmDeptName,
+ };
+
+ this.listgetOrder(data);
+ } else {
+ this.loadingSubmit = false;
+ this.$message({
+ type: "warning",
+ message: "璇烽�夋嫨濂楅!",
+ });
+ }
+ } else {
+ this.loadingSubmit = false;
+ this.$modal.msgError("鏀瑰彉鎶樻墸閿欒");
+ }
+ });
+ } else {
+ this.loadingSubmit = false;
+ this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
+ }
+},
},
};
</script>
--
Gitblit v1.8.0