diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index 6b12c206..a140934c 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -222,6 +222,7 @@ export function getMaxCoilNo(enterCoilNoPrefix) {
*/
export function getDuplicateGroups() {
return request({
+ timeout: 100000,
url: '/wms/materialCoil/duplicateGroups',
method: 'get'
})
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index ba87a8bb..6f28c6aa 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -202,8 +202,8 @@
-
-
+
+
{{ item.currentCoilNo }}
-
查看
+
查看
取消操作
@@ -343,8 +344,8 @@
@@ -829,33 +830,28 @@ export default {
}
})
},
- handleStartSplit(row) {
+ async handleStartSplit(row) {
this.buttonLoading = true
- this.$modal.confirm('是否确认领料开始分条操作?')
- .then(_ => {
+ try {
+ await this.$modal.confirm('是否确认领料开始分条操作?')
this.stepSpilt.loading = true
- addPendingAction({
+ await startSpecialSplit(row.coilId);
+ await addPendingAction({
coilId: row.coilId,
currentCoilNo: row.currentCoilNo,
actionType: 501,
actionStatus: 0,
sourceType: 'manual',
priority: 0,
- }).then(_ => {
- startSpecialSplit(row.coilId).then(_ => {
- this.$message.success('分条操作已创建')
- this.stepSpilt.loading = false
- this.getPendingAction()
- // this.getMaterialCoil()
- this.getStepSplitList()
- }).finally(() => {
- this.buttonLoading = false
- })
})
- })
- .finally(() => {
+ this.$message.success('分条操作已创建')
+ this.stepSpilt.loading = false
+ this.getPendingAction()
+ // this.getMaterialCoil()
+ this.getStepSplitList()
+ } finally {
this.buttonLoading = false
- })
+ }
},
handleContinueSplit(row) {
this.stepSpilt.coilId = row.coilId