分库功能添加往来分库，库存新增分库

public/config.json

@@ -1,5 +1,5 @@
 {
-    "BASE_URL": "http://192.168.1.2:9996",
+    "BASE_URL": "http://192.168.0.109:9996",
-    "SERVER_IP": "http://192.168.1.2:9996",
+    "SERVER_IP": "http://192.168.0.109:9996",
     "hosp_name": "诏安县总医院（测试）"
 }

src/views/basic/BussinessType.vue

@@ -211,6 +211,7 @@ export default {
                 scanPreIn: null,
                 vailInv: null,
                 codeFillCheck: null,
+                defaultSubInv: null,
             },
             enableMap: {
                 true: "是",
@@ -355,8 +356,8 @@ export default {
                 scanPreIn: row.scanPreIn,
                 vailInv: row.vailInv,
                 codeFillCheck: row.codeFillCheck,
-                changeEnable: row.changeEnable
+                changeEnable: row.changeEnable,
-
+                defaultSubInv: row.defaultSubInv
 
             };
             this.modifyDialogVisible = true;

src/views/basic/BussinessTypeModify.vue

@@ -43,24 +43,6 @@
 
                 </div>
             </el-col>
-            <!--            <el-col :span="10" class="el-col">-->
-            <!--                <div class="text item">-->
-            <!--                    <div class="itemTag">-->
-            <!--                        <span>第三方系统:&nbsp;</span>-->
-            <!--                    </div>-->
-            <!--                    <el-select v-model="inputQuery.thirdSysFk" placeholder="请选择" clearable="true">-->
-            <!--                        <el-option-->
-            <!--                            v-for="item in thirdSys"-->
-            <!--                            :key="item.value"-->
-            <!--                            :label="item.thirdName"-->
-            <!--                            :value="item.thirdId">-->
-            <!--                            <span style="float: left">{{ item.thirdName }}</span>-->
-            <!--                            <span style="float: right; color: #8492a6; font-size: 13px">{{ item.thirdId }}</span>-->
-            <!--                        </el-option>-->
-            <!--                    </el-select>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
-
             <el-col :span="10" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
@@ -118,25 +100,6 @@
                     </el-select>
                 </div>
             </el-col>
-
-
-            <!--            <el-col :span="10" class="el-col">-->
-            <!--                <div class="text item">-->
-            <!--                    <div class="itemTag">-->
-            <!--                        <span>当前仓库:&nbsp;</span>-->
-            <!--                    </div>-->
-            <!--                    <el-select clearable v-model="inputQuery.storageCode" placeholder="当前仓库信息">-->
-            <!--                        <el-option-->
-
-            <!--                            v-for="item in storageList"-->
-            <!--                            :key="item.name"-->
-            <!--                            :label="item.name"-->
-            <!--                            :value="item.code">-->
-            <!--                            <span style="float: left">{{ item.name }}</span>-->
-            <!--                        </el-option>-->
-            <!--                    </el-select>-->
-            <!--                </div>-->
-            <!--            </el-col>-->
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
 
@@ -145,11 +108,6 @@
                     <div class="itemTag">
                         <span>特殊单据往来:&nbsp;</span>
                     </div>
-                    <!--                    <el-input-->
-                    <!--                        style="width: 200px"-->
-                    <!--                        size="small"-->
-                    <!--                        v-model="inputQuery.defaultUnit"-->
-                    <!--                    ></el-input>-->
 
                     <el-select
                         v-model="inputQuery.defaultUnit"
@@ -192,7 +150,25 @@
         <el-row :gutter="20" class="el-row" type="flex">
 
 
-            <el-col :span="20" class="el-col">
+            <el-col :span="10" class="el-col">
+                <div class="text item">
+                    <div class="itemTag">
+                        <span>补单默认分库:&nbsp;</span>
+                    </div>
+                    <el-select v-model="inputQuery.defaultSubInv" placeholder="请选择默认分库" clearable="true"
+                               size="small">
+                        <el-option
+                            v-for="item in subInvList"
+                            :key="item.name"
+                            :label="item.name"
+                            :value="item.code">
+                            <span style="float: left">{{ item.name }}</span>
+                        </el-option>
+                    </el-select>
+                </div>
+            </el-col>
+
+            <el-col :span="10" class="el-col">
                 <div class="text item">
                     <div class="itemTag">
                         <span>备注:&nbsp;</span>
@@ -215,13 +191,10 @@
 
                 <div class="text item" style="margin-top: 6px">
                     <el-checkbox v-model="inputQuery.enable">启用单据类型</el-checkbox>
-                    <!--                    <el-checkbox v-model="inputQuery.innerOrder">标记为内部单据</el-checkbox>-->
                     <el-checkbox v-model="inputQuery.genUnit" :disabled="inputQuery.corpType !=2">允许手动输入客户信息
                     </el-checkbox>
                     <el-checkbox v-model="inputQuery.useDyCount" :disabled="true">以使用单元计量出库
                     </el-checkbox>
-                    <!--                    <el-checkbox v-model="inputQuery.expireTip">过期提醒并禁止录入-->
-                    <!--                    </el-checkbox>-->
                 </div>
 
 
@@ -302,12 +275,6 @@
 
         <el-divider></el-divider>
         <el-row :gutter="20" class="el-row" type="flex">
-            <!--            <el-col :span="5" class="el-col">-->
-            <!--                <span>单据需要复核的来源类型</span>-->
-            <!--                &lt;!&ndash;                <div class="text item">&ndash;&gt;-->
-            <!--                &lt;!&ndash;                    <el-checkbox v-model="inputQuery.checkEnable">必须选择业务单据校验来源</el-checkbox>&ndash;&gt;-->
-            <!--                &lt;!&ndash;                </div>&ndash;&gt;-->
-            <!--            </el-col>-->
             <el-col :span="4" class="el-col">
                 <div class="text item">
                     <el-checkbox v-model="inputQuery.secCheckEnable"
@@ -382,6 +349,7 @@ import {filterAll, filterAllByUser} from "@/api/basic/invWarehouse";
 import {getCandidateBussinessType} from "../../api/receipts/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {findConfig} from "@/api/thrsys/spsSyncStatus";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
     name: "inputQuery",
@@ -400,6 +368,7 @@ export default {
                 isFilterBind: true,
             },
             storageList: [],
+            subInvList: [],
             orderTypeList: [],
             fromSpecialOptions: [],
             thirdSys: [],
@@ -501,6 +470,18 @@ export default {
                 .catch(() => {
                 });
         },
+        findDefaultSubInv() {
+            this.subInvList = [];
+            let query = {
+                pcode: "1000"
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
     },
     computed: {
         corpType() {
@@ -526,6 +507,7 @@ export default {
         this.getList();
         this.getStorage();
         this.findSpecialMethod();
+        this.findDefaultSubInv();
 
     },
 };

src/views/basic/invWarehouse.vue

@@ -150,7 +150,7 @@
                 >
                 </el-table-column>
                 <el-table-column
-                    prop="name"
+                    prop="parentId"
                     label="所属仓库"
                 >
                 </el-table-column>

src/views/inventory/InvProducts.vue

@@ -112,6 +112,8 @@
                                  width="120"></el-table-column>
                 <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
                                  show-overflow-tooltip width="120"></el-table-column>
+                <el-table-column label="分库" prop="invSubStorageName" v-if="showSup"
+                                 show-overflow-tooltip width="120"></el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button

src/views/warehouse/IONewOrder.vue

@@ -469,6 +469,10 @@ export default {
                 this.idQuery.corpOrderId = row.corpOrderId;
                 this.idQuery.billType = row.action;
                 this.idQuery.locStorageCode = row.locStorageCode;
+                this.idQuery.invWarehouseCode = row.invWarehouseCode;
+                this.idQuery.fromSubInvCode = row.fromSubInvCode;
+
+
                 this.idQuery.preCheck = row.preCheck;
             }
 

src/views/warehouse/addHosOrder.vue

@@ -152,6 +152,21 @@
                                 <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
                             </el-option>
                         </el-select>
+
+
+                        <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
+                                   :disabled="corpOrderIdDisabled">
+                            <el-option
+                                v-for="item in fromSubStorageOptions"
+                                :key="item.code"
+                                :label="item.name"
+                                :value="item.code">
+                                <span style="float: left">{{ item.name }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.code }}</span>
+                                <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
+                            </el-option>
+                        </el-select>
+
                     </el-form-item>
                     <el-form-item class="query-form-item" prop="fromCorp"
                                   v-if="curAction.corpType ==2 && curAction.genUnit">
@@ -461,8 +476,9 @@ export default {
                 produceDate: null,
                 expireDate: null,
                 serialNo: null,
-        invWarehouseCode:null,
+                invWarehouseCode: null,
-        subInvCode:null,
+                subInvCode: null,
+                fromSubInvCode: null,
 
             },
             editOriginCodeVisible: false,
@@ -487,6 +503,7 @@ export default {
             orderNo: null,
             fromOptions: [],
             fromStorageOptions: [],
+            fromSubStorageOptions: [],
             curAction: {
                 corpType: 0,
                 genUnit: false,
@@ -518,6 +535,8 @@ export default {
             let tQuery = {
                 orderId: this.idQuery.id,
                 locStorageCode: this.formData.locStorageCode,
+                invWarehouseCode: this.formData.invWarehouseCode,
+                fromSubInvCode: this.formData.fromSubInvCode,
                 action: this.formData.action,
                 fromCorp: this.formData.fromCorp,
                 fromCorpId: this.formData.fromCorpId,
@@ -766,6 +785,7 @@ export default {
             console.log(row);
             this.formData.fromCorpId = row.code;
             this.formData.fromCorp = row.name;
+            this.findSubStorageMethod();
         },
 
         deleteCode(index, row) {
@@ -896,7 +916,7 @@ export default {
                 });
         },
 
-    findStorageMethod(query) {
+        findStorageMethod() {
             if (this.formData.locStorageCode == null)
                 return;
             this.fromStorageOptions = [];
@@ -911,6 +931,19 @@ export default {
                 });
         },
 
+        findSubStorageMethod() {
+            let cQuery = {
+                pcode: this.formData.fromCorpId,
+                filter:2,
+            };
+            filterSubByInv(cQuery)
+                .then((response) => {
+                    this.fromSubStorageOptions = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
 
         findSubInvByInv(invCode) {
             this.subInvList = [];
@@ -1091,10 +1124,13 @@ export default {
             this.formData.fromCorp = this.idQuery.fromCorp;
             this.formData.fromCorpId = this.idQuery.fromCorpId;
             this.formData.locStorageCode = this.idQuery.locStorageCode;
+            this.formData.invWarehouseCode = this.idQuery.invWarehouseCode;
+            this.formData.fromSubInvCode = this.idQuery.fromSubInvCode;
             this.formData.outChangeEnable = this.idQuery.outChangeEnable;
             this.formData.preCheck = this.idQuery.preCheck;
             this.actionEnable = true;
             this.getCodeList();
+            this.findSubStorageMethod();
         } else {
             this.corpOrderIdDisabled = false;
             if (JSON.stringify(this.$route.query) === '{}') {