build

src/components/globalComponents/company-sort/index.vue

@@ -68,6 +68,11 @@ export default {
       if (val && this.searchName) {
         this.remoteMethod(this.searchName)
       }
+    },
+    companyNo: function(val) {
+      console.log(val)
+      if (!val) return
+      this.remoteMethod()
     }
   },
   mounted() {

src/layout/components/Navbar.vue

@@ -422,7 +422,8 @@ export default {
 
   .left-menu{
     display: flex;
-    .hamburger-container {
+    max-width: 1300px;
+  .hamburger-container {
     line-height: 46px;
     height: 100%;
     cursor: pointer;
@@ -435,6 +436,9 @@ export default {
   }
 
   .breadcrumb-container {
+    display: flex;
+    flex-wrap: nowrap;
+    overflow:hidden;
     // width: 500px;
     //min-width: calc(1200px - 200px - 150px);
   }
@@ -447,6 +451,7 @@ export default {
 
   .right-menu {
     height: 100%;
+    width:700px;
     line-height: 50px;
     display: flex;
     flex-wrap: nowrap;

src/views/businessReportQuery/businessSaleReport/index.vue

@@ -77,8 +77,10 @@
 
 <script>
 import mixinPage from "@/mixins/elPaginationHandle";
+import companyHelper from "@/mixins/companyHelper";
 import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
+
 //标签页组件引入
 const table1 = () =>
   import(/* webpackChunkName:'mycomp' */ "./components/table1");
@@ -131,7 +133,7 @@ const table24 = () =>
   import(/* webpackChunkName:'mycomp' */ "./components/table24");
 
 export default {
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     table1,
     table2,

src/views/supplierSellOut/supplierFiling/cpns/baseForm.vue

@@ -113,14 +113,14 @@
               <!-- <search-sort :value="ruleForm.cat_id" :placeholder="'分类'" :size="'mini'" :names="cat_id_name"
                 :disabled="type === 'view'" :isDetail="true" @searchChange="cat_id_change" /> -->
 
-                <company-sort
+              <company-sort
                 :value="ruleForm.cat_id"
                 :placeholder="'商品分类'"
-                :disabled="type === 'view' || type === 'editBase' || type === 'editCoin'"
+                :disabled="(type === 'view' || type === 'editBase' || type === 'editCoin') || !companyNo"
                 :size="'mini'"
                 :names="cat_id_name"
                 :isDetail="type !== 'add'"
-                :company-no="currentCompany"
+                :companyNo="companyNo"
                 @searchChange="cat_id_change"
               />
             </el-form-item>
@@ -577,6 +577,7 @@ export default {
   data() {
     return {
       pid: "",
+      companyNo: "",
       cat_id_name: "",
       // supplierNo: "",
       brand_name: "",
@@ -967,6 +968,9 @@ export default {
     company_idsearchChange(e) {
       const { id, code, label } = e;
       this.ruleForm.customerCode = code || '';
+      this.companyNo = code || '';
+      this.cat_id_name = ""
+      this.ruleForm.cat_id = []
       this.$refs.ruleForm.validateField('customerCode');
     },
     async submitForm() {
@@ -1152,7 +1156,7 @@ export default {
             preservation_day: "1", //有效期
             delivery_day: "0", //物流时间
             make_day: "0", //生产工期
-            brand_id: [],
+          brand_id: [],
             // this.type === "add" && this.askItem.brand_id
             //   ? [this.askItem.brand_id]
             //   : [],