From 22400e8373197f64a3ebf64053fe2fe11a74ce4f Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期二, 31 十二月 2024 19:11:17 +0800 Subject: [PATCH] 33 --- src/views/system/tijian/index.vue | 631 +++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 460 insertions(+), 171 deletions(-) diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index 65631ab..e7eaf3c 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -1,5 +1,96 @@ <template> <div class="app-container"> + <el-dialog + :title="title" + :visible.sync="open1" + width="1000px" + append-to-body + > + <el-form + ref="form1" + :model="form1" + :rules="rules1" + label-width="100px" + :inline="true" + > + <el-form-item label="鍗曚綅鍚嶇О" prop="cnName"> + <el-input v-model="form1.cnName" placeholder="璇疯緭鍏ヤ腑鏂囧悕绉�" /> + </el-form-item> + <el-form-item label="鑱旂郴浜�" prop="contactPerson"> + <el-input v-model="form1.contactPerson" placeholder="璇疯緭鍏ヨ仈绯讳汉" /> + </el-form-item> + <el-form-item label="鑱旂郴鐢佃瘽" prop="contactPhone"> + <el-input v-model="form1.contactPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" /> + </el-form-item> + <el-form-item label="绋庡彿" prop="taxNumber"> + <el-input v-model="form1.taxNumber" placeholder="璇疯緭鍏ョ◣鍙�" /> + </el-form-item> + <el-form-item label="娉曚汉" prop="legalPerson"> + <el-input v-model="form1.legalPerson" placeholder="璇疯緭鍏ユ硶浜�" /> + </el-form-item> + <el-form-item label="娉ㄥ唽鍦板潃" prop="registerAddress"> + <el-input + v-model="form1.registerAddress" + placeholder="璇疯緭鍏ユ敞鍐屽湴鍧�" + /> + </el-form-item> + <el-form-item label="閫氳鍦板潃" prop="mailingAddress"> + <el-input + v-model="form1.mailingAddress" + placeholder="璇疯緭鍏ラ�氳鍦板潃" + /> + </el-form-item> + <el-form-item label="寮�鎴烽摱琛�" prop="bankAccount"> + <el-input v-model="form1.bankAccount" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" /> + </el-form-item> + <el-form-item label="閾惰璐︽埛" prop="countNum"> + <el-input v-model="form1.countNum" placeholder="璇疯緭鍏ラ摱琛岃处鎴�" /> + </el-form-item> + <el-form-item label="閭" prop="email"> + <el-input v-model="form1.email" placeholder="璇疯緭鍏ラ偖绠�" /> + </el-form-item> + <el-form-item label="璐熻矗浜�" prop="principal"> + <el-input v-model="form1.principal" placeholder="璇疯緭鍏ヨ礋璐d汉" /> + </el-form-item> + <el-form-item label="缃戝潃" prop="url"> + <el-input v-model="form1.url" placeholder="璇疯緭鍏ョ綉鍧�" /> + </el-form-item> + <el-form-item label="浼犵湡" prop="faxNumber"> + <el-input v-model="form1.faxNumber" placeholder="璇疯緭鍏ヤ紶鐪�" /> + </el-form-item> + <el-form-item label="琛屾斂鍖哄垝鍚嶇О" prop="areaName"> + <el-input v-model="form1.areaName" placeholder="璇疯緭鍏ヨ鏀垮尯鍒掑悕绉�" /> + </el-form-item> + <el-form-item label="鎺掑簭" prop="orderNum"> + <el-input v-model="form1.orderNum" placeholder="璇疯緭鍏ユ帓搴�" /> + </el-form-item> + <el-form-item label="鏈夋晥鏃堕棿" prop="validTime"> + <el-date-picker + clearable + v-model="form1.validTime" + type="date" + value-format="yyyy-MM-dd" + placeholder="璇烽�夋嫨鏈夋晥鏃堕棿" + > + </el-date-picker> </el-form-item + ><br /> + <el-form-item label="澶囨敞" prop="remark"> + <el-input + v-model="form1.remark" + type="textarea" + placeholder="璇疯緭鍏ュ唴瀹�" + :rows="2" + label-width="400px" + style="width: 830px" + resize="none" + ></el-input> + </el-form-item> + </el-form> + <div slot="footer" class="dialog-footer2"> + <el-button type="primary" @click="submitFormS">纭� 瀹�</el-button> + <el-button @click="cancel1">鍙� 娑�</el-button> + </div> + </el-dialog> <el-row :gutter="20"> <el-col :span="17"> <div class="grid-content bg-purple"> @@ -44,6 +135,14 @@ }, ]" > + + <span + slot="label" + style="display: inline-block; border-bottom: 2px solid blue" + @click="openname" + > + 濮撳悕 + </span> <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" @@ -236,7 +335,7 @@ /> </el-form-item> - <el-form-item label="骞撮緞 " prop="age"> + <el-form-item label="骞撮緞" prop="age"> <el-input v-model="form.age" :disabled="isDisabled" @@ -277,15 +376,30 @@ /> </el-form-item> - <el-form-item label="宸ヤ綔鍗曚綅" prop="company"> - <el-input + <el-form-item label="鍗曚綅鍚嶇О" prop="compName"> + <el-select :disabled="isDisabled" - v-model="form.company" - placeholder="璇疯緭鍏ュ伐浣滃崟浣�" - /> + v-model="form.compName" + remote + default-first-option + allow-create + filterable + style="width: 200px" + placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" + clearable + @change="idFn1" + > + <el-option + v-for="dict in CompanyList" + :key="dict.cnName" + :label="dict.cnName" + :value="dict.cnName" + /> + </el-select> + <!-- <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> --> </el-form-item> - <el-form-item label="鏂囧寲绋嬪害" prop="wenHua"> + <el-form-item label="鏂囧寲绋嬪害" prop="wenHua" label-width="93px"> <el-input :disabled="isDisabled" v-model="form.wenHua" @@ -414,7 +528,8 @@ > <el-button type="primary" plain size="mini" @click="setImage()" >鎷嶇収</el-button - ><br /> + > + <br /> </div> </div> </el-col> @@ -758,28 +873,6 @@ </el-table-column> </el-table> <h3 style="font-weight: 600">鍚堣锛歿{ marryall }}鍏�</h3> - <!-- <el-collapse v-model="activeName" accordion v-if="list1"> - <div> - <el-collapse-item title="璇烽�夋嫨椤圭洰"> - <el-table - :data="DataList" - border - style="width: 100%" - height="400" - :span-method="objectSpanMethod" - > - <el-table-column - prop="proName" - label="椤圭洰" - width="180" - > - </el-table-column> - <el-table-column prop="ordPrice" label="鍘熶环"> - </el-table-column> - </el-table> - </el-collapse-item> - </div> - </el-collapse> --> </div> </el-col> </el-row> @@ -995,7 +1088,29 @@ </div> </el-dialog> - <div style="text-align: center; margin-bottom: 10px"> + <div + style=" + display: flex; + align-items: center; + justify-content: flex-start; + width: 100%; + " + > + <div + style=" + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + 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 + >鏉� + </div> 宸查�夐」鐩垪琛� </div> <div @@ -1018,8 +1133,6 @@ <template slot="title"> <div style="width: 70%"> {{ - item.pacName + - ":" + item.parentName + " (搴旀敹閲戦:" + item.ordPrice + @@ -1032,7 +1145,7 @@ <div style="width: 20%"> <el-button type="primary" - @click="candelete(item)" + @click.stop="candelete(item)" style="float: right" >鍒� 闄�</el-button > @@ -1391,10 +1504,12 @@ </span> </el-dialog> <Packages ref="aaa" @add="handleChanges" /> + <selectName ref="bbb" @add="handleChangesName"/> </div> </template> <script> +import selectName from "@/components/selectName"; import { dataURLtoFile, random } from "./file"; import { getInfo } from "@/api/login"; import { @@ -1404,9 +1519,8 @@ getByTjNum, } from "@/api/hosp/customer"; import { getPrintSetUp } from "@/api/system/examcharge"; -import axios from "axios"; -import { getIp } from "@/utils/auth"; import { + tuantiSelect, deptTreeSelect, projectGetList, getOrder, @@ -1415,6 +1529,7 @@ getCusIdcard, getPackageListName, getaddtTransition, + tuantiqueren, getTransitionList, getByTeamNo, delTbBycusCardIdAndProId, @@ -1424,6 +1539,8 @@ getHistryTjOrderProByCusIdCard, readCertCardInfos, } from "@/api/system/tijian"; +import { addComp } from "@/api/system/comp"; +import { getCompany, queryCompany } from "@/api/team/tuanti"; import Packages from "@/components/Packages"; import { MessageBox } from "element-ui"; import VTreeTransfer from "./TreeTransfer.vue"; @@ -1448,9 +1565,11 @@ VTreeTransfer, historyTj, Packages, + selectName, }, data() { return { + open1: false, filterage: "", checkedkeys: [], DataLists: [], @@ -1468,7 +1587,7 @@ lishi: false, table: false, HistoryList: {}, - index: 0, + index: [], names: "", inputSSS: "", dictType: [ @@ -1620,6 +1739,7 @@ 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", @@ -1654,15 +1774,18 @@ // 琛ㄥ崟鍙傛暟 // 琛ㄥ崟鍙傛暟 obj: {}, + CompanyList: [], form: { cusIdcard: "", - tjType: "3", + tjType: "", cusSex: 1, cusNational: "1", cusMarryStatus: "5", idType: "1", ageUnit: "0", }, + form1: {}, + title: "", // 琛ㄥ崟鏍¢獙 rules: { cusName: [{ required: true, message: "", trigger: "blur" }], @@ -1676,6 +1799,20 @@ // ], cusIdcard: [{ required: true, message: "", trigger: "change" }], }, + rules1: { + cnName: [{ required: true, trigger: "blur" }], + contactPerson: [{ required: true, trigger: "blur" }], + contactPhone: [ + { + required: true, + trigger: "blur", + }, + { + pattern: /^1[3-9]\d{9}$/, + trigger: "blur", + }, + ], + }, }; }, watch: { @@ -1687,17 +1824,79 @@ }, }, created() { + this.getCompanyList(); + this.getCurrentDateTime(); this.startTimer(); this.getList1(); + // this.getData(); }, - mounted(){ - console.log(this.dict.type.dict_user_marry,555); - - }, + mounted() {}, methods: { + openname() { + + this.$refs.bbb.open = true; + this.$refs.bbb.title = "鎼滅储濮撳悕"; + this.$refs.bbb.getList(); + }, + getCompanyList() { + this.loading = true; + getconfigKey("team_reservation_default_day").then((res) => { + this.queryParams.yxts = res.msg; + }); + getCompany(this.queryParam).then((response) => { + this.CompanyList = response.data; + this.total = response.total; + this.loading = false; + }); + }, + cancel1() { + this.open1 = false; + this.reset1(); + }, + submitFormS() { + this.$refs["form1"].validate((valid) => { + if (valid) { + addComp(this.form1).then((response) => { + this.$modal.msgSuccess("鏂板鎴愬姛"); + this.open1 = false; + this.getCompanyList(); + }); + } + }); + }, + reset1() { + this.form1 = { + company: "", + payType: "", + name: "", + phoe: "", + signingPic: "", + discount: "", + }; + }, + handleAdd1() { + this.reset1(); + this.open1 = true; + this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢"; + }, + idFn1(value) { + if (value) { + const originalCompId = this.form.dictCompId; + this.form.compName = value; + this.CompanyList.forEach((item) => { + if (item.cnName == this.form.compName) { + this.form.dictCompId = item.drugManufacturerId; + } + }); + + if (this.form.dictCompId === originalCompId) { + this.form.dictCompId = ""; + } + } + }, getCurrentDateTime() { const currentDate = new Date(); @@ -2159,16 +2358,15 @@ if (this.form.cusSex === "鏈煡") { this.form.cusSex = 2; } + if (this.form.tjType === '') { + this.form.tjType = this.dict.type.dict_team[0].value; + } + addCustomer(this.form).then((response) => { this.responseList = response.data; + this.$modal.msgSuccess("鏂板鎴愬姛"); - // let cusSex = this.form.cusSex; - // //鍏ㄩ儴濂楅 - // deptTreeSelect(cusSex).then((response) => { - // this.newpacName = response.rows; - // this.loading = false; - // }); - // this.handleQuery(); + _this.tcShow = true; _this.tcShows = true; _this.isDisabled = true; @@ -2202,7 +2400,13 @@ this.discount = this.form.discount; } if (this.form.tjType === null) { - this.form.tjType = "3"; + this.form.tjType = this.dict.type.dict_team[0].value; + } + if (this.form.cusMarryStatus === "null") { + this.form.cusMarryStatus = "5"; + } + if (this.form.cusNational === "null") { + this.form.cusNational = "1"; } if (this.form.reservationId != null) { if (this.form.groupingId) { @@ -2228,9 +2432,11 @@ this.list1 = false; this.list2 = true; this.list3 = false; + this.top = false; } else { this.list1 = true; this.TotalPrice = "0.00"; + this.top = false; } }); } else { @@ -2279,13 +2485,9 @@ this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�"); } }); - // .catch((error) => { - // this.$message.error("姝ょ敤鎴蜂笉瀛樺湪"); - // }); } else { let configKey = "getInfoFromSqlData"; getconfigKey(configKey).then((res) => { - console.log(res); if (res.code == 200) { if (res.msg == "N") { var websocket = null; @@ -2295,7 +2497,6 @@ } else if ("MozWebSocket" in window) { websocket = new MozWebSocket(url); } else { - // console.log("SockJS"); } if (websocket == null) { @@ -2317,72 +2518,19 @@ }; var jStr = JSON.stringify(jsonObj); this.websocket.send(jStr); - alert("璇锋斁韬唤璇佸啀鐐圭‘璁�"); + // alert("璇锋斁韬唤璇佸啀鐐圭‘璁�"); var jsonObj = { // name: "readCert", }; - // var jStr = JSON.stringify(jsonObj); - // this.websocket.send(jStr); + this.dialogVisible = false; }; //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶 - websocket.onmessage = function (event) { + websocket.onmessage = (event) => { var resultObj = eval("(" + event.data + ")"); - //resultFlag涓�0浠h〃璇诲崱鎴愬姛 - - if ( - resultObj.name == "readCard" || - resultObj.name == "readCert" || - resultObj.name == "PushWithImg" || - resultObj.name == "PushWithOutImg" - ) { - if (resultObj.resultFlag == "0") { - //鍥炴樉鐩稿叧鏁版嵁 - _this.form.cusName = resultObj.resultContent.partyName; - _this.form.cusSex = - resultObj.resultContent.gender == "0" ? "濂�" : "鐢�"; - _this.form.cusNational = resultObj.resultContent.nation; - _this.form.cusBrithday = resultObj.resultContent.bornDay; - if (_this.form.cusBrithday) { - _this.form.cusBrithday = _this.form.cusBrithday.replace( - /^(\d{4})(\d{2})(\d{2})$/, - "$1-$2-$3" - ); - } - _this.form.cusAddr = resultObj.resultContent.certAddress; - _this.form.cusIdcard = resultObj.resultContent.certNumber; - _this.imageUrl = - "data:image/jpeg;base64," + - resultObj.resultContent.identityPic; - if ( - resultObj.name == "readCert" || - resultObj.name == "PushWithImg" - ) { - this.imageUrl = - "data:image/jpeg;base64," + - resultObj.resultContent.identityPrintPic; - } - } else if (resultObj.resultFlag == "-1") { - if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") { - //alert("璇诲崱鍣ㄦ湭杩炴帴"); - } else { - //alert(resultObj.errorMsg); - } - } else if (resultObj.resultFlag == "-2") { - //alert(resultObj.errorMsg); - } - } else if (resultObj.name == "getStatus") { - if (resultObj.resultFlag == "0") { - if (resultObj.status == "0") { - } else { - alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴"); - } - } - } + this.readCardWebSocket(resultObj); }; - - //杩炴帴鍏抽棴鐨勫洖璋冩柟娉� websocket.onclose = function () { alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�"); }; @@ -2394,35 +2542,92 @@ this.cardreader = true; _this.cardreaderradio = 3; _this.inputSSS = ""; - // let url = window.location.protocol + "//" + window.location.host; - // console.log(url); - // axios - // .get("http://localhost:81/dev-api/readCertCardInfos") - // .then((res) => { - // console.log(res); - // }) - // .catch((err) => { - // console.log(err); - // }); - - // readCertCardInfos().then((res) => { - // _this.form.cusName = res.data.name; - // _this.form.cusSex = - // res.data.sex; - // _this.form.cusNational = res.data.mz; - // _this.form.cusBrithday = res.data.csrq; - // if (_this.form.cusBrithday) { - // _this.form.cusBrithday = _this.form.cusBrithday.replace( - // /^(\d{4})(\d{2})(\d{2})$/, - // "$1-$2-$3" - // ); - // } - // _this.form.cusAddr = res.data.addres; - // _this.form.cusIdcard = res.data.card; - // }); } } }); + } + }, + + // 鏈�鏂颁娇鐢╳ebSocket閫氫俊 + readCardWebSocket(resultObj) { + let _this = this; + if (resultObj.code === 200 && resultObj.data.name != null) { + //鍥炴樉鐩稿叧鏁版嵁 + _this.form.cusName = resultObj.data.name; + _this.form.cusSex = resultObj.data.sex == "0" ? "濂�" : "鐢�"; + _this.form.cusNational = resultObj.data.mz; + _this.form.cusBrithday = resultObj.data.csrq; + if (_this.form.cusBrithday) { + _this.form.cusBrithday = _this.form.cusBrithday.replace( + /^(\d{4})(\d{2})(\d{2})$/, + "$1-$2-$3" + ); + } + _this.form.cusAddr = resultObj.data.addres; + _this.form.cusIdcard = resultObj.data.card; + _this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img; + if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") { + this.imageUrl = "data:image/jpeg;base64," + resultObj.data.img; + } + } 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) { + let _this = this; + if ( + resultObj.name == "readCard" || + resultObj.name == "readCert" || + resultObj.name == "PushWithImg" || + resultObj.name == "PushWithOutImg" + ) { + if (resultObj.resultFlag == "0") { + //鍥炴樉鐩稿叧鏁版嵁 + _this.form.cusName = resultObj.resultContent.partyName; + _this.form.cusSex = + resultObj.resultContent.gender == "0" ? "濂�" : "鐢�"; + _this.form.cusNational = resultObj.resultContent.nation; + _this.form.cusBrithday = resultObj.resultContent.bornDay; + if (_this.form.cusBrithday) { + _this.form.cusBrithday = _this.form.cusBrithday.replace( + /^(\d{4})(\d{2})(\d{2})$/, + "$1-$2-$3" + ); + } + _this.form.cusAddr = resultObj.resultContent.certAddress; + _this.form.cusIdcard = resultObj.resultContent.certNumber; + _this.imageUrl = + "data:image/jpeg;base64," + resultObj.resultContent.identityPic; + if (resultObj.name == "readCert" || resultObj.name == "PushWithImg") { + this.imageUrl = + "data:image/jpeg;base64," + + resultObj.resultContent.identityPrintPic; + } + } else if (resultObj.resultFlag == "-1") { + if (resultObj.errorMsg == "绔彛鎵撳紑澶辫触") { + //alert("璇诲崱鍣ㄦ湭杩炴帴"); + } else { + //alert(resultObj.errorMsg); + } + } else if (resultObj.resultFlag == "-2") { + //alert(resultObj.errorMsg); + } + } else if (resultObj.name == "getStatus") { + if (resultObj.resultFlag == "0") { + if (resultObj.status == "0") { + } else { + alert("璁惧杩炴帴宸叉柇寮�锛岃妫�鏌ヨ鍗″櫒杩炴帴"); + } + } } }, changeradio() { @@ -2444,7 +2649,6 @@ } else if ("MozWebSocket" in window) { websocket = new MozWebSocket(url); } else { - // console.log("SockJS"); } if (websocket == null) { alert("11111"); @@ -2549,7 +2753,6 @@ } else if ("MozWebSocket" in window) { websocket = new MozWebSocket(url); } else { - // console.log("SockJS"); } if (websocket == null) { alert("11111"); @@ -2654,7 +2857,10 @@ // this.form.cusName = param1[0].pacName; // this.form.cusPhone = param1[0].pacRemark; }, - + handleChangesName(params){ + this.form.cusIdcard = params[0].sfzh + this.handleQuery() + }, // selected(row, index) { // if (this.formPacId !== null) { // if (row.pacId == this.formPacId) { @@ -2709,16 +2915,27 @@ handle() { this.loading = true; this.name = this.queryParam.pacName; + let param = { + sex: this.form.cusSex, + dwId: this.form.dictCompId + } if (this.name) { getPackageListName(this.name).then((response) => { this.newpacName = response.data; this.loading = false; }); } else { - deptTreeSelect().then((response) => { + if(this.form.tjType == 1) { + tuantiSelect(param).then((response) => { + this.newpacName = response.data; + this.loading = false; + }) + } else{ + deptTreeSelect().then((response) => { this.newpacName = response.rows; this.loading = false; }); + } } }, @@ -2805,13 +3022,51 @@ }, Package() { - this.taocan = true; + this.activeNames = "first"; let cusSex = this.form.cusSex; this.datekey = Date.now(); //鍏ㄩ儴濂楅 - this.loading = true; - deptTreeSelect(cusSex).then((response) => { + + let param = { + sex: cusSex, + dwId: this.form.dictCompId || '' + } + if(this.form.tjType == 1) { + if(!this.form.dictCompId) { + this.$message({ + type: "warning", + message: "璇峰厛缁存姢鍗曚綅锛�", + }); + + } else { + this.taocan = true; + this.loading = true; + tuantiSelect(param).then((res) => { + this.newpacName = res.data; + try { + if (this.tableData1.length >= 1) { + this.newpacName.forEach((item3) => { + this.tableData1.forEach((item4) => { + item4.list.forEach((item6) => { + if (item6.pacName === item3.pacName) { + this.$nextTick(() => { + this.$refs.tb.toggleRowSelection(item3, true); + }); + throw Error(); + } + }); + }); + }); + } + } catch (error) {} + this.loading = false; + }) + } + } else { + this.taocan = true; + this.loading = true; + deptTreeSelect(cusSex).then((response) => { this.newpacName = response.rows; try { if (this.tableData1.length >= 1) { @@ -2831,7 +3086,9 @@ } catch (error) {} this.loading = false; }); - // this.getData(); + } + + }, // 鐐瑰嚮澶氶�夋鑾峰彇閫変腑鏁版嵁 @@ -2847,7 +3104,6 @@ this.tableData.forEach((item) => { this.tableData1.forEach((item1) => { item.tjProjectList.forEach((item2) => { - console.log(item1); if (item2.proId == item1.proPrantId && item1.pacName == "鍗曢」") { this.$confirm( "璇ュ椁愬寘鍚簡宸查�夊崟椤癸紝鏄惁纭閫夋嫨璇ュ椁愶紵", @@ -2934,9 +3190,7 @@ } }, // gaibian(val){ - // console.log(val); // let pname = val; - // console.log(pname); // getProParentIdDxList(pname).then(response=>{ // this.Treedata = response.data.list; // }) @@ -2945,7 +3199,6 @@ this.loading = true; getProParentIdDxList().then((response) => { this.Treedata = response.data.list; - console.log(response, 77788); if (this.tableData[0]) { this.tableData[0].tjProjectList.forEach((selectionitem) => { @@ -2969,7 +3222,7 @@ }; getlistByZhId(datas).then((res) => { this.packagedataList = res.data.tjProjectList; - console.log(this.packagedataList, 1122); + this.DataLists = []; this.checkedListkey1 = []; for (var i = 0; i < this.packagedataList.length; i++) { @@ -2978,13 +3231,12 @@ // this.DataLists.push(this.packagedataList[i]); getProSonDxList(proId).then((res) => { this.TreedataList = res.data.list; - console.log(this.TreedataList, 888); this.TreedataList.forEach((item) => { // this.checkedListkey1.push(item.proId); this.DataLists.push(item); - // console.log(this.DataLists,556644); + if (this.DataLists.length >= 1) { this.marryalls = 0; this.DataLists.forEach((item1) => { @@ -3005,9 +3257,6 @@ this.DataLists = []; this.marryalls = 0; // 娓呴浂鎬讳环 this.checkedListkey1 = []; - - // 浣犲彲浠ュ湪姝ゅ鏍规嵁闇�瑕佽繘琛屽叾浠栨搷浣滐紝濡傛洿鏂� UI - console.log("鍙栨秷閫変腑锛屾暟鎹凡娓呯┖锛屾�讳环宸查噸缃�"); } }, objectspanmethod({ row, column, rowIndex, columnIndex }) { @@ -3183,7 +3432,6 @@ } }); }, - // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 } objectSpanMethod({ row, column, rowIndex, columnIndex }) { let fields = ["propinName"]; let cellValue = row[column.property]; @@ -3236,7 +3484,8 @@ pacId: _this.pacId, proIds: this.proIds, }; - getaddtTransition(data).then((response) => { + if (this.form.tjType == 1){ + tuantiqueren(data).then((response) => { if (response.code == 200) { let cusId = this.form.cusIdcard; this.proIds = []; @@ -3266,28 +3515,64 @@ } this.list1 = false; this.list3 = true; + this.list2 = false; } else { this.list1 = true; this.TotalPrice = "0.00"; } }); + } else { + console.log(澶辫触浜�); } }); + } else { + getaddtTransition(data).then((response) => { + if (response.code == 200) { + let cusId = this.form.cusIdcard; + this.proIds = []; + getTransitionList(cusId).then((response) => { + this.tableData1 = response.data; + this.TotalPrice1 = 0; + if (this.tableData1) { + this.tableData1.forEach((item) => { + this.TotalPrice1 += item.nowPrice; + if (item.tjCategory != null) { + this.tjCategory = item.tjCategory; + } + if (item.pacName == "鍗曢」") { + item.list.forEach((item9) => { + this.treeList.push(item9.proId); + }); + } + this.pacName = item.pacName; + }); + + const r = /^\+?[0-9][0-9]*$/; //姝f暣鏁帮紙鍙互0鎵撳ご锛� + let TotalPrice = this.TotalPrice1 * (this.discount / 10); + if (r.test(TotalPrice)) { + this.TotalPrice = TotalPrice + ".00"; + } else { + this.TotalPrice = TotalPrice; + } + this.list1 = false; + this.list3 = true; + this.list2 = false; + } else { + this.list1 = true; + this.TotalPrice = "0.00"; + } + }); + } else { + console.log(澶辫触浜�); + } + }); + } + + this.taocan = false; this.defaultKeys = []; this.DataLists = []; }, - // changeCategoryKeys(val) { - // this.proIds = []; - // this.proIds = val; - // if (this.DataList.length != 0) { - // this.DataList.forEach((item) => { - // this.proIds.push(item.proId); - // }); - // } else { - // this.proIds = []; - // } - // }, submitCheckinfee() { let _this = this; if (_this.tjCategory !== "") { @@ -3629,7 +3914,6 @@ }; </script> - <style> .el-form-item__error { display: none; @@ -3751,7 +4035,12 @@ width: 300px; height: 300px; } - +.dialog-footer2 { + width: 960px; + height: 36px; + display: flex; + justify-content: center; +} .el-input--suffix .el-input__inner { padding-right: 15px; } -- Gitblit v1.8.0