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 | 53 +++++++++++++++++++++++++++++++++--------------------
1 files changed, 33 insertions(+), 20 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index 56b7c7a..86cf8f4 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -292,7 +292,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>
@@ -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: [],
@@ -1323,7 +1334,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,20 +1360,8 @@
if (data.zhmc.indexOf(value) !== -1) {
return data.zhmc.indexOf(value) !== -1;
} else {
- console.log(55555)
- if (/[A-Z]/.test(data.pym)) { // 妫�鏌ユ槸鍚﹀寘鍚ぇ鍐欏瓧姣�
- let pym = data.pym.toLowerCase()
- console.log(pym,11111)
- return pym.indexOf(value) !== -1;
- } else if (/[a-z]/.test(data.pym)) { // 妫�鏌ユ槸鍚﹀寘鍚皬鍐欏瓧姣�
- console.log(pym,22222)
- let pym = data.pym.toLowerCase()
- return pym.indexOf(value) !== -1;
- } else {
- console.log(66666)
- return data.pym.indexOf(value) !== -1;
- }
-
+ let values = value.toLowerCase();
+ return data.pym.indexOf(values) !== -1;
}
},
beforeDestroy() {
@@ -1968,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) {
@@ -2027,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) {
@@ -2323,7 +2328,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;
});
@@ -2928,6 +2934,8 @@
this.isSubmitting = true; // 寮�濮嬫彁浜ゆ椂璁剧疆鏍囧織
this.TotalPrice1 = 0; // 鍒濆鍖栧簲鏀堕噾棰�
this.TotalPrice = 0; // 鍒濆鍖栧疄鏀堕噾棰�
+
+ this.contentLoading = true;
this.discount = 10; // 鍒濆鍖栨姌鎵ｄ负10锛�100%锛�
// 鍒ゆ柇鏄惁鏈夐�変腑鐨勫椁�
@@ -2964,9 +2972,11 @@
this.processOrderItems(cusId);
}
this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+ // this.contentLoading = false;
})
.catch(() => {
this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+ // this.contentLoading = false;
});
} else {
getaddtTransition(data)
@@ -2975,9 +2985,11 @@
this.processOrderItems(cusId);
}
this.isSubmitting = false; // 鎻愪氦瀹屾垚鍚庨噸缃爣蹇�
+ // this.contentLoading = false;
})
.catch(() => {
this.isSubmitting = false; // 纭繚鍦ㄩ敊璇儏鍐典笅涔熼噸缃爣蹇�
+ // this.contentLoading = false;
});
}
@@ -2989,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