From 2ee7a81c2eb0df1fc473da6dbbaa13df662967c5 Mon Sep 17 00:00:00 2001 From: wwl <xchao828@163.com> Date: 星期三, 02 七月 2025 15:43:59 +0800 Subject: [PATCH] 1 --- src/views/system/tijian/index.vue | 69 +++++++++++++++++++++++++--------- 1 files changed, 50 insertions(+), 19 deletions(-) diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue index cb456aa..fc937f1 100644 --- a/src/views/system/tijian/index.vue +++ b/src/views/system/tijian/index.vue @@ -1,4 +1,6 @@ <template> + <div v-loading="isLoading" element-loading-text="璇风◢鍊�..." element-loading-spinner="el-icon-loading" + element-loading-background="rgba(255, 255, 255, 0.8)" style="height: 100%; padding: 20px; position: relative;"> <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"> @@ -181,7 +183,7 @@ trigger: 'blur', }, ]"> - <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" :disabled="isDisabled" + <el-input v-model="form.cusPhone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" maxlength="11" :disabled="isDisabled" @input="form.cusPhone = $event.replace(/\s/g, '')" /> </el-form-item> @@ -292,7 +294,7 @@ <el-tabs type="border-card" style="height: 560px; margin: 0 10px; width: 100%" v-model="activeNames" @tab-click="handleClick"> <el-tab-pane label="濂楅" name="first"> - <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto"> + <el-form :model="queryParam" ref="queryForm" size="small" :inline="true" v-if="showSearch" label-width="auto" @submit.native.prevent="handle"> <el-form-item label="濂楅鍚嶇О" prop="pacName"> <el-input v-model="queryParam.pacName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter.native="handle" /> </el-form-item> @@ -558,10 +560,19 @@ this.tableData1[0].pacName || "" }}</span> 宸查�夐」鐩潯鏁帮細<span style="font-weight: 700; color: red; margin-right: 5px">{{ this.tableData1.length || 0 - }}</span>鏉� + }}</span>鏉� </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 +628,7 @@ </template> </el-table-column> </el-table> + </div> </div> </div> </el-col> @@ -749,6 +761,7 @@ <Packages ref="aaa" @add="handleChanges" /> <selectName ref="bbb" @add="handleChangesName" /> </div> +</div> </template> <script> @@ -815,6 +828,8 @@ data() { return { isSubmitting: false, + contentLoading: false, + isLoading: false, open1: false, filterage: "", checkedkeys: [], @@ -1323,7 +1338,9 @@ // } if (!value) return true; if (data.proName.indexOf(value) !== -1) return true; - if (data.proEngName.indexOf(value) !== -1) return true; + let values = value.toLowerCase(); + if (data.proEngName.indexOf(values) !== -1) return true; + // 鍖归厤灏忓啓 let arr = data.proName.spell("low", "array"); let spell = arr.join(""); @@ -1347,7 +1364,8 @@ if (data.zhmc.indexOf(value) !== -1) { return data.zhmc.indexOf(value) !== -1; } else { - return data.pym.indexOf(value) !== -1; + let values = value.toLowerCase(); + return data.pym.indexOf(values) !== -1; } }, beforeDestroy() { @@ -1955,11 +1973,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) { @@ -2014,7 +2036,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) { @@ -2310,7 +2332,8 @@ dwId: this.form.firmId, }; if (this.name) { - getPackageListName(this.name).then((response) => { + let name= this.name.toLowerCase() + getPackageListName(name).then((response) => { this.newpacName = response.data; this.loading = false; }); @@ -2549,6 +2572,8 @@ }, handleClick(tab, event) { if (this.activeNames == "second") { + console.log(this.form); + this.DataList = []; this.checkedkey = []; this.TreedataList = []; @@ -2567,15 +2592,11 @@ }); } }, - // gaibian(val){ - // let pname = val; - // getProParentIdDxList(pname).then(response=>{ - // this.Treedata = response.data.list; - // }) - // }, getDataList() { this.loading = true; - getProParentIdDxList().then((response) => { + console.log(this.form); + + getProParentIdDxList(this.form.cusSex).then((response) => { this.Treedata = response.data.list; // 鍥炴樉 TreedataList 鍒� DataList @@ -2902,6 +2923,7 @@ // 椤圭洰鎻愪氦 submit() { + this.isLoading = true; if (this.form.cusIdcard) { var cusId = this.form.cusIdcard; } else { @@ -2915,6 +2937,8 @@ this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織 this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰� this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰� + + this.contentLoading = true; this.discount = 10; // 鍒濆鍖栨姌鎵d负10锛�100%锛� // 鍒ゆ柇鏄惁鏈夐�変腑鐨勫椁� @@ -2951,9 +2975,11 @@ this.processOrderItems(cusId); } this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇� + this.isLoading = false; }) .catch(() => { this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇� + this.isLoading = false; }); } else { getaddtTransition(data) @@ -2962,9 +2988,13 @@ this.processOrderItems(cusId); } this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇� + this.isLoading = false; + // this.contentLoading = false; }) .catch(() => { this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇� + this.isLoading = false; + // this.contentLoading = false; }); } @@ -2976,13 +3006,14 @@ // 澶勭悊璁㈠崟椤圭洰 processOrderItems(cusId) { getTransitionList1(cusId).then((response) => { + this.contentLoading = false; this.tableData1 = response.data; let Price = 0; if (this.tableData1) { this.tableData1.forEach((item) => { - if (typeof item.nowPrice === 'number') { - item.nowPrice = Number(item.nowPrice.toFixed(2)); - } + if (typeof item.nowPrice === 'number') { + item.nowPrice = Number(item.nowPrice.toFixed(2)); + } if (item.tjCategory != null) { this.tjCategory = item.tjCategory; } -- Gitblit v1.8.0