From 90b09b2e6023188135b3750657c9f4f0dcf16534 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 | 89 +++++++++++--------------------------------- 1 files changed, 23 insertions(+), 66 deletions(-) diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index aaf0a34..3a8821d 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -135,6 +135,13 @@ }, ]" > + <span + slot="label" + style="display: inline-block; border-bottom: 2px solid blue" + @click="openname" + > + 濮撳悕 + </span> <el-input v-model="form.cusName" placeholder="璇疯緭鍏ュ鍚�" @@ -520,7 +527,8 @@ > <el-button type="primary" plain size="mini" @click="setImage()" >鎷嶇収</el-button - ><br /> + > + <br /> </div> </div> </el-col> @@ -864,28 +872,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> @@ -1101,8 +1087,13 @@ </div> </el-dialog> - <div style="text-align: center; margin-bottom: 10px"> - 宸查�夐」鐩垪琛� + <div style="display: flex; align-items: flex-end;margin-bottom: 10px"> + <div style="margin-left: 46px;font-size:16px;"> + 宸查�夐」鐩潯鏁帮細0鏉� + </div> + <div style="margin-left: 242px;font-size:26px;font-weight: 700"> + 宸查�夐」鐩垪琛� + </div> </div> <div style=" @@ -1138,7 +1129,7 @@ <div style="width: 20%"> <el-button type="primary" - @click="candelete(item)" + @click.stop="candelete(item)" style="float: right" >鍒� 闄�</el-button > @@ -1575,7 +1566,7 @@ lishi: false, table: false, HistoryList: {}, - index: 0, + index: [], names: "", inputSSS: "", dictType: [ @@ -1823,6 +1814,7 @@ mounted() {}, methods: { + openname: {}, getCompanyList() { this.loading = true; getconfigKey("team_reservation_default_day").then((res) => { @@ -2420,9 +2412,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 { @@ -2471,9 +2465,6 @@ this.$message.warning("鏈煡鍒扮敤鎴蜂俊鎭�"); } }); - // .catch((error) => { - // this.$message.error("姝ょ敤鎴蜂笉瀛樺湪"); - // }); } else { let configKey = "getInfoFromSqlData"; getconfigKey(configKey).then((res) => { @@ -2511,22 +2502,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("璇诲崱鍣ㄨ繛鎺ュ叧闂�"); }; @@ -2538,37 +2522,12 @@ 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; @@ -3399,7 +3358,6 @@ } }); }, - // // 榛樿鎺ュ彈鍥涗釜鍊� { 褰撳墠琛岀殑鍊�, 褰撳墠鍒楃殑鍊�, 琛岀殑涓嬫爣, 鍒楃殑涓嬫爣 } objectSpanMethod({ row, column, rowIndex, columnIndex }) { let fields = ["propinName"]; let cellValue = row[column.property]; @@ -3847,7 +3805,6 @@ }, }; </script> - <style> .el-form-item__error { -- Gitblit v1.8.0