lucky 2 gadi atpakaļ
vecāks
revīzija
3506149e41

+ 1 - 1
src/views/serviceParam/business/index.vue

@@ -91,7 +91,7 @@
         </el-col>
       </el-row>
       <el-table
-        v-loading="false"
+        v-loading="loading"
         :data="tableData"
         :size="size"
         border

+ 5 - 6
src/views/serviceParam/storeSet/index.vue

@@ -4,7 +4,7 @@
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
       <ex-table
-        v-loading="false"
+        v-loading="loading"
         :table="table"
         :data="tableData"
         :columns="columns"
@@ -306,7 +306,7 @@ export default {
       supplierNo: [], //供应商
       stock_sn: "", //企业/仓库编码
       stock_name: "", //企业/仓库名称
-        company_name: "", //负责人部门
+        company_new_name: "", //负责人部门
       link: "", //联系电话/联系人
       loading: true,
       showModel: false,
@@ -372,9 +372,8 @@ export default {
           // sortable: true,
           _slot_: "status",
         },
-        //后台重名company_name,需修改
         {
-          prop: "company_name",
+          prop: "company_new_name",
           label: "负责人部门",
           minWidth: "150px",
         },
@@ -457,7 +456,7 @@ export default {
         wsm_code: "", //仓库编码
         wsm_type:"",
         start: "", //新建起始时间
-        company_name: "", //负责人部门
+        company_new_name: "", //负责人部门
         end: "", //新建结束时间
         mobile: "", //手机号
         contactor_name: "", //联系人
@@ -484,7 +483,7 @@ export default {
       this.parmValue.wsm_code = this.select === "1" ? this.input : "";
       this.parmValue.contactor_name = this.select === "2" ? this.input : "";
       this.parmValue.mobile = this.select === "3" ? this.input : "";
-      this.parmValue.company_name = this.select === "4" ? this.input : "";
+      this.parmValue.company_new_name = this.select === "4" ? this.input : "";
       const res = await asyncRequest.list(this.parmValue);
       if (res && res.code === 0 && res.data) {
         console.log("aaaaaaaaaaaaaaaa", res);