build

src/views/supplierPurchaseIn/supplierPurchaseDiffOrder/index.vue

@@ -82,6 +82,15 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
+              <el-col :span="4"  style="margin-right:10px">
+                 <search-work-company
+                   :value="parmValue.companyNo"
+                   :placeholder="'业务公司'"
+                   :size="searchSize"
+                   @searchChange="companyNosearchChange"
+                />
+              </el-col>
+
               <el-col :span="6" style="width: 400px; padding: 0 0 0 0px">
                 <el-input
                   clearable
@@ -196,6 +205,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        companyNo: '',
         name: "", // 业务员名字
         username: "", // 账号
         apply_name: "", //申请人
@@ -248,11 +258,6 @@ export default {
     this.select = this.parmValue.select;
     // this.sselect = this.parmValue.sselect;
     this.s_input = this.parmValue.s_input
-
-
-
-
-
     }else{
        this.select = "cgdNo";
       this.s_input = "";
@@ -263,6 +268,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList()
+    },
     getRouter(toRouter, queryId){
       if (toRouter && queryId) {
         let model = {

src/views/supplierPurchaseIn/supplierPurchaseOrder/components/order-in-table.vue

@@ -1,5 +1,6 @@
 <template>
   <el-row class="addForm">
+
     <el-col :span="24">
       <el-form
         :model="tableForm"
@@ -20,7 +21,7 @@
             />
           </template>
 
-          <el-table-column fixed="right" width="50">
+          <el-table-column fixed="right" width="80">
             <template slot="header" slot-scope="scope">
               <el-tooltip
                 class="fr"
@@ -29,7 +30,7 @@
                   ((status + '' === '1' && powers.some((i) => i == '028')) ||
                     (status + '' === '2' && powers.some((i) => i == '028'))) &&
                   sitem &&
-                  ((sitem.has_account + '' === '0' &&
+                  ((currentLevel === '3' &&
                     (sitem.order_type + '' === '2' ||
                       sitem.order_type + '' === '3' ||
                       sitem.order_type + '' === '4')) ||
@@ -81,12 +82,14 @@ import asyncRequest from "@/apis/service/stock/allot/detail";
 import resToken from "@/mixins/resToken";
 import config from "./columns-table"; //表格列参数
 import wsmInOrderModel from "@/views/purchaseIn/wsmInOrder/components/wsm-in-order-model";
+import { mapGetters } from "vuex";
 export default {
   name: "allot",
   props: ["id", "sitem", "newTime"],
   mixins: [resToken],
   components: { wsmInOrderModel },
   computed: {
+    ...mapGetters(['currentLevel']),
     powers() {
       const tran =
         this.$store.getters.btnList.find(

src/views/supplierPurchaseIn/supplierPurchaseOrder/detail.vue

@@ -61,7 +61,7 @@
                       sitem &&
                       ppowers.some((i) => i == '0') &&
                       sitem.status + '' === '0' &&
-                      ((sitem.has_account + '' === '0' &&
+                      ((currentLevel === '3' &&
                         (sitem.order_type + '' === '2' ||
                           sitem.order_type + '' === '3' ||
                           sitem.order_type + '' === '4')) ||
@@ -258,7 +258,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['isSupertube']),
+    ...mapGetters(['isSupertube','currentLevel']),
     powers() {
       const tran =
         this.$store.getters.btnList.find(

src/views/supplierPurchaseIn/supplierPurchaseOrder/index.vue

@@ -100,6 +100,15 @@
               </el-col>
             </el-row>
             <el-row style="padding: 10px 0 0 0">
+              <el-col :span="4" style="margin-right:10px">
+                <search-work-company
+                  :value="parmValue.companyNo"
+                  :placeholder="'业务公司'"
+                  :size="searchSize"
+                  @searchChange="companyNosearchChange"
+               />
+              </el-col>
+
               <el-col :span="6" style="width: 500px; padding: 0 0 0 0px">
                 <el-input
                   clearable
@@ -132,13 +141,14 @@
                     <el-option label="商品成本编号" value="4"></el-option>
                     <el-option label="商品名称" value="5"></el-option>
                     <el-option label="商品创建人" value="6"></el-option>
-                    <el-option label="采购供应商编号" value="7"></el-option>
-                    <el-option label="采购供应商名称" value="10"></el-option>
+                    <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
+                    <!-- <el-option label="采购供应商名称" value="10"></el-option> -->
                     <el-option label="订单编号" value="8"></el-option>
                     <el-option label="商品创建人部门" value="9"></el-option>
                   </el-select>
                 </el-input>
               </el-col>
+              
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
                   type="warning"
@@ -229,7 +239,7 @@ export default {
   mixins: [mixinPage, resToken, companyHelper],
   components: {},
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
+    ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube", "currentLevel"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find((item) => item.menu_route == "supplierPurchaseOrder") ||
@@ -265,6 +275,7 @@ export default {
       wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
+        companyNo: "",
         orderCode: "", // 订单编号
         bk_code: "", // 备库编码
         wsm_in_code: "", // 入库单号
@@ -346,6 +357,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList()
+    },
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
@@ -456,7 +471,6 @@ export default {
           isok = false;
         }
         if (
-          e.has_account + "" !== "0" &&
           (e.order_type + "" === "2" ||
             e.order_type + "" === "3" ||
             e.order_type + "" === "4")

src/views/supplierPurchaseIn/supplierPurchaseReturn/index.vue

@@ -48,6 +48,15 @@
                   />
                 </el-select>
               </el-col> -->
+              <el-col :span="4" style="margin-right: 10px">
+                 <search-work-company
+                   :value="parmValue.companyNo"
+                   :placeholder="'业务公司'"
+                   :size="searchSize"
+                   @searchChange="companyNosearchChange"
+                />
+              </el-col>
+
               <!-- 下拉筛选 -->
               <el-col :span="6" style="width: 400px; ">
                 <el-input
@@ -232,6 +241,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        companyNo: "",
         cgdNo: "", //采购单编号
         returnCode: "", //退货单编号
         good_type_code: "", //商品属性编号
@@ -289,6 +299,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList();
+    },
     getRouter(toRouter, queryId){
       if (toRouter && queryId) {
         let model = {

src/views/supplierPurchaseIn/supplierRecovery/index.vue

@@ -97,7 +97,17 @@
                 >
                 </el-input>
               </el-col>
-              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
+
+              <el-col :span="4" style="margin-left: 10px">
+                 <search-work-company
+                   :value="parmValue.companyNo"
+                   :placeholder="'业务公司'"
+                   :size="searchSize"
+                   @searchChange="companyNosearchChange"
+                />
+              </el-col>
+
+              <!-- <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
                 <el-input
                   clearable
                   placeholder="供应商名称"
@@ -111,7 +121,7 @@
                   "
                 >
                 </el-input>
-              </el-col>
+              </el-col> -->
               <!-- <el-col :span="6" style="width: 150px; padding: 0 0 0 10px">
                 <el-input
                   clearable
@@ -216,6 +226,7 @@ export default {
       modelId: 0,
       infoNo: 0,
       parmValue: {
+        companyNo: "",
         infoNo: "",
         bidNo: "",
         is_own: "1",
@@ -249,6 +260,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList();
+    },
     restSearch() {
       this.parmValue = {
         infoNo: "",

src/views/supplierPurchaseIn/supplierWsmInOrder/index.vue

@@ -110,6 +110,15 @@
                 </el-dropdown>
               </el-col> -->
 
+              <el-col :span="4"  style="margin-right:10px">
+                 <search-work-company
+                   :value="parmValue.companyNo"
+                   :placeholder="'业务公司'"
+                   :size="searchSize"
+                   @searchChange="companyNosearchChange"
+                />
+              </el-col>
+
               <el-col :span="6" style="width: 520px; padding: 0 0 0 0px">
                 <el-input
                   clearable
@@ -140,9 +149,10 @@
                     <el-option label="商品属性编号" value="4"></el-option>
                     <el-option label="产品名称" value="5"></el-option>
                     <el-option label="申请人" value="6"></el-option>
-                    <el-option label="采购供应商编号" value="7"></el-option>
+                    <!-- <el-option label="采购供应商编号" value="7"></el-option> -->
                     <el-option label="申请人部门" value="8"></el-option>
                   </el-select>
+
                   <el-button
                     slot="append"
                     @click="
@@ -288,6 +298,7 @@ export default {
       wsm_code: [],
       wsm_supplierNo: [],
       parmValue: {
+        companyNo: '',
         order_type: "",
         // bk_code: "", // 备库编码
         wsm_in_code: "", // 入库单号
@@ -357,6 +368,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList()
+    },
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {
@@ -501,6 +516,7 @@ export default {
         page: model.page,
         size: model.size,
         company_name: model.company_name,
+        companyNo: model.companyNo,
         noRelation:true
       };
       

src/views/supplierSellOut/supplierReturnOrder/index.vue

@@ -94,6 +94,16 @@
                   />
                 </el-select>
               </el-col>
+              
+              <el-col :span="4" style="margin-left: 10px">
+                 <search-work-company
+                   :value="parmValue.companyNo"
+                   :placeholder="'业务公司'"
+                   :size="searchSize"
+                   @searchChange="companyNosearchChange"
+                />
+              </el-col>
+
               <el-col :span="18" style="width: 500px; padding: 0 0 0 10px">
                 <el-input
                   clearable
@@ -229,6 +239,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        companyNo: "",
         order_type: "",
         order_code: "", //销售订单编号
         thNo: "", //退货编号
@@ -292,6 +303,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList();
+    },
     getRouter(toRouter, queryId) {
       if (toRouter && queryId) {
         let model = {

src/views/supplierSellOut/supplierSellAfterApply/index.vue

@@ -109,6 +109,16 @@
                 </el-select>
                 padding: 0 0 0 10px
               </el-col> -->
+
+              <el-col :span="4" style="margin-right: 10px">
+                 <search-work-company
+                   :value="parmValue.companyNo"
+                   :placeholder="'业务公司'"
+                   :size="searchSize"
+                   @searchChange="companyNosearchChange"
+                />
+              </el-col>
+
               <el-col :span="4" style="width: 620px">
                 <el-input
                   clearable
@@ -380,6 +390,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList();
+    },
     handleExport(){
       if(this.select_list.length === 0){
         this.$message.warning('请选择一条售后申请单');

src/views/supplierSellOut/supplierSellOutOrder/detail.vue

@@ -128,7 +128,7 @@
                 ppowers.some((i) => i == '1') &&
                 sitem &&
                 (sitem.order_type + '' === '1' ||
-                  (sitem.has_account + '' === '0' &&
+                  (currentLevel + '' === '3' &&
                     (sitem.order_type + '' === '2' ||
                       sitem.order_type + '' === '3' ||
                       sitem.order_type + '' === '4')))
@@ -380,7 +380,7 @@ export default {
     returnExpress,
   },
   computed: {
-    ...mapGetters(["private_field"]),
+    ...mapGetters(["private_field", "currentLevel"]),
     powers() {
       const tran =
         this.$store.getters.btnList.find(

src/views/supplierSellOut/supplierSellOutOrder/index.vue

@@ -130,6 +130,16 @@
                   />
                 </el-select>
               </el-col>
+
+              <el-col :span="4" style="margin-left: 10px">
+                 <search-work-company
+                   :value="parmValue.companyNo"
+                   :placeholder="'业务公司'"
+                   :size="searchSize"
+                   @searchChange="companyNosearchChange"
+                />
+              </el-col>
+
               <el-col :span="4" style="width: 500px; padding: 0 0 0 10px">
                 <el-input
                   clearable
@@ -147,7 +157,7 @@
                   >
                     <el-option label="销售订单编号" value="orderCode" />
                     <el-option label="发货申请单编号" value="outCode" />
-                    <el-option label="供应商名称" value="supplier_name" />
+                    <!-- <el-option label="供应商名称" value="supplier_name" /> -->
                     <el-option label="商品编号" value="good_code" />
                     <el-option label="商品名称" value="good_name" />
                     <el-option label="申请人部门" value="company_name" />
@@ -375,6 +385,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList();
+    },
     handleShare(outCode) {
       const url = shareWebUrl + outCode;
 

src/views/supplierSellOut/supplierSellReturn/index.vue

@@ -61,7 +61,46 @@
                     />
                   </el-select>
                 </el-col>
-                <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
+
+                <el-col
+                  :span="4"
+                  class="fr"
+                  style="width: 66px; padding: 0 0 0 10px"
+                >
+                  <el-button
+                    type="warning"
+                    class="fr"
+                    :size="searchSize"
+                    @click="restSearch"
+                  >
+                    重置
+                  </el-button>
+                </el-col>
+                <el-col :span="3" style="width: 66px; float: right">
+                  <el-button
+                    :size="searchSize"
+                    type="primary"
+                    style="float: right; margin-left: 5px"
+                    @click="searchList"
+                  >
+                    刷新
+                  </el-button>
+                </el-col>
+              </el-col>
+            </el-row>
+
+
+            <el-row style="padding: 10px 0 0 0">
+              <el-col :span="4" >
+                  <search-work-company
+                   :value="parmValue.companyNo"
+                   :placeholder="'业务公司'"
+                   :size="searchSize"
+                   @searchChange="companyNosearchChange"
+                 />
+               </el-col>
+
+              <el-col :span="6" style="width: 400px; padding: 0 0 0 10px">
                   <el-input
                     clearable
                     placeholder="关键字"
@@ -95,37 +134,8 @@
                   </el-input>
                 </el-col>
 
-                <el-col
-                  :span="4"
-                  class="fr"
-                  style="width: 66px; padding: 0 0 0 10px"
-                >
-                  <el-button
-                    type="warning"
-                    class="fr"
-                    :size="searchSize"
-                    @click="restSearch"
-                  >
-                    重置
-                  </el-button>
-                </el-col>
-                <el-col :span="3" style="width: 66px; float: right">
-                  <el-button
-                    :size="searchSize"
-                    type="primary"
-                    style="float: right; margin-left: 5px"
-                    @click="searchList"
-                  >
-                    刷新
-                  </el-button>
-                </el-col>
-              </el-col>
-            </el-row>
-
-
-            <el-row style="padding: 10px 0 0 0">
-               <div style="display:flex;width:100%;justify-content:flex-end">
-                  <el-button type="primary" size="mini" @click="handleExport">退货单导出</el-button>
+               <div style="float:right">
+                 <el-button type="primary" size="mini" @click="handleExport">退货单导出</el-button>
                </div>
              </el-row>
           </div>
@@ -214,6 +224,7 @@ export default {
       isDetail: false,
       modelId: 0,
       parmValue: {
+        companyNo: "",
         returnCode: "", //销售退货code
         orderCode: "", //销售订单code
         company_name: "",
@@ -277,6 +288,10 @@ export default {
   },
 
   methods: {
+    companyNosearchChange({code}){
+      this.parmValue.companyNo = code
+      this.searchList();
+    },
     handleExport(){
       if(this.select_list.length === 0){
         this.$message.warning('请选择一条退货单');