Merge remote-tracking branch 'origin/master'

ruoyi-admin-vue/src/views/inventory/inbound/index.vue

@@ -703,8 +703,16 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id;
+      
+      let id = row.id;
+      if(id === undefined){
+        id = this.ids
+      }
       getInbound(id).then(response => {
+        if(response.data.orderStatus === 2){
+          this.$modal.msgWarning("该入库单已提交，不能修改"); 
+          return;
+        }
         this.form = response.data || {};
         // 货主回显
         this.form.ownerName = response.data.ownerName || response.data.ownerCode || response.data.ownerId;