|
@@ -448,7 +448,7 @@
|
|
|
<el-option
|
|
<el-option
|
|
|
label="分批到货"
|
|
label="分批到货"
|
|
|
:value="2"
|
|
:value="2"
|
|
|
- @click.native="handleMethod()"
|
|
|
|
|
|
|
+ @click.native="handleMethod(null, null, true)"
|
|
|
/>
|
|
/>
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
@@ -471,7 +471,7 @@
|
|
|
type="primary"
|
|
type="primary"
|
|
|
:underline="false"
|
|
:underline="false"
|
|
|
v-show="formData2.deliveryMethod == 2"
|
|
v-show="formData2.deliveryMethod == 2"
|
|
|
- @click.native="handleMethod()"
|
|
|
|
|
|
|
+ @click.native="handleMethod(null, null, true)"
|
|
|
>
|
|
>
|
|
|
设置分批时间
|
|
设置分批时间
|
|
|
</el-link>
|
|
</el-link>
|
|
@@ -986,7 +986,7 @@
|
|
|
planIds: planIds,
|
|
planIds: planIds,
|
|
|
demandType: this.formData.demandType
|
|
demandType: this.formData.demandType
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (this.$store.state.user.info.clientEnvironmentId == '5') {
|
|
if (this.$store.state.user.info.clientEnvironmentId == '5') {
|
|
|
if (res && res.length > 0) {
|
|
if (res && res.length > 0) {
|
|
|
const firstOrderName = res[0].productName || '';
|
|
const firstOrderName = res[0].productName || '';
|
|
@@ -1180,12 +1180,12 @@
|
|
|
};
|
|
};
|
|
|
this.batchVisible = true;
|
|
this.batchVisible = true;
|
|
|
},
|
|
},
|
|
|
- handleMethod(row, index) {
|
|
|
|
|
|
|
+ handleMethod(row, index, isAll) {
|
|
|
console.log(index, 'index');
|
|
console.log(index, 'index');
|
|
|
if (row) {
|
|
if (row) {
|
|
|
this.multipleSelection = [];
|
|
this.multipleSelection = [];
|
|
|
}
|
|
}
|
|
|
- this.$refs.timeDialogRef.open(row || {}, index);
|
|
|
|
|
|
|
+ this.$refs.timeDialogRef.open(row || {}, index, isAll);
|
|
|
},
|
|
},
|
|
|
chooseTime(current, timeList, currentIndex) {
|
|
chooseTime(current, timeList, currentIndex) {
|
|
|
const tableList = this.$refs.table.getData();
|
|
const tableList = this.$refs.table.getData();
|
|
@@ -1277,6 +1277,7 @@
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
let _arr2 = [];
|
|
let _arr2 = [];
|
|
|
|
|
+ let isNoMaterial = [];
|
|
|
|
|
|
|
|
_arr2 = _arr.map((m) => {
|
|
_arr2 = _arr.map((m) => {
|
|
|
if (
|
|
if (
|
|
@@ -1289,12 +1290,19 @@
|
|
|
delete m.id;
|
|
delete m.id;
|
|
|
delete m.code;
|
|
delete m.code;
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ if (!m.materialList.length) {
|
|
|
|
|
+ isNoMaterial.push(m.productName);
|
|
|
|
|
+ }
|
|
|
return {
|
|
return {
|
|
|
...m
|
|
...m
|
|
|
};
|
|
};
|
|
|
});
|
|
});
|
|
|
-
|
|
|
|
|
|
|
+ if (isNoMaterial.length) {
|
|
|
|
|
+ this.$message.info(
|
|
|
|
|
+ isNoMaterial.join(',') + ' 物料清单为空,请检查!'
|
|
|
|
|
+ );
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
this.formData['type'] = 1;
|
|
this.formData['type'] = 1;
|
|
|
this.formData['salesOrderList'] = _arr2;
|
|
this.formData['salesOrderList'] = _arr2;
|
|
|
this.formData.baitingType = 2;
|
|
this.formData.baitingType = 2;
|