Merge remote-tracking branch 'origin/orderChange' into zhairh

src/views/business/codeReplace.vue

@@ -258,13 +258,28 @@ export default {
             this.getCodeList();
         },
         handleCurrentChange(val) {
-            this.query.page = val;
-            this.getCodeList();
+            this.query.page =val;
+            this.getCodeList1();
+        },
+        getCodeList1() {
+            this.loading = true;
+            this.query.corpOrderId = this.idQuery.id;
+            codeList(this.query) //查找该单号下的所有条码
+                .then((response) => {
+                    this.loading = false;
+                    this.codeArry = response.data.list || [];
+                    this.total = response.data.total || 0;
+                })
+                .catch(() => {
+                    this.loading = false;
+                    this.list = [];
+                    this.total = 0;
+                });
         },
-
         getCodeList() {
             this.loading = true;
             this.query.corpOrderId = this.idQuery.id;
+            this.query.page=1
             codeList(this.query) //查找该单号下的所有条码
                 .then((response) => {
                     this.loading = false;

src/views/business/stockOrderEditor.vue

@@ -645,8 +645,11 @@ export default {
                 this.query.startTime = null;
                 this.query.endTime = null;
             }
-
+            this.query.page=1
             this.getList();
+            //清空详情数据
+            this.detailQuery.page=1
+            this.detailTotal=0
             if (this.query.status === "202") {
                 this.haveDistributionVisible = true;
             } else {

src/views/business/stockOrderNewDistribution.vue

@@ -744,11 +744,13 @@ export default {
                 this.thisData.stockOrderLists = this.codeArray;
                 this.thisData.formData = this.formData;
                 let item = this.getActionItem(this.formData.billType);
+
                 if (item.mainAction == 'WareHouseOut' && this.formData.noInvOut != true) {
                     this.invQueryData = {
                         locStorageCode: this.formData.locStorageCode,
                         invWarehouseCode: this.formData.invWarehouseCode,
                     };
+                    debugger
                     if (!isBlank(this.formData.unitIdFk) && this.formData.unitIdFk === this.formData.corpId) {
                         this.invQueryData.corpId = this.formData.corpId;
                     }
@@ -761,6 +763,7 @@ export default {
                     };
                     this.selectInvProductVisible = true;
                 } else {
+                    this.invQueryData.corpId = this.formData.corpId;
                     this.selectProductVisible = true;
                 }
                 return;

src/views/business/stockOrderNewSelectProduct.vue

@@ -307,9 +307,12 @@ export default {
         getList() {
             this.loading = true;
             this.listQuery.customerId = store.getters.customerId;
-            if( this.data.companyName!=undefined && this.data.companyName!=null ){
+            if(this.data!=undefined && this.data.companyName!=undefined && this.data.companyName!=null ){
                 this.listQuery.companyName = this.data.companyName;
             }
+            if(this.data.formData!=undefined && this.data.formData.corpName!=undefined && this.data.formData.corpName!=null ){
+                this.listQuery.companyName = this.data.formData.corpName;
+            }
 
             if (this.filterType != null && this.filterType === 2) {
                 filterAllProduct(this.listQuery)

src/views/inout/IOAddOrder.vue

@@ -136,7 +136,7 @@
                     >
 
                         <el-select v-model="formData.fromSubInvCode" placeholder="请选择仓库" clearable="true"
-                                   :disabled="corpOrderIdDisabled"  filterable
+                                   :disabled="corpOrderIdDisabled"  @change="getFormCorp" filterable
                         >
                             <el-option
                                 v-for="item in fromSubStorageOptions"
@@ -506,7 +506,6 @@ export default {
             deleteLoading: false,
             orderNo: null,
             fromOptions: [],
-            fromStorageOptions: [],
             fromSubStorageOptions: [],
             curAction: {
                 corpType: 0,
@@ -541,7 +540,9 @@ export default {
                 orderId: this.idQuery.id,
                 locStorageCode: this.formData.locStorageCode,
                 invWarehouseCode: this.formData.invWarehouseCode,
+                invStorageCode:this.formData.invStorageCode,
                 fromSubInvCode: this.formData.fromSubInvCode,
+                subInvCode: this.formData.subInvCode,
                 action: this.formData.action,
                 fromCorp: this.formData.fromCorp,
                 fromCorpId: this.formData.fromCorpId,
@@ -961,23 +962,10 @@ export default {
         }
         ,
 
-        findStorageMethod() {
-            if (this.formData.locStorageCode == null)
-                return;
-            this.fromStorageOptions = [];
-            let cQuery = {
-                locInvCode: this.formData.locStorageCode,
-            };
-            filterAllByLoc(cQuery)
-                .then((response) => {
-                    this.fromStorageOptions = response.data || [];
-                })
-                .catch(() => {
-                });
-        }
-        ,
 
         findSubStorageMethod() {
+            this.formData.invStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
+            this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
             this.getBusType();
             let cQuery = {
                 code: this.formData.invWarehouseCode,
@@ -991,7 +979,11 @@ export default {
                 });
         }
         ,
-
+        getFormCorp(){
+            this.formData.subInvCode= this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).parentId
+            this.formData.fromCorp=this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).warehouseName
+            this.formData.fromCorpId=this.fromSubStorageOptions.find(item => item.code == this.formData.fromSubInvCode).code
+        },
 
         findSubInvByInv(invCode) {
             this.subInvList = [];
@@ -1001,9 +993,9 @@ 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;
+                    if (this.subInvList != null) {
                         this.getBusType();
+                        this.findSubStorageMethod();
                     }
                 })
                 .catch(() => {
@@ -1025,16 +1017,6 @@ export default {
                     this.fromDeptOptions = [];
                 });
         },
-        getStorage(event) {
-            this.storageList = [];
-            filterAllByUser()
-                .then((response) => {
-                    this.storageList = response.data || [];
-                })
-                .catch(() => {
-                });
-        }
-        ,
         getActionName(action) {
             for (let i = 0; i < this.busTypes.length; i++) {
                 if (this.busTypes[i].action === action) {
@@ -1181,7 +1163,7 @@ export default {
         this.formData.actDate = new Date();
         this.codeArray = [];
 
-        this.getStorage(this.formData.action);
+
 
         if (this.$isNotBlank(this.idQuery.id)) {
             this.formData.actDate = new Date(this.idQuery.actDate);
@@ -1216,17 +1198,10 @@ export default {
                 // this.getCodeList();
             }
             this.formData.invWarehouseCode = this.$store.getters.locSubInvCode;
+            this.formData.invStorageCode=this.$store.getters.locInvCode;
             this.formData.locStorageCode = this.$store.getters.locInvCode;
-
-            if (this.$isNotBlank(this.formData.locStorageCode)) {
-                this.findStorageMethod();
-            }
         }
         this.findSubInvByInv(this.formData.locStorageCode);
-        this.findSubStorageMethod();
-        if(this.formData.invWarehouseCode!=null){
-        this.getBusType();
-       }
         //查询是否启用多级仓库，判断是否启用部门
         selectSysParamByKey({paramKey: "muti_inv_mode"}).then((res) => {
             if (res.code === 20000) {

src/views/inout/IOCheckErrorOrder.vue

@@ -306,13 +306,13 @@
                 </el-table-column>
                 <el-table-column
                     label="单据数量"
-                    prop="reCount"
+                    prop="erpCount"
                     width="100"
                     :show-overflow-tooltip="true"
                 ></el-table-column>
                 <el-table-column
                     label="实际数量"
-                    prop="erpCount"
+                    prop="reCount"
                     width="100"
                     :show-overflow-tooltip="true"
                 ></el-table-column>

src/views/purchase/supCertificationAdd.vue

@@ -457,9 +457,11 @@ export default {
         /**---------------------------配送产品资质----------------------*/
 
         onReset2() {
+            //判断有没有选择配送企业
+            if(this.currentManufacturer!=null){
                 this.registrationQuery = {
-                customerId: null,
-                manufacturerIdFk: null,
+                    customerId: this.registrationQuery.customerId,
+                    manufacturerIdFk: this.registrationQuery.manufacturerIdFk,
                     recordProductName: "",
                     recordCode: "",
                     recordPeopleName: "",
@@ -468,6 +470,7 @@ export default {
                     limit: 20
                 };
                 this.getRegistrationList();
+            }
         },
         onSubmit2() {
             if(this.currentManufacturer==null){

src/views/purchase/supManufacturerEditDialog.vue

@@ -469,16 +469,16 @@ export default {
                 3: "变更未审核",
                 6: "未审核",
             },
+            statusFlag: {
+                0: "有效",
+                1: "失效",
+            },
             editTye: 1,
             formName: 1,
             formMap: {
                 1: "新增生产企业资质证书",
                 2: "编辑生产企业资质证书",
             },
-            formMap: {
-                1: "新增生产企业资质证书",
-                2: "编辑生产企业资质证书",
-            },
             manufacturerId: null,
             customerId: null,
             selectCertVisible: false,
@@ -513,20 +513,7 @@ export default {
     methods: {
         onModifySubmit(type) {
 
-          //判断本企业产品是否是通过审核的
-              let query = {
-                customerId: this.$store.getters.customerId
-                }
-              getCompany(query)
-               .then((response) => {
-                 if(response.data.auditStatus!=1){
-                  this.$message.error("本企业信息还未通过审核!");
-                  return;
-                 }else{
             this.addOrModifyCompany(type);
-                 }}).catch(() => {
-
-                 });
       },
       addOrModifyCompany (type){
           this.$refs["inputQuery"].validate(valid => {

src/views/thrsys/thrOrderNew.vue

@@ -479,7 +479,6 @@ export default {
             this.findSubStorageMethod();
         },
         subStorageChange(item) {
-
             this.formData.locStorageCode= this.subInvList.find(item => item.code == this.formData.invWarehouseCode).parentId
             this.formData.corpId=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).code
             this.formData.corpName=this.subInvList.find(item => item.code == this.formData.invWarehouseCode).warehouseName