From 5f6e994d3ce5f47e8b5dd95bbdfb8aef3e321cb0 Mon Sep 17 00:00:00 2001
From: qx <1084500556@qq.com>
Date: 星期三, 16 七月 2025 15:07:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/system/tijian/index.vue | 512 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 290 insertions(+), 222 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 4728be4..a0d7bad 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" maxlength="11"
+ @input="form.cusPhone = $event.replace(/\s/g, '')" />
</el-form-item>
<el-form-item label="鍑虹敓鏃ユ湡" prop="cusBrithday">
@@ -282,7 +285,8 @@
<el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames"
@tab-click="handleClick">
<el-tab-pane label="濂楅" name="first">
- <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto">
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto"
+ @submit.native.prevent="handle">
<el-form-item label="濂楅鍚嶇О" prop="pacName">
<el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" />
</el-form-item>
@@ -336,7 +340,7 @@
margin-top: 10px;
">
宸查�夐」鐩垪琛�
-
+
</div>
<el-table :data="DataLists" border style="width: 100%" height="400" :span-method="objectspanmethod">
<el-table-column prop="propinName" label="妫�鏌ラ」鐩�">
@@ -417,6 +421,31 @@
</el-col>
</el-row>
</el-tab-pane>
+ <el-tab-pane label="浜插睘濂楅" name="four">
+ <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto"
+ @submit.native.prevent="handle">
+ <el-form-item label="濮撳悕" prop="pacName">
+ <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ鍚�" clearable @keyup.enter.native="handle" />
+ </el-form-item>
+ <el-form-item label="韬唤璇�" prop="pacName">
+ <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ヨ韩浠借瘉" clearable @keyup.enter.native="handle" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handle">鏌ヨ</el-button>
+ </el-form-item>
+ </el-form>
+ <div class="tab4">
+ <div class="grid-content bg-purple" style="margin-left: 5px; width: 98%">
+ <el-table v-loading="loading" element-loading-text="姝ｅ湪鍔犺浇涓�..." element-loading-spinner="el-icon-loading"
+ border :data="newpacName" @selection-change="handleSelectionChange" height="450px" ref="tb">
+ <el-table-column type="selection" width="40px" align="center" label="閫夋嫨" />
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="pacName" width="120px" />
+ <el-table-column label="濂楅浠锋牸" align="center" prop="price" width="120px" />
+ <el-table-column label="濂楅鏄庣粏" align="center" prop="allProName" :show-overflow-tooltip="true" />
+ </el-table>
+ </div>
+ </div>
+ </el-tab-pane>
</el-tabs>
<span slot="footer" class="dialog-footer">
<el-button @click="cancel">鍙� 娑�</el-button>
@@ -475,8 +504,11 @@
:max="10" :min="0" @change="debounceNumberChange" :disabled="isfalse"></el-input-number>
</el-form-item>
<el-form-item label="瀹炴敹閲戦">
- <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" @input="changeXianjia"
+ <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 205px" @input="changeXianjia"
@blur="numberChangeXianPrice(discount, discount)" />
+ </el-form-item>
+ <el-form-item label="鏄惁鏇挎" v-if="tjtype">
+ <el-input placeholder="鏄惁鏇挎" v-model="sftj" style="width: 150px"></el-input>
</el-form-item>
<br />
@@ -529,7 +561,7 @@
this.tableData1[0].pacName || ""
}}</span>
宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0
- }}</span>鏉�
+ }}</span>鏉�
</div>
宸查�夐」鐩垪琛�
</div>
@@ -919,6 +951,8 @@
proIds: [],
// 鏄剧ず鎼滅储鏉′欢
showSearch: true,
+ tjtype: false,
+ sftj: null,
activeNames: "first",
// 鏍戠姸褰㈢姸
Treedata: [],
@@ -950,11 +984,10 @@
pacName: null,
pacRemark: null,
},
- // valueUrl: "ws://127.0.0.1:18890",
- // valueUrl: "ws://192.168.1.3:6789/websocket",
- valueUrl: "ws://127.0.0.1:6789/websocket",
- valueUrls: "ws://127.0.0.1:6789/websocket",
- // valueUrls: "ws://"+getIp() +":6789/websocket",
+ // valueUrl: "ws://127.0.0.1:6789/websocket",
+ // valueUrls: "ws://127.0.0.1:6789/websocket",
+ valueUrl: "ws://192.168.1.244:6789/websocket",
+ valueUrls: "ws://192.168.1.244:6789/websocket",
webSocket: null,
// 韬唤璇侀渶瑕�
// socket: null,
@@ -1074,9 +1107,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 +1149,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 +1180,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));
@@ -1225,11 +1258,10 @@
this.open1 = true;
this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢";
},
- idFn1(value) {
- if (value) {
- // console.log(value);
+ idFn1() {
+ this.tjtype = true
+ if (this.form.firmName) {
const originalCompId = this.form.firmId;
- this.form.firmName = value;
this.CompanyList.forEach((item) => {
if (item.cnName == this.form.firmName) {
this.form.firmId = item.drugManufacturerId;
@@ -1239,10 +1271,15 @@
if (this.form.firmId === originalCompId) {
this.form.firmId = "";
}
- if (this.form.firmId) {
- this.form.tjType = this.dict.type.dict_team[2].value;
- }
+
}
+
+ 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;
+ }
+
},
getCurrentDateTime() {
const currentDate = new Date();
@@ -1282,32 +1319,34 @@
// 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;
+ let values = value.toLowerCase();
+ if (data.proEngName.indexOf(values) !== -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;
if (data.zhmc.indexOf(value) !== -1) {
return data.zhmc.indexOf(value) !== -1;
} else {
- return data.pym.indexOf(value) !== -1;
+ let values = value.toLowerCase();
+ return data.pym.indexOf(values) !== -1;
}
},
beforeDestroy() {
@@ -1643,7 +1682,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(() => {
@@ -1701,41 +1740,57 @@
},
/** 鐧昏鎻愪氦鎸夐挳 */
/** 鐧昏鎻愪氦鎸夐挳 */
-submitForm() {
- let _this = this;
- 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;
+ submitForm() {
+ let _this = this;
+ if (!this.form.cusPhone || !this.form.cusName) {
+ 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;
+ 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 鏍煎紡鐨勫ご鍍忔暟鎹紝鑻ヤ负绌哄垯浼犵┖瀛楃涓�
+
+ // 澶勭悊鎬у埆鍊�
+ 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") {
@@ -1773,7 +1828,12 @@
if (this.form.reservationId != null) {
if (this.form.groupingId) {
this.form.firmName = this.form.compName;
- this.form.tjType = this.dict.type.dict_team[2].value;
+ this.dict.type.dict_team.forEach((item) => {
+ if (item.label == "鍥㈤槦") {
+ this.form.tjType = item.value;
+ }
+ })
+ // this.form.tjType = this.dict.type.dict_team[1].value;
this.CompanyList.forEach((item) => {
if (item.cnName == this.form.firmName) {
this.form.firmId = item.drugManufacturerId;
@@ -1908,11 +1968,15 @@
// 鏈�鏂颁娇鐢╳ebSocket閫氫俊
readCardWebSocket(resultObj) {
let _this = this;
-
+ const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
if (resultObj.code === 200 && resultObj.data.name != null) {
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.data.name;
- _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�";
+ if (isChineseChar(resultObj.data.sex)) {
+ _this.form.cusSex = resultObj.data.sex == "濂�" ? 1 : 0
+ } else {
+ _this.form.cusSex = resultObj.data.sex;
+ }
_this.form.cusNational = resultObj.data.mz;
_this.form.cusBrithday = resultObj.data.csrq;
if (_this.form.cusBrithday) {
@@ -1967,7 +2031,7 @@
//鍥炴樉鐩稿叧鏁版嵁
_this.form.cusName = resultObj.resultContent.partyName;
_this.form.cusSex =
- resultObj.resultContent.gender == "0" ? "濂�" : "鐢�";
+ resultObj.resultContent.gender;
_this.form.cusNational = resultObj.resultContent.nation;
_this.form.cusBrithday = resultObj.resultContent.bornDay;
if (_this.form.cusBrithday) {
@@ -2217,11 +2281,6 @@
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";
const isLt2M = file.size / 1024 / 1024 < 2;
@@ -2244,7 +2303,7 @@
this.malldisble = false;
this.defaultKeys = [];
this.DataLists = [];
-
+
},
cancell() {
@@ -2264,7 +2323,8 @@
dwId: this.form.firmId,
};
if (this.name) {
- getPackageListName(this.name).then((response) => {
+ let name = this.name.toLowerCase()
+ getPackageListName(name).then((response) => {
this.newpacName = response.data;
this.loading = false;
});
@@ -2327,6 +2387,11 @@
Package() {
this.activeNames = "first";
+ if (this.form.cusSex == "鐢�") {
+ this.form.cusSex = 0;
+ } else if (this.form.cusSex == "濂�") {
+ _this.form.cusSex = 1;
+ }
let cusSex = this.form.cusSex;
this.datekey = Date.now();
//鍏ㄩ儴濂楅
@@ -2912,8 +2977,15 @@
processOrderItems(cusId) {
getTransitionList1(cusId).then((response) => {
this.tableData1 = response.data;
+ // if (response.data.tjCategory != null) {
+ // this.tjCategory = response.data.tjCategory;
+ // }
+ let Price = 0;
if (this.tableData1) {
this.tableData1.forEach((item) => {
+ if (typeof item.nowPrice === 'number') {
+ item.nowPrice = Number(item.nowPrice.toFixed(3));
+ }
if (item.tjCategory != null) {
this.tjCategory = item.tjCategory;
}
@@ -2923,8 +2995,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;
@@ -2939,122 +3014,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) {
@@ -3215,7 +3290,7 @@
let _this = this;
this.loadingSubmit = true;
if (_this.tjCategory !== "") {
- let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅
+ let List = _this.tableData1; // 鍗曚釜椤圭洰淇℃伅
if (this.responseList.cusId) {
var userId = this.responseList.cusId;
} else {
@@ -3226,7 +3301,7 @@
var pacId = this.tableData[0].pacId;
}
- //tjOrderList//杩欎釜鏄鐞嗗畬鐨勬瘡涓�椤瑰椁愪俊鎭�
+ // tjOrderList 澶勭悊
List.forEach((item) => {
if (item.list) {
item.list.forEach((item1) => {
@@ -3252,27 +3327,30 @@
});
}
});
+
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 鐨勯」
+ .filter((item) => item.discount < 10)
.map((item) => ({
discount: item.discount,
parentProId: item.parentProId,
cusIdCard: item.cusId,
- yhj: item.nowPrice
- })); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id
+ 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: this.srcUrl, // 淇濈暀鍘熸湁 photo 瀛楁锛堝鏋滃悗绔粛闇�瑕侊級
+ sfzImg: this.imageUrl, // 娣诲姞 sfzImg 瀛楁锛屼紭鍏堜娇鐢ㄦ湇鍔″櫒URL锛岃嫢鏃犲垯浣跨敤base64
pacId,
tjOrderList: this.tjOrderList,
tjFlowingWater: this.tjFlowingWater,
@@ -3285,23 +3363,10 @@
};
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 ",
+ type: "warning",
message: "璇烽�夋嫨濂楅!",
});
}
@@ -3369,8 +3434,10 @@
}
.filter-tree {
- overflow-y: auto; /* 淇濈暀绾靛悜婊氬姩鏉� */
- overflow-x: hidden; /* 闅愯棌妯悜婊氬姩鏉� */
+ overflow-y: auto;
+ /* 淇濈暀绾靛悜婊氬姩鏉� */
+ overflow-x: hidden;
+ /* 闅愯棌妯悜婊氬姩鏉� */
height: 350px;
}
@@ -3481,6 +3548,7 @@
width: 100%;
display: flex;
}
+
/* .tab3 {
overflow-y: auto;
}
--
Gitblit v1.8.0