From 761f4ac65d86778b6fcf21db3d6ff78610830a90 Mon Sep 17 00:00:00 2001
From: lkk <364857242@qq.com>
Date: 星期四, 31 七月 2025 18:03:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.42.27.146:5001/r/ltkj_peisweb_region
---
src/views/system/tijian/index.vue | 55 +++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 41 insertions(+), 14 deletions(-)
diff --git a/src/views/system/tijian/index.vue b/src/views/system/tijian/index.vue
index a0d7bad..20355f0 100644
--- a/src/views/system/tijian/index.vue
+++ b/src/views/system/tijian/index.vue
@@ -248,7 +248,7 @@
<el-button v-show="lishi" type="primary" @click="cope" size="mini">涓�閿鍒�</el-button>
<el-button type="primary" @click="inputChanges" v-show="lishi" size="mini"
:disabled="confirm">鍘嗗彶浣撴璁板綍</el-button>
- <el-button :disabled="isDisabled" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
+ <el-button :disabled="butopen" type="primary" size="mini" @click="submitForm">鐧昏</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery" @queryTable="getList">閲嶇疆</el-button>
</div>
</el-col>
@@ -284,7 +284,7 @@
<el-dialog title="閫夋嫨濂楅" :visible.sync="taocan" width="70%" height="700px" :close-on-click-modal="false">
<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-tab-pane label="濂楅" name="first" :disabled ="form.sftj == 'Y'|| form.sftj == 'y'">
<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">
@@ -306,7 +306,7 @@
</div>
</div>
</el-tab-pane>
- <el-tab-pane label="缁勫悎" name="third">
+ <el-tab-pane label="缁勫悎" name="third" :disabled ="form.sftj == 'Y'|| form.sftj == 'y'">
<el-row :gutter="20" style="width: 100%">
<el-col :span="6" style="min-width: 200px">
<div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
@@ -367,7 +367,7 @@
</el-col>
</el-row>
</el-tab-pane>
- <el-tab-pane label="鍗曢」" name="second">
+ <el-tab-pane label="鍗曢」" name="second" :disabled ="form.sftj == 'Y'|| form.sftj == 'y'">
<el-row :gutter="20" style="width: 100%">
<el-col :span="6" style="min-width: 200px">
<div style="text-align: center; margin-bottom: 10px; margin-top: 10px;">
@@ -421,7 +421,7 @@
</el-col>
</el-row>
</el-tab-pane>
- <el-tab-pane label="浜插睘濂楅" name="four">
+ <el-tab-pane label="浜插睘濂楅" name="four" :disabled ="form.sftj == 'N'|| form.sftj == 'n'">
<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">
@@ -452,7 +452,6 @@
<el-button type="primary" @click="submit">纭� 瀹�</el-button>
</span>
</el-dialog>
- <!-- -->
<el-row v-if="tcShow">
<el-col :span="15">
<div class="grid-content bg-purple">
@@ -508,7 +507,11 @@
@blur="numberChangeXianPrice(discount, discount)" />
</el-form-item>
<el-form-item label="鏄惁鏇挎" v-if="tjtype">
- <el-input placeholder="鏄惁鏇挎" v-model="sftj" style="width: 150px"></el-input>
+ <!-- <el-input placeholder="鏄惁鏇挎" v-model="sftj" style="width: 150px"></el-input> -->
+ <el-select v-model="form.sftj" placeholder="鏄惁鏇挎" style="width: 150px">
+ <el-option v-for="dict in dict.type.sys_yes_no" :key="dict.value" :label="dict.label"
+ :value="dict.value"></el-option>
+ </el-select>
</el-form-item>
<br />
@@ -940,6 +943,7 @@
// 闈炲崟涓鐢�
single: true,
cardreader: false,
+ butopen:false,
// 闈炲涓鐢�
multiple: true,
nodeobj: {},
@@ -984,10 +988,10 @@
pacName: null,
pacRemark: null,
},
- // valueUrl: "ws://127.0.0.1:6789/websocket",
- // valueUrls: "ws://127.0.0.1:6789/websocket",
- valueUrl: "ws://192.168.1.244:6789/websocket",
- valueUrls: "ws://192.168.1.244:6789/websocket",
+ valueUrl: "ws://127.0.0.1:6789/websocket",
+ valueUrls: "ws://127.0.0.1:6789/websocket",
+ // valueUrl: "ws://192.168.1.244:6789/websocket",
+ // valueUrls: "ws://192.168.1.244:6789/websocket",
webSocket: null,
// 韬唤璇侀渶瑕�
// socket: null,
@@ -1742,6 +1746,7 @@
/** 鐧昏鎻愪氦鎸夐挳 */
submitForm() {
let _this = this;
+ _this.butopen = true;
if (!this.form.cusPhone || !this.form.cusName) {
this.$message.warning("璇峰～閫夊繀濉」");
return;
@@ -1778,6 +1783,7 @@
// }
addCustomer(formData).then((response) => {
+ _this.butopen = false;
this.responseList = response.data;
this.form.tjType = this.dict.type.dict_team[0].value;
this.$modal.msgSuccess("鏂板鎴愬姛");
@@ -1785,8 +1791,8 @@
_this.isDisabled = true;
_this.top = false;
}).catch((error) => {
+ _this.butopen = false;
this.$modal.msgError("鐧昏澶辫触锛岃妫�鏌ユ暟鎹�");
- console.error("Error in addCustomer:", error);
});
}
});
@@ -1975,7 +1981,7 @@
if (isChineseChar(resultObj.data.sex)) {
_this.form.cusSex = resultObj.data.sex == "濂�" ? 1 : 0
} else {
- _this.form.cusSex = resultObj.data.sex;
+ _this.form.cusSex = resultObj.data.sex == "1" ? 0 : 1;
}
_this.form.cusNational = resultObj.data.mz;
_this.form.cusBrithday = resultObj.data.csrq;
@@ -2123,7 +2129,13 @@
websocket.onmessage = function (event) {
var resultObj = JSON.parse(event.data);
_this.form.cusName = resultObj.data.name;
- _this.form.cusSex = resultObj.data.sex;
+ const isChineseChar = (char) => /[\u4E00-\u9FA5]/.test(char)
+ // _this.form.cusSex = resultObj.data.sex;
+ if (isChineseChar(resultObj.data.sex)) {
+ _this.form.cusSex = resultObj.data.sex == "濂�" ? 1 : 0
+ } else {
+ _this.form.cusSex = resultObj.data.sex == "1" ? 0 : 1;
+ }
_this.form.cusNational = resultObj.data.mz;
_this.form.cusBrithday = resultObj.data.csrq;
if (_this.form.cusBrithday) {
@@ -2408,6 +2420,11 @@
});
} else if (!this.form.firmId && this.form.firmName) {
this.taocan = true;
+ if(this.form.sftj == "Y" || this.form.sftj == "y"){
+ this.activeNames = "four"
+ }else{
+ this.activeNames = "first"
+ }
this.loading = true;
deptTreeSelect(cusSex).then((response) => {
this.newpacName = response.rows;
@@ -2433,6 +2450,11 @@
else {
this.taocan = true;
+ if(this.form.sftj == "Y" || this.form.sftj == "y"){
+ this.activeNames = "four"
+ }else{
+ this.activeNames = "first"
+ }
this.loading = true;
tuantiSelect(param).then((res) => {
this.newpacName = res.data;
@@ -2457,6 +2479,11 @@
}
} else {
this.taocan = true;
+ if(this.form.sftj == "Y" || this.form.sftj == "y"){
+ this.activeNames = "four"
+ }else{
+ this.activeNames = "first"
+ }
this.loading = true;
deptTreeSelect(cusSex).then((response) => {
this.newpacName = response.rows;
--
Gitblit v1.8.0