|
@@ -364,6 +364,7 @@
|
|
|
teamName: '',
|
|
teamName: '',
|
|
|
isDefaultExecutor: false,
|
|
isDefaultExecutor: false,
|
|
|
checked: false,
|
|
checked: false,
|
|
|
|
|
+ useDefaultFeedDate: false,
|
|
|
pickerOptions: {
|
|
pickerOptions: {
|
|
|
disabledDate(time) {
|
|
disabledDate(time) {
|
|
|
// 禁止选择大于当前时间的日期
|
|
// 禁止选择大于当前时间的日期
|
|
@@ -536,6 +537,7 @@
|
|
|
// }
|
|
// }
|
|
|
});
|
|
});
|
|
|
this.List = deepClone(arr);
|
|
this.List = deepClone(arr);
|
|
|
|
|
+ this.applyDefaultExecutorTime();
|
|
|
})
|
|
})
|
|
|
.finally(() => {
|
|
.finally(() => {
|
|
|
this.isLoad = true;
|
|
this.isLoad = true;
|
|
@@ -559,6 +561,16 @@
|
|
|
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
|
|
return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
|
|
+ applyDefaultExecutorTime() {
|
|
|
|
|
+ if (!this.useDefaultFeedDate || !this.List || this.List.length === 0) {
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ const dateTime = this.getNowTime();
|
|
|
|
|
+ this.List.forEach((item) => {
|
|
|
|
|
+ this.$set(item, 'executorTime', dateTime);
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
async getChooseEngrave() {
|
|
async getChooseEngrave() {
|
|
|
await parameterGetByCode({
|
|
await parameterGetByCode({
|
|
|
code: 'choose_engrave'
|
|
code: 'choose_engrave'
|
|
@@ -569,14 +581,9 @@
|
|
|
await parameterGetByCode({
|
|
await parameterGetByCode({
|
|
|
code: 'mes_order_feed_by_default_date'
|
|
code: 'mes_order_feed_by_default_date'
|
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
|
- if (res.value == '1') {
|
|
|
|
|
- const dateTime = this.getNowTime();
|
|
|
|
|
-
|
|
|
|
|
- this.$nextTick(() => {
|
|
|
|
|
- this.List.forEach((item) => {
|
|
|
|
|
- this.$set(item, 'executorTime', dateTime);
|
|
|
|
|
- });
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ this.useDefaultFeedDate = res.value == '1';
|
|
|
|
|
+ if (this.useDefaultFeedDate) {
|
|
|
|
|
+ this.applyDefaultExecutorTime();
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
|