From 6e08327e5ac538a54c11fe3fe9952b11ce1888e4 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期四, 10 四月 2025 16:47:20 +0800
Subject: [PATCH] qx
---
src/views/system/tijian/index.vue | 399 +++++++++++++++++++++++++++++---------------------------
1 files changed, 207 insertions(+), 192 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index f1d88a9..97c63ae 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -89,7 +89,8 @@
<span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname">
濮撳悕
</span>
- <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" @input="form.cusName = $event.replace(/\s/g, '')" />
+ <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled"
+ @input="form.cusName = $event.replace(/\s/g, '')" />
</el-form-item>
<el-form-item label="璇佷欢绫诲瀷" prop="idType">
@@ -147,7 +148,8 @@
<span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="handleQuery">
璇佷欢鍙风爜
</span>
- <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="handleIdCardInput"/>
+ <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�"
+ @input="handleIdCardInput" />
<!-- <i style="
font-size: 1rem;
position: absolute;
@@ -179,7 +181,8 @@
trigger: 'blur',
},
]">
- <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" @input="form.cusPhone = $event.replace(/\s/g, '')"/>
+ <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled"
+ @input="form.cusPhone = $event.replace(/\s/g, '')" />
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
@@ -336,7 +339,7 @@
margin-top: 10px;
">
宸查�夐」鐩垪琛�
-
+
</div>
<el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
@@ -529,7 +532,7 @@
this.tableData1[0].pacName || ""
}}</span>
宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
- }}</span>鏉�
+ }}</span>鏉�
</div>
宸查�夐」鐩垪琛�
</div>
@@ -1074,9 +1077,9 @@
},
methods: {
handleIdCardInput(value) {
- this.form.cusIdcard = value.replace(/\s/g, '');
- this.inputChange(); // 淇濈暀鍘熸湁鐨勮韩浠借瘉杈撳叆澶勭悊閫昏緫
-},
+ this.form.cusIdcard = value.replace(/\s/g, '');
+ this.inputChange(); // 淇濈暀鍘熸湁鐨勮韩浠借瘉杈撳叆澶勭悊閫昏緫
+ },
debounceNumberChange(currentValue, oldValue) {
clearTimeout(this.debounceTimer);
this.debounceTimer = setTimeout(() => {
@@ -1116,7 +1119,7 @@
});
this.TotalPrice = this.tableData1.reduce((sum, item) => {
return sum.plus(new Big(item.nowPrice || "0"));
- }, new Big(0));
+ }, new Big(0)).toNumber();
this.discount =
(Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) *
10;
@@ -1147,13 +1150,13 @@
row.nowPrice = result.toNumber();
this.TotalPrice = this.tableData1.reduce((sum, item) => {
return sum.plus(new Big(item.nowPrice || "0"));
- }, new Big(0));
+ }, new Big(0)).toNumber();
this.discount =
(Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10;
},
updateProPrice1(row) {
- console.log("杩涘叆浜�1")
+ console.log("杩涘叆浜�1", row)
const ordPrice = new Big(row.ordPrice);
const discount = new Big(row.discount);
const result = ordPrice.times(discount.div(10));
@@ -1237,15 +1240,15 @@
if (this.form.firmId === originalCompId) {
this.form.firmId = "";
}
-
+
}
if (this.form.firmName) {
- this.form.tjType = this.dict.type.dict_team[1].value;
- }else{
- this.form.tjType = this.dict.type.dict_team[0].value;
- }
-
+ this.form.tjType = this.dict.type.dict_team[1].value;
+ } else {
+ this.form.tjType = this.dict.type.dict_team[0].value;
+ }
+
},
getCurrentDateTime() {
const currentDate = new Date();
@@ -1285,25 +1288,25 @@
// return data.proEngName.indexOf(value) !== -1;
// }
if (!value) return true;
- if (data.proName.indexOf(value) !== -1) return true;
- if (data.proEngName.indexOf(value) !== -1) return true;
- // 鍖归厤灏忓啓
- let arr = data.proName.spell('low', 'array');
- let spell = arr.join('');
- let lengths = [0];
- for (var i = 0; i < arr.length - 1; i++) {
- lengths.push(lengths[i] + arr[i].length);
- };
- //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
- if(lengths.indexOf(spell.indexOf(value)) !== -1) return true
- // 澶у啓
- let arrUp = data.proName.spell('up', 'array');
- let spellUp = arrUp.join('');
- let lengthsUp = [0];
- for (var i = 0; i < arrUp.length - 1; i++) {
- lengthsUp.push(lengthsUp[i] + arrUp[i].length);
- };
- return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;
+ if (data.proName.indexOf(value) !== -1) return true;
+ if (data.proEngName.indexOf(value) !== -1) return true;
+ // 鍖归厤灏忓啓
+ let arr = data.proName.spell('low', 'array');
+ let spell = arr.join('');
+ let lengths = [0];
+ for (var i = 0; i < arr.length - 1; i++) {
+ lengths.push(lengths[i] + arr[i].length);
+ };
+ //鍒ゆ柇label瀹屾暣鎷奸煶 涓� 杈撳叆鍊肩殑 index 鏄笉鏄瓑浜庢煇涓眽瀛楃涓�涓嫾闊冲瓧姣嶇殑index鍊�
+ if (lengths.indexOf(spell.indexOf(value)) !== -1) return true
+ // 澶у啓
+ let arrUp = data.proName.spell('up', 'array');
+ let spellUp = arrUp.join('');
+ let lengthsUp = [0];
+ for (var i = 0; i < arrUp.length - 1; i++) {
+ lengthsUp.push(lengthsUp[i] + arrUp[i].length);
+ };
+ return lengthsUp.indexOf(spellUp.indexOf(value)) !== -1;
},
filterpackage(value, data) {
if (!value) return true;
@@ -1646,7 +1649,7 @@
item.nowPrice = result.toNumber();
this.TotalPrice = this.tableData1.reduce((sum, item) => {
return sum.plus(new Big(item.nowPrice || "0"));
- }, new Big(0));
+ }, new Big(0)).toNumber();
});
})
.catch(() => {
@@ -1704,45 +1707,46 @@
},
/** 鐧昏鎻愪氦鎸夐挳 */
/** 鐧昏鎻愪氦鎸夐挳 */
-submitForm() {
- let _this = this;
- if(!this.form.cusPhone || !this.form.cusName){
+ 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, '') : '';
+ } 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, '') : '';
- // 澶勭悊鎬у埆鍊�
- 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;
- }
+ // 澶勭悊鎬у埆鍊�
+ 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;
+
+ }
- 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;
- });
- }
- });
-}
-},
+ 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;
+ });
+ }
+ });
+ }
+ },
getmailType() {
if (this.getType == "2") {
@@ -1780,8 +1784,8 @@
if (this.form.reservationId != null) {
if (this.form.groupingId) {
this.form.firmName = this.form.compName;
- this.dict.type.dict_team.forEach((item)=> {
- if(item.label == "鍥㈤槦"){
+ this.dict.type.dict_team.forEach((item) => {
+ if (item.label == "鍥㈤槦") {
this.form.tjType = item.value;
}
})
@@ -2256,7 +2260,7 @@
this.malldisble = false;
this.defaultKeys = [];
this.DataLists = [];
-
+
},
cancell() {
@@ -2340,10 +2344,10 @@
Package() {
this.activeNames = "first";
if (this.form.cusSex == "鐢�") {
- this.form.cusSex = 0;
- } else if (this.form.cusSex == "濂�"){
- _this.form.cusSex = 1;
- }
+ this.form.cusSex = 0;
+ } else if (this.form.cusSex == "濂�") {
+ _this.form.cusSex = 1;
+ }
let cusSex = this.form.cusSex;
this.datekey = Date.now();
//鍏ㄩ儴濂楅
@@ -2927,10 +2931,15 @@
// 澶勭悊璁㈠崟椤圭洰
processOrderItems(cusId) {
+ console.log(11222)
getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
+ let Price = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
+ if (typeof item.nowPrice === 'number') {
+ item.nowPrice = Number(item.nowPrice.toFixed(2));
+ }
if (item.tjCategory != null) {
this.tjCategory = item.tjCategory;
}
@@ -2940,8 +2949,11 @@
});
}
this.TotalPrice1 += item.ordPrice || 0; // 绱姞搴旀敹閲戦
- this.TotalPrice += item.nowPrice || 0; // 绱姞瀹炴敹閲戦
+ // this.TotalPrice += item.nowPrice || 0;
+ Price += item.nowPrice || 0; // 绱姞瀹炴敹閲戦
+ this.TotalPrice = Price.toFixed(2);
});
+ console.log( this.TotalPrice1,this.TotalPrice)
// 璁＄畻鎶樻墸
this.discount = this.TotalPrice1 > 0 ?
(Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10 : 0;
@@ -2956,122 +2968,122 @@
});
},
submitCheckinfee() {
- let _this = this;
- 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;
- }
+ let _this = this;
+ 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;
+ }
- // 鍘荤┖鏍煎鐞�
- const processedForm = {
- ...this.form,
- cusName: this.form.cusName ? this.form.cusName.replace(/\s/g, '') : '',
- cusPhone: this.form.cusPhone ? this.form.cusPhone.replace(/\s/g, '') : '',
- cusIdcard: this.form.cusIdcard ? this.form.cusIdcard.replace(/\s/g, '') : ''
- };
+ // 鍘荤┖鏍煎鐞�
+ const processedForm = {
+ ...this.form,
+ cusName: this.form.cusName ? this.form.cusName.replace(/\s/g, '') : '',
+ cusPhone: this.form.cusPhone ? this.form.cusPhone.replace(/\s/g, '') : '',
+ cusIdcard: this.form.cusIdcard ? this.form.cusIdcard.replace(/\s/g, '') : ''
+ };
- List.forEach((item) => {
- if (item.list) {
- item.list.forEach((item1) => {
- this.tjOrderList.push({
- proName: item1.proName,
- proPrice: item1.nowPrice,
- proId: item1.proId,
- });
+ 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,
+ });
+ }
});
- } else if (item.tjProjectList) {
- item.tjProjectList.forEach((item1) => {
- this.tjOrderList.push({
- proName: item1.proName,
- proPrice: item1.priceNow,
- proId: item1.proId,
+
+ let copeWith = this.TotalPrice1;
+ let paidIn = this.TotalPrice.toString();
+ let discount = this.discount;
+ this.tjFlowingWater = { copeWith, paidIn, discount };
+
+ let data;
+ if (pacId || this.getType == "2") {
+ data = {
+ photo: this.srcUrl,
+ pacId,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ getType: this.getType,
+ addAddress: this.addAddress,
+ tjCategory: this.tjCategory,
+ // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
+ cusName: processedForm.cusName,
+ cusPhone: processedForm.cusPhone,
+ cusIdcard: processedForm.cusIdcard
+ };
+ } else {
+ data = {
+ photo: this.srcUrl,
+ tjOrderList: this.tjOrderList,
+ tjFlowingWater: this.tjFlowingWater,
+ userId,
+ tjType,
+ getType: this.getType,
+ tjCategory: this.tjCategory,
+ // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
+ cusName: processedForm.cusName,
+ cusPhone: processedForm.cusPhone,
+ cusIdcard: processedForm.cusIdcard
+ };
+ }
+
+ getOrder(data).then((res) => {
+ this.$modal.msgSuccess("鎻愪氦鎴愬姛");
+ this.tjNumbers = res.msg;
+ this.charge = true;
+ let data = {
+ tjNum: res.msg,
+ };
+ getfindTj(data).then((response) => {
+ if (response.data) {
+ this.feeitems = response.data;
+ if (this.feeitems.length != 0) {
+ this.$nextTick(() => {
+ this.$refs.multipleTable.toggleRowSelection(
+ this.feeitems[0],
+ true
+ );
+ });
+ } else {
+ this.$refs.multipleTable.clearSelection();
+ }
+ this.loading = false;
+ } else {
+ this.feeitems = [];
+ this.loading = false;
+ }
});
});
} else {
- this.tjOrderList.push({
- proName: item.proName,
- proPrice: item.ysPrice,
- proId: item.proId,
- });
+ this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
}
- });
-
- let copeWith = this.TotalPrice1;
- let paidIn = this.TotalPrice.toString();
- let discount = this.discount;
- this.tjFlowingWater = { copeWith, paidIn, discount };
-
- let data;
- if (pacId || this.getType == "2") {
- data = {
- photo: this.srcUrl,
- pacId,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- getType: this.getType,
- addAddress: this.addAddress,
- tjCategory: this.tjCategory,
- // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
- cusName: processedForm.cusName,
- cusPhone: processedForm.cusPhone,
- cusIdcard: processedForm.cusIdcard
- };
- } else {
- data = {
- photo: this.srcUrl,
- tjOrderList: this.tjOrderList,
- tjFlowingWater: this.tjFlowingWater,
- userId,
- tjType,
- getType: this.getType,
- tjCategory: this.tjCategory,
- // 浣跨敤鍘绘帀绌烘牸鍚庣殑鏁版嵁
- cusName: processedForm.cusName,
- cusPhone: processedForm.cusPhone,
- cusIdcard: processedForm.cusIdcard
- };
- }
-
- getOrder(data).then((res) => {
- this.$modal.msgSuccess("鎻愪氦鎴愬姛");
- this.tjNumbers = res.msg;
- this.charge = true;
- let data = {
- tjNum: res.msg,
- };
- getfindTj(data).then((response) => {
- if (response.data) {
- this.feeitems = response.data;
- if (this.feeitems.length != 0) {
- this.$nextTick(() => {
- this.$refs.multipleTable.toggleRowSelection(
- this.feeitems[0],
- true
- );
- });
- } else {
- this.$refs.multipleTable.clearSelection();
- }
- this.loading = false;
- } else {
- this.feeitems = [];
- this.loading = false;
- }
- });
- });
- } else {
- this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆");
- }
-},
+ },
// 琛ㄦ牸鍗曢��
handleSelect(selection, val) {
@@ -3386,8 +3398,10 @@
}
.filter-tree {
- overflow-y: auto; /* 淇濈暀绾靛悜婊氬姩鏉� */
- overflow-x: hidden; /* 闅愯棌妯悜婊氬姩鏉� */
+ overflow-y: auto;
+ /* 淇濈暀绾靛悜婊氬姩鏉� */
+ overflow-x: hidden;
+ /* 闅愯棌妯悜婊氬姩鏉� */
height: 350px;
}
@@ -3498,6 +3512,7 @@
width: 100%;
display: flex;
}
+
/* .tab3 {
overflow-y: auto;
}
--
Gitblit v1.8.0