From 17b0897ea77881bb9257fbdf8da20c7b11c4c40f Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 14 八月 2024 17:28:56 +0800
Subject: [PATCH] 1.BOM页面 开发完成70%
---
src/views/materialManager/materialList.vue | 246 ++++++++++++++++++++++++++----------------------
1 files changed, 133 insertions(+), 113 deletions(-)
diff --git a/src/views/materialManager/materialList.vue b/src/views/materialManager/materialList.vue
index 2d3088f..2b83580 100644
--- a/src/views/materialManager/materialList.vue
+++ b/src/views/materialManager/materialList.vue
@@ -116,13 +116,23 @@
<template slot-scope="{row}">
<div v-if="!row[item.prop]">/</div>
- <div v-else-if="item.prop==='startdate'">{{ row.startdate.substring(0, 11) }}</div>
+ <!-- <div v-else-if="item.prop==='startdate'">{{ row.startdate.substring(0, 11) }}</div>-->
<div v-else-if="item.prop==='status'">
<div v-if="row[item.prop]==='Y'">
<i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
鏄�
</div>
<div v-if="row[item.prop]==='N'">
+ <i class="el-icon-info" style="margin-right: 2px" />
+ 鍚�
+ </div>
+ </div>
+ <div v-else-if="item.prop==='isdefaultbom'">
+ <div v-if="row[item.prop]==='1'">
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
+ 鏄�
+ </div>
+ <div v-if="row[item.prop]==='0'">
<i class="el-icon-info" style="margin-right: 2px" />
鍚�
</div>
@@ -312,7 +322,6 @@
style="width: 490px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
- :disabled="operation!=='add'"
filterable
@change="partSelectChange"
>
@@ -387,7 +396,10 @@
/>
</el-form-item>
<el-form-item label="鐗堟湰鍙�" prop="version">
- <el-input v-model="dialogForm.version" disabled style="width: 200px" />
+ <el-input v-model="dialogForm.version" style="width: 200px" />
+ </el-form-item>
+ <el-form-item label="BOM灞傜骇">
+ <el-input v-model="dialogForm.bomdepth" disabled style="width: 200px" />
</el-form-item>
<el-form-item label="榛樿BOM">
@@ -434,7 +446,6 @@
>
<template slot-scope="{row}">
<el-select
- v-if="row.isVisible===1"
v-model="row.SMATERIRL_CODE"
filterable
style="width: 100%;"
@@ -448,7 +459,6 @@
:value="item.partcode"
/>
</el-select>
- <div v-if="row.isVisible===0">{{ row.SMATERIRL_CODE }}</div>
</template>
</el-table-column>
@@ -491,6 +501,7 @@
show-tooltip-when-overflow
>
<template slot-scope="{row}">
+ <!-- {{ row.idchildbom }}-->
<el-select
v-model="row.idchildbom"
style="width: 490px"
@@ -504,23 +515,25 @@
class="tableFixed"
highlight-current-row
:row-class-name="tableRowClassName"
- style="width: 100%"
+ style="width: 400px"
height="200"
- @row-click="rowClick"
+ @row-click="r=>rowClick(r,row)"
>
<el-table-column
- prop="partcode"
+ prop="materiel_code"
label="浜у搧缂栫爜"
- width="180"
/>
<el-table-column
- prop="partname"
+ prop="materiel_name"
label="浜у搧鍚嶇О"
- width="180"
/>
<el-table-column
- prop="unitcode"
- label="鍏跺畠"
+ prop="materiel_spec"
+ label="瑙勬牸鍨嬪彿"
+ />
+ <el-table-column
+ prop="version"
+ label="鐗堟湰鍙�"
/>
</el-table>
</template>
@@ -536,13 +549,11 @@
>
<template slot-scope="{row}">
<el-input
- v-if="row.isVisible===1"
v-model="row.BASE_QUANTITY"
oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
@input="val=>inputChange(val,row)"
/>
- <div v-if="row.isVisible===0">{{ row.BASE_QUANTITY }}</div>
</template>
</el-table-column>
<el-table-column
@@ -553,13 +564,12 @@
>
<template slot-scope="{row}">
<el-input
- v-if="row.isVisible===1"
+
v-model="row.LOSS_QUANTITY"
oninput="value=value.replace(/[^0-9.]/g,'')"
placeholder="璇疯緭鍏�"
@input="val=>inputChange(val,row)"
/>
- <div v-if="row.isVisible===0">{{ row.LOSS_QUANTITY }}</div>
</template>
</el-table-column>
<el-table-column
@@ -575,9 +585,9 @@
width="80"
fixed="right"
>
- <template slot-scope="{row}">
+ <template slot-scope="{row,$index}">
<div class="operationClass">
- <el-button v-waves type="text" @click="delRow(row)">鍒犻櫎</el-button>
+ <el-button v-waves type="text" @click="delRow(row,$index)">鍒犻櫎</el-button>
</div>
</template>
</el-table-column>
@@ -637,7 +647,7 @@
version: '', // 鐗堟湰鍙�
createusername: '', // 鍒涘缓浜哄憳
createdate: '', // 鍒涘缓鏃ユ湡
- prop: 'lm_date', // 鎺掑簭瀛楁
+ prop: 'id', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
@@ -653,11 +663,11 @@
tableColumnSettingsArray: [
{ minWidth: 50, width: false, prop: 'id', label: 'id', id: 1, show: false, fixed: false, sortable: false }, // 闅愯棌鍒� show: false闅愯棌锛宼rue鏄剧ず
- { minWidth: 25, width: 50, prop: 'RowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
+ { minWidth: 25, width: 50, prop: 'rowNum', label: '搴忓彿', id: 2, show: true, fixed: 'left', sortable: false }, // custom
{
minWidth: 110,
width: false,
- prop: 'partcode',
+ prop: 'materiel_code',
label: '姣嶄欢缂栫爜',
id: 3,
show: true,
@@ -667,7 +677,7 @@
{
minWidth: 110,
width: false,
- prop: 'partname',
+ prop: 'materiel_name',
label: '姣嶄欢鍚嶇О',
id: 4,
show: true,
@@ -677,7 +687,7 @@
{
minWidth: 110,
width: false,
- prop: 'partspec',
+ prop: 'materiel_spec',
label: '姣嶄欢瑙勬牸',
id: 5,
show: true,
@@ -687,7 +697,7 @@
{
minWidth: 110,
width: false,
- prop: 'stocktype_name',
+ prop: 'materiel_typename',
label: '瀛樿揣绫诲瀷',
id: 6,
show: true,
@@ -697,7 +707,7 @@
{
minWidth: 110,
width: false,
- prop: 'uom_name',
+ prop: 'unitname',
label: '璁￠噺鍗曚綅',
id: 7,
show: true,
@@ -718,7 +728,7 @@
minWidth: false,
width: 110,
prop: 'status',
- label: '鍚姩鐘舵��',
+ label: '鍚敤鐘舵��',
id: 9,
show: true,
fixed: false,
@@ -741,13 +751,22 @@
show: true,
fixed: false,
sortable: true
+ }, {
+ minWidth: false,
+ width: 110,
+ prop: 'isdefaultbom',
+ label: '榛樿BOM',
+ id: 12,
+ show: true,
+ fixed: false,
+ sortable: true
},
{
minWidth: false,
width: 110,
- prop: 'username',
+ prop: 'lm_user',
label: '鍒涘缓浜哄憳',
- id: 12,
+ id: 13,
show: true,
fixed: false,
sortable: true
@@ -757,7 +776,7 @@
width: 160,
prop: 'lm_date',
label: '鍒涘缓鏃堕棿',
- id: 13,
+ id: 14,
show: true,
fixed: false,
sortable: true
@@ -778,7 +797,8 @@
status: 'Y',
startdate: '',
version: '',
- isdefaultbom: false
+ isdefaultbom: false,
+ bomdepth: ''
},
operation: '',
dialogFormRules: {
@@ -802,11 +822,12 @@
// ],
startdate: [
{ required: true, message: '璇烽�夋嫨鍚敤鏃ユ湡', trigger: ['blur', 'change'] }
+ ],
+ version: [
+ { required: true, message: '璇烽�夋嫨鐗堟湰鍙�', trigger: ['blur', 'change'] }
]
},
- PartSelectArrAll: [], // 浜у搧鎵�鏈夊��
PartSelectArr: [], // 浜у搧鍙�夊��
- PartSelectArrTemp: [], // 浜у搧宸查�夋殏瀛樺��
dialogTableDataArr: [],
UnitGroupArr: [], // 璁￠噺鍗曚綅鏁扮粍
PartDetailSelectArr: []
@@ -862,7 +883,6 @@
async getAddUpdateTBomParentData() {
const { data: res } = await AddUpdateTBomParentData()
this.PartSelectArr = res
- this.PartSelectArrAll = res
},
// 鑾峰彇瀛樿揣绫诲瀷涓嬫媺鎺ュ彛
async getAddUpdateTBomDetailsData() {
@@ -888,7 +908,7 @@
this.UnitGroupArr = r
}
- await this.getAddUpdateTBomMaxVsion(this.dialogForm.parentpartcode)
+ // await this.getAddUpdateTBomMaxVsion(this.dialogForm.parentpartcode)
},
async getAddUpdateTBomMaxVsion(parentpartcode) {
const { data: res } = await AddUpdateTBomMaxVsion({ parentpartcode })
@@ -935,56 +955,67 @@
this.dialogVisible = true
this.dialogForm.startdate = handleDatetime(new Date())
+
+ // this.$refs.dialogTableDataArrRef.doLayout()
},
// 淇敼鎸夐挳
async edit(operation, row) {
- const res = await BomMainDataView({ bomid: row.id })
- if (res.code === '200') {
- this.operation = operation
- this.dialogVisible = true
+ this.operation = operation
- const childrenArr = [] // 瀛愰泦鏁扮粍partcode
-
- res.data.forEach((item, index) => {
- let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
- number = number === 0 ? (10 + Math.random()) : number
-
- // item.SEQ = (index + 1) + '0'
- // item.isVisible = 0
- // item.number = number
- this.dialogTableDataArr.push({
- id: item.id,
- SEQ: item.seq,
- isVisible: 0,
- number,
- SMATERIRL_CODE: item.partcode,
- SMATERIRL_NAME: item.partname,
- SMATERIRL_SPEC: item.partspec,
- uomcode: item.uom_code,
- uomname: item.uom_name,
- BASE_QUANTITY: item.base_quantity,
- LOSS_QUANTITY: item.loss_quantity,
- TOTAL_QUANTITY: item.total_quantity
-
- })
- childrenArr.push(item.partcode)
- })
-
- this.$nextTick(() => {
- this.dialogForm.bomid = row.id
- this.dialogForm.parentpartcode = row.partcode
- this.dialogForm.parentpartname = row.partname
- this.dialogForm.parentpartspec = row.partspec
- this.dialogForm.uomcode = row.uom_code
- this.dialogForm.uomname = row.uom_name
- this.dialogForm.startdate = row.startdate
- this.dialogForm.status = row.status
- this.dialogForm.quantity = row.quantity
- this.dialogForm.version = row.version
-
- this.PartSelectArr = this.PartSelectArr.filter(item => !childrenArr.includes(item.partcode) && item.partcode !== this.dialogForm.parentpartcode)
- })
+ this.UnitGroupArr = []
+ this.UnitGroupArr.push({
+ unitcode: row.unitcode,
+ unitname: row.unitname
+ })
+ const t = this.PartSelectArr.find(item => item.partcode === row.materiel_code).idunitgroup
+ if (t) {
+ const { data: r } = await AddUpdateTBomUnitGroup({ idunitgroup: t })
+ this.UnitGroupArr = r
}
+
+ this.dialogForm = {
+ bomid: row.id,
+ parentpartcode: row.materiel_code,
+ parentpartname: row.materiel_name,
+ parentpartspec: row.materiel_spec,
+ uomcode: row.unitcode,
+ uomname: row.unitname,
+ quantity: row.quantity,
+ status: row.status,
+ startdate: row.startdate,
+ version: row.version,
+ isdefaultbom: row.isdefaultbom === '1',
+ bomdepth: row.bomdepth
+ }
+
+ const children = []
+
+ row.children.forEach((i, index) => {
+ let number = Math.random() * Math.random() // 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ number = number === 0 ? (10 + Math.random()) : number
+ children.push({
+ SEQ: (index + 1) + '0',
+ number,
+ SMATERIRL_CODE: i.materiel_code,
+ SMATERIRL_NAME: i.materiel_name,
+ SMATERIRL_SPEC: i.materiel_spec,
+ uomcode: i.unitcode,
+ uomname: '',
+ UnitGroupArr: [],
+ tableData2: [],
+ BASE_QUANTITY: i.base_quantity,
+ LOSS_QUANTITY: i.loss_quantity,
+ TOTAL_QUANTITY: i.total_quantity,
+ idchildbom: i.idchildbom
+ })
+ this.tableChange(i.materiel_code, children[index])
+ })
+
+ this.dialogTableDataArr = children
+
+ this.dialogVisible = true
+
+ this.$refs.dialogTableDataArrRef.doLayout()
},
// 杈撳叆妗嗗�兼敼鍙樻椂瑙﹀彂
inputChange(val, row) {
@@ -1014,33 +1045,34 @@
}
const { data: r2 } = await AddUpdateTBomDetailsBomData({ materiel_code: val })
- row.tableData2 = r2
+ if (r2.length > 0) {
+ row.idchildbom = row.idchildbom ? row.idchildbom : r2[0].id
+ row.tableData2 = r2
+ row.idchildbom = row.tableData2.find(i => parseFloat(i.id) === parseFloat(row.idchildbom)).version
+ }
},
addDialog() {
- // if (this.dialogTableDataArr.find(item => item.isVisible === 1)) {
- // return this.$message.info('璇峰厛淇濆瓨鏈潯璁板綍锛�')
- // }
-
let number = Math.random() * Math.random() // 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
number = number === 0 ? (10 + Math.random()) : number
this.dialogTableDataArr.push({
SEQ: (this.dialogTableDataArr.length + 1) + '0',
- isVisible: 1,
number,
SMATERIRL_CODE: '',
SMATERIRL_NAME: '',
SMATERIRL_SPEC: '',
uomcode: '',
uomname: '',
+ idchildbom: '',
UnitGroupArr: [],
tableData2: [],
- BASE_QUANTITY: '',
- LOSS_QUANTITY: '',
- TOTAL_QUANTITY: ''
+ BASE_QUANTITY: '1',
+ LOSS_QUANTITY: '0',
+ TOTAL_QUANTITY: '1'
})
},
- delRow(row) {
+ delRow(row, index) {
+ this.dialogTableDataArr.splice(index, 1)
this.dialogTableDataArr.forEach((item, index) => {
item.SEQ = (index + 1) + '0'
})
@@ -1077,10 +1109,8 @@
this.dialogForm.status = 'Y'
this.dialogForm.startdate = ''
this.dialogForm.version = ''
+ this.dialogForm.bomdepth = ''
this.dialogForm.isdefaultbom = false
- this.PartSelectArr = []
- this.PartSelectArrAll = []
- this.PartSelectArrTemp = []
this.dialogTableDataArr = []
this.$refs.dialogForm.clearValidate()
},
@@ -1094,23 +1124,12 @@
return this.$message.info('瀛愪欢淇℃伅涓嶈兘涓虹┖锛�')
}
+ if (this.dialogTableDataArr.find(i => i.SMATERIRL_CODE === this.dialogForm.parentpartcode)) {
+ return this.$message.info('鐖朵欢涓嶈兘浣滀负鑷繁鐨勫瓙浠讹紒')
+ }
+
this.$refs.dialogForm.validate(valid => {
if (valid) {
- // [
- // {
- // 'id': 'string',
- // 'm_id': 'string',
- // 'seq': 'string',
- // 'materiel_code': 'string',
- // 'materiel_name': 'string',
- // 'materiel_spec': 'string',
- // 'unitcode': 'string',
- // 'base_quantity': 'string',
- // 'loss_quantity': 'string',
- // 'total_quantity': 'string',
- // 'idchildbom': 'string'
- // }
- // ]
const children = []
this.dialogTableDataArr.forEach(i => {
@@ -1125,12 +1144,13 @@
'base_quantity': i.BASE_QUANTITY,
'loss_quantity': i.LOSS_QUANTITY,
'total_quantity': i.TOTAL_QUANTITY,
- 'idchildbom': ''
+ 'idchildbom': i.tableData2.find(j => j.version === i.idchildbom).id
})
})
const data = {
- 'id': '',
+ rowNum: '',
+ 'id': this.dialogForm.bomid,
'materiel_code': this.dialogForm.parentpartcode,
'materiel_name': this.dialogForm.parentpartname,
'materiel_spec': this.dialogForm.parentpartspec,
@@ -1143,7 +1163,7 @@
'startdate': this.dialogForm.startdate,
'version': this.dialogForm.version,
'isdefaultbom': this.dialogForm.isdefaultbom ? '1' : '0',
- 'bomdepth': '',
+ 'bomdepth': this.dialogForm.bomdepth === '' ? '1' : this.dialogForm.bomdepth,
'lm_user': '',
'lm_date': '',
children
@@ -1178,8 +1198,8 @@
return 'custom-row'
},
- rowClick(row, column, event) {
- // this.dialogForm.parentpartcode = row.partcode
+ rowClick(r, row) {
+ row.idchildbom = r.version
}
}
--
Gitblit v1.9.3