From f8f4b4d42f1a6997a6e1a1d329f2296eb37a2a62 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 26 九月 2022 14:31:15 +0800
Subject: [PATCH] 1.工艺路线备份
---
src/views/jcsz/wldw.vue | 72 +++++++++++++++++++++++-------------
1 files changed, 46 insertions(+), 26 deletions(-)
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 45af01d..6f1d888 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -2,14 +2,16 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
+ <div class="bodyTopButtonGroup" style="justify-content: space-between">
<el-button type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
- <el-button
- icon="el-icon-refresh-right"
- @click="syncSeaveSearchPartner"
- >鍚屾寰�鏉ュ崟浣�
- </el-button>
- <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ <div style="display: flex">
+ <el-button
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchPartner"
+ >鍚屾寰�鏉ュ崟浣�
+ </el-button>
+ <el-button icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
</div>
<div class="bodyTopFormGroup">
@@ -47,7 +49,7 @@
<el-input v-model="form.CreateUser" style="width: 200px" placeholder="璇疯緭鍏�" />
</el-form-item>
</div>
- <div style="display: flex;align-items: start;margin-top: 5px;z-index: 2">
+ <div class="bodySearchReset">
<el-button type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
<el-button type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
@@ -56,8 +58,10 @@
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
border
+ class="tableFixed"
:height="tableHeight+'px'"
:row-class-name="tableRowClassName"
highlight-current-row
@@ -87,6 +91,7 @@
label="鍗曚綅鍚嶇О"
sortable="custom"
min-width="160px"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鍗曚綅灞炴��"
@@ -133,19 +138,35 @@
label="鑱旂郴浜�"
width="110"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.conttacts">{{ row.conttacts }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="conttphone"
label="鑱旂郴鏂瑰紡"
width="160"
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.conttphone">{{ row.conttphone }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="addr"
min-width="160"
label="琛ュ厖鎻忚堪"
+ show-tooltip-when-overflow
sortable="custom"
- />
+ >
+ <template slot-scope="{row}">
+ <div v-if="row.addr">{{ row.addr }}</div>
+ <div v-else>/</div>
+ </template>
+ </el-table-column>
<el-table-column
prop="lm_user"
label="鍒涘缓浜哄憳"
@@ -242,25 +263,13 @@
} from '@/api/jcsz'
import { SeaveSearchPartner } from '@/api/ErpSyncMes'
import ImportPicker from '@/components/ImportPicker'
-
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import { validateCode } from '@/utils/global'
export default {
name: 'WLDW',
components: {
Pagination, ImportPicker
},
data() {
- const validateName = (rule, value, callback) => {
- if (!value) {
- return callback(new Error('璇疯緭鍏ョ紪鐮�'))
- } else {
- if (SER_HZ.test(value)) {
- return callback(new Error('缂栫爜涓嶈兘涓轰腑鏂�'))
- } else {
- callback()
- }
- }
- }
const validateMobile = (rule, value, callback) => {
if (!value) {
callback()
@@ -315,7 +324,7 @@
operation: '',
dialogFormRules: {
unitcode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
unitname: [
{ required: true, message: '璇疯緭鍏ヤ緵鏂瑰悕绉�', trigger: ['blur', 'change'] }
@@ -465,6 +474,9 @@
DeleteCurrentUnit({ unitcode: row.code }).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
+ if (this.form.page > 1 && this.tableData.length === 1) {
+ this.form.page--
+ }
this.getCurrentUnitSearch()
}
})
@@ -536,6 +548,7 @@
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
+ this.$refs.tableDataRef.doLayout()
})
},
@@ -643,7 +656,14 @@
.userDialogVisible ::v-deep .el-form-item {
margin-bottom: 0;
}
-
+.tableFixed{
+ ::v-deep .el-table__fixed-right{
+ height: 100% !important;
+ }
+ ::v-deep .el-table__fixed{
+ height: 100% !important;
+ }
+}
</style>
<style>
--
Gitblit v1.9.3