|
|
@@ -462,28 +462,28 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column prop="productType" label="类型">
|
|
|
</el-table-column>
|
|
|
- <el-table-column prop="colourNumber" width="130" label="色号">
|
|
|
+ <el-table-column prop="colours" width="130" label="色号">
|
|
|
<template slot-scope="scope">
|
|
|
<el-form-item
|
|
|
- :prop="'colourNumber-' + scope.$index"
|
|
|
- :name="'colourNumber-' + scope.$index"
|
|
|
+ :prop="'colours-' + scope.$index"
|
|
|
+ :name="'colours-' + scope.$index"
|
|
|
style="margin: 0px; padding: 0px"
|
|
|
>
|
|
|
<el-select
|
|
|
- v-model="scope.row.colourNumber"
|
|
|
+ v-model="scope.row.colours"
|
|
|
placeholder=""
|
|
|
filterable
|
|
|
@change="colourNumberChangeHandler(scope.row)"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="item in colourNumberOptions"
|
|
|
- :key="item.materielCode"
|
|
|
- :label="item.materieEncoding + item.materieColorNumber"
|
|
|
- :value="item.materielCode"
|
|
|
+ :key="item.colour"
|
|
|
+ :label="item.colour"
|
|
|
+ :value="item.colour"
|
|
|
>
|
|
|
- <span class="discribe" style="float: left">{{
|
|
|
+ <!-- <span class="discribe" style="float: left">{{
|
|
|
item.materieEncoding + item.materieColorNumber
|
|
|
- }}</span>
|
|
|
+ }}</span> -->
|
|
|
<!-- <span
|
|
|
style="float: right; color: #8492a6; font-size: 13px"
|
|
|
>{{ item.materielCode }}</span
|
|
|
@@ -828,6 +828,7 @@ import {
|
|
|
queryMaterielList,
|
|
|
getSaleOrderProductionListDistinct,
|
|
|
getProductSpecificationsByProductName,
|
|
|
+ productColourList,
|
|
|
} from "@/api/tablelist/commonTable";
|
|
|
import { updateOrder } from "@/api/system/retailMange.js";
|
|
|
import { listData } from "@/api/system/tenant/data";
|
|
|
@@ -912,7 +913,7 @@ export default {
|
|
|
sliceType: "", //切片类型
|
|
|
sliceTypeLabel: "",
|
|
|
colourNumberLabel: "",
|
|
|
- colourNumber: "", //色号
|
|
|
+ colours: "", //色号
|
|
|
remark: "", //备注
|
|
|
// 工艺表
|
|
|
craftGrid: "", //网络
|
|
|
@@ -1315,7 +1316,7 @@ export default {
|
|
|
sliceType: "", //切片类型
|
|
|
sliceTypeLabel: "",
|
|
|
colourNumberLabel: "",
|
|
|
- colourNumber: "", //色号
|
|
|
+ colours: "", //色号
|
|
|
remark: "", //备注
|
|
|
// 工艺表
|
|
|
craftGrid: "", //网络
|
|
|
@@ -1389,7 +1390,7 @@ export default {
|
|
|
sliceType: "", //切片类型
|
|
|
sliceTypeLabel: "",
|
|
|
colourNumberLabel: "",
|
|
|
- colourNumber: "", //色号
|
|
|
+ colours: "", //色号
|
|
|
remark: "", //备注
|
|
|
specificationsList: [],
|
|
|
productSpecifications: "", //型号
|
|
|
@@ -1454,7 +1455,7 @@ export default {
|
|
|
validator: this.validateTableField,
|
|
|
},
|
|
|
];
|
|
|
- this.rules["colourNumber-" + i] = [
|
|
|
+ this.rules["colours-" + i] = [
|
|
|
{
|
|
|
// required: true,
|
|
|
message: "请选择色号",
|
|
|
@@ -1549,11 +1550,12 @@ export default {
|
|
|
},
|
|
|
];
|
|
|
// let res = await queryDropDownBoxData(payLoad);
|
|
|
- let res = await queryMaterielList();
|
|
|
+ // let res = await queryMaterielList();
|
|
|
+ let res = await productColourList({ isEnablePaging: false });
|
|
|
if (res.code == 200) {
|
|
|
console.log(res.data);
|
|
|
// let { materiel } = res.data;
|
|
|
- this.colourNumberOptions = res.data || [];
|
|
|
+ this.colourNumberOptions = res.rows || [];
|
|
|
} else {
|
|
|
throw Error("获取下拉框数据失败");
|
|
|
}
|
|
|
@@ -1669,7 +1671,7 @@ export default {
|
|
|
'[{"fieldName":"sale_order.status","mark":"3","refValue":"2"},{"fieldName":"sale_order.status","mark":"3","refValue":"3"},{"fieldName":"sale_order.status","mark":"3","refValue":"4"},{"fieldName":"sale_order.status","mark":"3","refValue":"5"},{"fieldName":"sale_order.status","mark":"3","refValue":"6"},{"fieldName":"sale_order.status","mark":"3","refValue":"8"},{"fieldName":"sale_order.status","mark":"3","refValue":"9"}]',
|
|
|
children: [],
|
|
|
btnHasPermi: "huaxian:xsglddgl:INSERT",
|
|
|
- },
|
|
|
+ }
|
|
|
// {
|
|
|
// btnName: "完成",
|
|
|
// btnType: "myComplate",
|
|
|
@@ -1824,7 +1826,7 @@ export default {
|
|
|
item.productUnitPrice &&
|
|
|
item.productAmounts &&
|
|
|
item.sliceType &&
|
|
|
- item.colourNumber
|
|
|
+ item.colours
|
|
|
);
|
|
|
});
|
|
|
if (!res) {
|
|
|
@@ -1965,7 +1967,7 @@ export default {
|
|
|
delete item.specificationsList;
|
|
|
delete item.productSpecifications;
|
|
|
const matchedOption = this.colourNumberOptions.find(
|
|
|
- (option) => option.materielCode === item.colourNumber
|
|
|
+ (option) => option.colour === item.colours
|
|
|
);
|
|
|
let taskName =
|
|
|
item.productName +
|
|
|
@@ -3066,17 +3068,17 @@ export default {
|
|
|
},
|
|
|
// 色号改变回调
|
|
|
colourNumberChangeHandler(row) {
|
|
|
- let { colourNumber } = row;
|
|
|
- if (colourNumber) {
|
|
|
+ let { colours } = row;
|
|
|
+ if (colours) {
|
|
|
let target = this.colourNumberOptions.find(
|
|
|
- (item) => item.materielCode == colourNumber
|
|
|
+ (item) => item.colour == colours
|
|
|
);
|
|
|
if (target) {
|
|
|
row.colourNumberLabel =
|
|
|
target.materieEncoding + target.materieColorNumber;
|
|
|
}
|
|
|
// row.colourNumberLabel = this.colourNumberOptions.find(
|
|
|
- // (item) => item.materielCode == colourNumber
|
|
|
+ // (item) => item.materielCode == colours
|
|
|
// )?.materieColorNumber;
|
|
|
}
|
|
|
},
|
|
|
@@ -3244,12 +3246,12 @@ export default {
|
|
|
this.sliceTypeOptions.find((k) => k.materielCode == item.sliceType)
|
|
|
?.materielName || "";
|
|
|
item.colourNumberLabel = this.colourNumberOptions.find(
|
|
|
- (k) => k.materielCode == item.colourNumber
|
|
|
- )?.materieColorNumber;
|
|
|
+ (k) => k.colour == item.colours
|
|
|
+ )?.colour;
|
|
|
// item.materieEncoding + item.materieColorNumber
|
|
|
- let materieEncoding = this.colourNumberOptions.find(
|
|
|
- (k) => k.materielCode == item.colourNumber
|
|
|
- )?.materieEncoding;
|
|
|
+ // let materieEncoding = this.colourNumberOptions.find(
|
|
|
+ // (k) => k.materielCode == item.colours
|
|
|
+ // )?.materieEncoding;
|
|
|
let productName = productData ? productData.productName : "";
|
|
|
let productType = productData ? productData.productType : "";
|
|
|
let productSpecifications = productData
|
|
|
@@ -3259,7 +3261,7 @@ export default {
|
|
|
<td>${productName}</td>
|
|
|
<td>${productSpecifications}</td>
|
|
|
<td>${productType}</td>
|
|
|
- <td>${materieEncoding + item.colourNumberLabel}</td>
|
|
|
+ <td>${item.colourNumberLabel}</td>
|
|
|
<td>${item.productNumber}</td>
|
|
|
<td>${item.productUnitPrice}</td>
|
|
|
<td>${item.productAmounts}</td>
|
lph