build

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

@@ -28,10 +28,11 @@
 
 <script>
 import asyncRequest from '@/apis/components/company-sort'
+import companyHelper from '@/mixins/companyHelper'
 import resToken from '@/mixins/resToken'
 export default {
   name: 'CompanySort',
-  mixins: [resToken],
+  mixins: [resToken, companyHelper],
   props: ['size', 'value', 'placeholder', 'isDetail', 'disabled', 'names', 'type', 'companyNo'],
   /**
    * 属性集合

src/components/globalComponents/search-account/main.vue

@@ -105,7 +105,7 @@ export default {
         this.options = []
         const formValue = {
           page: 1,
-          name: query,
+          nickname: query,
           itemid: this.itemid || '',
           companyNo: this.filterCompany ? this.currentCompany : ''
         }

src/components/globalComponents/search-stock/main.vue

@@ -21,28 +21,27 @@
       :label="item.name"
       :value="item.wsm_code"
       :disabled="item.status + '' === '0'"
-    >
-    </el-option>
+    />
   </el-select>
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/search-stock";
-import resToken from "@/mixins/resToken";
+import asyncRequest from '@/apis/components/search-stock'
+import resToken from '@/mixins/resToken'
 export default {
-  name: "SearchStock",
+  name: 'SearchStock',
   mixins: [resToken],
   props: [
-    "size",
-    "value",
-    "placeholder",
-    "isDetail",
-    "disabled",
-    "isRelation",
+    'size',
+    'value',
+    'placeholder',
+    'isDetail',
+    'disabled',
+    'isRelation',
     // "companyCode",
-    "companyNo", //业务公司
-    "wsmtype",
-    "names",
+    'companyNo', // 业务公司
+    'wsmtype',
+    'names'
   ],
   /**
    * 属性集合
@@ -63,20 +62,20 @@ export default {
     return {
       options: [],
       selectLoading: false,
-      searchName: "",
+      searchName: '',
       formValue: {
         page: 1,
         size: 100,
-        supplierNo: "",
-        wsm_code: "",
-        companyNo: "",
-        start: "",
-        end: "",
-        mobile: "",
-        contactor: "",
-        wsm_type: "",
-      },
-    };
+        supplierNo: '',
+        wsm_code: '',
+        companyNo: '',
+        start: '',
+        end: '',
+        mobile: '',
+        contactor: '',
+        wsm_type: ''
+      }
+    }
   },
   watch: {
     // companyCode: function (val, old) {
@@ -84,29 +83,32 @@ export default {
     //     this.remoteMethod(val);
     //   }
     // },
-    companyNo: function (val, old) {
-      if (this.isRelation && val !== "") {
-        this.remoteMethod(val);
-      }
+    companyNo: {
+      handler: function(val, old) {
+        if (this.isRelation && val !== '') {
+          this.remoteMethod(val)
+        }
+      },
+      immediate: true
     },
-    names: function (val, old) {
+    names: function(val, old) {
       // console.log(val, old);
-      this.searchName = val;
+      this.searchName = val
       if (this.isDetail && this.searchName) {
-        this.remoteMethod(this.searchName);
+        this.remoteMethod(this.searchName)
       }
-    },
+    }
   },
   mounted() {
-    this.options = [];
-    this.selectLoading = false;
+    this.options = []
+    this.selectLoading = false
   },
   methods: {
     async selectChange(e) {
       if (e && e.length > 0) {
-        let index = this.options.findIndex((v) => v.wsm_code === e[0]);
+        const index = this.options.findIndex((v) => v.wsm_code === e[0])
         if (index !== -1) {
-          let model = {
+          const model = {
             id: this.options[index].id,
             code: this.options[index].wsm_code,
             label: this.options[index].name,
@@ -114,37 +116,37 @@ export default {
             mobile: this.options[index].mobile,
             addr: this.options[index].wsm_addr,
             addr_code: this.options[index].addr_code,
-            addr_cn: this.options[index].addr_cn,
-          };
-          this.$emit("searchChange", model);
+            addr_cn: this.options[index].addr_cn
+          }
+          this.$emit('searchChange', model)
         } else {
-          this.$emit("searchChange", {});
+          this.$emit('searchChange', {})
         }
       } else {
-        this.$emit("searchChange", {});
+        this.$emit('searchChange', {})
       }
     },
     async remoteMethod() {
-      this.selectLoading = true;
-      this.options = [];
+      this.selectLoading = true
+      this.options = []
       // this.formValue.supplierNo = this.companyCode || "";
-      this.formValue.companyNo = this.companyNo || "";
-      this.formValue.wsm_type = this.wsmtype || "";
+      this.formValue.companyNo = this.companyNo || ''
+      this.formValue.wsm_type = this.wsmtype || ''
 
-      const { code, data, message } = await asyncRequest.list(this.formValue);
+      const { code, data, message } = await asyncRequest.list(this.formValue)
 
       if (code === 0) {
-        const { list } = data;
-        this.options = list;
+        const { list } = data
+        this.options = list
       } else if (code >= 100 && code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(message);
+        this.$message.warning(message)
       }
-      this.selectLoading = false;
-    },
-  },
-};
+      this.selectLoading = false
+    }
+  }
+}
 </script>
 
 <style></style>

src/components/search-stock-allot-good-modal/index.vue

@@ -1,39 +1,40 @@
 <template>
   <el-dialog
+    v-loading="loading"
     :title="'仓库商品选择'"
     :center="true"
     align="left"
     top="8vh"
     width="1040px"
-    @close="showModelThis = false"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
-    v-loading="loading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
     append-to-body
+    @close="showModelThis = false"
   >
     <el-card style="margin-top: -20px" class="modal-form-style">
       <el-table
+        v-loading="loading"
         :data="tableData"
         border
         :size="size"
-        v-loading="loading"
         style="width: 100%"
         @selection-change="handleSelectionChange"
       >
         <template v-for="(column, index) in columns">
           <el-table-column
             v-if="column._slot_ && column._slot_ === 'good_name'"
-            show-overflow-tooltip
             :key="column + index"
+            show-overflow-tooltip
           >
             <template slot-scope="scope">
               <span>{{ scope.row.good_name }}</span>
-              <span v-for="(si, sii) in scope.row.specinfo" :key="si.spec_value_id + sii"
-                >{{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value }}]</span
-              >
+              <span
+                v-for="(si, sii) in scope.row.specinfo"
+                :key="si.spec_value_id + sii"
+              >{{ sii === 0 ? "_" : "-" }}{{ si.spec_name }}[{{ si.spec_value }}]</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -58,10 +59,10 @@
             :total="pageInfo.total"
             @size-change="
               (pageInfo.curr = 1),
-                (parmValue.page = 1),
-                (pageInfo.size = $event),
-                (parmValue.size = $event),
-                searchList()
+              (parmValue.page = 1),
+              (pageInfo.size = $event),
+              (parmValue.size = $event),
+              searchList()
             "
             @current-change="
               (pageInfo.curr = $event), (parmValue.page = $event), searchList()
@@ -77,19 +78,19 @@
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/search-stock-allot-good-modal";
-import resToken from "@/mixins/resToken";
-import mixinPage from "@/mixins/elPaginationHandle";
-import { mapGetters } from "vuex";
-import columns from "./columns";
+import asyncRequest from '@/apis/components/search-stock-allot-good-modal'
+import resToken from '@/mixins/resToken'
+import mixinPage from '@/mixins/elPaginationHandle'
+import { mapGetters } from 'vuex'
+import columns from './columns'
 export default {
-  name: "searchStockGoodModal",
+  name: 'SearchStockGoodModal',
 
   mixins: [resToken, mixinPage],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
   },
-  props: ["showModel", "once", "code", "good_code", "cat_id"],
+  props: ['showModel', 'once', 'code', 'good_code', 'cat_id'],
 
   /**
    * 属性集合
@@ -109,10 +110,10 @@ export default {
       loading: true,
       showModelThis: false,
       parmValue: {
-        wsm_code: "", //仓库code
-        cat_id: "",
+        wsm_code: '', // 仓库code
+        cat_id: '',
         page: 1, // 页码
-        size: 10, // 每页显示条数
+        size: 10 // 每页显示条数
       },
       tableData: [],
       passwordModel: false,
@@ -123,96 +124,96 @@ export default {
       // 表格 - 参数
       table: {
         stripe: true,
-        border: true,
+        border: true
         // _defaultHeader_: ["setcol"],
       },
       // 表格 - 分页
       pageInfo: {
         size: 10,
         curr: 1,
-        total: 0,
+        total: 0
       },
       // 表格 - 列参数
-      columns: columns,
-    };
+      columns: columns
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.supplierCode = [];
-        this.searchList();
+        this.supplierCode = []
+        this.searchList()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
 
   methods: {
     restSearch() {
       this.parmValue = {
-        wsm_code: "", //仓库code
-        cat_id: "",
+        wsm_code: '', // 仓库code
+        cat_id: '',
         page: 1, // 页码
-        size: 10, // 每页显示条数
-      };
+        size: 10 // 每页显示条数
+      }
       // 表格 - 分页
       this.pageInfo = {
         size: 10,
         curr: 1,
-        total: 0,
-      };
-      this.searchList();
+        total: 0
+      }
+      this.searchList()
     },
     async searchList() {
-      this.loading = true;
-      this.parmValue.wsm_code = this.code || "";
-      this.parmValue.type_code = this.good_code || "";
-      this.parmValue.stock_max = "1";
-      this.parmValue.cat_id = this.cat_id;
+      this.loading = true
+      this.parmValue.wsm_code = this.code || ''
+      this.parmValue.type_code = this.good_code || ''
+      this.parmValue.stock_max = '1'
+      this.parmValue.cat_id = this.cat_id
 
-      const res = await asyncRequest.list(this.parmValue);
+      const res = await asyncRequest.list(this.parmValue)
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        this.tableData = res.data.list
         this.tableData.forEach((v) => {
-          v.class_cat = "";
+          v.class_cat = ''
           if (v.can && v.can.length > 0) {
             v.can.forEach((x, i) => {
-              v.class_cat += i === 0 ? x.name : "_" + x.name;
-            });
+              v.class_cat += i === 0 ? x.name : '_' + x.name
+            })
           }
-        });
+        })
 
-        this.pageInfo.total = Number(res.data.count);
+        this.pageInfo.total = Number(res.data.count)
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.tableData = [];
-        this.pageInfo.total = 0;
+        this.tableData = []
+        this.pageInfo.total = 0
       }
-      this.loading = false;
+      this.loading = false
     },
     async handleSelectionChange(selection) {
-      this.multipleSelection = selection;
+      this.multipleSelection = selection
     },
     async resultList() {
       if (this.multipleSelection && this.multipleSelection.length > 1 && this.once) {
-        this.$message.warning("只能选择一条商品信息！");
-        return;
+        this.$message.warning('只能选择一条商品信息！')
+        return
       }
-      let list = JSON.parse(JSON.stringify(this.multipleSelection));
+      const list = JSON.parse(JSON.stringify(this.multipleSelection))
       list.map((v) => {
-        delete v["id"];
-        return v;
-      });
-      this.showModelThis = false;
-      this.$emit("searchChange", list);
-    },
-  },
-};
+        delete v['id']
+        return v
+      })
+      this.showModelThis = false
+      this.$emit('searchChange', list)
+    }
+  }
+}
 </script>
 
 <style></style>

src/mixins/companyHelper.js

@@ -60,7 +60,8 @@ const companyHelper = {
         // 超管公司改变后执行该方法(刷新列表页或自定义实现)
         if (vm.isSupertube) vm.onCompanyChange ? vm.onCompanyChange() : vm.onCompanyChangeInner()
       },
-      deep: true
+      deep: true,
+      immediate: true
     }
   }
 }

src/store/getters.js

@@ -21,6 +21,7 @@ const getters = {
   userInfo: state => state.user.userInfo,
   roleProcess: state => state.user.roleProcess,
   currentLevel: state => state.user.currentLevel,
+  currentCompany: state => state.user.currentCompany,
   private_field: state => {
     if (!state.user.private_field) return []
     if (typeof state.user.private_field === 'string') return JSON.parse(state.user.private_field)

src/views/goodStore/goodsCost/index.vue

@@ -270,11 +270,12 @@
             "
           ></i>
         </el-tooltip>
+        <!-- scope.row.has_account + '' == '0' && -->
         <el-tooltip
           v-if="
             ppowers.some((i) => i == '4') &&
             (scope.row.status + '' === '4' || scope.row.status + '' === '1') &&
-            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
+            (( scope.row.is_stock + '' === '0') ||
               scope.row.is_stock + '' === '1')
           "
           effect="dark"
@@ -286,11 +287,12 @@
             @click="wantto(scope.row.is_online, scope.row.spuCode, scope.row.status, '2')"
           ></i>
         </el-tooltip>
+        <!-- scope.row.has_account + '' == '0' &&  -->
         <el-tooltip
           v-if="
             ppowers.some((i) => i == '5') &&
             (scope.row.status + '' === '5' || scope.row.status + '' === '1') &&
-            ((scope.row.has_account + '' == '0' && scope.row.is_stock + '' === '0') ||
+            ((scope.row.is_stock + '' === '0') ||
               scope.row.is_stock + '' === '1')
           "
           effect="dark"
@@ -398,10 +400,11 @@ export default {
       return action ?? [];
     },
     ppowers() {
-      // const tran =
-      //   this.$store.getters.roleProcess.find((i) => i.process_type === "SPCB") || {};
-      // const { action } = tran ?? {};
-      return  [];
+      const tran =
+        this.$store.getters.roleProcess.find((i) => i.process_type === "SPCB") || {};
+      const { action } = tran ?? {};
+      console.log(action)
+      return action || []
     },
   },
   data() {

src/views/sellOut/stockApply/components/purchaseBack.vue

@@ -36,10 +36,10 @@
         </el-form-item> -->
         <!-- :companyCode="supplier_code" -->
         <el-form-item label="仓库名称" prop="wsm_code">
+          <!-- :disabled="ruleForm.supplier_code.length === 0" -->
           <search-stock
             :isDetail="false"
             :size="'mini'"
-            :disabled="ruleForm.supplier_code.length === 0"
             :value="ruleForm.wsm_code"
             :placeholder="'仓库名称'"
             :isRelation="true"
@@ -139,6 +139,8 @@ export default {
 
     //初始化表单
     async resetForm() {
+      console.log(this.sitem)
+
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
           this.$refs.ruleForm.resetFields();
@@ -164,6 +166,7 @@ export default {
           delete item["supplier_code"];
           item.bk_code = this.sitem.bk_code;
           const res = await asyncRequest.purchcgd(item);
+
           if (res && res.code === 0) {
             this.$notify.success({
               title: "添加成功",

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

@@ -279,7 +279,7 @@
         <add-edit-good-modal
           :showModel="showModel"
           :sitem="editItem"
-          :company-no="ruleForm.companyNo"
+          :company-no="currentCompany"
           @cancel="showModel = false"
           @refresh="editGoodRefresh"
         />
@@ -443,6 +443,7 @@ export default {
   methods: {
     onCompanyChange(){
       this.ruleForm.companyNo = this.currentCompany
+      console.log(this.currentCompany)
     },
     async initForm() {
       this.loading = true;
@@ -597,6 +598,8 @@ export default {
           model.khNo = model.khNo.toString();
           model.projectNo = model.projectNo.toString();
           model.ladder = [];
+          model.companyNo = this.currentCompany
+          
           let list = JSON.parse(JSON.stringify(this.tableData));
           list.forEach((e) => {
             let im = {

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

@@ -773,7 +773,7 @@ export default {
     async goods_class_change(e) {
       const { code, pid, id, label, item } = e
 
-      if (label){
+      if (label) {
         this.cat_labels = label.split('_')
       }
 

src/views/serviceParam/storeSet/addEdit.vue

@@ -1,17 +1,17 @@
 <template>
   <el-dialog
+    v-loading="loading"
     :title="title"
     :center="true"
     align="left"
     top="8vh"
     width="1040px"
-    @close="showModelThis = false"
     :close-on-click-modal="false"
     :visible.sync="showModelThis"
-    v-loading="loading"
     element-loading-text="拼命加载中"
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(0, 0, 0, 0.8)"
+    @close="showModelThis = false"
   >
     <el-card style="margin-top: -20px">
       <el-row :gutter="10">
@@ -30,21 +30,22 @@
             </div>
 
             <el-row>
-              <el-col :span="12"
-                ><el-form-item
-                  label-width="140px"
-                  label="仓库所在业务公司"
-                  prop="companyNo"
-                >
-                  <search-work-company
-                    :value="ruleForm.companyNo"
-                    :placeholder="'业务公司'"
-                    :disabled="isDetail"
-                    :size="'mini'"
-                    :isDetail="false"
-                    @searchChange="companyNosearchChange"
-                  />
-                </el-form-item>
+              <el-col
+                :span="12"
+              ><el-form-item
+                label-width="140px"
+                label="仓库所在业务公司"
+                prop="companyNo"
+              >
+                <search-work-company
+                  :value="ruleForm.companyNo"
+                  :placeholder="'业务公司'"
+                  :disabled="isDetail"
+                  :size="'mini'"
+                  :is-detail="false"
+                  @searchChange="companyNosearchChange"
+                />
+              </el-form-item>
               </el-col>
               <!-- <el-col :span="12"
                 ><el-form-item
@@ -67,14 +68,13 @@
               <el-col :span="12">
                 <el-form-item label="仓库名称" prop="name">
                   <el-input
+                    v-model="ruleForm.name"
                     placeholder="仓库名称"
                     filterable
                     :disabled="isDetail"
                     maxlength="50"
                     clearable
-                    v-model="ruleForm.name"
-                  >
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -90,8 +90,7 @@
                       :key="item.value"
                       :label="item.label"
                       :value="item.value"
-                    >
-                    </el-option>
+                    />
                   </el-select>
                 </el-form-item>
               </el-col>
@@ -105,19 +104,16 @@
                     :size="'mini'"
                     :names="accountNames"
                     @searchChange="accountChange"
-                  /> </el-form-item
-              ></el-col>
+                  /> </el-form-item></el-col>
               <el-col :span="12">
                 <el-form-item label="负责人电话" prop="mobile">
                   <el-input
-                    placeholder="联系人电话"
                     v-model="ruleForm.mobile"
+                    placeholder="联系人电话"
                     maxlength="11"
                     clearable
                     :disabled="isDetail"
-                  >
-                  </el-input> </el-form-item
-              ></el-col>
+                  /> </el-form-item></el-col>
               <el-col :span="12">
                 <el-form-item
                   label="仓库所在省/市/区"
@@ -137,13 +133,12 @@
               <el-col :span="12">
                 <el-form-item label="仓库所在详细地址" prop="addr" label-width="140px">
                   <el-input
-                    placeholder="仓库所在详细地址"
                     v-model="ruleForm.addr"
+                    placeholder="仓库所在详细地址"
                     maxlength="100"
                     clearable
                     :disabled="isDetail"
-                  >
-                  </el-input>
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -154,36 +149,30 @@
               <el-col :span="8">
                 <el-form-item label="联系人" prop="wsm_name" label-width="68px">
                   <el-input
+                    v-model="ruleForm.wsm_name"
                     placeholder="联系人"
                     maxlength="20"
                     :disabled="isDetail"
-                    v-model="ruleForm.wsm_name"
                     clearable
-                  >
-                  </el-input> </el-form-item
-              ></el-col>
+                  /> </el-form-item></el-col>
               <el-col :span="8">
                 <el-form-item label="职位" prop="position" label-width="55px">
                   <el-input
+                    v-model="ruleForm.position"
                     placeholder="职位"
                     maxlength="20"
                     :disabled="isDetail"
-                    v-model="ruleForm.position"
                     clearable
-                  >
-                  </el-input> </el-form-item
-              ></el-col>
+                  /> </el-form-item></el-col>
               <el-col :span="8">
                 <el-form-item label="电话" prop="wsm_mobile" label-width="55px">
                   <el-input
-                    placeholder="电话"
                     v-model="ruleForm.wsm_mobile"
+                    placeholder="电话"
                     maxlength="11"
                     :disabled="isDetail"
                     clearable
-                  >
-                  </el-input> </el-form-item
-              ></el-col>
+                  /> </el-form-item></el-col>
             </el-row>
 
             <el-row>
@@ -200,25 +189,26 @@
                     :value="ruleForm.addrs_code"
                     :placeholder="'收发货省/市/区'"
                     @selectChange="selectAreaAddrs_code"
-                  /> </el-form-item
-              ></el-col>
+                  /> </el-form-item></el-col>
               <el-col :span="12">
                 <el-form-item label="收发货详细地址" prop="wsm_addr" label-width="126px">
                   <el-input
+                    v-model="ruleForm.wsm_addr"
                     placeholder="收发货详细地址"
                     maxlength="100"
                     :disabled="isDetail"
-                    v-model="ruleForm.wsm_addr"
                     clearable
-                  >
-                  </el-input> </el-form-item
-              ></el-col>
+                  /> </el-form-item></el-col>
             </el-row>
           </el-form>
         </el-col>
         <el-col :span="24" style="text-align: right">
-          <el-button type="primary" :size="'mini'" @click="submitForm" v-if="!isDetail"
-            >保 存
+          <el-button
+            v-if="!isDetail"
+            type="primary"
+            :size="'mini'"
+            @click="submitForm"
+          >保 存
           </el-button>
           <el-button :size="'mini'" @click="showModelThis = false">{{
             isDetail ? "关 闭" : "取 消"
@@ -229,60 +219,60 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/serviceParam/storeSet";
-import resToken from "@/mixins/resToken";
-import { isMobile, isSpecialSymbol, hasSpace, isAddr } from "@/utils/validate";
-import { mapGetters } from "vuex";
+import asyncRequest from '@/apis/service/serviceParam/storeSet'
+import resToken from '@/mixins/resToken'
+import { isMobile, isSpecialSymbol, hasSpace, isAddr } from '@/utils/validate'
+import { mapGetters } from 'vuex'
 export default {
-  name: "storeSet",
-  props: ["showModel", "id", "isDetail"],
+  name: 'StoreSet',
   mixins: [resToken],
+  props: ['showModel', 'id', 'isDetail'],
   computed: {
-    ...mapGetters(["business_companyNo"]),
+    ...mapGetters(['business_companyNo'])
   },
   data() {
     const validatemobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("联系方式不能为空！"));
+      if (value === '') {
+        callback(new Error('联系方式不能为空！'))
       } else {
         if (!isMobile(value)) {
-          callback(new Error("联系方式格式不正确！"));
+          callback(new Error('联系方式格式不正确！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     const validatewsmmobile = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("联系方式不能为空！"));
+      if (value === '') {
+        callback(new Error('联系方式不能为空！'))
       } else {
         if (!isMobile(value)) {
-          callback(new Error("联系方式格式不正确！"));
+          callback(new Error('联系方式格式不正确！'))
         } else {
-          callback();
+          callback()
         }
       }
-    };
+    }
     const validateAddr = (rule, value, callback) => {
-      if (value === "") {
-        callback(new Error("详细地址不能为空！"));
+      if (value === '') {
+        callback(new Error('详细地址不能为空！'))
       } else {
         if (hasSpace(value)) {
-          callback(new Error("不能出现/回车/换行符！"));
+          callback(new Error('不能出现/回车/换行符！'))
         } else if (isSpecialSymbol(value)) {
-          callback(new Error("不能使用英文特殊字符！"));
+          callback(new Error('不能使用英文特殊字符！'))
         } else if (isAddr(value)) {
-          callback();
+          callback()
         } else {
-          callback(new Error("详细地址填写不规范！"));
+          callback(new Error('详细地址填写不规范！'))
         }
       }
-    };
+    }
     return {
-      supplier_name: "",
-      accountNames: "",
+      supplier_name: '',
+      accountNames: '',
       loading: false,
-      title: "添加仓库",
+      title: '添加仓库',
       showModelThis: this.showModel,
       options: [
         // {
@@ -298,41 +288,41 @@ export default {
         //   label: "自建仓",
         // },
         {
-          value: "5",
-          label: "销售仓",
+          value: '5',
+          label: '销售仓'
         },
         {
-          value: "4",
-          label: "次品仓",
-        },
+          value: '4',
+          label: '次品仓'
+        }
       ],
       ruleForm: {
-        companyNo: "",
-        name: "", // 仓库名称
+        companyNo: '',
+        name: '', // 仓库名称
         // supplierNo: [], //供应商编码
-        wsmtype: "", //仓库类型 目前随便填
-        addr_code: [], //仓库省市区
-        addr: "", //仓库详细地址
-        contactor_id: [], //仓库联系人
-        mobile: "", //仓库联系方式
-        position: "", //联系人职位  目前随便填
+        wsmtype: '', // 仓库类型 目前随便填
+        addr_code: [], // 仓库省市区
+        addr: '', // 仓库详细地址
+        contactor_id: [], // 仓库联系人
+        mobile: '', // 仓库联系方式
+        position: '', // 联系人职位  目前随便填
 
-        wsm_name: "", //收发货联系人
-        wsm_mobile: "", //收发货联系方式
-        wsm_addr: "", //收发货地址详细
-        addrs_code: [], //收发货省市区
+        wsm_name: '', // 收发货联系人
+        wsm_mobile: '', // 收发货联系方式
+        wsm_addr: '', // 收发货地址详细
+        addrs_code: [] // 收发货省市区
       },
       rulesThis: this.rules,
       rules: {
-        name: [{ required: true, message: "仓库名称不能为空", trigger: "blur" }],
-        position: [{ required: true, message: "联系人职位不能为空", trigger: "blur" }],
-        wsmtype: [{ required: true, message: "请选择仓库类型", trigger: "change" }],
+        name: [{ required: true, message: '仓库名称不能为空', trigger: 'blur' }],
+        position: [{ required: true, message: '联系人职位不能为空', trigger: 'blur' }],
+        wsmtype: [{ required: true, message: '请选择仓库类型', trigger: 'change' }],
         companyNo: [
           {
             required: true,
-            message: "业务公司不能为空",
-            trigger: "change",
-          },
+            message: '业务公司不能为空',
+            trigger: 'change'
+          }
         ],
         // supplierNo: [
         //   {
@@ -344,136 +334,136 @@ export default {
         // ],
         addr_code: [
           {
-            type: "array",
+            type: 'array',
             required: true,
-            message: "仓库所在省/市/区",
-            trigger: "change",
-          },
+            message: '仓库所在省/市/区',
+            trigger: 'change'
+          }
         ],
-        addr: [{ required: true, validator: validateAddr, trigger: "blur" }],
+        addr: [{ required: true, validator: validateAddr, trigger: 'blur' }],
 
         contactor_id: [
           {
             required: true,
-            type: "array",
-            message: "仓库负责人",
-            trigger: "change",
-          },
+            type: 'array',
+            message: '仓库负责人',
+            trigger: 'change'
+          }
         ],
 
         mobile: [
           {
             required: true,
             validator: validatemobile,
-            trigger: "blur",
-          },
+            trigger: 'blur'
+          }
         ],
         wsm_name: [
-          { required: true, message: "收发货联系人", trigger: "blur" },
+          { required: true, message: '收发货联系人', trigger: 'blur' },
           {
             min: 1,
             max: 20,
-            message: "长度在 1 到 20 个字符",
-            trigger: "blur",
-          },
+            message: '长度在 1 到 20 个字符',
+            trigger: 'blur'
+          }
         ],
         wsm_mobile: [
           {
             required: true,
             validator: validatewsmmobile,
-            trigger: "blur",
-          },
+            trigger: 'blur'
+          }
         ],
         addrs_code: [
           {
-            type: "array",
+            type: 'array',
             required: true,
-            message: "收发货所在省/市/区",
-            trigger: "change",
-          },
+            message: '收发货所在省/市/区',
+            trigger: 'change'
+          }
         ],
         wsm_addr: [
-          { required: true, message: "收发货详细地址", trigger: "blur" },
+          { required: true, message: '收发货详细地址', trigger: 'blur' },
           {
             min: 1,
             max: 100,
-            message: "长度在 1 到 100 个字符",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
+            message: '长度在 1 到 100 个字符',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
-    //业务公司选择
+    // 业务公司选择
     async companyNosearchChange(e) {
-      const { id, code, label } = e;
-      this.ruleForm.companyNo = code || "";
-      this.$refs.ruleForm.validateField("companyNo");
+      const { id, code, label } = e
+      this.ruleForm.companyNo = code || ''
+      this.$refs.ruleForm.validateField('companyNo')
     },
-    //供应商公司选择
+    // 供应商公司选择
     supplierChange(e) {
       if (e && e.id) {
-        this.ruleForm.supplierNo = [e.code]; //供应商编码
+        this.ruleForm.supplierNo = [e.code] // 供应商编码
       } else {
-        this.ruleForm.supplierNo = [];
+        this.ruleForm.supplierNo = []
       }
-      this.$refs.ruleForm.validateField("supplierNo");
+      this.$refs.ruleForm.validateField('supplierNo')
     },
-    //仓库省市区
+    // 仓库省市区
     selectAreaAddr_code(e) {
-      this.ruleForm.addr_code = e;
-      this.$refs.ruleForm.validateField("addr_code");
+      this.ruleForm.addr_code = e
+      this.$refs.ruleForm.validateField('addr_code')
     },
-    //收发货省市区
+    // 收发货省市区
     selectAreaAddrs_code(e) {
-      this.ruleForm.addrs_code = e;
-      this.$refs.ruleForm.validateField("addrs_code");
+      this.ruleForm.addrs_code = e
+      this.$refs.ruleForm.validateField('addrs_code')
     },
-    //负责人选择
+    // 负责人选择
     accountChange(e) {
       if (e && e.id) {
-        this.ruleForm.contactor_id = [e.id];
+        this.ruleForm.contactor_id = [e.id]
       } else {
-        this.ruleForm.contactor_id = [];
+        this.ruleForm.contactor_id = []
       }
-      this.$refs.ruleForm.validateField("contactor_id");
+      this.$refs.ruleForm.validateField('contactor_id')
     },
     async initForm() {
-      this.supplier_name = "";
-      this.loading = true;
-      if (this.id === "add") {
-        this.title = "新建仓库";
-        this.rulesThis = this.rules;
-        await this.resetForm();
+      this.supplier_name = ''
+      this.loading = true
+      if (this.id === 'add') {
+        this.title = '新建仓库'
+        this.rulesThis = this.rules
+        await this.resetForm()
       } else {
         if (this.isDetail) {
-          this.title = "仓库详情";
-          this.rulesThis = {};
+          this.title = '仓库详情'
+          this.rulesThis = {}
         } else {
-          this.title = "修改仓库";
-          this.rulesThis = this.rules;
+          this.title = '修改仓库'
+          this.rulesThis = this.rules
         }
-        await this.resetForm();
-        await this.initData();
+        await this.resetForm()
+        await this.initData()
       }
-      this.loading = false;
+      this.loading = false
     },
     async initData() {
-      const res = await asyncRequest.detail({ id: this.id });
+      const res = await asyncRequest.detail({ id: this.id })
       if (res && res.code === 0 && res.data) {
         const {
           addr,
@@ -491,92 +481,92 @@ export default {
           wsm_name,
           companyNo,
           position,
-          wsm_type,
-        } = res.data;
+          wsm_type
+        } = res.data
 
-        this.supplier_name = supplier_name;
-        this.accountNames = contactor_name;
+        this.supplier_name = supplier_name
+        this.accountNames = contactor_name
         this.ruleForm = {
-          companyNo: companyNo || this.business_companyNo || "",
+          companyNo: companyNo || this.business_companyNo || '',
           name: name, // 仓库名称
           // supplierNo: [supplierNo], //供应商编码
-          wsmtype: wsm_type || "", //仓库类型 目前随便填
-          addr_code: this.getCode(addr_code), //仓库省市区
-          addr: addr, //仓库详细地址
-          contactor_id: contactor ? [contactor] : [], //仓库联系人
-          mobile: mobile, //仓库联系方式
-          position: position || "", //联系人职位  目前随便填
-          wsm_type: "", //目前随便填
+          wsmtype: wsm_type || '', // 仓库类型 目前随便填
+          addr_code: this.getCode(addr_code), // 仓库省市区
+          addr: addr, // 仓库详细地址
+          contactor_id: contactor ? [contactor] : [], // 仓库联系人
+          mobile: mobile, // 仓库联系方式
+          position: position || '', // 联系人职位  目前随便填
+          wsm_type: '', // 目前随便填
 
-          wsm_name: wsm_name, //收发货联系人
-          wsm_mobile: wsm_mobile, //收发货联系方式
-          wsm_addr: wsm_addr, //收发货地址详细
-          addrs_code: this.getCode(addrs_code), //收发货省市区
-        };
-        console.log(this.ruleForm);
+          wsm_name: wsm_name, // 收发货联系人
+          wsm_mobile: wsm_mobile, // 收发货联系方式
+          wsm_addr: wsm_addr, // 收发货地址详细
+          addrs_code: this.getCode(addrs_code) // 收发货省市区
+        }
+        console.log(this.ruleForm)
 
         // this.ruleForm = res.data;
         // this.ruleForm.role_id = this.ruleForm.role;
       } else if (res && res.code >= 100 && res.code <= 104) {
-        await this.logout();
+        await this.logout()
       } else {
-        this.$message.warning(res.message);
+        this.$message.warning(res.message)
       }
     },
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
-          this.supplier_name = "";
-          this.accountNames = "";
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
+          this.supplier_name = ''
+          this.accountNames = ''
           this.ruleForm = {
-            companyNo: "",
-            name: "", // 仓库名称
+            companyNo: '',
+            name: '', // 仓库名称
             // supplierNo: [], //供应商编码
-            wsmtype: "", //仓库类型 目前随便填
-            addr_code: [], //仓库省市区
-            addr: "", //仓库详细地址
-            contactor_id: [], //仓库联系人
-            mobile: "", //仓库联系方式
-            position: "", //联系人职位  目前随便填
+            wsmtype: '', // 仓库类型 目前随便填
+            addr_code: [], // 仓库省市区
+            addr: '', // 仓库详细地址
+            contactor_id: [], // 仓库联系人
+            mobile: '', // 仓库联系方式
+            position: '', // 联系人职位  目前随便填
             // wsm_type: "", //目前随便填
 
-            wsm_name: "", //收发货联系人
-            wsm_mobile: "", //收发货联系方式
-            wsm_addr: "", //收发货地址详细
-            addrs_code: [], //收发货省市区
-          };
+            wsm_name: '', // 收发货联系人
+            wsm_mobile: '', // 收发货联系方式
+            wsm_addr: '', // 收发货地址详细
+            addrs_code: [] // 收发货省市区
+          }
         }
-      });
+      })
     },
     setCode(list) {
-      let model = {
+      const model = {
         provice_code: list[0],
         city_code: list[1],
-        area_code: list[2],
-      };
-      return model;
+        area_code: list[2]
+      }
+      return model
     },
     getCode(obj) {
-      let arr = [];
-      arr.push(obj.provice_code);
-      arr.push(obj.city_code);
-      arr.push(obj.area_code);
-      return arr;
+      const arr = []
+      arr.push(obj.provice_code)
+      arr.push(obj.city_code)
+      arr.push(obj.area_code)
+      return arr
     },
     getId(list) {
-      let arr = JSON.parse(JSON.stringify(list));
-      return arr.join(",");
+      const arr = JSON.parse(JSON.stringify(list))
+      return arr.join(',')
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          this.loading = true;
+          this.loading = true
           const {
             name,
             // supplierNo,
@@ -590,8 +580,8 @@ export default {
             addrs_code,
             companyNo,
             position,
-            wsmtype,
-          } = JSON.parse(JSON.stringify(this.ruleForm));
+            wsmtype
+          } = JSON.parse(JSON.stringify(this.ruleForm))
           const model = {
             id: this.id,
             companyNo,
@@ -607,39 +597,39 @@ export default {
             addrs_code: this.setCode(addrs_code),
             position,
             // wsm_type: "", //目前随便填
-            wsmtype,
-          };
-          console.log(model);
-          let res = {};
-          if (this.id === "add") {
-            delete model["id"];
-            res = await asyncRequest.add(model);
+            wsmtype
+          }
+          console.log(model)
+          let res = {}
+          if (this.id === 'add') {
+            delete model['id']
+            res = await asyncRequest.add(model)
           } else {
-            res = await asyncRequest.update(model);
+            res = await asyncRequest.update(model)
           }
-          this.loading = false;
+          this.loading = false
           if (res && res.code === 0) {
-            const title = this.id === "add" ? "添加成功" : "修改成功";
+            const title = this.id === 'add' ? '添加成功' : '修改成功'
             this.$notify.success({
               title,
-              message: "",
-            });
-            this.showModelThis = false;
+              message: ''
+            })
+            this.showModelThis = false
             // 刷新
-            this.$emit("refresh");
+            this.$emit('refresh')
           } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(res.message)
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>

src/views/serviceParam/storeSet/index.vue

@@ -329,13 +329,13 @@ export default {
           width: "80px",
         },
         {
-          prop: "supplierNo",
-          label: "供应商编号",
+          prop: "companyNo",
+          label: "业务公司编码",
           width: "140px",
         },
         {
-          prop: "supplier_name",
-          label: "供应商公司",
+          prop: "company_name",
+          label: "业务公司",
           "min-width": "140px",
         },
         {