From 41e50bf6f55a2e70ee0850452d2b34f608060a01 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期一, 08 一月 2024 16:22:44 +0800
Subject: [PATCH] 1.项目中多处优化
---
src/views/basicSettings/storageList.vue | 14 ++--
src/views/basicSettings/warehouseList.vue | 14 ++--
src/components/DragSelect/index.vue | 2
src/views/mouldManager/mouldList.vue | 79 ++++++++++++++++++--------
src/views/produce/stepReport.vue | 3
src/views/systemSetting/dataImport.vue | 27 ++++++++
src/views/workOrder/workOrderList.vue | 4 +
7 files changed, 101 insertions(+), 42 deletions(-)
diff --git a/src/components/DragSelect/index.vue b/src/components/DragSelect/index.vue
index 47f4247..5454770 100644
--- a/src/components/DragSelect/index.vue
+++ b/src/components/DragSelect/index.vue
@@ -1,5 +1,5 @@
<template>
- <el-select ref="dragSelect" v-model="selectVal" v-bind="$attrs" class="drag-select" multiple v-on="$listeners">
+ <el-select ref="dragSelect" v-model="selectVal" v-bind="$attrs" class="drag-select" multiple filterable v-on="$listeners">
<slot />
</el-select>
</template>
diff --git a/src/views/basicSettings/storageList.vue b/src/views/basicSettings/storageList.vue
index cc53778..b737779 100644
--- a/src/views/basicSettings/storageList.vue
+++ b/src/views/basicSettings/storageList.vue
@@ -63,13 +63,13 @@
>
<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>
- <!-- <el-button-->
- <!-- v-waves-->
- <!-- type="success"-->
- <!-- icon="el-icon-download"-->
- <!-- @click="$router.push('./../systemSetting/dataImport?fileCode=7')"-->
- <!-- >瀵煎叆-->
- <!-- </el-button>-->
+ <el-button
+ v-waves
+ type="success"
+ icon="el-icon-download"
+ @click="$router.push('./../systemSetting/dataImport?fileCode=7')"
+ >瀵煎叆
+ </el-button>
</div>
<div class="bodyTopFormGroup">
diff --git a/src/views/basicSettings/warehouseList.vue b/src/views/basicSettings/warehouseList.vue
index 6ef0916..c6cce70 100644
--- a/src/views/basicSettings/warehouseList.vue
+++ b/src/views/basicSettings/warehouseList.vue
@@ -5,13 +5,13 @@
<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-->
- <!-- type="success"-->
- <!-- icon="el-icon-download"-->
- <!-- @click="$router.push('./../systemSetting/dataImport?fileCode=6')"-->
- <!-- >瀵煎叆-->
- <!-- </el-button>-->
+ <el-button
+ v-waves
+ type="success"
+ icon="el-icon-download"
+ @click="$router.push('./../systemSetting/dataImport?fileCode=6')"
+ >瀵煎叆
+ </el-button>
<el-button v-waves icon="el-icon-refresh-right" @click="syncERP">鍚屾浠撳簱</el-button>
</div>
</div>
diff --git a/src/views/mouldManager/mouldList.vue b/src/views/mouldManager/mouldList.vue
index 78768ee..862ffc5 100644
--- a/src/views/mouldManager/mouldList.vue
+++ b/src/views/mouldManager/mouldList.vue
@@ -310,22 +310,41 @@
</el-radio-group>
</el-form-item>
- <!-- <el-form-item label="浠撳簱淇℃伅" prop="warehousecode">-->
- <!-- <el-select-->
- <!-- v-model="dialogForm.warehousecode"-->
- <!-- style="width:200px"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- filterable-->
- <!-- :popper-append-to-body="false"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in wareHouseArr"-->
- <!-- :key="item.code"-->
- <!-- :label="item.name"-->
- <!-- :value="item.code"-->
- <!-- />-->
- <!-- </el-select>-->
- <!-- </el-form-item>-->
+ <el-form-item v-if="dialogForm.opertype==='Add'" prop="warehousecode" label="鎵�灞炰粨搴�">
+ <el-select
+ v-model="dialogForm.warehousecode"
+ style="width:200px"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ @change="warehousecodeChange"
+ >
+ <el-option
+ v-for="item in wareHouseArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item v-if="dialogForm.opertype==='Add'" prop="location_code" label="鎵�灞炲簱浣�">
+ <el-select
+ v-model="dialogForm.location_code"
+ style="width:200px"
+ :disabled="dialogForm.warehousecode===''"
+ placeholder="璇烽�夋嫨"
+ filterable
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in locationArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
<el-form-item label="棰勮瀵垮懡(娆�)">
<el-input v-model="dialogForm.surplife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
@@ -524,7 +543,7 @@
ProductionScheduleReportSearch
} from '@/api/ReportManager'
import { AddUpdateMouldManger, DeleteMouldManger, MoldResumeSearch, MouldMangerSearch } from '@/api/MouldManager'
-import { InventoryTreePermissions, WareHouse } from '@/api/GeneralBasicData'
+import { InventoryTreePermissions, WareHouse, WareHouseSelectLocation } from '@/api/GeneralBasicData'
import arrayToTree from 'array-to-tree'
import { TCunstomerDelete } from '@/api/basicSettings'
@@ -580,7 +599,8 @@
mouldcode: '',
mouldname: '',
mouldspec: '',
- // warehousecode: '',
+ warehousecode: '', // 浠撳簱缂栫爜
+ location_code: '', // 搴撲綅缂栫爜
surplife: '',
resilife: '',
status: 'Y',
@@ -593,10 +613,13 @@
],
mouldname: [
{ required: true, message: '璇疯緭鍏ユā鍏峰悕绉�', trigger: ['blur', 'change'] }
+ ],
+ warehousecode: [
+ { required: true, message: '璇疯緭鍏ラ�夋嫨浠撳簱淇℃伅', trigger: ['blur', 'change'] }
+ ],
+ location_code: [
+ { required: true, message: '璇疯緭鍏ラ�夋嫨搴撲綅淇℃伅', trigger: ['blur', 'change'] }
]
- // warehousecode: [
- // { required: true, message: '璇疯緭鍏ラ�夋嫨浠撳簱淇℃伅', trigger: ['blur', 'change'] }
- // ]
},
filterText: '',
defaultProps: {
@@ -610,7 +633,8 @@
// }
],
- wareHouseArr: [],
+ wareHouseArr: [], // 浠撳簱鏁扮粍
+ locationArr: [], // 搴撲綅鏁扮粍
dialogVisibleResume: false,
formResume: {
@@ -730,7 +754,10 @@
this.form.createdate = ''
this.getMouldMangerSearch()
},
-
+ async warehousecodeChange(val) {
+ const { data: res } = await WareHouseSelectLocation({ warhousecode: val })
+ this.locationArr = res
+ },
add() {
this.operation = 'add'
this.dialogForm.opertype = 'Add'
@@ -745,7 +772,8 @@
this.dialogForm.mouldcode = row.code
this.dialogForm.mouldname = row.name
this.dialogForm.mouldspec = row.spec
- // this.dialogForm.warehousecode = row.warehousecode
+ this.dialogForm.warehousecode = row.warehousecode
+ this.dialogForm.location_code = row.location_code
this.dialogForm.surplife = row.surp_life
this.dialogForm.resilife = row.resi_life
this.dialogForm.status = row.status
@@ -831,7 +859,8 @@
mouldcode: '',
mouldname: '',
mouldspec: '',
- // warehousecode: '',
+ warehousecode: '',
+ location_code: '',
surplife: '',
resilife: '',
status: 'Y',
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 2603673..6d727e9 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -385,12 +385,13 @@
<div class="dialogFormItemDiv" style="color:red;">{{ dialogForm.noputqty }}</div>
</el-form-item>
- <el-form-item v-if="activeName==='鐢熶骇鍒楄〃'" prop="eqpcode" label="鎶ュ伐璁惧" class="dialogFormItem">
+ <el-form-item v-if="activeName==='鐢熶骇鍒楄〃'" label="鎶ュ伐璁惧" class="dialogFormItem">
<el-select
v-model="dialogForm.eqpcode"
style="width:200px"
placeholder="璇烽�夋嫨"
filterable
+ clearable
:popper-append-to-body="false"
>
<el-option
diff --git a/src/views/systemSetting/dataImport.vue b/src/views/systemSetting/dataImport.vue
index 7d0ce9a..c4c8aa5 100644
--- a/src/views/systemSetting/dataImport.vue
+++ b/src/views/systemSetting/dataImport.vue
@@ -144,7 +144,10 @@
item.indexOf('淇濆吇閮ㄤ綅瑕佹眰')!==-1||
item.indexOf('淇濆吇椤圭洰瑕佹眰')!==-1||
item.indexOf('鐐规閮ㄤ綅瑕佹眰')!==-1||
- item.indexOf('鐐规椤圭洰瑕佹眰')!==-1
+ item.indexOf('鐐规椤圭洰瑕佹眰')!==-1||
+
+ item.indexOf('浠撳簱缂栫爜')!==-1||
+ item.indexOf('搴撲綅缂栫爜')!==-1
"
>
<el-input v-model="row[item]" placeholder="璇疯緭鍏�" />
@@ -545,6 +548,17 @@
this.tableData[0].forEach(j => {
j['*鐘舵��'] = j['*鐘舵��'] ? this.statusArr.find(e => e.name === j['*鐘舵��']).code : ''
j['*搴撲綅绠＄悊'] = j['*搴撲綅绠＄悊'] ? this.isYesOrNo.find(e => e.name === j['*搴撲綅绠＄悊']).code : ''
+ j.uuid = nanoid()
+ })
+ }
+
+ if (this.sheetName.indexOf('搴撲綅璁剧疆') !== -1) {
+ this.statusArr = [
+ { code: '0', name: '姝ｅ父' },
+ { code: '1', name: '鍋滅敤' }
+ ]
+ this.tableData[0].forEach(j => {
+ j['*鐘舵��'] = j['*鐘舵��'] ? this.statusArr.find(e => e.name === j['*鐘舵��']).code : ''
j.uuid = nanoid()
})
}
@@ -1413,6 +1427,14 @@
flag = false
msg = '*鐘舵�佷笉鑳戒负绌猴紒'
}
+ if (!j['*浠撳簱缂栫爜']) {
+ flag = false
+ msg = '*浠撳簱缂栫爜涓嶈兘涓虹┖锛�'
+ }
+ if (!j['*搴撲綅缂栫爜']) {
+ flag = false
+ msg = '*搴撲綅缂栫爜涓嶈兘涓虹┖锛�'
+ }
})
this.tableData[1].forEach(j => {
if (!j['妯″叿缂栫爜'] && j['浜у搧缂栫爜']) {
@@ -1981,8 +2003,11 @@
'*妯″叿鍚嶇О': '',
'瑙勬牸鍨嬪彿': '',
'*鐘舵��': 'Y',
+ '*浠撳簱缂栫爜': '',
+ '*搴撲綅缂栫爜': '',
'棰勮瀵垮懡(娆�)': '',
'鍓╀綑瀵垮懡(娆�)': ''
+
})
}
if (this.sheetName.indexOf('妯″叿鍏宠仈浜у搧') !== -1 && this.activeName === '1') {
diff --git a/src/views/workOrder/workOrderList.vue b/src/views/workOrder/workOrderList.vue
index 6c176b4..f0a327a 100644
--- a/src/views/workOrder/workOrderList.vue
+++ b/src/views/workOrder/workOrderList.vue
@@ -2425,6 +2425,10 @@
},
// 娲惧彂
send() {
+ if (this.multipleSelection.length === 0) {
+ return this.$message.info('璇峰厛鍕鹃�夌浉瀵瑰簲鐨勫伐鍗曪紒')
+ }
+
this.$confirm('鏄惁纭娲惧彂?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
--
Gitblit v1.9.3