Merge remote-tracking branch 'origin/master'

src/views/basic/busType/bussinessType.vue

@@ -216,7 +216,7 @@ export default {
         scanPreIn: false,
         vailInv: false,
         entrutSpms: null,
-        codeFillCheck: false,
+        codeFillCheck: true,
         defaultInv: null,
         defaultSubInv: null,
         orderVisibleType: null,
@@ -464,7 +464,7 @@ export default {
         scanPreIn: false,
         vailInv: false,
         entrutSpms: null,
-        codeFillCheck: false,
+        codeFillCheck: true,
         defaultInv: null,
         defaultSubInv: null,
         orderVisibleType: null,

src/views/basic/busType/bussinessTypeModify.vue

@@ -1178,7 +1178,15 @@ export default {
         curAction: this.inputQuery.supplementOrderType
       }
       candidateBusType(query).then((response) => {
-        this.orderTypeList = response.data || []
+        let data = response.data || []
+        if (data != null && data.length > 0) {
+          for (var i = 0; i < data.length; i++) {
+            if (data[i].action != this.inputQuery.action) {
+              this.orderTypeList.push(data[i]);
+            }
+          }
+        }
+
       }).catch(() => {
 
       })

src/views/basic/product/udIInfoSelect.vue

@@ -265,6 +265,7 @@ import {filterByUuid} from "@/api/basic/udiInfo";
 import {sysFilter} from "@/api/basic/product/udiRelevance";
 
 
+
 export default {
     name: "UdIInfoSelect",
     props: {

src/views/inout/IoSupAduitOrder.vue

@@ -582,6 +582,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
+      this.actDateRange=[];
       this.getList();
     },
     onSubmit() {

src/views/supplier/company/basicCompanyProducts.vue

@@ -681,6 +681,7 @@ export default {
         isUseDy: row.isUseDy,
         isDisable: row.isDisable,
         isAdavence: row.isAdavence,
+        useMuti:    row.useMuti
       };
     },
     sumitLockStatus(row) {

src/views/supplier/company/basicCompanyproductDetail.vue

@@ -134,7 +134,7 @@
                 </div>
               </el-col>
             </el-row>
-            <el-row>
+            <el-row :gutter="20" class="el-row" type="flex">
               <el-col :span="12" class="el-col">
                 <div class="text item">
                   <div class="itemTag">