From 3f386968d4b5cbb002ad93483f86a5443159e18a Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期六, 08 二月 2025 09:54:32 +0800
Subject: [PATCH] 1.递交
---
src/views/materialManager/materialList.vue | 790 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 469 insertions(+), 321 deletions(-)
diff --git a/src/views/materialManager/materialList.vue b/src/views/materialManager/materialList.vue
index 51b54dc..83c3938 100644
--- a/src/views/materialManager/materialList.vue
+++ b/src/views/materialManager/materialList.vue
@@ -3,7 +3,7 @@
<div class="body" :style="{height:mainHeight+'px'}">
<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 icon="el-icon-download" @click="upload">瀵煎叆</el-button>
+ <!-- <el-button v-waves icon="el-icon-download" @click="upload">瀵煎叆</el-button>-->
</div>
<div class="bodyTopFormGroup">
@@ -24,17 +24,7 @@
<el-form-item label="姣嶄欢瑙勬牸" style=" display: flex;">
<el-input v-model="form.parentpartspec" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="瀛樿揣绫诲瀷" style=" display: flex;">
- <el-select v-model="form.parttype" style="width: 200px" placeholder="璇烽�夋嫨">
- <el-option
- v-for="item in parttypeArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- </el-form-item>
- <el-form-item v-show="isExpandForm" label="鐗堟湰缂栧彿" style=" display: flex;">
+ <el-form-item label="鐗堟湰缂栧彿" style=" display: flex;">
<el-input v-model="form.version" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="鍒涘缓浜哄憳" style=" display: flex;">
@@ -92,10 +82,10 @@
</div>
<div class="elTableDiv">
- <TableColumnSettings
- :list1="tableColumnSettingsArray"
- @tableColumnUpdate="tableColumnUpdate"
- />
+ <!-- <TableColumnSettings-->
+ <!-- :list1="tableColumnSettingsArray"-->
+ <!-- @tableColumnUpdate="tableColumnUpdate"-->
+ <!-- />-->
<el-table
ref="tableDataRef"
:key="tableTimeStampKey"
@@ -126,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>
@@ -289,7 +289,7 @@
align="right"
layout="total,prev, pager, next,sizes"
popper-class="select_bottom"
- @pagination="getBoIventorySelect"
+ @pagination="getBomMainData"
/>
</div>
@@ -315,60 +315,46 @@
label-width="80px"
style="margin-left: 20px;"
>
+
<el-form-item label="姣嶄欢缂栫爜" prop="parentpartcode">
<el-select
v-model="dialogForm.parentpartcode"
- style="width: 200px"
+ style="width: 490px"
placeholder="璇烽�夋嫨"
:popper-append-to-body="false"
- :disabled="operation!=='add'"
filterable
@change="partSelectChange"
>
<el-option
v-for="item in PartSelectArr"
:key="item.partcode"
- :label="item.partcode"
+ :label="item.partcode+' / '+item.partname"
:value="item.partcode"
/>
</el-select>
</el-form-item>
- <el-form-item label="姣嶄欢鍚嶇О" prop="parentpartname">
- <el-select
- v-model="dialogForm.parentpartname"
- style="width: 200px"
- placeholder="璇烽�夋嫨"
- filterable
- :disabled="operation!=='add'"
- :popper-append-to-body="false"
- @change="partSelectChange"
- >
- <el-option
- v-for="item in PartSelectArr"
- :key="item.partcode"
- :label="item.partname"
- :value="item.partcode"
- />
- </el-select>
- </el-form-item>
+
<el-form-item label="姣嶄欢瑙勬牸" prop="parentpartspec">
<el-input v-model="dialogForm.parentpartspec" disabled style="width: 200px" />
- <!-- <el-select-->
- <!-- v-model="dialogForm.parentpartspec"-->
- <!-- style="width: 200px"-->
- <!-- placeholder="璇烽�夋嫨"-->
- <!-- :popper-append-to-body="false"-->
- <!-- >-->
- <!-- <el-option-->
- <!-- v-for="item in PartSelectArr"-->
- <!-- :key="item.partcode"-->
- <!-- :label="item.partcode"-->
- <!-- :value="item.partcode"-->
- <!-- />-->
- <!-- </el-select>-->
</el-form-item>
<el-form-item label="璁￠噺鍗曚綅">
- <el-input v-model="dialogForm.uomname" disabled style="width: 200px" />
+ <!-- <el-input v-model="dialogForm.uomname" style="width: 200px" />-->
+
+ <el-select
+ v-model="dialogForm.uomcode"
+ :disabled="UnitGroupArr.length<2"
+ style="width: 200px"
+ placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
+ >
+ <el-option
+ v-for="item in UnitGroupArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
+ />
+ </el-select>
+
</el-form-item>
<!-- <el-form-item label="瀛樿揣绫诲瀷">-->
<!-- <el-input v-model="dialogForm.chlx" readonly style="width: 200px" />-->
@@ -410,7 +396,14 @@
/>
</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">
+ <el-checkbox v-model="dialogForm.isdefaultbom" />
</el-form-item>
</el-form>
</div>
@@ -448,68 +441,106 @@
/>
<el-table-column
prop="SMATERIRL_CODE"
- label="瀛愪欢缂栫爜"
+ label="瀛愪欢缂栫爜/鍚嶇О"
show-tooltip-when-overflow
>
<template slot-scope="{row}">
<el-select
- v-if="row.isVisible===1"
v-model="row.SMATERIRL_CODE"
filterable
+ style="width: 100%;"
placeholder="璇烽�夋嫨"
@change="val=>tableChange(val,row)"
>
<el-option
- v-for="item in PartSelectArr"
- :key="item.partname"
- :label="item.partcode"
- :value="item.partname"
- />
- </el-select>
- <div v-if="row.isVisible===0">{{ row.SMATERIRL_CODE }}</div>
- </template>
- </el-table-column>
- <el-table-column
- prop="SMATERIRL_NAME"
- label="瀛愪欢鍚嶇О"
- filterable
- show-tooltip-when-overflow
- >
-
- <template slot-scope="{row}">
- <el-select
- v-if="row.isVisible===1"
- v-model="row.SMATERIRL_NAME"
- placeholder="璇烽�夋嫨"
- @change="val=>tableChange(val,row)"
- >
- <el-option
- v-for="item in PartSelectArr"
+ v-for="item in PartDetailSelectArr"
:key="item.partcode"
- :label="item.partname"
+ :label="item.partcode+' / '+item.partname"
:value="item.partcode"
/>
</el-select>
- <div v-if="row.isVisible===0">{{ row.SMATERIRL_NAME }}</div>
</template>
</el-table-column>
+
<el-table-column
prop="SMATERIRL_SPEC"
label="瀛愪欢瑙勬牸"
width="110"
show-tooltip-when-overflow
>
- <template slot-scope="{row}">
- <div v-if="row.SMATERIRL_SPEC">{{ row.SMATERIRL_SPEC }}</div>
- <div v-else>/</div>
- </template>
+ <!-- <template slot-scope="{row}">-->
+ <!-- <div v-if="row.SMATERIRL_SPEC">{{ row.SMATERIRL_SPEC }}</div>-->
+ <!-- <div v-else>/</div>-->
+ <!-- </template>-->
</el-table-column>
<el-table-column
prop="uomname"
label="璁￠噺鍗曚綅"
width="110"
show-tooltip-when-overflow
- />
+ >
+ <template slot-scope="{row}">
+ <el-select
+ v-model="row.uomcode"
+ :disabled="row.UnitGroupArr.length<2"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in row.UnitGroupArr"
+ :key="item.unitcode"
+ :label="item.unitname"
+ :value="item.unitcode"
+ />
+ </el-select>
+ </template>
+ </el-table-column>
+ <el-table-column
+ prop="idchildbom"
+ label="瀛愪欢BOM"
+ width="110"
+ show-tooltip-when-overflow
+ >
+ <template slot-scope="{row}">
+ <!-- {{ row.idchildbom }}-->
+ <el-select
+ v-model="row.idchildbom"
+ style="width: 490px"
+ placeholder="璇烽�夋嫨"
+ >
+ <template slot="empty">
+ <el-table
+ :data="row.tableData2"
+ border
+ stripe
+ class="tableFixed"
+ highlight-current-row
+ :row-class-name="tableRowClassName"
+ style="width: 400px"
+ height="200"
+ @row-click="r=>rowClick(r,row)"
+ >
+ <el-table-column
+ prop="materiel_code"
+ label="浜у搧缂栫爜"
+ />
+ <el-table-column
+ prop="materiel_name"
+ label="浜у搧鍚嶇О"
+ />
+ <el-table-column
+ prop="materiel_spec"
+ label="瑙勬牸鍨嬪彿"
+ />
+ <el-table-column
+ prop="version"
+ label="鐗堟湰鍙�"
+ />
+ </el-table>
+ </template>
+ </el-select>
+ </template>
+ </el-table-column>
+
<el-table-column
prop="BASE_QUANTITY"
label="鍩烘湰鐢ㄩ噺"
@@ -518,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
@@ -535,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
@@ -550,45 +578,20 @@
show-tooltip-when-overflow
width="110"
/>
- <el-table-column
- prop="PN_TYPE"
- label="灞炴��"
- show-tooltip-when-overflow
- width="110"
- >
- <template slot-scope="{row}">
- <el-select
- v-if="row.isVisible===1"
- v-model="row.PN_TYPE"
- :disabled="row.PN_TYPE==='Z'"
- placeholder="璇烽�夋嫨"
- @change="val=>changeType(val,row)"
- >
- <el-option
- v-for="item in sxArr"
- :key="item.code"
- :label="item.name"
- :value="item.code"
- />
- </el-select>
- <div v-if="row.isVisible===0">{{ row.PN_TYPE === 'Z' ? '涓绘枡' : '杈呮枡' }}</div>
- </template>
- </el-table-column>
+
<el-table-column
v-if="operation!=='preview'"
label="鎿嶄綔"
- width="120"
+ width="80"
fixed="right"
>
- <template slot-scope="{row}">
+ <template slot-scope="{row,$index}">
<div class="operationClass">
- <el-button v-if="row.isVisible===1" v-waves type="text" @click="saveRow(row)">纭畾</el-button>
- <el-button v-if="row.isVisible===1" v-waves type="text" @click="cancelRow(row)">鍙栨秷</el-button>
- <el-button v-if="row.isVisible===0" v-waves type="text" @click="editRow(row)">缂栬緫</el-button>
- <el-button v-if="row.isVisible===0" 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>
+
</el-table>
<span slot="footer" class="dialog-footer">
@@ -613,17 +616,15 @@
<script>
import Pagination from '@/components/Pagination'
import { handleDatetime } from '@/utils/global'
-// import {
-// AddUpdateBoIventory,
-// BoIventorySelect,
-// BoIventorySelectView,
-// DeleteBoIventory, MaterielDetailedVsion,
-// PartSelect,
-// StockTypeSelect
-// } from '@/api/makeModel'
import elDragDialog from '@/directive/el-drag-dialog'
import waves from '@/directive/waves'
import TableColumnSettings from '@/components/TableColumnSettings'
+import {
+ AddUpdateTBomUnitGroup,
+ BomMainData,
+ AddUpdateTBomParentData,
+ AddUpdateTBomDetailsData, AddUpdateTBomMaxVsion, AddUpdateTBomDetailsBomData, TBomAddUpdate, TBomDelete
+} from '@/api/ProductModel'
export default {
name: 'Zzjg',
@@ -646,12 +647,12 @@
version: '', // 鐗堟湰鍙�
createusername: '', // 鍒涘缓浜哄憳
createdate: '', // 鍒涘缓鏃ユ湡
- prop: 'lm_date', // 鎺掑簭瀛楁
+ prop: 'id', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
rows: 20 // 姣忛〉澶氬皯鏉�
},
- parttypeArr: [], // 瀛樿揣绫诲瀷
+
openTypeArr: [// 鍚敤鐘舵��
{ label: '鏄�', value: 'Y' },
{ label: '鍚�', value: 'N' }
@@ -662,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,
@@ -676,7 +677,7 @@
{
minWidth: 110,
width: false,
- prop: 'partname',
+ prop: 'materiel_name',
label: '姣嶄欢鍚嶇О',
id: 4,
show: true,
@@ -686,7 +687,7 @@
{
minWidth: 110,
width: false,
- prop: 'partspec',
+ prop: 'materiel_spec',
label: '姣嶄欢瑙勬牸',
id: 5,
show: true,
@@ -696,7 +697,7 @@
{
minWidth: 110,
width: false,
- prop: 'stocktype_name',
+ prop: 'materiel_typename',
label: '瀛樿揣绫诲瀷',
id: 6,
show: true,
@@ -706,7 +707,7 @@
{
minWidth: 110,
width: false,
- prop: 'uom_name',
+ prop: 'unitname',
label: '璁￠噺鍗曚綅',
id: 7,
show: true,
@@ -727,7 +728,7 @@
minWidth: false,
width: 110,
prop: 'status',
- label: '鍚姩鐘舵��',
+ label: '鍚敤鐘舵��',
id: 9,
show: true,
fixed: false,
@@ -750,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
@@ -766,7 +776,7 @@
width: 160,
prop: 'lm_date',
label: '鍒涘缓鏃堕棿',
- id: 13,
+ id: 14,
show: true,
fixed: false,
sortable: true
@@ -784,9 +794,11 @@
uomname: '',
// chlx: '',
quantity: '',
- status: '',
+ status: 'Y',
startdate: '',
- version: ''
+ version: '',
+ isdefaultbom: false,
+ bomdepth: ''
},
operation: '',
dialogFormRules: {
@@ -810,26 +822,23 @@
// ],
startdate: [
{ required: true, message: '璇烽�夋嫨鍚敤鏃ユ湡', trigger: ['blur', 'change'] }
+ ],
+ version: [
+ { required: true, message: '璇烽�夋嫨鐗堟湰鍙�', trigger: ['blur', 'change'] }
]
},
- PartSelectArrAll: [], // 浜у搧鎵�鏈夊��
PartSelectArr: [], // 浜у搧鍙�夊��
- PartSelectArrTemp: [], // 浜у搧宸查�夋殏瀛樺��
dialogTableDataArr: [],
- sxArr: [
- { code: 'Z', name: '涓绘枡' },
- { code: 'F', name: '杈呮枡' }
- ],
-
- title_value: '鏁版嵁瀵煎叆 / 鐗╂枡娓呭崟',
- code: '21',
- shows: false
+ UnitGroupArr: [], // 璁￠噺鍗曚綅鏁扮粍
+ PartDetailSelectArr: []
}
},
created() {
- // this.handleRequest()
+ this.getBomMainData()
+ this.getAddUpdateTBomParentData()
+ this.getAddUpdateTBomDetailsData()
},
mounted() {
window.addEventListener('resize', this.getHeight)
@@ -843,14 +852,7 @@
this.tableTimeStampKey = new Date().getTime()
this.$refs.tableDataRef.doLayout()
},
- handleRequest() {
- this.getBoIventorySelect().then(res => {
- if (res.code === '200') {
- this.getStockTypeSelect()
- }
- })
- },
- async getBoIventorySelect() {
+ async getBomMainData() {
let tempDate = this.form.createdate
if (tempDate.length > 0) {
tempDate = handleDatetime(tempDate[0]) + '~' + handleDatetime(tempDate[1])
@@ -872,45 +874,44 @@
rows: this.form.rows // 姣忛〉澶氬皯鏉�
}
- const res = await BoIventorySelect(data)
+ const res = await BomMainData(data)
this.tableData = res.data
this.total = res.count
return { code: res.code }
},
// 鑾峰彇姣嶄欢缂栫爜鍚嶇О绛変笅鎷夋帴鍙�
- async getPartSelect() {
- const { data: res } = await PartSelect()
+ async getAddUpdateTBomParentData() {
+ const { data: res } = await AddUpdateTBomParentData()
this.PartSelectArr = res
- this.PartSelectArrAll = res
},
// 鑾峰彇瀛樿揣绫诲瀷涓嬫媺鎺ュ彛
- async getStockTypeSelect() {
- const { data: res } = await StockTypeSelect()
- this.parttypeArr = res
+ async getAddUpdateTBomDetailsData() {
+ const { data: res } = await AddUpdateTBomDetailsData()
+ this.PartDetailSelectArr = res
},
- partSelectChange(val) {
+ async partSelectChange(val) {
const res = this.PartSelectArr.find(item => item.partcode === val)
- this.dialogForm.parentpartcode = res.partcode
+ // this.dialogForm.parentpartcode = res.partcode
this.dialogForm.parentpartname = res.partname
this.dialogForm.parentpartspec = res.partspec
- // this.dialogForm.uomcode = res.uom_code
- this.dialogForm.uomname = res.uom_name
+ this.dialogForm.uomcode = res.unitcode
+ this.dialogForm.uomname = res.unitname
- if (this.PartSelectArrTemp.length > 0) {
- this.PartSelectArr.unshift(this.PartSelectArrTemp[0])
- this.PartSelectArrTemp.splice(0, 1)
+ this.UnitGroupArr = []
+ this.UnitGroupArr.push({
+ unitcode: res.unitcode,
+ unitname: res.unitname
+ })
+
+ if (res.idunitgroup) {
+ const { data: r } = await AddUpdateTBomUnitGroup({ idunitgroup: res.idunitgroup })
+ this.UnitGroupArr = r
}
- this.PartSelectArr.forEach((item, index) => {
- if (item.partcode === val) {
- this.PartSelectArrTemp.push(item)
- this.PartSelectArr.splice(index, 1)
- }
- })
- this.getMaterielDetailedVsion(this.dialogForm.parentpartcode)
+ // await this.getAddUpdateTBomMaxVsion(this.dialogForm.parentpartcode)
},
- async getMaterielDetailedVsion(parentpartcode) {
- const { data: res } = await MaterielDetailedVsion({ parentpartcode })
+ async getAddUpdateTBomMaxVsion(parentpartcode) {
+ const { data: res } = await AddUpdateTBomMaxVsion({ parentpartcode })
this.dialogForm.version = res
},
// 鎺掑簭鏀瑰彉鏃�
@@ -924,20 +925,17 @@
}
this.form.order = order
this.form.prop = prop
- this.getBoIventorySelect()
+ this.getBomMainData()
},
// 鏌ヨ
search() {
- this.getBoIventorySelect()
+ this.getBomMainData()
},
// 瀵煎叆鎸夐挳
upload() {
this.shows = true
- this.$refs.importPickerFunc.newDataFunc()
},
- colos() {
- this.shows = false
- },
+
// 閲嶇疆
reset() {
this.form.parentpartcode = ''
@@ -948,66 +946,76 @@
this.form.version = ''
this.form.createusername = ''
this.form.createdate = ''
- this.getBoIventorySelect()
+ this.getBomMainData()
},
// 鏂板鎸夐挳
add(operation) {
this.operation = operation
this.dialogVisible = true
- this.getPartSelect()
this.dialogForm.startdate = handleDatetime(new Date())
+
+ // this.$refs.dialogTableDataArrRef.doLayout()
},
// 淇敼鎸夐挳
async edit(operation, row) {
- const res = await BoIventorySelectView({ bomid: row.id })
- if (res.code === '200') {
- this.operation = operation
- this.dialogVisible = true
- await this.getPartSelect()
+ 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({
- 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,
- PN_TYPE: item.pn_type
- })
- 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) {
@@ -1017,86 +1025,54 @@
}
},
// 瀵硅瘽妗嗚〃鏍间笅鎷夐�夋嫨鍊兼敼鍙樻椂
- tableChange(val, row) {
- const res = this.PartSelectArr.find(item => item.partcode === val || item.partname === val)
+ async tableChange(val, row) {
+ const res = this.PartSelectArr.find(item => item.partcode === val)
row.SMATERIRL_CODE = res.partcode
row.SMATERIRL_NAME = res.partname
row.SMATERIRL_SPEC = res.partspec
- row.uomcode = res.uom_code
- row.uomname = res.uom_name
+ row.uomcode = res.unitcode
+ row.uomname = res.unitname
- // this.PartSelectArr.forEach((item, index) => {
- // this.PartSelectArr.splice(index, 1)
- // })
- },
- // 鐗╂枡娓呭崟灞炴�х被鍨嬪�兼敼鍙樻椂瑙﹀彂
- changeType(val, row) {
- this.dialogTableDataArr.forEach(item => {
- item.PN_TYPE = item.SMATERIRL_CODE === row.SMATERIRL_CODE ? 'Z' : 'F'
+ row.UnitGroupArr = []
+ row.UnitGroupArr.push({
+ unitcode: res.unitcode,
+ unitname: res.unitname
})
- },
- addDialog() {
- if (this.dialogTableDataArr.find(item => item.isVisible === 1)) {
- return this.$message.info('璇峰厛淇濆瓨鏈潯璁板綍锛�')
+
+ if (res.idunitgroup) {
+ const { data: r } = await AddUpdateTBomUnitGroup({ idunitgroup: res.idunitgroup })
+ row.UnitGroupArr = r
}
- let number = Math.random() * Math.random()// 浣滀负鍒犻櫎鏃剁殑鏍囪瘑绗�
+ const { data: r2 } = await AddUpdateTBomDetailsBomData({ materiel_code: val })
+ 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() {
+ 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: '',
- BASE_QUANTITY: '',
- LOSS_QUANTITY: '',
- TOTAL_QUANTITY: '',
- PN_TYPE: this.dialogTableDataArr.length === 0 ? 'Z' : 'F'
+ idchildbom: '',
+ UnitGroupArr: [],
+ tableData2: [],
+ BASE_QUANTITY: '1',
+ LOSS_QUANTITY: '0',
+ TOTAL_QUANTITY: '1'
})
},
- saveRow(row) {
- if (row.SMATERIRL_CODE === '' || row.BASE_QUANTITY === '' || row.LOSS_QUANTITY === '' || row.PN_TYPE === '') {
- return this.$message.info('淇濆瓨澶辫触锛岃琛屽唴瀹规湭濉叏锛�')
- }
-
- row.isVisible = 0
- this.PartSelectArr = this.PartSelectArr.filter(i => i.partcode !== row.SMATERIRL_CODE)
- },
- cancelRow(row) {
- row.isVisible = 0
- this.dialogTableDataArr = this.dialogTableDataArr.filter(i => i.number !== row.number)
- },
- editRow(row) {
- if (this.dialogTableDataArr.find(item => item.isVisible === 1)) {
- return this.$message.info('璇峰厛淇濆瓨鍏跺畠琛岃褰曪紒')
- }
-
- row.isVisible = 1
-
- this.PartSelectArrAll.forEach(item => {
- if (item.partcode === row.SMATERIRL_CODE) {
- this.PartSelectArr.unshift(item)
- }
- })
- },
- delRow(row) {
- if (row.PN_TYPE === 'Z') {
- return this.$message.info('涓绘枡涓嶅彲鍒犻櫎锛�')
- }
-
- this.PartSelectArrAll.forEach(item => {
- if (item.partcode === row.SMATERIRL_CODE) {
- this.PartSelectArr.unshift(item)
- }
- })
- this.dialogTableDataArr.forEach((item, index) => {
- if (item.SMATERIRL_CODE === row.SMATERIRL_CODE) {
- this.dialogTableDataArr.splice(index, 1)
- }
- })
+ delRow(row, index) {
+ this.dialogTableDataArr.splice(index, 1)
this.dialogTableDataArr.forEach((item, index) => {
item.SEQ = (index + 1) + '0'
})
@@ -1108,13 +1084,13 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- DeleteBoIventory({ bomid: row.id }).then(res => {
+ TBomDelete(row).then(res => {
if (res.code === '200') {
this.$message.success('鍒犻櫎鎴愬姛!')
if (this.form.page > 1 && this.tableData.length === 1) {
this.form.page--
}
- this.getBoIventorySelect()
+ this.getBomMainData()
}
})
}).catch(() => {
@@ -1130,12 +1106,11 @@
this.dialogForm.uomname = ''
// this.dialogForm.chlx = ''
this.dialogForm.quantity = ''
- this.dialogForm.status = ''
+ this.dialogForm.status = 'Y'
this.dialogForm.startdate = ''
this.dialogForm.version = ''
- this.PartSelectArr = []
- this.PartSelectArrAll = []
- this.PartSelectArrTemp = []
+ this.dialogForm.bomdepth = ''
+ this.dialogForm.isdefaultbom = false
this.dialogTableDataArr = []
this.$refs.dialogForm.clearValidate()
},
@@ -1149,29 +1124,58 @@
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) {
+ const children = []
+
+ this.dialogTableDataArr.forEach(i => {
+ children.push({
+ id: i.id,
+ m_id: this.dialogForm.bomid,
+ 'seq': i.SEQ,
+ 'materiel_code': i.SMATERIRL_CODE,
+ 'materiel_name': i.SMATERIRL_NAME,
+ 'materiel_spec': i.SMATERIRL_SPEC,
+ 'unitcode': i.uomcode,
+ 'base_quantity': i.BASE_QUANTITY,
+ 'loss_quantity': i.LOSS_QUANTITY,
+ 'total_quantity': i.TOTAL_QUANTITY,
+ 'idchildbom': i.idchildbom ? i.tableData2.find(j => j.version === i.idchildbom).id : ''
+ })
+ })
+
const data = {
- bomid: this.dialogForm.bomid,
- parentpartcode: this.dialogForm.parentpartcode,
- parentpartname: this.dialogForm.parentpartname,
- parentpartspec: this.dialogForm.parentpartspec,
- uomcode: this.PartSelectArrTemp.length > 0 ? this.PartSelectArrTemp[0].uom_code : this.dialogForm.uomcode,
- quantity: this.dialogForm.quantity,
- status: this.dialogForm.status,
- startdate: this.dialogForm.startdate,
- version: this.dialogForm.version,
- worklist: this.dialogTableDataArr,
- opertype: this.operation === 'add' ? 'Add' : 'Update'
+ rowNum: '',
+ 'id': this.dialogForm.bomid,
+ 'materiel_code': this.dialogForm.parentpartcode,
+ 'materiel_name': this.dialogForm.parentpartname,
+ 'materiel_spec': this.dialogForm.parentpartspec,
+ 'materiel_typecode': '',
+ 'materiel_typename': '',
+ 'unitcode': this.dialogForm.uomcode,
+ 'unitname': this.UnitGroupArr.find(i => i.unitcode === this.dialogForm.uomcode).unitname,
+ 'quantity': this.dialogForm.quantity,
+ 'status': this.dialogForm.status,
+ 'startdate': this.dialogForm.startdate,
+ 'version': this.dialogForm.version,
+ 'isdefaultbom': this.dialogForm.isdefaultbom ? '1' : '0',
+ 'bomdepth': this.dialogForm.bomdepth === '' ? '1' : this.dialogForm.bomdepth,
+ 'lm_user': '',
+ 'lm_date': '',
+ children
}
- // console.log(data)
+ console.log(JSON.parse(JSON.stringify(data)))
this.$store.state.app.buttonIsDisabled = true
- AddUpdateBoIventory(data).then(res => {
+ TBomAddUpdate(data, this.operation === 'add' ? 'Add' : 'Update').then(res => {
if (res.code === '200') {
this.dialogVisible = false
this.$message.success(this.operation === 'add' ? '娣诲姞鎴愬姛锛�' : '淇敼鎴愬姛锛�')
- this.getBoIventorySelect()
+ this.getBomMainData()
this.$store.state.app.buttonIsDisabled = false
} else {
this.$message.error(this.operation === 'add' ? '娣诲姞澶辫触锛�' : '淇敼澶辫触锛�')
@@ -1192,8 +1196,152 @@
},
tableRowClassName({ row, rowIndex }) {
return 'custom-row'
+ },
+
+ rowClick(r, row) {
+ row.idchildbom = r.version
}
+
}
}
</script>
+<style scoped lang="scss">
+::v-deep .el-select__caret::before{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ height: 34px;
+}
+</style>
+<!--鍏叡椤甸潰鏍峰紡-->
+<style lang="scss" scoped>
+$main_color: #42b983;
+::v-deep .el-button--text {
+ font-size: 14px;
+ cursor: pointer;
+}
+
+.el-icon-share, .el-icon-delete, .el-icon-edit-outline {
+ color: $main_color;
+ cursor: pointer;
+}
+
+.el-icon-edit-outline {
+ margin-right: 15px;
+}
+
+::v-deep .el-button--primary, .el-button--default, .el-button--info {
+ height: 34px;
+ display: flex;
+ align-items: center;
+ padding: 0 15px;
+}
+
+::v-deep .el-button--primary {
+ //background-color: $main_color !important;
+}
+
+::v-deep .el-button--default {
+ background-color: #f8f8fa;
+ border: none;
+}
+
+::v-deep .el-input__inner {
+ height: 34px;
+ line-height: 34px;
+ //color: #a7a7a7;
+}
+
+::v-deep .el-dialog__body {
+ //padding: 20px 100px !important;
+ padding: 20px !important;
+}
+
+::v-deep .dialogVisibleRoles .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .importPickerClass .el-dialog__body {
+ padding: 20px 20px !important;
+}
+
+::v-deep .el-dialog__footer {
+ display: flex;
+ justify-content: flex-end;
+}
+
+::v-deep .el-table .caret-wrapper {
+ transform: scale(0.8);
+}
+
+::v-deep .cell {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+
+::v-deep .el-table::before {
+ height: 0;
+}
+
+::v-deep .el-table__body-wrapper {
+ background-color: #f8f8fa;
+}
+
+::v-deep .el-table__body .el-table__row.hover-row td {
+ background-color: #eaecef;
+}
+
+::v-deep .el-form--inline .el-form-item__label {
+ color: #a7a7a7;
+}
+
+.body ::v-deep .el-divider {
+ border: 1px solid #eee;
+ width: 99%;
+ margin: 10px auto;
+}
+
+.body ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+.userDialogVisible ::v-deep .el-form-item {
+ margin-bottom: 0;
+}
+
+::v-deep .el-select__caret {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.tableFixed {
+ ::v-deep .el-table__fixed-right {
+ height: 100% !important;
+ }
+
+ ::v-deep .el-table__fixed {
+ height: 100% !important;
+ }
+}
+
+::v-deep .el-range__icon {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-separator {
+ line-height: 28px !important;
+}
+
+::v-deep .el-range-input {
+ font-size: 14px;
+}
+
+::v-deep .el-range-separator {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+}
+</style>
--
Gitblit v1.9.3