From 2e5fdbffc7a581a32368d3bd9a64ecdeb6b463b0 Mon Sep 17 00:00:00 2001 From: wwl <xchao828@163.com> Date: 星期一, 30 十二月 2024 18:13:36 +0800 Subject: [PATCH] 1 --- src/views/system/tijian/index.vue | 185 ++++++++++++++++++--------------------------- 1 files changed, 75 insertions(+), 110 deletions(-) diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index 7dcebe1..2b6af1b 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -135,6 +135,14 @@ }, ]" > + <!-- style="display: inline-block; border-bottom: 2px solid blue" + @click="openname" --> + <span + slot="label" + + > + 濮撳悕 + </span> <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" @@ -327,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" @@ -368,13 +376,15 @@ /> </el-form-item> - <el-form-item label="鍗曚綅鍚嶇О" prop="dictCompId"> + <el-form-item label="鍗曚綅鍚嶇О" prop="compName"> <el-select - :remote-method="getRemoteData" + :disabled="isDisabled" v-model="form.compName" remote + default-first-option + allow-create filterable - style="width: 300px" + style="width: 200px" placeholder="璇烽�夋嫨鍗曚綅鍚嶇О" clearable @change="idFn1" @@ -383,13 +393,13 @@ v-for="dict in CompanyList" :key="dict.cnName" :label="dict.cnName" - :value="dict.drugManufacturerId" + :value="dict.cnName" /> </el-select> - <i class="el-icon-circle-plus-outline" @click="handleAdd1"></i> + <!-- <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" @@ -518,7 +528,8 @@ > <el-button type="primary" plain size="mini" @click="setImage()" >鎷嶇収</el-button - ><br /> + > + <br /> </div> </div> </el-col> @@ -862,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> @@ -1099,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; + " + > + {{ this.tableData1[0].pacName || "" }} 宸查�夐」鐩潯鏁帮細<span + style="font-weight: 700; color: red; margin-right: 5px" + >{{ this.tableData1.length || 0 }}</span + >鏉� + </div> 宸查�夐」鐩垪琛� </div> <div @@ -1122,8 +1133,6 @@ <template slot="title"> <div style="width: 70%"> {{ - item.pacName + - ":" + item.parentName + " (搴旀敹閲戦:" + item.ordPrice + @@ -1136,7 +1145,7 @@ <div style="width: 20%"> <el-button type="primary" - @click="candelete(item)" + @click.stop="candelete(item)" style="float: right" >鍒� 闄�</el-button > @@ -1148,7 +1157,7 @@ style="width: 100%" height="270" > - <el-table-column prop="s" label="椤圭洰" width="180"> + <el-table-column prop="proName" label="椤圭洰" width="180"> </el-table-column> <el-table-column prop="proType" label="鎬у埆" width="180"> <template @@ -1495,10 +1504,12 @@ </span> </el-dialog> <Packages ref="aaa" @add="handleChanges" /> + <selectName ref="bbb" /> </div> </template> <script> +import selectName from "@/components/selectName"; import { dataURLtoFile, random } from "./file"; import { getInfo } from "@/api/login"; import { @@ -1508,8 +1519,6 @@ getByTjNum, } from "@/api/hosp/customer"; import { getPrintSetUp } from "@/api/system/examcharge"; -import axios from "axios"; -import { getIp } from "@/utils/auth"; import { deptTreeSelect, projectGetList, @@ -1554,6 +1563,7 @@ VTreeTransfer, historyTj, Packages, + selectName, }, data() { return { @@ -1575,7 +1585,7 @@ lishi: false, table: false, HistoryList: {}, - index: 0, + index: [], names: "", inputSSS: "", dictType: [ @@ -1765,7 +1775,7 @@ CompanyList: [], form: { cusIdcard: "", - tjType: "3", + tjType: "", cusSex: 1, cusNational: "1", cusMarryStatus: "5", @@ -1817,13 +1827,16 @@ this.getCurrentDateTime(); this.startTimer(); this.getList1(); + // this.getData(); }, - mounted() { - - }, + mounted() {}, methods: { + openname() { + this.$refs.bbb.open = true; + this.$refs.bbb.title = "123"; + }, getCompanyList() { this.loading = true; getconfigKey("team_reservation_default_day").then((res) => { @@ -1866,25 +1879,18 @@ this.title = "娣诲姞浣撴鍗曚綅淇℃伅缁存姢"; }, idFn1(value) { - if (value) { - this.form.dictCompId = value; + const originalCompId = this.form.dictCompId; + this.form.compName = value; this.CompanyList.forEach((item) => { - if (item.drugManufacturerId == this.form.dictCompId) { - this.form.compName = item.cnName; + if (item.cnName == this.form.compName) { + this.form.dictCompId = item.drugManufacturerId; } }); - } - }, - getRemoteData(query) { - if (query) { - let compName = query; - queryCompany(compName).then((response) => { - this.CompanyList = response.data; - this.CompanyList.forEach((item) => { - this.objs = item; - }); - }); + + if (this.form.dictCompId === originalCompId) { + this.form.dictCompId = ""; + } } }, getCurrentDateTime() { @@ -2348,8 +2354,13 @@ 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; // //鍏ㄩ儴濂楅 @@ -2391,7 +2402,7 @@ 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"; @@ -2423,9 +2434,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 { @@ -2474,13 +2487,9 @@ this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�"); } }); - // .catch((error) => { - // this.$message.error("姝ょ敤鎴蜂笉瀛樺湪"); - // }); } else { let configKey = "getInfoFromSqlData"; getconfigKey(configKey).then((res) => { - if (res.code == 200) { if (res.msg == "N") { var websocket = null; @@ -2490,7 +2499,6 @@ } else if ("MozWebSocket" in window) { websocket = new MozWebSocket(url); } else { - } if (websocket == null) { @@ -2516,23 +2524,15 @@ var jsonObj = { // name: "readCert", }; - // var jStr = JSON.stringify(jsonObj); - // this.websocket.send(jStr); + this.dialogVisible = false; }; //鎺ユ敹鍒版秷鎭殑鍥炶皟鏂规硶 websocket.onmessage = (event) => { - var resultObj = eval("(" + event.data + ")"); - //resultFlag涓�0浠h〃璇诲崱鎴愬姛 - - // TODO 浠ヤ笅浠g爜鍙兘鏄尘宸濅娇鐢ㄧ殑 - // this.jingChuanHandlerWebSocketResult(resultObj) this.readCardWebSocket(resultObj); }; - - //杩炴帴鍏抽棴鐨勫洖璋冩柟娉� websocket.onclose = function () { alert("璇诲崱鍣ㄨ繛鎺ュ叧闂�"); }; @@ -2544,43 +2544,16 @@ this.cardreader = true; _this.cardreaderradio = 3; _this.inputSSS = ""; - // let url = window.location.protocol + "//" + window.location.host; - - // axios - // .get("http://localhost:81/dev-api/readCertCardInfos") - // .then((res) => { - - // }) - // .catch((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" ? "濂�" : "鐢�"; @@ -2678,7 +2651,6 @@ } else if ("MozWebSocket" in window) { websocket = new MozWebSocket(url); } else { - } if (websocket == null) { alert("11111"); @@ -2783,7 +2755,6 @@ } else if ("MozWebSocket" in window) { websocket = new MozWebSocket(url); } else { - } if (websocket == null) { alert("11111"); @@ -3176,7 +3147,6 @@ this.loading = true; getProParentIdDxList().then((response) => { this.Treedata = response.data.list; - if (this.tableData[0]) { this.tableData[0].tjProjectList.forEach((selectionitem) => { @@ -3200,7 +3170,7 @@ }; getlistByZhId(datas).then((res) => { this.packagedataList = res.data.tjProjectList; - + this.DataLists = []; this.checkedListkey1 = []; for (var i = 0; i < this.packagedataList.length; i++) { @@ -3210,12 +3180,11 @@ getProSonDxList(proId).then((res) => { this.TreedataList = res.data.list; - this.TreedataList.forEach((item) => { // this.checkedListkey1.push(item.proId); this.DataLists.push(item); - + if (this.DataLists.length >= 1) { this.marryalls = 0; this.DataLists.forEach((item1) => { @@ -3411,7 +3380,6 @@ } }); }, - // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 } objectSpanMethod({ row, column, rowIndex, columnIndex }) { let fields = ["propinName"]; let cellValue = row[column.property]; @@ -3466,7 +3434,6 @@ }; getaddtTransition(data).then((response) => { if (response.code == 200) { - let cusId = this.form.cusIdcard; this.proIds = []; getTransitionList(cusId).then((response) => { @@ -3503,7 +3470,6 @@ }); } else { console.log(澶辫触浜�); - } }); this.taocan = false; @@ -3861,7 +3827,6 @@ }, }; </script> - <style> .el-form-item__error { -- Gitblit v1.8.0