From 5fc42c5d825592f2c04ca284f4360f9bbad62174 Mon Sep 17 00:00:00 2001 From: lkk <364857242@qq.com> Date: 星期四, 12 六月 2025 16:53:45 +0800 Subject: [PATCH] 11 --- src/views/system/tijian/index.vue | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index 0e82f85..86cf8f4 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -562,6 +562,15 @@ </div> 宸查�夐」鐩垪琛� </div> + + <div v-loading="contentLoading" element-loading-text="鍔犺浇涓�..." element-loading-spinner="el-icon-loading" element-loading-background="rgba(255, 255, 255, 0.7)" style=" padding: 0px 6px; + border: 1px solid #e6ebf5; + max-height: 650%; + overflow: auto; + width: 916px; + margin-left: 35px;" > + + <div style=" padding: 0px 6px; border: 1px solid #e6ebf5; @@ -617,6 +626,7 @@ </template> </el-table-column> </el-table> + </div> </div> </div> </el-col> @@ -815,6 +825,7 @@ data() { return { isSubmitting: false, + contentLoading: false, open1: false, filterage: "", checkedkeys: [], @@ -1958,11 +1969,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) { @@ -2017,7 +2032,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) { @@ -2919,6 +2934,8 @@ this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織 this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰� this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰� + + this.contentLoading = true; this.discount = 10; // 鍒濆鍖栨姌鎵d负10锛�100%锛� // 鍒ゆ柇鏄惁鏈夐�変腑鐨勫椁� @@ -2955,9 +2972,11 @@ this.processOrderItems(cusId); } this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇� + // this.contentLoading = false; }) .catch(() => { this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇� + // this.contentLoading = false; }); } else { getaddtTransition(data) @@ -2966,9 +2985,11 @@ this.processOrderItems(cusId); } this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇� + // this.contentLoading = false; }) .catch(() => { this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇� + // this.contentLoading = false; }); } @@ -2980,6 +3001,7 @@ // 澶勭悊璁㈠崟椤圭洰 processOrderItems(cusId) { getTransitionList1(cusId).then((response) => { + this.contentLoading = false; this.tableData1 = response.data; let Price = 0; if (this.tableData1) { -- Gitblit v1.8.0