Просмотр исходного кода

fix(workOrder): 修复派单逻辑和加载状态处理

liujt 6 месяцев назад
Родитель
Сommit
ee00309001

+ 1 - 1
src/views/batchRecord/components/programRulesDialog.vue

@@ -673,7 +673,7 @@
     },
     computed: {
       dispatchStatus() {
-        return ((this.addForm.autoOrder && (this.type == 'add' || this.type == 'edit' || this.type == 'detail')) || (((!this.addForm.autoOrder && this.addForm.status == 0) || (this.addForm.autoOrder && this.addForm.status == 4)) && this.type == 'dispatch'))
+        return (this.addForm.autoOrder && (this.type == 'add' || this.type == 'edit' || this.type == 'detail')) || (!this.addForm.autoOrder && this.type == 'dispatch')
       },
       // 当前用户信息
       loginUser() {

+ 1 - 0
src/views/produce/components/prenatalExamination/components/workOrder/programRulesDialog.vue

@@ -865,6 +865,7 @@
               let sendMsg = this.ruleIdList.map((item, index) => {
                 return {
                   ...this.addForm,
+                  autoOrder: this.dialogTitle === '派单' ? 1 : this.addForm.autoOrder,
                   ruleId: item.ruleId,
                   categoryId: item.categoryId,
                   planDeviceList: planDeviceList[index],

+ 2 - 0
src/views/produce/components/prenatalExamination/components/workOrder/signingUpWork.vue

@@ -227,6 +227,8 @@
               this.$emit('refresh');
             }
             this.butLoading = false;
+          }).catch((err) => {
+            this.butLoading = false;
           });
         } else {
           this.$message.error('请选择实际起始时间');