build

src/views/netOrderEntry/netOrderEnter/addEdit.vue

@@ -30,7 +30,7 @@
             </el-divider>
 
             <el-row>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="采购员" prop="buyerid">
                   <el-select
                     v-model="ruleForm.buyerid"
@@ -59,7 +59,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="采购毛利率" label-width="110px" prop="cgd_tax">
                   <el-input-number
                     v-model="ruleForm.cgd_tax"
@@ -75,8 +75,8 @@
                 </el-form-item>
               </el-col>
 
-              <el-col :span="8">
-                <el-form-item label="平台" prop="platform_id">
+              <el-col :span="12">
+                <el-form-item label="所属平台" prop="platform_id">
                   <!-- <search-pay
                     :value="ruleForm.platform_id"
                     :disabled="id !== '003'"
@@ -88,16 +88,15 @@
                     @searchChange="platform_id_change"
                   /> -->
 
-                  <el-col :span="6" style="width: 240px">
-                    <search-terrace
-                      :value="ruleForm.platform_id"
-                      :disabled="false"
-                      :size="'mini'"
-                      :is-detail="false"
-                      :is_show="'0'"
-                      :placeholder="'所属平台'"
-                      @searchChange="platform_codesearchChange"
-                    /></el-col>
+                  <search-terrace
+                    :value="ruleForm.platform_id"
+                    :disabled="false"
+                    :size="'mini'"
+                    :is-detail="false"
+                    :is_show="'0'"
+                    :placeholder="'所属平台'"
+                    @searchChange="platform_codesearchChange"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -137,9 +136,10 @@
               </el-col>
 
               <el-col :span="12">
+                <!-- :disabled="id !== '003'" -->
                 <el-form-item label="销售方公司" label-width="110px" prop="companyNo">
                   <search-work-company
-                    :disabled="id !== '003'"
+                    disabled
                     :value="ruleForm.companyNo"
                     :names="''"
                     :size="'mini'"
@@ -234,11 +234,12 @@
 
               <el-col :span="12">
                 <el-form-item label="商品分类" prop="cat_id">
-                  <search-sort
+                  <company-sort
                     :value="ruleForm.cat_id"
                     :placeholder="'商品分类'"
                     :disabled="id !== '003'"
                     :size="'mini'"
+                    :company-no="ruleForm.companyNo"
                     :names="cat_id_name"
                     :is-detail="type !== 'add'"
                     @searchChange="goods_class_change"
@@ -342,6 +343,7 @@
 </template>
 <script>
 import asyncRequest from '@/apis/service/netOrderEntry/netOrderEnter'
+import companyHelper from '@/mixins/companyHelper'
 import { accMul, isPhone, isMobile } from '@/utils/validate'
 import resToken from '@/mixins/resToken'
 
@@ -370,7 +372,7 @@ const defaultData = {
 
 export default {
   name: 'Terrace',
-  mixins: [resToken],
+  mixins: [resToken, companyHelper],
   props: ['showModel', 'id', 'sitem'],
   data() {
     const validatemobile = (rule, value, callback) => {
@@ -652,6 +654,14 @@ export default {
         }
       })
 
+      console.log(this.id)
+
+      if (this.id === '003') {
+        this.ruleForm.companyNo = this.currentCompany
+        console.log(this.ruleForm.companyNo)
+        return
+      }
+
       if (this.id !== '003') this.getDetail()
     },
     async getDetail() {

src/views/netOrderEntry/netOrderEnter/index.vue

@@ -203,10 +203,11 @@ import resToken from "@/mixins/resToken";
 import { mapGetters } from "vuex";
 import addEdit from "./addEdit";
 import { xs_order_type_options, xs_order_source_options } from "@/assets/js/statusList";
+import companyHelper from "@/mixins/companyHelper";
 
 export default {
   name: "netOrderEnter",
-  mixins: [mixinPage, resToken],
+  mixins: [mixinPage, resToken, companyHelper],
   components: {
     addEdit,
   },
@@ -406,11 +407,17 @@ export default {
     },
     // 新建/编辑/详情
     openModal(row, type) {
+      if(type === '003' && !this.currentCompany){
+        this.$message.warning('请选择一家业务公司')
+        return
+      }
       // const { status } = row;
       // if (type === "005" && status === "1") {
       //   this.$message.warning("禁用后，才可以修改！");
       //   return;
       // }
+
+
       this.sitem = row;
       this.modelId = type;
       this.showModel = true;

src/views/sellOut/filing/index.vue

@@ -52,22 +52,19 @@
               </el-button> -->
             </el-col>
 
-            <el-col :span="4" style="margin-top:15px;margin-right:10px">
-              <el-input size="mini" placeholder="企业客户名称" v-model="parmValue.companyName" 
-              @blur="pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();" />
-            </el-col>
-
-            <el-col :span="4" style="margin-top:15px;margin-right:10px">
-              <el-input size="mini" placeholder="企业客户编码" v-model="parmValue.companyCode" 
-              @blur="pageInfo.curr = 1;
-                     parmValue.page = 1;
-                     searchList();"  />
+            <el-col :span="4" style="margin-top:15px">
+              <search-customer
+                  size="mini"
+                  :names="khName"
+                  :is-detail="type !== 'add'"
+                  :value="parmValue.companyCode"
+                  placeholder="客户公司"
+                  @searchChange="handleCustomerChange"
+              />
             </el-col>
 
 
-            <el-col :span="4" style="margin-top:15px;margin-right:10px">
+            <el-col :span="4" style="margin-top:15px;margin-left:10px">
               <el-select clearable size="mini" placeholder="请选择状态" v-model="parmValue.status" 
               @change="pageInfo.curr = 1;
                        parmValue.page = 1;
@@ -154,6 +151,7 @@ export default {
       wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
+        companyCode:[],
         start_date: "", //新建起始时间
         end_date: "", // 新建结束时间
       },
@@ -284,6 +282,11 @@ export default {
       };
       this.searchList();
     },
+    handleCustomerChange(e) {
+      this.parmValue.companyCode = e.code ? [e.code] : "";
+      this.customerName = e.label;
+      this.searchList();
+    },
     async searchList() {
       if (this.loading) return;
 
@@ -299,7 +302,8 @@ export default {
       // this.wsm_supplierNo = [];
       const res = await asyncRequest.list({
         ...this.parmValue,
-        ...this.timeOBJ
+        ...this.timeOBJ,
+        companyCode: Array.isArray(this.parmValue.companyCode) ? this.parmValue.companyCode[0] : this.parmValue.companyCode 
       });
       const { code, data } = await this.useResHandle(res);
       if (code === 0) {

src/views/sellOut/zixunOrder/components/editForm.vue

@@ -30,20 +30,6 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col :span="6">
-        <el-form-item label="所属平台" prop="platform_code">
-          <search-terrace
-            :value="ruleForm.platform_code"
-            :disabled="type === 'view' || type === 'edit'"
-            :size="'mini'"
-            :is_show="'1'"
-            :isDetail="type === 'view' || type === 'edit'"
-            :names="platform_name"
-            :placeholder="'所属平台'"
-            @searchChange="platform_code_codesearchChange"
-          />
-        </el-form-item>
-      </el-col>
 <!--      <el-col :span="6">-->
 <!--        <el-form-item label="支付渠道" prop="pay_id">-->
 <!--          <search-pay-->
@@ -72,6 +58,20 @@
           </el-date-picker>
         </el-form-item>
       </el-col>
+      <el-col :span="12">
+        <el-form-item label="所属平台" prop="platform_code">
+          <search-terrace
+            :value="ruleForm.platform_code"
+            :disabled="type === 'view' || type === 'edit'"
+            :size="'mini'"
+            :is_show="'1'"
+            :isDetail="type === 'view' || type === 'edit'"
+            :names="platform_name"
+            :placeholder="'所属平台'"
+            @searchChange="platform_code_codesearchChange"
+          />
+        </el-form-item>
+      </el-col>
       <el-col :span="12">
         <el-form-item label="销售方" prop="companyNo">
        <search-work-company

src/views/supplierSellOut/supplierFiling/index.vue

@@ -52,22 +52,19 @@
               </el-button>
             </el-col>
 
-            <el-col :span="4" style="margin-top:15px;margin-right:10px">
-              <el-input size="mini" placeholder="企业客户名称" v-model="parmValue.companyName" 
-              @blur="pageInfo.curr = 1;
-                    parmValue.page = 1;
-                    searchList();" />
-            </el-col>
-
-            <el-col :span="4" style="margin-top:15px;margin-right:10px">
-              <el-input size="mini" placeholder="企业客户编码" v-model="parmValue.companyCode" 
-              @blur="pageInfo.curr = 1;
-                     parmValue.page = 1;
-                     searchList();"  />
+            <el-col :span="4" style="margin-top:15px;">
+              <search-customer
+                  size="mini"
+                  :names="khName"
+                  :is-detail="type !== 'add'"
+                  :value="parmValue.companyCode"
+                  placeholder="客户公司"
+                  @searchChange="handleCustomerChange"
+              />
             </el-col>
 
 
-            <el-col :span="4" style="margin-top:15px;margin-right:10px">
+            <el-col :span="4" style="margin-top:15px;margin-left:10px">
               <el-select clearable size="mini" placeholder="请选择状态" v-model="parmValue.status" 
               @change="pageInfo.curr = 1;
                        parmValue.page = 1;
@@ -154,6 +151,7 @@ export default {
       wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
+        companyCode: "",
         start_date: "", //新建起始时间
         end_date: "", // 新建结束时间
       },
@@ -200,6 +198,11 @@ export default {
   },
 
   methods: {
+    handleCustomerChange(e) {
+      this.parmValue.companyCode = e.code ? [e.code] : "";
+      this.customerName = e.label;
+      this.searchList()
+    },
     getRouter(toRouter, queryId) {
       console.log(toRouter, queryId);
       if (toRouter && queryId) {
@@ -299,7 +302,8 @@ export default {
       // this.wsm_supplierNo = [];
       const res = await asyncRequest.list({
         ...this.parmValue,
-        ...this.timeOBJ
+        ...this.timeOBJ,
+        companyCode: Array.isArray(this.parmValue.companyCode) ? this.parmValue.companyCode[0] : this.parmValue.companyCode 
       });
       const { code, data } = await this.useResHandle(res);
       if (code === 0) {