修改bug

src/views/basic/BasicEntrutsRece.vue

@@ -202,25 +202,16 @@ export default {
         this.$message.error("单据类型不能为空！");
         return;
       }
-      if (this.$isBlank(this.inputQuery.curInv)) {
-        this.$message.error("请输入委托仓库！");
-        return;
-      }
-      if (this.$isBlank(this.inputQuery.entrustInv)) {
-        this.$message.error("请输入接受委托仓库！");
-        return;
-      }
       if (this.$isBlank(this.inputQuery.entrustUser)) {
         this.$message.error("请输入接受委托人！");
         return;
       }
-
       if (this.$isBlank(this.inputQuery.invWarehouseCode)) {
-        this.$message.error("当前分库不能为空！");
+        this.$message.error("当前仓库不能为空！");
         return;
       }
       if (this.$isBlank(this.inputQuery.entrustSubInv)) {
-        this.$message.error("请输入接受委托分库！");
+        this.$message.error("请输入接受委托仓库！");
         return;
       }
 

src/views/basic/BasicEntrutsReceModify.vue

@@ -5,9 +5,9 @@
                 <el-col :span="10" class="el-col">
                     <div class="text item">
                         <div class="itemTag">
-                            <span>当前分库:&nbsp;</span>
+                            <span>当前仓库:&nbsp;</span>
                         </div>
-                        <el-select v-model="inputQuery.invWarehouseCode" placeholder="当前分库"
+                        <el-select v-model="inputQuery.invWarehouseCode" placeholder="当前仓库"
                                    @change="entrustInvChange"
                                    filterable
                                    clearable>
@@ -56,9 +56,9 @@
                 <el-col :span="10" class="el-col">
                     <div class="text item">
                         <div class="itemTag">
-                            <span>接受委托分库:&nbsp;</span>
+                            <span>接受委托仓库:&nbsp;</span>
                         </div>
-                        <el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托分库"
+                        <el-select v-model="inputQuery.entrustSubInv" placeholder="接受委托仓库"
                                    @change="entrustSubInvChange"
                                    filterable
                                    clearable>
@@ -167,9 +167,7 @@ export default {
                 action: [
                     {required: true, message: "请输入扫码单据类型", trigger: "blur"}
                 ],
-                curInv: [
-                    {required: true, message: "请输入委托仓库", trigger: "blur"}
-                ],
+
                 entrustInv: [
                     {required: true, message: "请输入委托验收人仓库", trigger: "blur"}
                 ],
@@ -230,11 +228,11 @@ export default {
 
 
         findEntrustSubInvByInv() {
-           
+
             this.entrustSubInvList = [];
             let query = {
                 code: this.inputQuery.invWarehouseCode,
-               
+
             };
             filterSub(query)
                 .then((response) => {
@@ -258,7 +256,7 @@ export default {
                 });
         },
         getOrderType() {
-           
+
             let query = {
                 locSubInvCode: this.inputQuery.invWarehouseCode
             }

src/views/basic/BusTypeChangeModify.vue

@@ -222,6 +222,7 @@ export default {
         getFromInv() {
             let subQuery = {
                 code:this.inputQuery.locSubInv,
+                filter:2
             }
             filterSubByInv(subQuery).then((res) => {
                 if (res.code == 20000) {

src/views/home/index.vue

@@ -208,12 +208,12 @@
                 <el-row :gutter="20">
                     <el-col :span="4">
                         <div class="ao-text">
-                            <span>分库：</span>
+                            <span>仓库：</span>
                         </div>
                     </el-col>
                     <el-col :span="16">
                         <el-form-item prop="locInvCode">
-                            <el-select v-model="userInfo.locSubInvCode"   filterable placeholder="分库信息" clearable
+                            <el-select v-model="userInfo.locSubInvCode"   filterable placeholder="仓库信息" clearable
                             >
                                 <el-option
                                     v-for="item in subInvList"
@@ -229,7 +229,7 @@
                 </el-row>
 
                 <div style="margin-top: 8px ;  color: #F71616;">
-                    <span>提示：进入系统前请选择您默认所在分库&nbsp;</span>
+                    <span>提示：进入系统前请选择您默认所仓库&nbsp;</span>
                 </div>
                 <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
                     <el-button type="primary" @click="submitInv" style="width: 150px">提交</el-button>

src/views/purchase/pureApplyDetailDialog.vue

@@ -87,6 +87,7 @@
                             <el-input v-model="formData.remark" auto-complete="off" type="textarea"
                                       disabled
                                       autosize></el-input>
+                        </el-form-item>
                         <el-form-item prop="targetInv">
                             <el-select v-model="formData.targetSubInv" placeholder="当前分库信息" @change="setTargetInv" style="width: 100%"
                                        clearable>

src/views/purchase/supCertificationAdd.vue

@@ -162,9 +162,11 @@
                       :data="registrationList"
                       style="width: 100%">
                 <el-table-column type="index" label="序号" width="50"></el-table-column>
-                <el-table-column label="注册/备案产品名称" prop="recordProductName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="注册/备案产品名称" prop="recordProductName"
+                                 show-overflow-tooltip></el-table-column>
                 <el-table-column label="注册/备案号" prop="recordCode" show-overflow-tooltip></el-table-column>
-                <el-table-column label="注册/备案人名称" prop="recordPeopleName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="注册/备案人名称" prop="recordPeopleName"
+                                 show-overflow-tooltip></el-table-column>
                 <el-table-column label="生产企业" prop="manufacturerName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="所属供应商" prop="supName" show-overflow-tooltip></el-table-column>
                 <el-table-column label="审核状态" prop="auditStatus" width="120">
@@ -285,7 +287,7 @@ export default {
                 add: "新增生产企业资质信息",
                 update: "编辑生产企业资质信息",
             },
-            tital:"",
+            tital: "",
             currentManufacturer: null,
 
 
@@ -363,7 +365,7 @@ export default {
             this.registrationList = [];
         },
         onSubmit() {
-            this.filterQuery.page=1
+            this.filterQuery.page = 1
             this.getList();
             this.registrationList = [];
         },
@@ -378,7 +380,7 @@ export default {
                     this.loading = false;
                     this.list = response.data.list || [];
                     this.total = response.data.total || 0;
-                    
+
                 })
                 .catch(() => {
                     this.loading = false;
@@ -393,11 +395,11 @@ export default {
                 this.enterpriseId = row.id;
                 this.editType = 1;
                 this.inputQuery = row;
-                this.tital="编辑生产企业资质信息";
+                this.tital = "编辑生产企业资质信息";
             } else {
                 this.enterpriseId = null;
                 this.editType = 0;
-                this.tital="新增生产企业资质信息";
+                this.tital = "新增生产企业资质信息";
                 this.inputQuery = {
                     auditStatus: 0
                 };
@@ -480,24 +482,24 @@ export default {
             this.getRegistrationList();
         },
         onSubmit2() {
-            if(this.currentManufacturer==null){
+            if (this.currentManufacturer == null) {
                 this.$message.error("请先选中生产企业！");
                 return
             }
-            this.registrationQuery.page=1;
+            this.registrationQuery.page = 1;
             this.getRegistrationList();
         },
         registrationDialog(row) {
 
-            if(this.currentManufacturer==null){
+            if (this.currentManufacturer == null) {
                 this.$message.error("请先选中生产企业！");
                 return
             }
-           
+
             if (this.$isNotBlank(row)) {
                 this.registrationId = row.id;
                 this.curProductQuery = row;
-                this.curProductQuery.cuStatus=this.currentManufacturer.auditStatus;
+                this.curProductQuery.cuStatus = this.currentManufacturer.auditStatus;
                 this.formName = "update";
                 this.editProductType = 1;
             } else {
@@ -505,7 +507,7 @@ export default {
                 this.formName = "add";
                 this.curProductQuery = {
                     auditStatus: 0,
-                    cuStatus:this.currentManufacturer.auditStatus
+                    cuStatus: this.currentManufacturer.auditStatus
                 };
             }
             this.registrationVisible = true;
@@ -579,7 +581,7 @@ export default {
     created() {
         this.fileUrl = BASE_URL + "/udiwms/image/register/file/getImage?type=image4&name=";
         this.getList();
-      //  this.getRegistrationList();
+        //  this.getRegistrationList();
     },
 }
 </script>

src/views/warehouse/DialogcChangeNewOrder.vue

@@ -122,8 +122,8 @@
                     </el-form-item>
                     <el-form-item class="query-form-item" prop="fromCorp"
                                   v-if="curAction.corpType ==1">
-                      
-                        <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
+
+                        <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true" @change="getFormStorageCode"
                         >
                             <el-option
                                 v-for="item in fromSubStorageOptions"
@@ -146,7 +146,7 @@
                 </el-col>
 
 
-               
+
             </el-row>
         </el-form>
 
@@ -242,14 +242,6 @@ export default {
                 this.$message.warning("请选择单据类型！");
                 return;
             }
-            if (this.$isBlank(this.formData.locStorageCode)) {
-                this.$message.error('当前仓库不能为空');
-                return;
-            }
-            if (this.$isBlank(this.formData.fromCorp)) {
-                this.$message.error('当前往来单位不能为空');
-                return;
-            }
             if (this.$isBlank(this.formData.invWarehouseCode)) {
                 this.$message.error("当前分库不能为空");
                 return;
@@ -305,7 +297,9 @@ export default {
                     this.loading = false;
                 });
         },
-
+        getFormStorageCode(){
+            // this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
+        },
 
         locCHange() {
 
@@ -346,6 +340,7 @@ export default {
                 });
         },
         findSubStorageMethod() {
+            this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
             let cQuery = {
                 code: this.formData.invWarehouseCode,
                 filter: 2,

src/views/warehouse/addHosOrder.vue

@@ -77,14 +77,16 @@
                 <el-col :span="8">
                     <el-form-item prop="invWarehouseCode">
                         <el-select v-model="formData.invWarehouseCode" placeholder="当前分库信息"
-                                   :disabled="corpOrderIdDisabled" @change="findSubStorageMethod"   filterable>
+                                   :disabled="corpOrderIdDisabled" @change="findSubStorageMethod" filterable>
                             <el-option
                                 v-for="item in subInvList"
                                 :key="item.name"
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                        item.warehouseName
+                                    }}</span>
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -131,11 +133,9 @@
                     <el-form-item class="query-form-item" prop="fromCorp"
                                   v-if="curAction.corpType ==1"
                     >
-                       
-
 
                         <el-select v-model="formData.fromSubInvCode" placeholder="请选择分库" clearable="true"
-                                   :disabled="corpOrderIdDisabled"  filterable
+                                   :disabled="corpOrderIdDisabled" filterable @change="getFormStorageCode"
                         >
                             <el-option
                                 v-for="item in fromSubStorageOptions"
@@ -143,7 +143,9 @@
                                 :label="item.name"
                                 :value="item.code">
                                 <span style="float: left">{{ item.name }}</span>
-                                <span style="float: right; color: #8492a6; font-size: 13px">{{ item.warehouseName }}</span>
+                                <span style="float: right; color: #8492a6; font-size: 13px">{{
+                                        item.warehouseName
+                                    }}</span>
                                 <!--<span style="float: right; color: #8492a6; font-size: 13px">{{ item.action }}</span>-->
                             </el-option>
                         </el-select>
@@ -160,7 +162,7 @@
 
                 </el-col>
 
-               
+
             </el-row>
 
             <el-row :gutter="20" v-if="enableDept">
@@ -574,7 +576,7 @@ export default {
                 this.$message.error('未选择扫码单据类型');
                 return
             }
-           
+
 
             if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
                 this.$message.error('当前分库不能为空');
@@ -683,15 +685,12 @@ export default {
                 this.$message.warning("请选择单据类型！");
                 return;
             }
-          
+
             if (this.formData.invWarehouseCode == null || this.formData.invWarehouseCode == '') {
                 this.$message.error('当前分库不能为空');
                 return;
             }
-            if (this.$isBlank(this.formData.fromCorp)) {
-                this.$message.error('当前往来单位不能为空');
-                return;
-            }
+
             if (this.curAction.corpType == 1) {
                 if (this.$isBlank(this.formData.fromSubInvCode)) {
                     this.$message.error('当前往来分库不能为空');
@@ -815,13 +814,14 @@ export default {
             this.formData.fromCorp = row.name;
             this.curRow = row;
         },
-        storageChange(row) {
-            this.formData.fromSubInvCode = "";
-            this.formData.fromCorpId = row.code;
+        getFormStorageCode(code) {
+            var row= this.fromSubStorageOptions.find(item => item.code == code)
+            this.formData.fromSubInvCode = row.code
+            this.formData.fromCorpId = row.parentId;
             this.formData.fromCorp = row.name;
-            this.findSubStorageMethod();
         },
 
+
         deleteCode(index, row) {
             this.$confirm("是否确定移除一个条码?", "提示", {
                 confirmButtonText: "确定",
@@ -888,7 +888,7 @@ export default {
             let query = {
                 code: this.formData.invWarehouseCode,
                 enabled: true,
-                type:1
+                type: 1
             };
             getLocalJoinByUser(query)
                 .then((response) => {
@@ -926,11 +926,9 @@ export default {
             this.findSubInvByInv(this.formData.locStorageCode);
         },
 
-        subStorageChange() {
-            this.getBusType();
-        },
+
         findMethod(query) {
-           
+
             this.fromOptions = [];
             let cQuery = {
                 key: query,
@@ -984,7 +982,7 @@ export default {
 
 
         findStorageMethod() {
-           
+
             if (this.formData.locStorageCode == null)
                 return;
             this.fromStorageOptions = [];
@@ -1000,14 +998,14 @@ export default {
         },
 
         findSubStorageMethod(val) {
-            this. getBusType() ;
+            this.getBusType();
             let cQuery = {
                 code: this.formData.invWarehouseCode,
                 filter: 2,
             };
             filterSubByInv(cQuery)
                 .then((response) => {
-                 
+
                     this.fromSubStorageOptions = response.data || [];
                     if (val == 1) {
 
@@ -1020,11 +1018,12 @@ export default {
 
 
         findSubInvByInv() {
-            
+
             this.subInvList = [];
             let query = {
-                filter:3
+                filter: 3
             };
+
             filterSubByInv(query)
                 .then((response) => {
                     this.subInvList = response.data || [];
@@ -1062,7 +1061,7 @@ export default {
             }
         },
         actionChange(item) {
-           
+
             this.curAction = this.getActionItem(item);
             this.findMethod();
 
@@ -1183,7 +1182,7 @@ export default {
 
     },
     created() {
-      
+
         this.formData.code = '';
         this.formData.actDate = new Date();
         this.codeArray = [];

src/views/warehouse/stockHospOrderNew.vue

@@ -142,7 +142,7 @@
 
                 </el-row>
                 <el-row :gutter="20" style="margin-top: 5px">
-                   
+
                     <el-col :span="3">
                         <div class="ao-text">
                             <span>当前分库：</span>
@@ -218,7 +218,6 @@
                         </el-form-item>
                     </el-col>
                 </el-row>
-
             </el-card>
 
             <el-card>
@@ -617,7 +616,7 @@ export default {
             this.findSubStorageMethod();
 
         },
-      
+
 
         getActionName(action) {
             for (let i = 0; i < this.busTypes.length; i++) {
@@ -676,7 +675,7 @@ export default {
         },
 
         findSubInvByInv(invCode) {
-         
+
             this.subInvList = [];
             let query = {
                 pcode: invCode,
@@ -754,7 +753,6 @@ export default {
             });
         },
         selectProductFunction(event) {
-
             if (event != null) {
                 event.target.select();
             }
@@ -821,6 +819,7 @@ export default {
             let tQuery = {
                 code: this.code,
                 customerId: store.getters.customerId,
+
             };
 
             stockOrderDetailQueryProduct(tQuery).then((response) => {
@@ -1272,7 +1271,7 @@ export default {
             };
             filterSubByInv(query)
                 .then((response) => {
-                  
+
                     this.subInvList = response.data || [];
                     if (this.subInvList != null && this.subInvList.length == 1) {
                         this.formData.invWarehouseCode = this.subInvList[0].code;

src/views/warehouse/stockOrderNewDistribution.vue

@@ -72,7 +72,7 @@
                     </el-col>
                     <el-col :span="7">
                         <el-form-item prop="billType">
-                            <el-select v-model="formData.billType" placeholder="请选择业务类型" 
+                            <el-select v-model="formData.billType" placeholder="请选择业务类型"
                                        :disabled="codeArray.length>0"
                                        clearable>
                                 <el-option
@@ -542,6 +542,7 @@ export default {
             });
         },
         selectProductFunction(event) {
+
             if (event != null)
                 event.target.select();
             if (this.$isBlank(event)) {
@@ -562,6 +563,7 @@ export default {
                 this.thisData.code = "";
                 this.thisData.orderEditor = this.orderEditor;
                 this.thisData.orderId = "";
+                this.thisData.corpName=this.formData.corpName;
                 this.thisData.billType = this.formData.billType;
                 this.thisData.stockOrderLists = this.codeArray;
                 if (this.orderEditor) {
@@ -905,7 +907,7 @@ export default {
         },
 
         getBusType() {
-           
+
             if(this.$isBlank(this.query.orderIdFk)){
                 this.formData.billType=null;
             }
@@ -976,7 +978,7 @@ export default {
         };
     },
     created() {
-       
+
         this.formData = {};
         this.codeArray = [];
         this.closeConfirmFunction(false);
@@ -1005,7 +1007,7 @@ export default {
 
 
         }
-     
+
        if(this.formData.invWarehouseCode!=null){
         this.getBusType();
        }

src/views/warehouse/stockOrderNewSelectProduct.vue

@@ -302,8 +302,15 @@ export default {
             this.getList();
         },
         getList() {
+
             this.loading = true;
             this.listQuery.customerId = store.getters.customerId;
+            if(this.listQuery.customerId==110){
+                this.listQuery.companyName=this.data.formData.corpName
+            }else{
+                this.listQuery.companyName=this.data.corpName
+            }
+
             stockOrderDetailFilterProduct(this.listQuery)
                 .then((response) => {
                     this.loading = false;