禅道上bug修改

src/views/basic/BasicEntrutsRece.vue

@@ -201,11 +201,21 @@ export default {
         this.$message.error("请输入接受委托仓库！");
         return;
       }
-            if (this.$isBlank(this.inputQuery.entrustInv)) {
+      if (this.$isBlank(this.inputQuery.entrustUser)) {
         this.$message.error("请输入接受委托人！");
         return;
       }
 
+      if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
+        this.$message.error("当前分库不能为空！");
+        return;
+      }
+      if (this.$isBlank(this.inputQuery.entrustSubInv)) {
+        this.$message.error("请输入接受委托分库！");
+        return;
+      }
+
+
       insertEntrustRece(this.inputQuery)
           .then((response) => {
             this.loading = false;

src/views/inventory/InvProductsDetail.vue

@@ -173,6 +173,7 @@ export default {
                 customerId: null,
                 page: 1,
                 invStorageCode: null,
+                invWarehouseCode: null,
                 limit: 20,
             },
             codeArry: [],
@@ -225,6 +226,7 @@ export default {
             this.query.batchNo = this.idQuery.batchNo;
             this.query.supId = this.idQuery.supId;
             this.query.invStorageCode = this.idQuery.invStorageCode;
+            this.query.invWarehouseCode = this.idQuery.invWarehouseCode;
             filterDetailProducts(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     this.loading = false;
@@ -243,6 +245,7 @@ export default {
             this.query.batchNo = this.idQuery.batchNo;
             this.query.customerId = store.getters.customerId;
             this.query.invStorageCode = this.idQuery.invStorageCode;
+            this.query.invWarehouseCode = this.idQuery.invWarehouseCode;
             statDetailProducts(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     this.loading = false;

src/views/warehouse/AdditionalOrder.vue

@@ -87,6 +87,11 @@
                         <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
                     </template>
                 </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="120">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <i class="el-icon-time"></i>
@@ -283,8 +288,8 @@ export default {
     data() {
         return {
             filterQuery: {
-                locStorageCode:null,
-                invWarehouseCode:null,
+                locStorageCode: null,
+                invWarehouseCode: null,
                 id: "",
                 mainAction: null,
                 action: null,
@@ -548,6 +553,13 @@ export default {
                 }
             }
         },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         addOrders(row) {
             console.log(row)
             this.idQuery.id = '';