Merge remote-tracking branch 'origin/dev' into dev

src/views/distribution/stockup/distributionStockup.vue

@@ -805,6 +805,10 @@ export default {
       // getDetail(row.id).then(res => {
       //   this.form = res.data.data;
       // });
+      if(row.row.assignStatus == "10"){
+        this.$message.warning("当前任务未指派！请指派后在修改！！！");
+        return ;
+      }
       console.log("row<<<<<",row);
       this.form.forkliftId = row.row.forkliftId;
       this.form.loaderId = row.row.loaderId;

src/views/distribution/stockup/distributionStockupMarket.vue

@@ -885,6 +885,10 @@ export default {
       // getDetail(row.id).then(res => {
       //   this.form = res.data.data;
       // });
+      if(row.row.assignStatus == "10"){
+        this.$message.warning("当前任务未指派！请指派后在修改！！！");
+        return ;
+      }
       console.log("row<<<<<",row);
       this.form.forkliftId = !!row.row.forkliftId && row.row.forkliftId != "-1" ? row.row.forkliftId : null ;
       this.form.loaderId = !!row.row.loaderId && row.row.loaderId != "-1" ? row.row.loaderId : null;

src/views/distribution/stockup/distributionStockupSelf.vue

@@ -894,6 +894,10 @@ export default {
       // getDetail(row.id).then(res => {
       //   this.form = res.data.data;
       // });
+      if(row.row.assignStatus == "10"){
+        this.$message.warning("当前任务未指派！请指派后在修改！！！");
+        return ;
+      }
       console.log("row<<<<<",row);
       this.form.forkliftId = !!row.row.forkliftId && row.row.forkliftId != "-1" ? row.row.forkliftId : null ;
       this.form.loaderId = !!row.row.loaderId && row.row.loaderId != "-1" ? row.row.loaderId : null;