分库功能bug修复

public/config.json

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

src/api/warehouse/order.js

@@ -197,6 +197,14 @@ export function commitOrder(query) {
     });
 }
 
+export function repeatCommitOrder(query) {
+    return axios({
+        url: "/warehouse/inout/repeatCommitOrder",
+        method: "post",
+        data: query
+    });
+}
+
 export function addCommitOrder(query) {
     return axios({
         url: "/warehouse/inout/addCommit",

src/views/basic/invWarehouse.vue

@@ -227,13 +227,13 @@
                         min-width="30%"
                     >
                         <template slot-scope="scope">
-                            <el-button
+<!--                            <el-button-->
-                                type="text"
+<!--                                type="text"-->
-                                size="small"
+<!--                                size="small"-->
-                                @click.native="updateDirector(scope.row)">
+<!--                                @click.native="updateDirector(scope.row)">-->
 
-                                {{ directorMap[scope.row.director] }}
+<!--                                {{ directorMap[scope.row.director] }}-->
-                            </el-button>
+<!--                            </el-button>-->
                             <el-button
                                 type="text"
                                 size="small"
@@ -663,7 +663,7 @@ export default {
                 children: "children",
                 label: "name"
             },
-            setDictor: "设为主管",
+            // setDictor: "设为主管",
             fileList: [],
             pCodes: [],
             uploadData: {},
@@ -671,7 +671,7 @@ export default {
             index: null,
             formName: null,
             formMap: {
-                addTop: "添加仓库",
+                addTop: "添加分库",
                 add: "添加货位",
                 edit: "编辑"
             },
@@ -827,6 +827,7 @@ export default {
             if (formName === "edit") {
                 this.subData = data;
             } else if (formName === "add") {
+                this.subData = {};
                 this.subData.parentId = data.code;
             }
             ;
@@ -882,6 +883,11 @@ export default {
 
         //添加分库
         forSubSubmit() {
+
+            if (this.$isBlank(this.subData.name)) {
+                this.$message.error("分库名称不能为空！");
+                return;
+            }
             saveSubWarehouse(this.subData, this.subFromName).then((response) => {
                 if (response.code == 20000) {
                     this.loadSubData(this.subData.parentId);
@@ -1079,7 +1085,8 @@ export default {
 
         loadSubData(parentId) {
 
-
+            this.userData = [];
+            this.bussinessTypeData = [];
             let subQuery = {
                 parentId: parentId,
             }

src/views/inventory/invPreInProducts.vue

@@ -92,6 +92,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/inventory/invPreProducts.vue

@@ -100,6 +100,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/AdditionalOrder.vue

@@ -27,6 +27,7 @@
                     </el-form-item>
                     <el-form-item class="query-form-item">
                         <el-select v-model="filterQuery.locStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                   @change="invChange"
                                    size="mini">
                             <el-option
                                 v-for="item in storageList"
@@ -37,6 +38,18 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invWarehouseCode" placeholder="请选择当前分库" clearable="true"
+                                   size="mini">
+                            <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>
+                    </el-form-item>
                     <el-form-item>
                         <el-button-group>
                             <el-button
@@ -256,6 +269,7 @@ import {getBussinessType} from "../../api/basic/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
+import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 const formJson = {
     site_id: "",
@@ -308,6 +322,7 @@ export default {
             },
             list: [],
             storageList: [],
+            subInvList: [],
             queryAdIdAsyncLoading: false,
             codeDetailVisible: false,
             total: 0,
@@ -509,6 +524,21 @@ export default {
                 .catch(() => {
                 });
         },
+
+        invChange() {
+            this.filterQuery.invWarehouseCode = "";
+            this.subInvList = [];
+            let query = {
+                pcode: this.filterQuery.locStorageCode
+            };
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
+
         getStorageName(code) {
             for (let i = 0; i < this.storageList.length; i++) {
                 if (this.storageList[i].code === code) {

src/views/warehouse/IOCheckErrOrder.vue

@@ -117,11 +117,16 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <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"
@@ -831,6 +836,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;
+                }
+            }
+        },
         repeatPrintCheckClick(row) {
             let tQuery = {
                 orderId: row.id,
@@ -1230,6 +1242,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };

src/views/warehouse/IOErrorOrder.vue

@@ -269,7 +269,7 @@ import {
     filterOrder,
     deleteByOrderId,
     commitOrder,
-    updateUnit,
+    updateUnit, repeatCommitOrder,
 } from "../../api/warehouse/order";
 
 import draggable from "vuedraggable";
@@ -502,7 +502,7 @@ export default {
                 orderId: "",
             };
             idQuery.orderId = data;
-            commitOrder(idQuery)
+            repeatCommitOrder(idQuery)
                 .then((response) => {
                     if (response.code === 20000) {
                         this.$message.success(response.data);
@@ -570,6 +570,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };

src/views/warehouse/IONewOrder.vue

@@ -100,11 +100,18 @@
                 <el-table-column label="往来单位" prop="fromCorp" width="220">
 
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <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>
@@ -456,6 +463,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 = '';
@@ -633,6 +647,7 @@ export default {
             idQuery.orderId = data;
             commitOrder(idQuery)
                 .then((response) => {
+                    this.loading = false;
                     if (response.code == 20000) {
                         this.$message.success(response.data);
                         this.getList();
@@ -660,6 +675,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.filterQuery.invWarehouseCode = "";
             let query = {
                 pcode: this.filterQuery.locStorageCode
             };

src/views/warehouse/IOSearchOrder.vue

@@ -114,11 +114,16 @@
                 </el-table-column>
                 <el-table-column label="往来单位" prop="fromCorp" width="250">
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <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"
@@ -634,6 +639,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;
+                }
+            }
+        },
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             this.errorDetail = mOrder.remark;
@@ -943,6 +955,7 @@ export default {
             }
         },
         invChange() {
+            this.filterQuery.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.filterQuery.locStorageCode

src/views/warehouse/IOWaitOrder.vue

@@ -115,11 +115,16 @@
         </el-table-column>
         <el-table-column label="往来单位" prop="fromCorp" width="250">
         </el-table-column>
-        <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+        <el-table-column label="当前仓库" prop="locStorageCode" width="120">
           <template slot-scope="scope">
             <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"
@@ -636,6 +641,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;
+              }
+          }
+      },
     handleErrorDetail(poistion) {
       var mOrder = this.list[poistion];
       this.errorDetail = mOrder.remark;
@@ -995,6 +1007,7 @@ export default {
           });
     },
     invChange() {
+        this.filterQuery.invWarehouseCode = "";
       this.subInvList = [];
       let query = {
         pcode: this.filterQuery.locStorageCode

src/views/warehouse/stockHospOrderNew.vue

@@ -1180,6 +1180,7 @@ export default {
             this.findStorageMethod();
         },
         invChange() {
+            this.formData.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.formData.locStorageCode

src/views/warehouse/stockOrder.vue

@@ -131,6 +131,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="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -783,6 +788,16 @@ export default {
                 }
             }
         },
+
+
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
+
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -798,6 +813,7 @@ export default {
         },
 
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode

src/views/warehouse/stockOrderDelSearch.vue

@@ -102,11 +102,17 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <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="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -837,6 +843,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;
+                }
+            }
+        },
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -852,6 +865,7 @@ export default {
         },
 
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode

src/views/warehouse/stockOrderEditDistribution.vue

@@ -62,24 +62,6 @@
                     <el-col :span="7">
                         <el-form-item prop="corpName">
                             <el-input v-model="formData.corpName" auto-complete="off" :disabled="true"></el-input>
-                            <!--                            <el-select-->
-                            <!--                                style="width: 100%"-->
-                            <!--                                v-model="sValue"-->
-                            <!--                                :multiple="false"-->
-                            <!--                                filterable-->
-                            <!--                                remote-->
-                            <!--                                reserve-keyword-->
-                            <!--                                placeholder="请输入供应商名称"-->
-                            <!--                                :remote-method="remoteMethod"-->
-                            <!--                                :loading="sLoading"-->
-                            <!--                                @change="selectOne">-->
-                            <!--                                <el-option-->
-                            <!--                                    v-for="item in sOptions"-->
-                            <!--                                    :key="idx"-->
-                            <!--                                    :label="item.name"-->
-                            <!--                                    :value="item">-->
-                            <!--                                </el-option>-->
-                            <!--                        </el-select>-->
                         </el-form-item>
                     </el-col>
                     <el-col :span="3">
@@ -104,19 +86,6 @@
                 </el-row>
 
                 <el-row :gutter="20" style="margin-top: -10px;">
-                    <!--                    <el-col :span="3">-->
-                    <!--                        <div class="ao-text">-->
-                    <!--                            <span>采购类型：</span>-->
-                    <!--                        </div>-->
-                    <!--                    </el-col>-->
-                    <!--                    <el-col :span="7">-->
-                    <!--                        <el-form-item prop="type">-->
-                    <!--                            <el-select v-model="formData.type" style="width: 100%" placeholder="采购类型">-->
-                    <!--                                <el-option label="预入库" value="1"></el-option>-->
-                    <!--                                <el-option label="普通采购" value="2"></el-option>-->
-                    <!--                            </el-select>-->
-                    <!--                        </el-form-item>-->
-                    <!--                    </el-col>-->
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前仓库：</span>

src/views/warehouse/stockOrderEditor.vue

@@ -104,11 +104,18 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-        <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <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="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -936,6 +943,14 @@ export default {
                 }
             }
         },
+
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -951,6 +966,7 @@ export default {
         },
         invChange() {
             this.subInvList = [];
+            this.query.invWarehouseCode = "";
             let query = {
                 pcode: this.query.locStorageCode
             };

src/views/warehouse/stockOrderNew.vue

@@ -118,6 +118,12 @@
                         <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="采购类别" width="150">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -857,6 +863,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;
+                }
+            }
+        },
         getBusType() {
             let query = {
                 enabled: true,
@@ -923,6 +936,7 @@ export default {
                 });
         },
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode

src/views/warehouse/stockOrderNewDistribution.vue

@@ -1119,6 +1119,7 @@ export default {
             }
         },
         invChange() {
+            this.formData.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.formData.locStorageCode

src/views/warehouse/stockOrderSearch.vue

@@ -102,11 +102,16 @@
                         <span>{{ getActionName(scope.row.billType) }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                <el-table-column label="当前仓库" prop="locStorageCode" width="120">
                     <template slot-scope="scope">
                         <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="操作" fixed="right" width="200">
                     <template slot-scope="scope">
                         <el-button
@@ -925,6 +930,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;
+                }
+            }
+        },
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -939,6 +951,7 @@ export default {
                 });
         },
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode

src/views/warehouse/stockOrderWaitCheck.vue

@@ -109,6 +109,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="采购类型">-->
                 <!--                    <template slot-scope="scope">-->
                 <!--                        {{ scope.row.type | typeFilterName }}-->
@@ -340,7 +345,6 @@
 import {
     stockOrderList, stockOrderDetail,
     deleteStockOrderById, deleteStockOrderDetailById,
-    copyStockOrderDetail, submitStockOrder,
     uploadStockOrderDetail, uploadStockOrderDetailCount,
     generateStockOrderQRCodeText, updateStockOrder
 } from "../../api/warehouse/stockOrder";
@@ -774,6 +778,15 @@ export default {
                 }
             }
         },
+
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
+
         getStorage() {
             this.storageList = [];
             filterAllByUser()
@@ -789,6 +802,7 @@ export default {
                 });
         },
         invChange() {
+            this.query.invWarehouseCode = "";
             this.subInvList = [];
             let query = {
                 pcode: this.query.locStorageCode