|
@@ -132,18 +132,18 @@
|
|
|
</el-row>
|
|
|
</el-row>
|
|
|
<el-row class="my-row">
|
|
|
- <el-form-item label="是否组合产品" prop="displayProductList">
|
|
|
+ <el-form-item label="是否组合物料" prop="displayProductList">
|
|
|
<el-switch v-model="displayProductList" active-color="#13ce66" inactive-color="#ff4949" active-text="是"
|
|
|
inactive-text="否">
|
|
|
</el-switch>
|
|
|
</el-form-item>
|
|
|
</el-row>
|
|
|
<el-row v-if="displayProductList">
|
|
|
- <div class="title"><span style="color: red">*</span> 组合小产品</div>
|
|
|
+ <div class="title"><span style="color: red">*</span> 组合小物料</div>
|
|
|
<el-table :data="productDetails" border style="width: 100%;">
|
|
|
<el-table-column label="序号" type="index" width="50" align="center">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="productName" header-align="center" align="center" label="产品名称">
|
|
|
+ <el-table-column prop="productName" header-align="center" align="center" label="物料名称">
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="productSpec" header-align="center" align="center" label="规格">
|
|
|
</el-table-column>
|
|
@@ -252,13 +252,13 @@ export default {
|
|
|
this.visible = true
|
|
|
this.id = id || 0
|
|
|
this.display = display
|
|
|
- // 获取产品类别
|
|
|
+ // 获取物料类别
|
|
|
await getDictList({ type: 'product_type' }).then(({ data }) => {
|
|
|
if (data) {
|
|
|
this.optionsType = data
|
|
|
}
|
|
|
})
|
|
|
- // 产品工艺
|
|
|
+ // 物料工艺
|
|
|
if (!id) return
|
|
|
await getProductDetail(this.id).then(({ data }) => {
|
|
|
if (data && data.code === '200') {
|
|
@@ -284,7 +284,7 @@ export default {
|
|
|
dealStepData(data.data.workFlowBusinessExt.workFlowProcessStepList, this.stepList)
|
|
|
dealStepLogs(data.data.workFlowBusinessExt.processLogList, this.logList)
|
|
|
}
|
|
|
- // 组合小产品
|
|
|
+ // 组合小物料
|
|
|
if (data.data.productMaterialList) {
|
|
|
data.data.productMaterialList.forEach((item) => {
|
|
|
this.productDetails.push({
|
|
@@ -295,7 +295,7 @@ export default {
|
|
|
this.displayProductList = true
|
|
|
}
|
|
|
|
|
|
- // 产品图纸
|
|
|
+ // 物料图纸
|
|
|
this.drawingList = data.data.proDrawings
|
|
|
}
|
|
|
})
|
|
@@ -306,7 +306,7 @@ export default {
|
|
|
uploadSuccess2 (fileList2) {
|
|
|
this.listingList = fileList2
|
|
|
},
|
|
|
- // 添加组合产品
|
|
|
+ // 添加组合物料
|
|
|
addProduct () {
|
|
|
this.productListVisible = true
|
|
|
this.$nextTick(() => {
|
|
@@ -321,8 +321,7 @@ export default {
|
|
|
},
|
|
|
addProductItem (item) {
|
|
|
this.productDetails.push({
|
|
|
- productId: item.productId,
|
|
|
- materialId: item.productId,
|
|
|
+ proProductId: item.productId,
|
|
|
productName: item.productName,
|
|
|
productSpec: item.productSpec,
|
|
|
cnt: 1,
|
|
@@ -354,7 +353,7 @@ export default {
|
|
|
dataFormSubmit () {
|
|
|
this.$refs['dataForm'].validate((valid) => {
|
|
|
if (valid) {
|
|
|
- // 组合小产品
|
|
|
+ // 组合小物料
|
|
|
this.dataForm.composeProductMaterialList = []
|
|
|
const b1 = this.displayProductList
|
|
|
this.dataForm.isCompose = b1 === true ? '1' : '0'
|