From d71436544198b7b051115662fc9cf4b12ce0cda3 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 19 七月 2022 18:32:40 +0800
Subject: [PATCH] 1.修改bug
---
src/views/jcsz/wldw.vue | 72 ++++++++++++++++++++++++++++++------
1 files changed, 60 insertions(+), 12 deletions(-)
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 269afb5..b663498 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -39,14 +39,20 @@
<el-divider />
<div style="margin-left: 10px;display: flex">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button type="primary" icon="el-icon-upload2">瀵煎叆</el-button>
+ <el-button
+ type="primary"
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchPartner"
+ >鍚屾寰�鏉ュ崟浣�
+ </el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
<el-table
:data="tableData"
border
- :height="tableHeight"
+ :height="tableHeight+'px'"
stripe
highlight-current-row
:header-cell-style="this.$headerCellStyle"
@@ -71,7 +77,6 @@
<el-table-column
prop="name"
label="鍗曚綅鍚嶇О"
- show-overflow-tooltip
sortable="custom"
min-width="200px"
/>
@@ -95,7 +100,7 @@
width="120"
>
<template slot-scope="{row}">
- <div v-if="row.btype==='WX'">澶栨枩渚涙柟</div>
+ <div v-if="row.btype==='WX'">澶栧崗渚涙柟</div>
<div v-else>/</div>
</template>
</el-table-column>
@@ -134,14 +139,13 @@
label="鍒涘缓鏃堕棿"
sortable="custom"
width="200"
- show-overflow-tooltip
/>
<el-table-column
label="鎿嶄綔"
>
<template slot-scope="{row}">
<div class="operationClass">
- <el-button type="text" @click="edit('edit',row)">淇敼</el-button>
+ <el-button type="text" @click="edit('edit',row)">缂栬緫</el-button>
<el-button type="text" @click="del(row)">鍒犻櫎</el-button>
</div>
</template>
@@ -162,21 +166,22 @@
</div>
<el-dialog
- :title="operation==='add'?'鏂板':'淇敼'"
+ :title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
- width="50%"
+ width="800px"
top="15vh"
+ :close-on-click-modal="false"
@closed="handleClose"
@close="handleClose"
>
<el-form ref="dialogForm" inline :rules="dialogFormRules" :model="dialogForm" label-width="80px">
- <el-form-item label="渚涙柟缂栫爜" prop="unitcode">
+ <el-form-item label="鍗曚綅缂栫爜" prop="unitcode">
<el-input v-model="dialogForm.unitcode" :disabled="operation!=='add'" style="width: 220px" />
</el-form-item>
- <el-form-item label="渚涙柟鍚嶇О" prop="unitname">
+ <el-form-item label="鍗曚綅鍚嶇О" prop="unitname">
<el-input v-model="dialogForm.unitname" style="width: 220px" />
</el-form-item>
- <el-form-item style="width: 100%" label="渚涙柟灞炴��" prop="checkboxIsSelected">
+ <el-form-item style="width: 100%" label="鍗曚綅灞炴��" prop="checkboxIsSelected">
<el-checkbox-group v-model="dialogForm.checkboxIsSelected" @change="checkboxGroupChange">
<el-checkbox key="WG" value="WG" label="澶栬喘渚涙柟" />
<el-checkbox key="WX" value="WX" label="澶栧崗渚涙柟" />
@@ -208,10 +213,11 @@
import {
AddUpdateCurrentUnit, CurrentUnitSearch, DeleteCurrentUnit
} from '@/api/jcsz'
+import { SeaveSearchPartner, SeaveSearchWhareHouseLocation } from '@/api/ErpSyncMes'
const SER_HZ = /^[\u4e00-\u9fa5]+$/
export default {
- name: 'Zzjg',
+ name: 'WLDW',
components: {
Pagination
},
@@ -224,6 +230,22 @@
return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
} else {
callback()
+ }
+ }
+ }
+ const validateMobile = (rule, value, callback) => {
+ if (!value) {
+ callback()
+ // return callback(new Error('璇疯緭鍏ョ數璇濆彿鐮�'))
+ } else {
+ const mobile = /^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\d{8}$/ // 闀垮彿
+ const mobile2 = /^[0-9]{6}$/ // 鐭彿
+ if (mobile.test(value) || mobile2.test(value)) {
+ callback()
+ // return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
+ } else {
+ return callback(new Error('鐢佃瘽鍙风爜涓嶇鍚堣鍒�'))
+ // callback()
}
}
}
@@ -272,6 +294,9 @@
],
checkboxIsSelected: [
{ required: true, message: '璇烽�夋嫨渚涙柟灞炴��', trigger: ['blur', 'change'] }
+ ],
+ contact: [
+ { required: true, validator: validateMobile, trigger: ['blur', 'change'] }
]
}
@@ -305,6 +330,29 @@
this.tableData = res.data
this.total = res.count
},
+ // 鍚屾寰�鏉ュ崟浣�
+ async syncSeaveSearchPartner() {
+ const loading = this.$loading({
+ lock: true,
+ text: '姝ｅ湪鍚屾寰�鏉ュ崟浣嶏紝璇风◢绛�...',
+ spinner: 'el-icon-loading',
+ customClass: 'osloading',
+ background: 'rgba(0, 0, 0, 0.7)'
+ })
+ const res = await SeaveSearchPartner()
+ if (res.code === '200') {
+ setTimeout(() => {
+ this.getCurrentUnitSearch()
+ loading.close()
+ this.$message.success('鍚屾鎴愬姛锛�')
+ }, 2000)
+ } else {
+ setTimeout(() => {
+ loading.close()
+ this.$message.error('鍚屾澶辫触锛�')
+ }, 10000)
+ }
+ },
// 鎺掑簭鏀瑰彉鏃�
sortChange({ column, prop, order }) {
if (order === 'descending') {
--
Gitblit v1.9.3