调整页面细节

src/views/warehouseBusiness/goodsTransfer/index.vue

@@ -1558,6 +1558,13 @@
           >
           </el-table-column>
           <el-table-column
+            prop="fWarehouseids"
+            header-align="center"
+            align="center"
+            label="仓库"
+          >
+          </el-table-column>
+          <el-table-column
             prop="fWarehouseLocationids"
             header-align="center"
             align="center"

src/views/warehouseBusiness/inStock/index.vue

@@ -4315,9 +4315,13 @@ export default {
           if (!this.form.fId) {
             this.form.fId = this.fid
           }
+          if (!this.form.fBusinessType) {
+            this.$message.error('请选择货物属性!')
+            return false
+          }
           for (let list in this.dataList) {
             if (!this.dataList[list].fBusinessType) {
-              this.$message.error('请输入业务类型!')
+              this.$message.error('请输入库存明细的货物属性!')
               return false
             }
           }
@@ -4360,6 +4364,10 @@ export default {
           this.$message.error('请新增库存明细!')
           return false
         }
+        if (!this.form.fBusinessType) {
+          this.$message.error('请选择货物属性!')
+          return false
+        }
         for (let list in this.dataList) {
           if (!this.dataList[list].fGoodsid) {
             this.$message.error('请输入品名!')

src/views/warehouseBusiness/outStock/index.vue

@@ -1941,6 +1941,13 @@
           >
           </el-table-column>
           <el-table-column
+            prop="fWarehouseids"
+            header-align="center"
+            align="center"
+            label="仓库"
+          >
+          </el-table-column>
+          <el-table-column
             prop="fWarehouseLocationids"
             header-align="center"
             align="center"

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -1876,6 +1876,13 @@
           >
           </el-table-column>
           <el-table-column
+            prop="fWarehouseids"
+            header-align="center"
+            align="center"
+            label="仓库"
+          >
+          </el-table-column>
+          <el-table-column
             prop="fWarehouseLocationids"
             header-align="center"
             align="center"
@@ -3520,6 +3527,9 @@ export default {
           } else if (!this.dataListSelection[warehouse].fTransferWarehouselocid) {
             this.$message.error("请选择调拨库区");
             return false;
+          } else if (this.dataListSelection[warehouse].fTransferWarehouselocid === this.dataListSelection[warehouse].fWarehouselocids) {
+            this.$message.error("调拨库区不得与原库区相同");
+            return false;
           } else if (!this.dataListSelection[warehouse].fNetweight) {
             this.$message.error("请选择调拨净重");
             return false;