Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/storage/allocation/allocationAdd.vue

@@ -285,7 +285,7 @@
 
             fetchBySid(res.data).then((res) => {
               if (res.success) {
-                this.formobj.outOrgName = res.data
+                this.formobj.outOrgName = res.data.name
               }
             })
 
@@ -555,6 +555,8 @@
 
       },
       saveOrUpdate() {
+        console.log("saveOrUpdate", this.formobj);
+
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {
             this.submitdisabled = true
@@ -575,11 +577,8 @@
           }
         })
       },
-      settle() {
-        this.settleVisible = true
-        this.formobj.settlementVo.receivableAmount = this.amountReceivable
-      },
       confirm() {
+        console.log("saveOrUpdate", this.formobj);
         this.$refs['form_obj'].validate((valid) => {
           if (valid) {
             this.submitdisabled = true

yxt-as-ui/src/views/storage/receivingGoods/index.vue

@@ -438,6 +438,16 @@
           return
         }
 
+        if (this.selectionList[0].distributeType == '已分配') {
+          this.$message({
+            type: 'warning',
+            message: "此记录已全部分配,不可操作。",
+            showClose: true
+          })
+          return
+        }
+
+
         this.viewState = 5
         this.$refs['divAddupShelfRecord'].showEdit(this.selectionList[0])
       },

yxt-as-ui/src/views/storage/receivingGoods/receivingGoodsAdd.vue

@@ -1080,4 +1080,10 @@
     justify-content: space-between;
     align-items: center;
   }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
 </style>