Merge branch 'dev-scheduling' of http://42.192.7.176:3000/suojin/jonhon-mes-web into dev-scheduling

src/views/productionManagement/blbWorkOrder/components/glass.vue

@@ -18,7 +18,7 @@
       @on-load="onLoad"
     >
       <template #menu-left>
-        <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button>
+        <!-- <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button> -->
         <!-- <el-button type="primary" @click="priorityFn">优先级调整</el-button> -->
       </template>
       <template #menu-right>

src/views/productionManagement/blbWorkOrder/components/others.vue

@@ -18,7 +18,7 @@
       @on-load="onLoad"
     >
       <template #menu-left>
-        <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button>
+        <!-- <el-button type="primary" @click="handlePrintTags">过程记录打印</el-button> -->
         <!-- <el-button type="primary" @click="priorityFn">优先级调整</el-button> -->
       </template>
       <template #menu-right>

src/views/productionManagement/components/batchesDialog.vue

@@ -48,7 +48,7 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submit()">确 认</el-button>
+        <el-button type="primary" @click="submit()" :loading="saveLoading">确 认</el-button>
       </span>
     </template>
   </el-dialog>
@@ -69,6 +69,7 @@ export default {
   },
   data() {
     return {
+      saveLoading: false,
       isOpen: false,
       batchesForm: {},
       batchesRules: {
@@ -87,6 +88,7 @@ export default {
     submit() {
       this.$refs.batchesForm.validate(valid => {
         if (valid) {
+          this.saveLoading = true;
           let query = {
             id: this.itemData[0].woId,
             batchNo: this.itemData[0].batchNo,
@@ -95,13 +97,17 @@ export default {
             makeQty: this.batchesForm.makeQty,
             batchReason: this.batchesForm.batchReason,
           };
-          inBatches(query).then((res) => {
-            if (res.code == 200) {
+          inBatches(query)
+            .then(res => {
               this.$message.success('操作成功');
+              this.saveLoading = false;
               this.closeDialog();
-            }
+            })
+            .catch(err => {
+              this.saveLoading = false;
             });
         } else {
+          this.saveLoading = false;
           console.log('error submit!!');
           return false;
         }

src/views/productionManagement/components/productionMonitoringDialog.vue

@@ -11,7 +11,7 @@
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="closeDialog">取 消</el-button>
-        <el-button type="primary" @click="submit">确 定</el-button>
+        <el-button type="primary" @click="submit" :loading="loadingSave">确 定</el-button>
       </span>
     </template>
   </el-dialog>
@@ -31,6 +31,7 @@ export default {
   },
   data() {
     return {
+      loadingSave:false,
       openShow: false,
       form: {
         priority: '',
@@ -74,16 +75,22 @@ export default {
       //如果存在验证不通过，msg为错误信息
       this.$refs.form.validate((valid, done, msg) => {
         if (valid) {
+          this.loadingSave = true
           // this.$emit('submitPriority', this.form);
           updatePrioritye({
             demandDate: this.form.demandDate,
-            priority: this.form.priority,
-            id: this.itemData[0].woId,
+            priority:Number(this.form.priority),
+            woId: this.itemData[0].woId,
           }).then(res => {
+             this.loadingSave = false
             this.$message.success('操作成功');
             this.closeDialog();
-          });
+          }).catch(err=>{
+            this.loadingSave = false
+            done()
+          })
         } else {
+          this.loadingSave = false
           console.log('error submit!!');
           return false;
         }

src/views/productionManagement/productionMonitoring.vue

@@ -703,9 +703,9 @@ export default {
       this.showClose = false;
       this.showAbnormal = false;
       this.isPriorityOpen = false;
-      if (type) {
+      // if (type) {
         this.onLoad(this.page, this.query);
-      }
+      // }
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;

src/views/productionManagement/sinTerWorkOrder/index.vue

@@ -582,9 +582,9 @@ export default {
       this.showClose = false;
       this.showAbnormal = false;
       this.isPriorityOpen = false;
-      if (type) {
+      // if (type) {
         this.onLoad(this.page, this.query);
-      }
+      // }
     },
     currentChange(currentPage) {
       this.page.currentPage = currentPage;