From b46bc2dba51a3885a68e4c58316b41a31ea16bb2 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 14 二月 2023 13:35:03 +0800
Subject: [PATCH] 1.存货档案修改
---
src/views/jcsz/wldw.vue | 258 ++++++++++++++++++++++++++------------------------
1 files changed, 134 insertions(+), 124 deletions(-)
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index bf56201..58da740 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -2,23 +2,26 @@
<div>
<div class="body" :style="{height:mainHeight+'px'}">
- <div class="bodyTopButtonGroup">
- <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 class="bodyTopButtonGroup" style="justify-content: space-between">
+ <el-button v-waves type="primary" icon="el-icon-circle-plus-outline" @click="add('add')">鏂板</el-button>
+ <div style="display: flex">
+ <el-button
+ v-waves
+ icon="el-icon-refresh-right"
+ @click="syncSeaveSearchPartner"
+ >鍚屾寰�鏉ュ崟浣�
+ </el-button>
+ <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ </div>
</div>
<div class="bodyTopFormGroup">
<el-form
ref="form"
:model="form"
- label-width="80px"
+ label-width="100px"
inline
- style="display: flex;justify-content: space-between"
+ style="display: flex;"
>
<div class="elForm">
<el-form-item label="鍗曚綅缂栫爜" style=" display: flex;">
@@ -47,17 +50,25 @@
<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">
- <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
+ class="bodySearchReset"
+ :style="{marginLeft:$store.state.app.sidebar.opened? $store.state.settings.menuIsHorizontal?'15%':'3%':'10%'}"
+ >
+ <el-button v-waves type="primary" icon="el-icon-search" @click="search">鏌ヨ</el-button>
+ <el-button v-waves type="info" icon="el-icon-refresh" @click="reset">閲嶇疆</el-button>
</div>
</el-form>
+ <div
+ class="bodyTopFormExpand"
+ />
</div>
<div class="elTableDiv">
<el-table
+ ref="tableDataRef"
:data="tableData"
border
+ class="tableFixed"
:height="tableHeight+'px'"
:row-class-name="tableRowClassName"
highlight-current-row
@@ -79,6 +90,7 @@
<el-table-column
prop="code"
label="鍗曚綅缂栫爜"
+ show-tooltip-when-overflow
sortable="custom"
min-width="110"
/>
@@ -86,64 +98,71 @@
prop="name"
label="鍗曚綅鍚嶇О"
sortable="custom"
- min-width="160px"
+ min-width="240px"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鍗曚綅灞炴��"
- width="240"
+ show-tooltip-when-overflow
+ width="160"
+ sortable="custom"
+ prop="type"
>
<!-- sortable="custom"-->
+ <template slot-scope="{row}">
+ <div v-if="row.type==='226'">瀹㈡埛</div>
+ <div v-else-if="row.type==='211'">渚涘簲鍟�</div>
+ <div v-else-if="row.type==='228'">瀹㈡埛/渚涘簲鍟�</div>
+ <div v-else>/</div>
+ <!-- <div style="display: flex;justify-content: flex-start">-->
+ <!-- <div v-if="row.mtype==='211'" style="margin-right: 15px">渚涘簲鍟�</div>-->
+ <!-- <div v-if="row.btype==='228'" style="margin-right: 15px;">瀹㈡埛/渚涘簲鍟�</div>-->
+ <!-- <div v-if="row.htype==='226'">瀹㈡埛</div>-->
+ <!-- </div>-->
+ </template>
- <el-table-column
- prop="mtype"
- width="80"
- >
- <template slot-scope="{row}">
- <div v-if="row.mtype==='WG'">澶栬喘渚涙柟</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="btype"
- width="80"
- >
- <template slot-scope="{row}">
- <div v-if="row.btype==='WX'">澶栧崗渚涙柟</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="htype"
- width="80"
- >
- <template slot-scope="{row}">
- <div v-if="row.htype==='KH'">瀹㈡埛</div>
- <div v-else>/</div>
- </template>
- </el-table-column>
</el-table-column>
<el-table-column
prop="conttacts"
label="鑱旂郴浜�"
width="110"
+ show-tooltip-when-overflow
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="鑱旂郴鏂瑰紡"
+ show-tooltip-when-overflow
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="鍒涘缓浜哄憳"
width="110"
+ show-tooltip-when-overflow
sortable="custom"
/>
<el-table-column
@@ -151,6 +170,7 @@
label="鍒涘缓鏃堕棿"
sortable="custom"
width="160"
+ show-tooltip-when-overflow
/>
<el-table-column
label="鎿嶄綔"
@@ -160,10 +180,10 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
@@ -172,18 +192,18 @@
</div>
<!--鍒嗛〉-->
<pagination
- v-show="total>0"
:total="total"
:page.sync="form.page"
:limit.sync="form.rows"
align="right"
- layout="prev, pager, next,sizes"
+ layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
@pagination="getCurrentUnitSearch"
/>
</div>
<el-dialog
+ v-el-drag-dialog
:title="operation==='add'?'鏂板':'缂栬緫'"
:visible.sync="dialogVisible"
width="800px"
@@ -199,12 +219,27 @@
<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-checkbox-group v-model="dialogForm.checkboxIsSelected" @change="checkboxGroupChange">
- <el-checkbox key="WG" value="WG" label="澶栬喘渚涙柟" />
- <el-checkbox key="WX" value="WX" label="澶栧崗渚涙柟" />
- <el-checkbox key="KH" value="KH" label="瀹㈡埛" />
- </el-checkbox-group>
+ <el-form-item style="width: 100%" label="鍗曚綅灞炴��" prop="type">
+ <el-radio-group v-model="dialogForm.type">
+ <el-radio key="226" value="226" label="瀹㈡埛" />
+ <el-radio key="211" value="211" label="渚涘簲鍟�" />
+ <el-radio key="228" value="228" label="瀹㈡埛/渚涘簲鍟�" />
+ </el-radio-group>
+
+ <!-- <el-select-->
+ <!-- v-model="dialogForm.UnitAttr"-->
+ <!-- :popper-append-to-body="false"-->
+ <!-- filterable-->
+ <!-- style="width: 200px"-->
+ <!-- placeholder="璇烽�夋嫨"-->
+ <!-- >-->
+ <!-- <el-option-->
+ <!-- v-for="item in UnitAttrArr"-->
+ <!-- :key="item.value"-->
+ <!-- :label="item.label"-->
+ <!-- :value="item.value"-->
+ <!-- />-->
+ <!-- </el-select>-->
</el-form-item>
<el-form-item label="鑱旂郴浜�" prop="person">
<el-input v-model="dialogForm.person" style="width: 220px" />
@@ -218,8 +253,14 @@
</el-form>
<span slot="footer" class="dialog-footer">
<div class="footerButton">
- <el-button @click="dialogVisibleCancel">鍙� 娑�</el-button>
- <el-button type="primary" @click="dialogVisibleConfirm">纭� 瀹�</el-button>
+ <el-button v-waves @click="dialogVisibleCancel">鍙� 娑�</el-button>
+ <el-button
+ v-waves
+ type="primary"
+ :loading="$store.state.app.buttonIsDisabled"
+ :disabled="$store.state.app.buttonIsDisabled"
+ @click="dialogVisibleConfirm"
+ >纭� 瀹�</el-button>
</div>
</span>
</el-dialog>
@@ -237,25 +278,16 @@
} from '@/api/jcsz'
import { SeaveSearchPartner } from '@/api/ErpSyncMes'
import ImportPicker from '@/components/ImportPicker'
-
-const SER_HZ = /^[\u4e00-\u9fa5]+$/
+import { validateCode } from '@/utils/global'
+import elDragDialog from '@/directive/el-drag-dialog'
+import waves from '@/directive/waves'
export default {
name: 'WLDW',
components: {
Pagination, ImportPicker
},
+ directives: { elDragDialog, waves },
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()
@@ -286,22 +318,18 @@
rows: 20 // 姣忛〉澶氬皯鏉�
},
UnitAttrArr: [
- { label: '澶栬喘渚涙柟', value: 'WG' },
- { label: '澶栧崗渚涙柟', value: 'WX' },
- { label: '瀹㈡埛', value: 'KH' }
+ { label: '瀹㈡埛', value: '226' },
+ { label: '渚涘簲鍟�', value: '211' },
+ { label: '瀹㈡埛/渚涘簲鍟�', value: '228' }
],
tableData: [],
total: 10,
dialogVisible: false,
dialogForm: {
- checkboxIsSelected: [], // 瀛樺偍el-checkbox-grounp閫変腑鐨勫��
-
id: '', // 寰�鏉ュ崟浣峣d
unitcode: '', // 寰�鏉ュ崟浣嶇紪鐮�
unitname: '', // 寰�鏉ュ崟浣嶅悕绉�
- // mtypecode: '', // 澶栬喘缂栫爜
- // btypecode: '', // 澶栧崗缂栫爜
- // htypecode: '', // 瀹㈡埛缂栫爜
+ type: '', // 鍗曚綅灞炴��
person: '', // 鑱旂郴浜�
contact: '', // 鑱旂郴鏂瑰紡
description: '', // 琛ュ厖鎻忚堪
@@ -310,13 +338,13 @@
operation: '',
dialogFormRules: {
unitcode: [
- { required: true, validator: validateName, trigger: ['blur', 'change'] }
+ { required: true, validator: validateCode, trigger: ['blur', 'change'] }
],
unitname: [
- { required: true, message: '璇疯緭鍏ヤ緵鏂瑰悕绉�', trigger: ['blur', 'change'] }
+ { required: true, message: '璇疯緭鍏ュ崟浣嶅悕绉�', trigger: ['blur', 'change'] }
],
- checkboxIsSelected: [
- { required: true, message: '璇烽�夋嫨渚涙柟灞炴��', trigger: ['blur', 'change'] }
+ type: [
+ { required: true, message: '璇烽�夋嫨鍗曚綅灞炴��', trigger: ['blur', 'change'] }
],
contact: [
{ required: false, validator: validateMobile, trigger: ['blur', 'change'] }
@@ -411,11 +439,7 @@
this.form.CreateUser = ''
this.getCurrentUnitSearch()
},
- // 澶嶉�夋鏀瑰彉浜嬩欢
- checkboxGroupChange(val) {
- this.dialogForm.checkboxIsSelected = val
- this.dialogForm.checkboxIsSelected = this.dialogForm.checkboxIsSelected.filter(item => item !== null)
- },
+
// 鏂板鎸夐挳
add(operation) {
this.operation = operation
@@ -426,23 +450,9 @@
this.operation = operation
this.dialogVisible = true
- this.dialogForm.id = row.id
- let mtype = null
- let btype = null
- let htype = null
-
- if (row.mtype === 'WG') {
- mtype = '澶栬喘渚涙柟'
- }
- if (row.btype === 'WX') {
- btype = '澶栧崗渚涙柟'
- }
- if (row.htype === 'KH') {
- htype = '瀹㈡埛'
- }
-
this.$nextTick(() => {
- this.dialogForm.checkboxIsSelected = [btype, htype, mtype]
+ this.dialogForm.id = row.id
+ this.dialogForm.type = this.UnitAttrArr.find(i => i.value === row.type).label
this.dialogForm.unitcode = row.code
this.dialogForm.unitname = row.name
this.dialogForm.person = row.conttacts
@@ -460,6 +470,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()
}
})
@@ -474,7 +487,7 @@
this.dialogForm.person = ''
this.dialogForm.contact = ''
this.dialogForm.description = ''
- this.dialogForm.checkboxIsSelected = []
+ this.dialogForm.type = ''
this.$refs.dialogForm.clearValidate()
},
// 瀵硅瘽妗嗗彇娑�
@@ -485,39 +498,28 @@
dialogVisibleConfirm() {
this.$refs.dialogForm.validate(valid => {
if (valid) {
- let mtypecode = null // 澶栬喘缂栫爜
- let btypecode = null // 澶栧崗缂栫爜
- let htypecode = null // 瀹㈡埛缂栫爜
- const checkboxIsSelected = this.dialogForm.checkboxIsSelected// 瀛樺偍el-checkbox-grounp閫変腑鐨勫��
- if (checkboxIsSelected.includes('澶栬喘渚涙柟')) {
- mtypecode = 'WG'
- }
- if (checkboxIsSelected.includes('澶栧崗渚涙柟')) {
- btypecode = 'WX'
- }
- if (checkboxIsSelected.includes('瀹㈡埛')) {
- htypecode = 'KH'
- }
+ this.$store.state.app.buttonIsDisabled = true
+
const data = {
id: this.dialogForm.id,
unitcode: this.dialogForm.unitcode,
unitname: this.dialogForm.unitname,
- mtypecode: mtypecode,
- btypecode: btypecode,
- htypecode: htypecode,
+ typecode: this.UnitAttrArr.find(i => i.label === this.dialogForm.type).value,
person: this.dialogForm.person,
contact: this.dialogForm.contact,
description: this.dialogForm.description,
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
- // console.log(data, 2)
+
AddUpdateCurrentUnit(data).then(res => {
if (res.code === '200') {
- this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.dialogVisible = false
+ this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
this.getCurrentUnitSearch()
+ this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
+ this.$store.state.app.buttonIsDisabled = false
}
})
}
@@ -527,10 +529,11 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 200
+ this.tableHeight = this.mainHeight - 195
if (window.innerHeight < 769) {
this.tableHeight = this.tableHeight - 40
}
+ this.$refs.tableDataRef.doLayout()
})
},
@@ -638,7 +641,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