代码备份，bug修复

src/api/basic/busChangeType.js

@@ -17,6 +17,14 @@ export function addChangeBusType(query) {
     });
 }
 
+export function removeBusChange(query) {
+    return axios({
+        url: "/spms/bussinessChangeType/remove",
+        method: "post",
+        data: query
+    });
+}
+
 
 export function deleteChangeBusType(query) {
     return axios({

src/views/basic/BussinessType.vue

@@ -187,6 +187,8 @@ export default {
                 secCheckPc: null,
                 secCheckWebNew: null,
                 secCheckChange: null,
+                checkBalacne: null,
+                secCheckBalacne: null,
                 corpType: null,
                 storageCode: null,
                 supplementOrderType: null,
@@ -319,6 +321,8 @@ export default {
                 corpType: row.corpType + "",
                 storageCode: row.storageCode,
                 supplementOrderType: row.supplementOrderType,
+                checkBalacne: row.checkBalacne,
+                secCheckBalacne: row.secCheckBalacne,
             };
             this.modifyDialogVisible = true;
         },

src/views/basic/BussinessTypeLoclModify.vue

@@ -71,11 +71,11 @@
 
         </el-row>
         <el-row :gutter="20" class="el-row" type="flex">
-<!--            <el-col :span="4" class="el-col">-->
+            <!--            <el-col :span="4" class="el-col">-->
-<!--                <div class="text item">-->
+            <!--                <div class="text item">-->
-<!--                    <el-checkbox v-model="inputQuery.enable">启用当前单据</el-checkbox>-->
+            <!--                    <el-checkbox v-model="inputQuery.enable">启用当前单据</el-checkbox>-->
-<!--                </div>-->
+            <!--                </div>-->
-<!--            </el-col>-->
+            <!--            </el-col>-->
             <el-col :span="4" class="el-col">
                 <div class="text item">
                     <el-checkbox v-model="inputQuery.advanceType">寄售类型单据</el-checkbox>
@@ -216,7 +216,7 @@ import {
     getChangeBusType,
     addChangeBusType,
     deleteChangeBusType,
-    updateChangeBusType
+    updateChangeBusType, removeBusChange
 } from "../../api/basic/busChangeType";
 
 export default {
@@ -306,7 +306,17 @@ export default {
                 });
         },
 
-
+        removeBusChangeType() {
+            let query = {
+                scAction: this.inputQuery.action,
+            };
+            removeBusChange(query)
+                .then((response) => {
+                    this.changeList = [];
+                })
+                .catch(() => {
+                });
+        },
         addChangeType() {
             this.changeEdit = 0;
             this.editQuery = {};
@@ -367,6 +377,7 @@ export default {
                 this.getList()
             } else {
                 this.visibleChange = false;
+                this.removeBusChangeType();
             }
         }
         ,

src/views/basic/BussinessTypeModify.vue

@@ -234,13 +234,23 @@
                     <el-checkbox v-model="inputQuery.checkPc" :disabled="!inputQuery.checkEnable">UDI扫码通</el-checkbox>
                 </div>
             </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable">自动补录单据
+                    <el-checkbox v-model="inputQuery.checkChange" :disabled="!inputQuery.checkEnable">自动缺量补单
+                    </el-checkbox>
+                </div>
+            </el-col>
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.checkBalacne" :disabled="!inputQuery.checkEnable">自动平衡补单
                     </el-checkbox>
                 </div>
             </el-col>
         </el-row>
+
         <el-divider></el-divider>
         <el-row :gutter="20" class="el-row" type="flex">
             <!--            <el-col :span="5" class="el-col">-->
@@ -289,9 +299,18 @@
                     </el-checkbox>
                 </div>
             </el-col>
+
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex" style="margin-left: 15px">
+            <el-col :span="4" class="el-col">
+                <div class="text item">
+                    <el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable">自动缺量补单
+                    </el-checkbox>
+                </div>
+            </el-col>
             <el-col :span="4" class="el-col">
                 <div class="text item">
-                    <el-checkbox v-model="inputQuery.secCheckChange" :disabled="!inputQuery.secCheckEnable">自动补录单据
+                    <el-checkbox v-model="inputQuery.secCheckBalacne" :disabled="!inputQuery.secCheckEnable">自动平衡补单
                     </el-checkbox>
                 </div>
             </el-col>

src/views/basic/basicCompanyProductsImport.vue

@@ -56,9 +56,9 @@
             <el-button type="primary" icon="search" @click="selectExport"
             >选中导入
             </el-button>
-<!--                        <el-button type="primary" icon="search" @click="allExport"-->
+            <!--                        <el-button type="primary" icon="search" @click="allExport"-->
-<!--                        >结果全部导入-->
+            <!--                        >结果全部导入-->
-<!--                        </el-button>-->
+            <!--                        </el-button>-->
 
           </el-button-group>
         </el-form-item>
@@ -522,23 +522,23 @@
 </template>
 
 <script>
-    import {
+import {
   getUdiInfos,
   updateErpProduct,
   thirdSysDetail,
   getSmUdiInfos
-    } from "../../api/basic/udiRelevance";
+} from "../../api/basic/udiRelevance";
-    import {udiUpload} from "../../api/thrsys/smp"
+import {udiUpload} from "../../api/thrsys/smp"
-    import {exportExcel} from "../../api/basic/udiInfoExport"
+import {exportExcel} from "../../api/basic/udiInfoExport"
-    import {selectSysParamByKey} from "../../api/param/systemParamConfig";
+import {selectSysParamByKey} from "../../api/param/systemParamConfig";
-    import {filterByUuid} from "../../api/basic/udiInfo";
+import {filterByUuid} from "../../api/basic/udiInfo";
-    import {
+import {
   insertCompanyProductRelevance,
   updateCompanyProductRelevance, insertFilter
-    } from "../../api/warehouse/companyProductRelevance";
+} from "../../api/warehouse/companyProductRelevance";
-    import store from "../../store";
+import store from "../../store";
 
-    export default {
+export default {
   name: "UdIInfoSelect",
   props: {
     selectType: {
@@ -555,13 +555,14 @@
       filterQuery: {
         customerId: null,
         uuids: [],
-                    rlIds:[],
+        rlIds: [],
         ylqxzcrbarmc: "",
         cpmctymc: "",
         nameCode: "",
         page: 1,
         limit: 20,
         addType: 1,
+        isDisable: false,
       },
 
       editQuery: null,
@@ -605,7 +606,7 @@
       this.filterQuery = {
         customerId: null,
         uuids: [],
-                    rlIds:[],
+        rlIds: [],
         ylqxzcrbarmc: "",
         cpmctymc: "",
         nameCode: "",
@@ -679,7 +680,7 @@
         if (response.code == 20000) {
           this.$message.success(response.data);
           console.log("关闭弹窗");
-                        this.$emit("closeSelDialog",true);
+          this.$emit("closeSelDialog", true);
           this.closeSelDialog();
         } else {
           this.$message.error(response.message);
@@ -846,34 +847,34 @@
     this.getList();
     this.selectSysParam();
   },
-    };
+};
 </script>
 <style scoped>
-    .itemTag {
+.itemTag {
   float: left;
   text-align: left;
   margin-top: 10px;
   width: 25%;
-    }
+}
 
-    .query-form-item {
+.query-form-item {
   display: block !important;
   margin-right: 10px;
   margin-bottom: 5px;
-    }
+}
 
-    .text {
+.text {
   font-size: 13px;
   font-family: "Microsoft YaHei";
-    }
+}
 
-    .el-row {
+.el-row {
   display: flex;
   flex-wrap: wrap;
-    }
+}
 
-    .el-col {
+.el-col {
   border-radius: 4px;
   flex-wrap: wrap;
-    }
+}
 </style>

src/views/basic/invWarehouse.vue

@@ -472,7 +472,8 @@ const formJson = {
     code: null,
     status: 1,
     advanceType: false,
-    isDefault: false
+    isDefault: false,
+    level:1,
 };
 export default {
     data() {
@@ -815,8 +816,10 @@ export default {
                 });
         },
         changeLevel(row) {
+            this.formData.pcode =null;
             this.getParentInv(this.formData.level);
         },
+
         loadLinkData(row) {
             let query = {
                 code: row.code

src/views/inventory/InvProducts.vue

@@ -36,6 +36,18 @@
                             </el-option>
                         </el-select>
                     </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="filterQuery.invStorageCode" placeholder="请选择当前仓库" clearable="true"
+                                   size="mini">
+                            <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>
+                    </el-form-item>
 
                     <el-form-item>
                         <el-button-group>
@@ -70,7 +82,8 @@
                     </template>
                 </el-table-column>
                 <el-table-column label="供应商" prop="companyName" v-if="showSup" show-overflow-tooltip></el-table-column>
-                <el-table-column label="仓库" prop="invStorageName" v-if="showSup" show-overflow-tooltip></el-table-column>
+                <el-table-column label="仓库" prop="invStorageName" v-if="showSup"
+                                 show-overflow-tooltip></el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
                         <el-button
@@ -124,12 +137,14 @@ import codeDetail from "./InvProductsDetail";
 import store from "../../store";
 import {getBussinessType} from "../../api/basic/bussinessType";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
+import {filterAllByUser} from "@/api/basic/invWarehouse";
 
 
 export default {
     data() {
         return {
             filterQuery: {
+                invStorageCode: null,
                 cpmctymc: null,
                 nameCode: null,
                 relIdFk: null,
@@ -137,7 +152,7 @@ export default {
                 page: 1,
                 limit: 20,
                 customerId: null,
-                supId:null,
+                supId: null,
                 unitFk: null,
             },
             detailQuery: {
@@ -147,6 +162,7 @@ export default {
                 limit: 20,
             },
             list: [],
+            storageList: [],
             codeDetailVisible: false,
             total: 0,
             loading: true,
@@ -177,7 +193,7 @@ export default {
                 batchNo: null,
                 customerId: null,
                 unitFk: null,
-                supId:null,
+                supId: null,
                 page: 1,
                 limit: 20,
             };
@@ -273,7 +289,15 @@ export default {
                     this.loading = false;
                 });
         },
-
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
         intentDetail(row) {
 
             this.idQuery = row;
@@ -318,6 +342,7 @@ export default {
         };
     },
     created() {
+        this.getStorage();
         this.getBusType();
         let query = this.$route.query;
         this.filterQuery = Object.assign(this.filterQuery, query);

src/views/inventory/invUdiTraceOrder.vue

@@ -355,8 +355,9 @@ export default {
                 "3": "pda即时校验",
                 "4": "pda未校验",
                 "5": "pc端扫码精灵",
-                "6": "补录单据",
+                "6": "缺量补录单据",
-                "7": "UDI供应商平台"
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
             },
             //往来单位
             unitquery: {key: "", page: 1, limit: 20},

src/views/inventory/supInvProducts.vue

@@ -12,8 +12,6 @@
           <el-form-item class="query-form-item">
             <el-input v-model="filterQuery.batchNo" placeholder="批次号"></el-input>
           </el-form-item>
-
-
           <el-form-item>
             <el-button-group>
               <el-button
@@ -113,7 +111,7 @@ export default {
         page: 1,
         limit: 20,
         customerId: null,
-                unitFk:null,
+        unitFk: null,
       },
       detailQuery: {
         code: null,
@@ -133,7 +131,7 @@ export default {
       busTypes: [],
       idQuery: null,
       showSup: false,
-            fromOptions:[],
+      fromOptions: [],
     };
   },
   components: {
@@ -151,7 +149,7 @@ export default {
         relIdFk: null,
         batchNo: null,
         customerId: null,
-                unitFk:null,
+        unitFk: null,
         page: 1,
         limit: 20,
       };

src/views/warehouse/AdditionalOrder.vue

@@ -307,8 +307,9 @@ export default {
                 "3": "pda即时校验",
                 "4": "pda未校验",
                 "5": "pc端扫码精灵",
-                "6": "补录单据",
+                "6": "缺量补录单据",
-                "7": "UDI供应商平台"
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
             },
             list: [],
             adId: [],

src/views/warehouse/IOCheckErrOrder.vue

@@ -119,6 +119,11 @@
                         {{ scope.row.fromCorp }}
                     </template>
                 </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -525,8 +530,9 @@ export default {
                 "3": "pda即时校验",
                 "4": "pda未校验",
                 "5": "pc端扫码精灵",
-                "6": "补录单据",
+                "6": "缺量补录单据",
-                "7": "UDI供应商平台"
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
             },
             busTypes: [],
             //往来单位
@@ -801,7 +807,13 @@ export default {
                     this.$message.error(response.message);
                 });
         },
-
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
+                }
+            }
+        },
         repeatPrintCheckClick(row) {
             let tQuery = {
                 orderId: row.id,

src/views/warehouse/IOErrorOrder.vue

@@ -298,8 +298,9 @@ export default {
                 "3": "pda即时校验",
                 "4": "pda未校验",
                 "5": "pc端扫码精灵",
-                "6": "补录单据",
+                "6": "缺量补录单据",
-                "7": "UDI供应商平台"
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
             },
             list: [],
             adId: [],

src/views/warehouse/IONewOrder.vue

@@ -100,6 +100,11 @@
                         <!--                    </p>-->
                     </template>
                 </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="创建时间" prop="actDate" show-overflow-tooltip>
                     <template slot-scope="scope">
                         <i class="el-icon-time"></i>
@@ -369,11 +374,12 @@ export default {
             fromTypeMap: {
                 "1": "UDIMS平台",
                 "2": "网页新增",
-                "3": "pda已校验",
+                "3": "pda即时校验",
                 "4": "pda未校验",
                 "5": "pc端扫码精灵",
-                "6": "补录单据",
+                "6": "缺量补录单据",
-                "7": "UDI供应商平台"
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
             },
             deleteData: {
                 id: "",
@@ -453,6 +459,13 @@ export default {
                 .catch(() => {
                 });
         },
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
+                }
+            }
+        },
         addOrders(row) {
             console.log(row)
             this.idQuery.id = '';

src/views/warehouse/IOSearchOrder.vue

@@ -109,6 +109,11 @@
                         {{ scope.row.fromCorp }}
                     </template>
                 </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -454,8 +459,9 @@ export default {
                 "3": "pda即时校验",
                 "4": "pda未校验",
                 "5": "pc端扫码精灵",
-                "6": "补录单据",
+                "6": "缺量补录单据",
-                "7": "UDI供应商平台"
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
             },
             //往来单位
             unitquery: {key: "", page: 1, limit: 20},
@@ -470,6 +476,7 @@ export default {
             },
             actDateRange: [],
             filterQuery: {
+                locStorageCode: null,
                 id: "",
                 mainAction: null,
                 action: null,
@@ -613,6 +620,13 @@ export default {
                 .catch(() => {
                 });
         },
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
+                }
+            }
+        },
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             this.errorDetail = mOrder.remark;

src/views/warehouse/IOWaitOrder.vue

@@ -105,6 +105,11 @@
                         {{ scope.row.fromCorp }}
                     </template>
                 </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column
                     label="创建时间"
                     prop="actDate"
@@ -498,8 +503,9 @@ export default {
                 "3": "pda即时校验",
                 "4": "pda未校验",
                 "5": "pc端扫码精灵",
-                "6": "补录单据",
+                "6": "缺量补录单据",
-                "7": "UDI供应商平台"
+                "7": "UDI供应商平台",
+                "8": "平衡补录单据",
             },
             exportQuery: {
                 orderId: "",
@@ -601,7 +607,13 @@ export default {
             console.log(val);
             this.multipleSelection = val;
         },
-
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
+                }
+            }
+        },
         handleErrorDetail(poistion) {
             var mOrder = this.list[poistion];
             this.errorDetail = mOrder.remark;

src/views/warehouse/stockHospOrderNew.vue

@@ -103,7 +103,7 @@
                             >
                                 <el-option
                                     v-for="item in fromOptions"
-                                    :key="item.name"
+                                    :key="item.id"
                                     :label="item.name"
                                     :value="item"
                                 >
@@ -729,7 +729,13 @@ export default {
             };
             filterAllByUser(cQuery)
                 .then((response) => {
-                    this.fromStorageOptions = response.data || [];
+                    let temp = response.data || [];
+                    for(let i = 0;i<temp.length;i++){
+                        if(temp[i].code != this.formData.locStorageCode){
+                            this.fromStorageOptions.push(temp[i]);
+                        }
+                    }
+
                 })
                 .catch(() => {
                 });
@@ -1245,9 +1251,15 @@ export default {
             }
         },
         actionChange(item) {
+            console.log("item = " + item);
+            if (item == '') {
+                this.formData.locStorageCode == null;
+            } else {
                 this.curAction = this.getActionItem(item);
                 this.formData.locStorageCode = this.curAction.storageCode;
                 console.log(this.curAction.corpType + "---" + this.formData.locStorageCode + "-----" + this.curAction.action);
+            }
+
         },
         locInChange(item) {
             console.log(item);

src/views/warehouse/stockOrderDelSearch.vue

@@ -130,7 +130,7 @@
                                 type="text"
                                 size="small"
                                 @click.native="supplementOrder(scope.row)">
-                                补单
+                                平衡补单
                             </el-button>
                         </div>
                     </template>
@@ -163,7 +163,7 @@
                 </el-table-column>
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
                 <el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
-                <el-table-column label="包装规格" width="200"prop="spec"></el-table-column>
+                <el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
                 <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
                 <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo">
                     <template slot-scope="scope">
@@ -185,7 +185,9 @@
                 </el-table-column>
                 <el-table-column label="发票日期" width="150" prop="invoiceDate">
                     <template slot-scope="scope">
-                        <el-date-picker :disabled="scope.$index !== currentCheckIndex" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="scope.row.invoiceDate" style="width: 100%;"></el-date-picker>
+                        <el-date-picker :disabled="scope.$index !== currentCheckIndex" format="yyyy-MM-dd"
+                                        value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
+                                        v-model="scope.row.invoiceDate" style="width: 100%;"></el-date-picker>
                     </template>
                 </el-table-column>
                 <el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
@@ -254,7 +256,8 @@
                     <el-input style="width: 80%;" v-model="batchForm.secSalesInvNo" autocomplete="off"></el-input>
                 </el-form-item>
                 <el-form-item label="发票日期：" :label-width="formLabelWidth">
-                    <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" v-model="batchForm.invoiceDate" style="width: 80%;"></el-date-picker>
+                    <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="选择日期"
+                                    v-model="batchForm.invoiceDate" style="width: 80%;"></el-date-picker>
                 </el-form-item>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -986,18 +989,18 @@ export default {
 
 <style scoped>
 
-.el-dialog{
+.el-dialog {
     display: flex;
     flex-direction: column;
-    margin:0 !important;
+    margin: 0 !important;
-    position:absolute;
+    position: absolute;
-    top:50%;
+    top: 50%;
-    left:50%;
+    left: 50%;
-    transform:translate(-50%,-50%);
+    transform: translate(-50%, -50%);
 }
 
-.el-dialog .el-dialog__body{
+.el-dialog .el-dialog__body {
-    flex:1;
+    flex: 1;
     overflow: auto;
 }