From 20597e952095f7183e9a0e344bb1505420616dc9 Mon Sep 17 00:00:00 2001 From: wwl <xchao828@163.com> Date: 星期六, 11 一月 2025 18:09:01 +0800 Subject: [PATCH] 222 --- src/views/system/tijian/index.vue | 415 +++++++++++++++++++++++++++-------------------------------- 1 files changed, 190 insertions(+), 225 deletions(-) diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index bf3c9af..dd2b83c 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -86,7 +86,6 @@ trigger: 'blur', }, ]"> - <span slot="label" style="display: inline-block; border-bottom: 2px solid blue" @click="openname"> 濮撳悕 </span> @@ -218,8 +217,6 @@ <el-input :disabled="isDisabled" v-model="form.cusIntroduce" placeholder="璇疯緭鍏ヤ粙缁嶄汉" /> </el-form-item> - - <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px"> <el-input :disabled="isDisabled" v-model="form.wenHua" placeholder="璇疯緭鍏ユ枃鍖栫▼搴�" /> </el-form-item> @@ -295,7 +292,6 @@ </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"> @@ -306,17 +302,8 @@ <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" /> - <!-- :selectable="checkSelectable" --> - <!-- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width"> - <template slot-scope="scope"> - <el-button size="mini" type="text" icon="el-icon-circle-check" @click="handleSeach(scope.row)" - v-hasPermi="['system:package:Seach']">濂楅璇︽儏 - </el-button> - </template> -</el-table-column> --> </el-table> </div> - </div> </el-tab-pane> <el-tab-pane label="缁勫悎" name="third"> @@ -388,18 +375,6 @@ </el-tab-pane> <el-tab-pane label="鍗曢」" name="second"> <div class="tab8"> - <!-- <div class="tab7"> - <v-tree-transfer - :treeData="treedataList" - :defaultProps="{ children: 'tjProjectList', label: 'proName' }" - :defaultKeys="defaultKeys" - @changeKeys="changeCategoryKeys" - :key="datekey" - ></v-tree-transfer> --> - <!-- <el-tree :data="data" show-checkbox node-key="proId" :props="defaultProps" :default-checked-keys="treeList" - @check-change="handleCurrentChecked"> - </el-tree> --> - <!-- </div> --> <el-row :gutter="20"> <el-col :span="6"> <div style=" @@ -476,11 +451,9 @@ <el-col :span="15"> <div class="grid-content bg-purple"> <template> - <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px;width: 900px;"> + <el-form :model="form" :inline="true" label-width="75px" style="margin-left: 20px; width: 900px"> <el-form-item label="濮撳悕" prop="cusName"> - <span slot="label"> - 濮撳悕 - </span> + <span slot="label"> 濮撳悕 </span> <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" :disabled="isDisabled" /> </el-form-item> <el-form-item label="鎬у埆" prop="cusSex"> @@ -490,9 +463,7 @@ </el-select> </el-form-item> <el-form-item label="璇佷欢鍙风爜" prop="cusIdcard"> - <span slot="label"> - 璇佷欢鍙风爜 - </span> + <span slot="label"> 璇佷欢鍙风爜 </span> <el-input :disabled="isDisabled" v-model="form.cusIdcard" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @input="inputChange" /> </el-form-item> <el-form-item label="鍗曚綅鍚嶇О" prop="firmName"> @@ -501,13 +472,15 @@ <el-option v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" :value="dict.cnName" /> </el-select> </el-form-item> + <el-form-item label="鍗曚綅閮ㄩ棬" prop="firmDeptName"> + <el-input v-model="form.firmDeptName" style="width: 150px" placeholder="璇疯緭鍏ュ崟浣嶉儴闂�" @input="inputChange" /> + </el-form-item> <el-form-item label="浣撴绫诲瀷"> - <el-select style="width: 150px" v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷"> + <el-select v-model="form.tjType" placeholder="璇烽�夋嫨浣撴绫诲瀷"> <el-option v-for="dict in dict.type.dict_team" :key="dict.value" :label="dict.label" :value="dict.value" :disabled="!form.firmId && dict.value === '1'"></el-option> </el-select> </el-form-item> - <el-form-item label="浣撴绫诲埆"> <el-select style="width: 200px" v-model="tjCategory" placeholder="璇烽�夋嫨浣撴绫诲埆"> <el-option v-for="dict in dict.type.dict_tjtype" :key="dict.value" :label="dict.label" @@ -515,26 +488,26 @@ </el-select> <!-- <el-input v-model="form.category" placeholder="璇疯緭鍏ヤ綋妫�绫诲埆" /> --> </el-form-item> + <el-form-item label="搴旀敹閲戦"> - <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 200px"></el-input> + <el-input placeholder="搴旀敹閲戦" v-model="TotalPrice1" disabled style="width: 150px"></el-input> </el-form-item> <el-form-item label="浼樻儬"> <!-- {{ discount }} --> - <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="2" :step="0.1" - :max="10" :min="0" @change="numberChange" :disabled="isfalse"></el-input-number> + <el-input-number ref="inputNumber" style="width: 150px" v-model="discount" :precision="1" :step="0.1" + :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"></el-input> + <el-input placeholder="瀹炴敹閲戦" v-model="TotalPrice" style="width: 206px" + @input="changeXianjia" @blur="numberChangeXianPrice(discount, discount)"/> </el-form-item> <br /> - - <el-form-item style="margin-left: 149px"> <el-button type="primary" @click="Package" size="mini" style="margin-right: 20px">閫夋嫨濂楅</el-button> <el-button type="primary" @click="resetpackage" size="mini" style="margin-right: 20px">閲嶇疆濂楅</el-button> - <el-button type="primary" @click="submitPrice" :disabled="confirm" v-if="showHidden.has_charge == 'N'" - size="mini">绛惧埌鐧昏</el-button> + <el-button type="primary" @click="submitPrice" :loading="loadingSubmit" + :disabled="confirm || loadingSubmit" v-if="showHidden.has_charge == 'N'" size="mini">绛惧埌鐧昏</el-button> <el-button type="primary" @click="submitCheckinfee" :disabled="confirm" v-if="showHidden.has_charge == 'Y'" size="mini">鐧昏鏀惰垂</el-button> </el-form-item> @@ -571,12 +544,15 @@ white-space: nowrap; overflow: hidden; text-overflow: ellipsis; - margin-left: 46px; + margin-left: 46px; 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>鏉� + <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> 宸查�夐」鐩垪琛� </div> @@ -588,15 +564,12 @@ width: 916px; margin-left: 35px; "> - - <el-table :data="tableData1" border style="width: 100%;"> + <el-table :data="tableData1" border style="width: 100%"> <el-table-column prop="proName" label="椤圭洰" width="180"> </el-table-column> <el-table-column prop="proType" label="鎬у埆" width="50"> <template slot-scope="scope"> - <template v-if="isAll(scope.row.proType)"> - 鍏ㄩ儴 - </template> + <template v-if="isAll(scope.row.proType)"> 鍏ㄩ儴 </template> <template v-else> <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.proType" /> </template> @@ -608,9 +581,9 @@ <el-table-column label="鎶樻墸"> <template slot-scope="scope"> <!-- 鍙緭鍏ョ函鏁板瓧鎶樻墸 --> - <el-input v-model.number="scope.row.discount" @input="validateDiscount(scope.row)" placeholder="杈撳叆鎶樻墸" - size="small" type="number" min="0" step="1" max="10"> - </el-input> + <el-input-number v-model.number="scope.row.discount" @input="validateDiscount(scope.row)" + placeholder="杈撳叆鎶樻墸" size="small" type="number" :precision="1" :step="0.1" :max="10" :min="0"> + </el-input-number> </template> </el-table-column> <el-table-column prop="nowPrice" label="瀹炴敹閲戦"> @@ -620,6 +593,13 @@ <dict-tag :options="dict.type.sys_yes_no" :value="scope.row.proCheckMethod" /> </template> </el-table-column> + <!-- <el-table-column prop="proCheckMethod" label="鍏垂"> + <template #default="scope"> + <el-checkbox v-model="scope.row.free" :disabled="true"> + {{ scope.row.free ? "鍏嶈垂" : "鏀惰垂" }} + </el-checkbox> + </template> + </el-table-column> --> <el-table-column label="鎿嶄綔" align="center" width="80px"> <template slot-scope="scope"> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete1(scope.row)" title="鍒犻櫎"> @@ -627,7 +607,6 @@ </template> </el-table-column> </el-table> - </div> </div> </el-col> @@ -675,8 +654,8 @@ :disabled="true"></el-input> </el-form-item> <el-form-item label="浼樻儬"> - <el-input-number style="width: 140px" v-model="discount" :precision="2" :step="0.1" :max="10" :min="0" - @change="numberChange" :disabled="isfalse"></el-input-number> + <el-input-number style="width: 140px" v-model="discount" :precision="1" :step="0.1" :max="10" :min="0" + @change="debounceNumberChange" :disabled="isfalse"></el-input-number> </el-form-item> <el-form-item label="瀹炴敹閲戦"> <el-input v-model="formInline.paidIn" placeholder="瀹炰粯" style="width: 94px"> @@ -763,7 +742,7 @@ </template> <script> -import Big from 'big.js'; +import Big from "big.js"; import selectName from "@/components/selectName"; import { dataURLtoFile, random } from "./file"; import { getInfo } from "@/api/login"; @@ -794,7 +773,7 @@ getconfigKey, getHistryTjOrderProByCusIdCard, readCertCardInfos, - gaibianzhekou + gaibianzhekou, } from "@/api/system/tijian"; import { addComp } from "@/api/system/comp"; import { getCompany, queryCompany } from "@/api/team/tuanti"; @@ -893,6 +872,7 @@ hide: true, beat: false, dialogVisibles: false, + loadingSubmit: false, charge: false, src: "", url: "", @@ -1039,8 +1019,8 @@ cusMarryStatus: "5", idType: "1", ageUnit: "0", - firmId: '', - + firmId: "", + firmDeptName: "", }, form1: {}, title: "", @@ -1093,33 +1073,54 @@ mounted() { }, methods: { + debounceNumberChange(currentValue, oldValue) { + clearTimeout(this.debounceTimer); + this.debounceTimer = setTimeout(() => { + this.numberChange(currentValue, oldValue); + }, 300); + }, + changeXianjia() { + // 鍘熷鎶樻墸鐜囪绠� + if (this.TotalPrice1 !== 0) { + this.discount = +(Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10; + } + + }, clear() { - this.form.firmId = "" + this.form.firmId = ""; }, /** 鍒犻櫎鎸夐挳鎿嶄綔 */ handleDelete1(row) { - console.log(row); + // console.log(row); let data = { cusCardId: row.cusId, proId: row.parentProId, }; - this.$modal.confirm('鏄惁纭鍒犻櫎锛�').then(() => { - return delTbBycusCardIdAndProId(data); - }).then(() => { - this.TotalPrice1 = 0 - getTransitionList1(row.cusId).then((response) => { - this.tableData1 = response.data; - this.tableData1.forEach((item) => { - this.TotalPrice1 += item.ordPrice; - this.TotalPrice += item.nowPrice; + this.$modal + .confirm("鏄惁纭鍒犻櫎锛�") + .then(() => { + return delTbBycusCardIdAndProId(data); + }) + .then(() => { + this.TotalPrice1 = 0; + getTransitionList1(row.cusId).then((response) => { + this.tableData1 = response.data; + + this.tableData1.forEach((item) => { + this.TotalPrice1 += item.ordPrice; + this.TotalPrice += item.nowPrice; + }); + this.TotalPrice = this.tableData1.reduce((sum, item) => { + return sum.plus(new Big(item.nowPrice || "0")); + }, new Big(0)); + this.discount = + (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * + 10; }); - this.TotalPrice = this.tableData1.reduce((sum, item) => { - return sum.plus(new Big(item.nowPrice || '0')); - }, new Big(0)); - this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10 - }); - this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); - }).catch(() => { }); + this.$modal.msgSuccess("鍒犻櫎鎴愬姛"); + }) + .catch(() => { }); }, validateDiscount(row) { if (row.discount > 10) { @@ -1130,24 +1131,23 @@ this.updateProPrice(row); // 鏇存柊浠锋牸鎴栧叾浠栭�昏緫 }, isAll(value) { - return value === '' || value === null; + return value === "" || value === null; }, updateProPrice(row) { const ordPrice = new Big(row.ordPrice); const discount = new Big(row.discount); - const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10) + const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10) row.nowPrice = result.toNumber(); this.TotalPrice = this.tableData1.reduce((sum, item) => { - return sum.plus(new Big(item.nowPrice || '0')); + return sum.plus(new Big(item.nowPrice || "0")); }, new Big(0)); - this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10 + this.discount = + (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10; }, - openname() { - this.$refs.bbb.open = true; this.$refs.bbb.title = "鎼滅储濮撳悕"; this.$refs.bbb.getList(); @@ -1195,7 +1195,7 @@ }, idFn1(value) { if (value) { - console.log(value) + // console.log(value); const originalCompId = this.form.firmId; this.form.firmName = value; this.CompanyList.forEach((item) => { @@ -1208,7 +1208,7 @@ this.form.firmId = ""; } if (this.form.firmId) { - this.form.tjType = "1" + this.form.tjType = "1"; } } }, @@ -1387,8 +1387,6 @@ this.pacName = item.pacName; }); - - this.list1 = false; this.list3 = true; } else { @@ -1489,25 +1487,7 @@ this.srcUrl = response.url; }); }, - // base64杞枃浠� - // dataURLtoFile(image, filename) { - // var arr = image.split(","); - // var mime = arr[0].match(/:(.*?);/)[1]; - // var bstr = atob(arr[1]); - // var n = bstr.length; - // var u8arr = new Uint8Array(n); - // while (n--) { - // u8arr[n] = bstr.charCodeAt(n); - // } - // return new File([u8arr], filename, { type: mime }); - // }, - // 鍏抽棴鎽勫儚澶� - - // stopNavigator() { - // this.thisVideo.srcObject.getTracks()[0].stop(); - // this.beat = false; - // }, handleClose(done) { this.$confirm("纭鍏抽棴锛�") @@ -1519,11 +1499,6 @@ /** 鏌ヨ淇℃伅鍒楄〃 */ getList() { - // listCustomer(this.queryParams).then((response) => { - // this.customerList = response.rows; - // this.total = response.total; - // this.loading = false; - // }); getInfo().then((response) => { this.getInfodis = response.user.discount; if (this.getInfodis === null) { @@ -1573,14 +1548,13 @@ updateBy: null, updateTime: null, deleted: null, - firmid: '' + firmid: "", + firmDeptName: "", }; this.resetForm("form"); }, /** 閲嶇疆鎸夐挳鎿嶄綔 */ resetQuery() { - // this.resetForm("form"); - // this.form = {}; if (this.confirm === true) { this.$tab.refreshPage(); } else { @@ -1618,24 +1592,54 @@ // this.$modal.msgError(`璇ヤ汉鍛樻渶楂樹紭鎯犳潈闄愪负${this.getInfodis}鎶榒); } this.tableData1.forEach((item) => { - item.discount = this.discount + item.discount = this.discount; const ordPrice = new Big(item.ordPrice); const discount = new Big(item.discount); - const result = ordPrice.times(discount.div(10)); // ordPrice * (discount / 10) + const result = ordPrice.times(discount.div(10)) item.nowPrice = result.toNumber(); this.TotalPrice = this.tableData1.reduce((sum, item) => { - return sum.plus(new Big(item.nowPrice || '0')); + return sum.plus(new Big(item.nowPrice || "0")); }, new Big(0)); - }) - // ---------------------------------------------------------- - + }); }) .catch(() => { this.discount = oldValue; }); - }, - + numberChangeXianPrice(currentValue, oldValue) { + this.$confirm("纭畾淇敼鎵�鏈夊瓙椤圭殑鎶樻墸鍚楋紵", "鎻愮ず", { + confirmButtonText: "纭畾", + cancelButtonText: "鍙栨秷", + type: "warning", + }) + .then(() => { + this.discount = currentValue; + if (this.discount < this.getInfodis) { + this.discount = this.getInfodis; + } + let totalYsprice = new Big(0) + this.tableData1.forEach((item) => { + item.discount = this.discount; + const ordPrice = new Big(item.ordPrice); + const discount = new Big(item.discount); + const result = ordPrice.times(discount.div(10)) + item.nowPrice = result.toNumber(); + totalYsprice = totalYsprice.plus(new Big(item.nowPrice)); + }) + if (!totalYsprice.eq(this.TotalPrice)) { + const diff = new Big(this.TotalPrice).minus(totalYsprice); + if (this.tableData1.length > 0) { + const lastItem = this.tableData1[this.tableData1.length - 1] + const newYsPrice = new Big(lastItem.nowPrice).plus(diff).toNumber() + console.log("hhh", this.tableData1[this.tableData1.length - 1].nowPrice,newYsPrice) + this.$set(this.tableData1[this.tableData1.length - 1], 'nowPrice', newYsPrice) + } + } + }) + .catch(() => { + this.discount = oldValue; + }); + }, /** 鐧昏鎻愪氦鎸夐挳 */ submitForm() { let _this = this; @@ -1651,7 +1655,7 @@ if (this.form.cusSex === "鏈煡") { this.form.cusSex = 2; } - if (this.form.tjType === '') { + if (this.form.tjType === "") { this.form.tjType = this.dict.type.dict_team[0].value; } @@ -1702,8 +1706,8 @@ } if (this.form.reservationId != null) { if (this.form.groupingId) { - this.form.firmName = this.form.compName - this.form.tjType = "1" + this.form.firmName = this.form.compName; + this.form.tjType = "1"; this.CompanyList.forEach((item) => { if (item.cnName == this.form.firmName) { this.form.firmId = item.drugManufacturerId; @@ -1840,6 +1844,7 @@ // 鏈�鏂颁娇鐢╳ebSocket閫氫俊 readCardWebSocket(resultObj) { let _this = this; + if (resultObj.code === 200 && resultObj.data.name != null) { //鍥炴樉鐩稿叧鏁版嵁 _this.form.cusName = resultObj.data.name; @@ -1851,6 +1856,29 @@ /^(\d{4})(\d{2})(\d{2})$/, "$1-$2-$3" ); + } else if (_this.form.cusIdcard) { + // 浠庤韩浠借瘉鍙风爜鎻愬彇鍑虹敓鏃ユ湡 + var org_birthday = _this.form.cusIdcard.substring(6, 14); + _this.form.cusBrithday = + org_birthday.substring(0, 4) + + "-" + + org_birthday.substring(4, 6) + + "-" + + org_birthday.substring(6, 8); + } + // 濡傛灉鍑虹敓鏃ユ湡瀛樺湪锛岃绠楀勾榫� + if (_this.form.cusBrithday) { + var birthdays = new Date(_this.form.cusBrithday); + let d = new Date(); + let age = + d.getFullYear() - + birthdays.getFullYear() - + (d.getMonth() < birthdays.getMonth() || + (d.getMonth() == birthdays.getMonth() && + d.getDate() < birthdays.getDate()) + ? 1 + : 0); + _this.form.age = age; // 璧嬪�艰绠楃殑骞撮緞 } _this.form.cusAddr = resultObj.data.addres; _this.form.cusIdcard = resultObj.data.card; @@ -1860,15 +1888,7 @@ } } else { this.$message.warning("璇锋斁缃韩浠借瘉鍚庡啀鐐瑰嚮璇诲彇"); - } /* if (resultObj.resultFlag == "-1") { - if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") { - //alert("璇诲崱鍣ㄦ湭杩炴帴"); - } else { - //alert(resultObj.errorMsg); - } - } else if (resultObj.resultFlag == "-2") { - //alert(resultObj.errorMsg); - } */ + } }, // TODO 浠ヤ笅浠g爜鍙兘鏄尘宸濅娇鐢ㄧ殑 jingChuanHandlerWebSocketResult(resultObj) { @@ -2020,23 +2040,9 @@ alert("璇锋鏌ヨ鍗″櫒杩炴帴鏄惁姝e父"); }; } else { - // if (_this.inputSSS.indexOf(":1") != -1) { - - // var str1 = _this.inputSSS.indexOf(":1"); - // var result1 = _this.inputSSS.substring(0, str1); - - // var str2 = _this.inputSSS.indexOf(":1"); - // var result2 = _this.inputSSS.substring( - // str2 + 2, - // _this.inputSSS.length - // ); - - // _this.inputSSS = result1 + result2; - // } _this.inputSSS = _this.inputSSS.replace(":1", ""); var websocket = null; var url = this.valueUrls; - // var url = 'ws://'+ getIp() +':6789/websocket' if ("WebSocket" in window) { websocket = new WebSocket(url); } else if ("MozWebSocket" in window) { @@ -2144,10 +2150,9 @@ } }, handleChangesName(params) { - this.form.cusIdcard = params[0].sfzh - this.handleQuery() + this.form.cusIdcard = params[0].sfzh; + this.handleQuery(); }, - // 涓婁紶澶村儚 handleAvatarSuccess(res, file) { @@ -2188,8 +2193,8 @@ this.name = this.queryParam.pacName; let param = { sex: this.form.cusSex, - dwId: this.form.firmId - } + dwId: this.form.firmId, + }; if (this.name) { getPackageListName(this.name).then((response) => { this.newpacName = response.data; @@ -2200,7 +2205,7 @@ tuantiSelect(param).then((response) => { this.newpacName = response.data; this.loading = false; - }) + }); } else { deptTreeSelect().then((response) => { this.newpacName = response.rows; @@ -2210,55 +2215,9 @@ } }, - // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁 - // handleSelectionChange(selection, row) { - // this.tableData = selection; - // if (selection.length > 1) { - // let del_row = selection.shift(); - // this.$refs.tb.toggleRowSelection(del_row, false); //璁剧疆杩欎竴琛屽彇娑堥�変腑 - // } - // this.single = selection.length !== 1; - // this.multiple = !selection.length; - // this.tableData.forEach((item) => { - // this.fData = item.tjProjectList; - // }); - // if (selection[0]) { - // this.DataList = []; - // this.data = JSON.parse(JSON.stringify(this.dXData)); - // if (selection[0].tjProjectList) { - // selection[0].tjProjectList.forEach((selectionitem) => { - // this.treedataList.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 = []; - // } - // }); - // } - // }); - // } - // }); - // }); - // } - // } else { - // this.treedataList = JSON.parse(JSON.stringify(this.dXData)); - // return; - // } - // }, resetpackage() { - this.discount = 10 + this.discount = 10; if (this.form.cusIdcard) { var cusId = this.form.cusIdcard; } else { @@ -2294,7 +2253,6 @@ }, Package() { - this.activeNames = "first"; let cusSex = this.form.cusSex; this.datekey = Date.now(); @@ -2302,15 +2260,14 @@ let param = { sex: cusSex, - dwId: this.form.firmId || '' - } + dwId: this.form.firmId || "", + }; if (this.form.tjType == 1) { if (!this.form.firmId) { this.$message({ type: "warning", message: "璇峰厛缁存姢鍗曚綅锛�", }); - } else { this.taocan = true; this.loading = true; @@ -2333,7 +2290,7 @@ } } catch (error) { } this.loading = false; - }) + }); } } else { this.taocan = true; @@ -2359,8 +2316,6 @@ this.loading = false; }); } - - }, // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁 @@ -2611,7 +2566,6 @@ if (this.DataList.length != 0) { this.list1 = false; this.DataList.forEach((item) => { - this.marryall += item.proPrice; }); } @@ -2773,6 +2727,7 @@ this.treeList.push(item9.proId); }); } + this.TotalPrice = 0; this.TotalPrice1 += item.ordPrice; this.TotalPrice += item.nowPrice; @@ -2780,9 +2735,12 @@ }); this.TotalPrice = this.tableData1.reduce((sum, item) => { - return sum.plus(new Big(item.nowPrice || '0')); + return sum.plus(new Big(item.nowPrice || "0")); }, new Big(0)); - this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10 + this.discount = + (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / + 100) * + 10; this.list1 = false; this.list3 = true; this.list2 = false; @@ -2792,11 +2750,9 @@ } }); } else { - } }); - } - else { + } else { getaddtTransition(data).then((response) => { if (response.code == 200) { let cusId = this.form.cusIdcard; @@ -2814,13 +2770,16 @@ this.treeList.push(item9.proId); }); } + this.TotalPrice = 0; this.TotalPrice1 += item.ordPrice; this.TotalPrice += item.nowPrice; this.pacName = item.pacName; }); - this.discount = (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / 100) * 10 - + this.discount = + (Math.floor((this.TotalPrice / this.TotalPrice1) * 100) / + 100) * + 10; this.list1 = false; this.list3 = true; @@ -2831,7 +2790,6 @@ } }); } else { - } }); } @@ -3086,8 +3044,6 @@ listgetOrder(data) { getOrder(data).then((res) => { this.$modal.msgSuccess("鎻愪氦鎴愬姛"); - // this.dialogVisibles = true; - // this.url = window.webkitURL.createObjectURL(res); //灏嗗悗绔繑鍥炵殑blob鏂囦欢璇诲彇鍑簎rl //璋冩帴鍙f樉绀哄妫�鍗� const tjNumber = res.msg; const viewNum = "792931586196398080"; @@ -3102,6 +3058,7 @@ submitPrice() { let _this = this; if (_this.tjCategory !== "") { + this.loadingSubmit = true; let List = _this.tableData1; //鍗曚釜椤圭洰淇℃伅 if (this.responseList.cusId) { var userId = this.responseList.cusId; @@ -3144,10 +3101,15 @@ 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 })); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id + .filter((item) => item.discount < 10) // 杩囨护鍑� discount < 10 鐨勯」 + .map((item) => ({ + discount: item.discount, + parentProId: item.parentProId, + cusIdCard: item.cusId, + })); // 鍒涘缓鏂扮殑瀵硅薄锛屽寘鍚� discount 鍜� id gaibianzhekou(newArray).then((res) => { if (res.code === 200) { + this.loadingSubmit = false; let data; if (pacId || this.tjOrderList.length > 0) { @@ -3160,7 +3122,8 @@ tjType, tjCategory: this.tjCategory, firmId: this.form.firmId, - firmName: this.form.firmName + firmName: this.form.firmName, + firmDeptName: this.form.firmDeptName, }; this.listgetOrder(data); @@ -3173,7 +3136,8 @@ tjType, tjCategory: this.tjCategory, firmId: this.form.firmId, - firmName: this.form.firmName + firmName: this.form.firmName, + firmDeptName: this.form.firmDeptName, }; this.listgetOrder(data); } else { @@ -3183,11 +3147,12 @@ }); } } else { + this.loadingSubmit = false; this.$modal.msgError("鏀瑰彉鎶樻墸閿欒"); } - }) - + }); } else { + this.loadingSubmit = false; this.$modal.msgError("璇烽�夋嫨浣撴绫诲埆"); } }, -- Gitblit v1.8.0