From 392f9468875a8721c17c4e15c288333017cac4a1 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 16 七月 2022 15:11:44 +0800
Subject: [PATCH] 1.修改bug2.工序检验实现部分3.缺陷定义实现部分
---
src/views/zzmx/chda.vue | 110 +++++++++++++++++++++++++++++++++---------------------
1 files changed, 67 insertions(+), 43 deletions(-)
diff --git a/src/views/zzmx/chda.vue b/src/views/zzmx/chda.vue
index 5d00b84..51ff850 100644
--- a/src/views/zzmx/chda.vue
+++ b/src/views/zzmx/chda.vue
@@ -22,11 +22,12 @@
<el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">
<el-select
v-model="form.stocktypecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @change="val=>stocktypecodeChange(val,'form')"
>
+ <!-- @change="val=>stocktypecodeChange(val,'form')"-->
<el-option
v-for="item in stocktypeArr"
:key="item.code"
@@ -35,9 +36,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鐗╂枡绫诲瀷" style=" display: flex;">
+ <el-form-item v-if="false" label="鐗╂枡绫诲瀷" style=" display: flex;">
<el-select
v-model="form.materialtypecode"
+ filterable
:disabled="form.stocktypecode===''"
:popper-append-to-body="false"
style="width: 200px"
@@ -54,10 +56,12 @@
<el-form-item label="鎵�灞炰粨搴�" style=" display: flex;">
<el-select
v-model="form.storehousecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
>
+ <!-- @focus="getWareHouseSelect"-->
<el-option
v-for="item in storehouseArr"
:key="item.code"
@@ -77,7 +81,7 @@
<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-office-building" @click="office">鍗曚綅</el-button>
- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button type="primary" icon="el-icon-upload2" @click="upload">瀵煎叆</el-button>-->
</div>
<el-divider />
<div class="elTableDiv">
@@ -128,11 +132,11 @@
label="瀛樿揣绫诲瀷"
sortable="custom"
/>
- <el-table-column
- prop="materialtypename"
- label="鐗╂枡绫诲埆"
- sortable="custom"
- />
+ <!-- <el-table-column-->
+ <!-- prop="materialtypename"-->
+ <!-- label="鐗╂枡绫诲埆"-->
+ <!-- sortable="custom"-->
+ <!-- />-->
<el-table-column
prop="stck_name"
label="浠撳簱鍚嶇О"
@@ -165,10 +169,12 @@
<el-table-column
label="宸ヨ壓璺嚎"
width="80"
+ prop="proute_id"
>
<template slot-scope="{row}">
<div class="operationClass">
- <i class="el-icon-share" @click="routeClick(row)" />
+ <i v-if="row.proute_id==='Y'" class="el-icon-share" @click="routeClick(row)" />
+ <i v-if="row.proute_id==='N'" style="color: #E4E7ED" class="el-icon-share" @click="routeClick(row)" />
</div>
</template>
</el-table-column>
@@ -220,6 +226,7 @@
<el-form-item label="浣跨敤鍗曚綅" prop="uomcode">
<el-select
v-model="dialogForm.uomcode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -232,29 +239,16 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鎵�灞炰粨搴�" prop="warehousecode">
- <el-select
- v-model="dialogForm.warehousecode"
- :popper-append-to-body="false"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in storehouseArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
<el-form-item label="瀛樿揣绫诲瀷" prop="stocktypecode">
<el-select
v-model="dialogForm.stocktypecode"
+ filterable
:popper-append-to-body="false"
style="width: 200px"
placeholder="璇烽�夋嫨"
- @change="val=>stocktypecodeChange(val,'dialogForm')"
>
+ <!-- @change="val=>stocktypecodeChange(val,'dialogForm')"-->
+
<el-option
v-for="item in stocktypeArr"
:key="item.code"
@@ -263,11 +257,29 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鐗╂枡绫诲瀷" prop="materialtypecode">
+ <el-form-item label="鎵�灞炰粨搴�" prop="warehousecode">
+ <el-select
+ v-model="dialogForm.warehousecode"
+ filterable
+ :popper-append-to-body="false"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ >
+ <!-- @focus="getWareHouseSelect2"-->
+ <el-option
+ v-for="item in storehouseArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item v-if="false" label="鐗╂枡绫诲瀷" prop="materialtypecode">
<el-select
v-model="dialogForm.materialtypecode"
:popper-append-to-body="false"
style="width: 200px"
+ filterable
:disabled="dialogForm.stocktypecode===''"
placeholder="璇烽�夋嫨"
>
@@ -279,11 +291,12 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="鏈�灏忓簱瀛�" prop="minstockqty">
- <el-input v-model="dialogForm.minstockqty" style="width: 200px" />
- </el-form-item>
+
<el-form-item label="鏈�澶у簱瀛�" prop="maxstockqty">
- <el-input v-model="dialogForm.maxstockqty" style="width: 200px" />
+ <el-input v-model="dialogForm.maxstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
+ <el-form-item label="鏈�灏忓簱瀛�" prop="minstockqty" style="margin-left: 10px">
+ <el-input v-model="dialogForm.minstockqty" oninput="value=value.replace(/[^0-9]/g,'')" style="width: 200px" />
+ </el-form-item>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -352,7 +365,12 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-input v-if="row.isVisible===1" v-model="row.digdect" placeholder="璇疯緭鍏�" />
+ <el-input
+ v-if="row.isVisible===1"
+ v-model="row.digdect"
+ oninput="value=value.replace(/[^0-9]/g,'')"
+ placeholder="璇疯緭鍏�"
+ />
<div v-else> {{ row.digdect }}</div>
</template>
</el-table-column>
@@ -558,6 +576,7 @@
stocktypeArr: [], // 瀛樿揣绫诲瀷鏁扮粍
materialtypeArr: [], // 鐗╂枡绫诲瀷鏁扮粍
storehouseArr: [], // 鎵�灞炰粨搴撴暟缁�
+ storehouseArr2: [], // 鎵�灞炰粨搴撴暟缁勫璇濇
tableData: [],
dialogVisible: false,
dialogForm: {
@@ -589,21 +608,21 @@
uomcode: [
{ required: true, message: '璇烽�夋嫨浣跨敤鍗曚綅', trigger: ['blur', 'change'] }
],
- warehousecode: [
- { required: true, message: '璇烽�夋嫨鎵�灞炰粨搴�', trigger: ['blur', 'change'] }
- ],
+ // warehousecode: [
+ // { required: true, message: '璇烽�夋嫨鎵�灞炰粨搴�', trigger: ['blur', 'change'] }
+ // ],
stocktypecode: [
{ required: true, message: '璇烽�夋嫨瀛樿揣绫诲瀷', trigger: ['blur', 'change'] }
],
materialtypecode: [
{ required: true, message: '璇疯緭鍏ョ墿鏂欑被鍨�', trigger: ['blur', 'change'] }
- ],
- minstockqty: [
- { required: true, message: '璇疯緭鍏ユ渶灏忓簱瀛�', trigger: ['blur', 'change'] }
- ],
- maxstockqty: [
- { required: true, message: '璇疯緭鍏ユ渶澶у簱瀛�', trigger: ['blur', 'change'] }
]
+ // minstockqty: [
+ // { required: true, message: '璇疯緭鍏ユ渶灏忓簱瀛�', trigger: ['blur', 'change'] }
+ // ],
+ // maxstockqty: [
+ // { required: true, message: '璇疯緭鍏ユ渶澶у簱瀛�', trigger: ['blur', 'change'] }
+ // ]
},
officeDialogVisible: false,
@@ -653,6 +672,10 @@
const { data: res } = await WareHouseSelect()
this.storehouseArr = res
},
+ // async getWareHouseSelect2() {
+ // const { data: res } = await WareHouseSelect()
+ // this.storehouseArr2 = res
+ // },
async getuomSelect() {
const { data: res } = await UomSelect()
this.uomArr = res
@@ -707,7 +730,7 @@
async edit(operation, row) {
this.operation = operation
this.dialogVisible = true
- await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
+ // await this.stocktypecodeChange(row.stocktypecode, 'dialogForm')
this.$nextTick(() => {
this.dialogForm.id = row.id
this.dialogForm.materialcode = row.partcode
@@ -768,8 +791,8 @@
warehousecode: this.dialogForm.warehousecode,
stocktypecode: this.dialogForm.stocktypecode,
materialtypecode: this.dialogForm.materialtypecode,
- minstockqty: this.dialogForm.minstockqty,
- maxstockqty: this.dialogForm.maxstockqty,
+ minstockqty: this.dialogForm.minstockqty === '' ? 0 : this.dialogForm.minstockqty,
+ maxstockqty: this.dialogForm.maxstockqty === '' ? 0 : this.dialogForm.maxstockqty,
OperType: this.operation === 'add' ? 'Add' : 'Update'
}
AddUpdateInventoryFile(data).then(res => {
@@ -934,6 +957,7 @@
const res = await SaveInventoryFile(this.dialogFormRoute.projectCode, data)
if (res.code === '200') {
this.$message.success('淇濆瓨鎴愬姛锛�')
+ await this.getInventoryFileSelect()
this.dialogVisibleRoute = false
}
},
--
Gitblit v1.9.3