From 844adb3a80b39f9a78dae89a6a27f19e58a931df Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 09 一月 2024 10:34:58 +0800
Subject: [PATCH] 1.图片预览地址配置
---
src/views/mouldManager/mouldList.vue | 96 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/src/views/mouldManager/mouldList.vue b/src/views/mouldManager/mouldList.vue
index 63e0a9b..862ffc5 100644
--- a/src/views/mouldManager/mouldList.vue
+++ b/src/views/mouldManager/mouldList.vue
@@ -201,17 +201,20 @@
</el-table-column>
<el-table-column
prop="surp_life"
- label="棰勮瀵垮懡"
+ label="棰勮瀵垮懡(娆�)"
+ width="125"
sortable="custom"
/>
<el-table-column
prop="serlife"
- label="浣跨敤瀵垮懡"
+ label="浣跨敤瀵垮懡(娆�)"
+ width="125"
sortable="custom"
/>
<el-table-column
prop="resi_life"
- label="鍓╀綑瀵垮懡"
+ label="鍓╀綑瀵垮懡(娆�)"
+ width="125"
sortable="custom"
/>
<el-table-column
@@ -307,27 +310,46 @@
</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 label="棰勮瀵垮懡">
+ <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" />
</el-form-item>
- <el-form-item label="鍓╀綑瀵垮懡">
+ <el-form-item label="鍓╀綑瀵垮懡(娆�)">
<el-input v-model="dialogForm.resilife" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
</el-form-item>
@@ -418,13 +440,13 @@
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
- 棰勮瀵垮懡(灏忔椂)
+ 棰勮瀵垮懡(娆�)
</template>
{{ formResume.surp_life }}
</el-descriptions-item>
<el-descriptions-item>
<template slot="label">
- 鍓╀綑瀵垮懡(灏忔椂)
+ 鍓╀綑瀵垮懡(娆�)
</template>
{{ formResume.serlife }}
</el-descriptions-item>
@@ -521,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'
@@ -577,7 +599,8 @@
mouldcode: '',
mouldname: '',
mouldspec: '',
- // warehousecode: '',
+ warehousecode: '', // 浠撳簱缂栫爜
+ location_code: '', // 搴撲綅缂栫爜
surplife: '',
resilife: '',
status: 'Y',
@@ -590,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: {
@@ -607,7 +633,8 @@
// }
],
- wareHouseArr: [],
+ wareHouseArr: [], // 浠撳簱鏁扮粍
+ locationArr: [], // 搴撲綅鏁扮粍
dialogVisibleResume: false,
formResume: {
@@ -727,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'
@@ -742,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
@@ -828,7 +859,8 @@
mouldcode: '',
mouldname: '',
mouldspec: '',
- // warehousecode: '',
+ warehousecode: '',
+ location_code: '',
surplife: '',
resilife: '',
status: 'Y',
--
Gitblit v1.9.3