|
@@ -133,6 +133,7 @@ export default {
|
|
|
selectedRowKeys: [],
|
|
|
selectedRows: {}, // 勾选项
|
|
|
loading: false, // 表格加载
|
|
|
+ fatherData:[],
|
|
|
// 表头
|
|
|
referOerderColumns: [
|
|
|
{
|
|
@@ -423,6 +424,7 @@ export default {
|
|
|
confirmLoading: false,
|
|
|
referOrderDataModVis: false,
|
|
|
error:[], // 选中数据不符合的字段名
|
|
|
+ errorFather: [], //选中数据与已有数据不同集合
|
|
|
|
|
|
// 查询条件
|
|
|
queryParam: {
|
|
@@ -479,12 +481,21 @@ export default {
|
|
|
// 弹框确定
|
|
|
onSubmit() {
|
|
|
this.dataSet( this.selectedRows)
|
|
|
+ var vv = this.selectedRows[0]
|
|
|
+ if(this.fatherData.length !== 0){
|
|
|
+ this.fatherDataSet(this.fatherData,vv)
|
|
|
+ }
|
|
|
if (this.selectedRowKeys.length == 0) {
|
|
|
this.$message.error('请勾选订单数据')
|
|
|
} else if(this.selectedRows !== 1 && this.error.length !==0){
|
|
|
var cc =this.error.toString()
|
|
|
this.$message.error(cc+'必须相同!');
|
|
|
- }else {
|
|
|
+ this.error = []
|
|
|
+ }else if(this.fatherData.length !== 0 && this.errorFather.length !== 0){
|
|
|
+ var dd =this.errorFather.toString()
|
|
|
+ this.$message.error(dd+'必须相同!');
|
|
|
+ this.errorFather = []
|
|
|
+ }else{
|
|
|
confimOrderData(this.confimList).then(res => {
|
|
|
if (res.success) {
|
|
|
this.propList = res.result;
|
|
@@ -497,8 +508,9 @@ export default {
|
|
|
this.selectedRows = [];
|
|
|
this.searchReset();
|
|
|
}
|
|
|
- this.error = []
|
|
|
},
|
|
|
+
|
|
|
+ //参照数据选择多条时
|
|
|
dataSet(){
|
|
|
this.confimList = []
|
|
|
var orderTest = [],
|
|
@@ -533,6 +545,20 @@ export default {
|
|
|
if([...new Set(sizeTest)].length !== 1){this.error.push('尺码')}
|
|
|
},
|
|
|
|
|
|
+ //已有参考列表
|
|
|
+ fatherDataSet(fathers,sons){
|
|
|
+ var father = fathers[0]
|
|
|
+ if(father.orderNumber !== sons.orderNumber){this.errorFather.push('订单号')}
|
|
|
+ if(father.smallPo !== sons.smallPo){this.errorFather.push('小po')}
|
|
|
+ if(father.preDeliveryDate !== sons.preDeliveryDate){this.errorFather.push('预发货日期')}
|
|
|
+ if(father.preCompletionDate !== sons.preCompletionDate){this.errorFather.push('预完工日期')}
|
|
|
+ if(father.itemNumber !== sons.itemNumber){this.errorFather.push('款号')}
|
|
|
+ if(father.inventoryCode !== sons.inventoryCode){this.errorFather.push('存货编码')}
|
|
|
+ if(father.inventoryName !== sons.inventoryName){this.errorFather.push('存货名称')}
|
|
|
+ if(father.colour !== sons.colour){this.errorFather.push('颜色')}
|
|
|
+ if(father.size !== sons.size){this.errorFather.push('尺码')}
|
|
|
+ },
|
|
|
+
|
|
|
handleTableChange(pagination, filters, sorter) {
|
|
|
this.queryParam.pageNo = pagination.current;
|
|
|
this.getOrderList();
|