ソースを参照

Merge branch 'sit'

xiaodai2022 2 年 前
コミット
dd33afdc20

ファイルの差分が大きいため隠しています
+ 0 - 0
dist/index.html


ファイルの差分が大きいため隠しています
+ 0 - 0
dist/static/js/chunk-f51ebd40.dcd609fe.js


BIN
dist/static/js/chunk-f51ebd40.633da090.js.gz → dist/static/js/chunk-f51ebd40.dcd609fe.js.gz


+ 23 - 49
src/views/serviceParam/storeSet/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="storeSet pagePadding">
-    <div
-      v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
-    >
+    <div v-if="powers && powers.length > 0 && powers.some((item) => item == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -70,16 +68,8 @@
                 /> -->
               </el-col>
 
-              <el-col
-                :span="3"
-                style="width: 56px; margin-left: 10px"
-                class="fr"
-              >
-                <el-button
-                  :size="searchSize"
-                  type="primary"
-                  @click="searchList"
-                >
+              <el-col :span="3" style="width: 56px; margin-left: 10px" class="fr">
+                <el-button :size="searchSize" type="primary" @click="searchList">
                   刷新
                 </el-button>
               </el-col>
@@ -133,11 +123,7 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <el-col
-                :span="4"
-                style="width: 66px; padding-left: 10px"
-                class="fr"
-              >
+              <el-col :span="4" style="width: 66px; padding-left: 10px" class="fr">
                 <el-button
                   type="warning"
                   class="fl"
@@ -170,8 +156,8 @@
             :size="tablebtnSize"
             :type="scope.row.status == '0' ? 'warning' : ''"
             v-text="
-              (statusOptions.find((item) => item.id == scope.row.status) || {})
-                .label || '--'
+              (statusOptions.find((item) => item.id == scope.row.status) || {}).label ||
+              '--'
             "
           ></el-tag>
         </template>
@@ -183,10 +169,7 @@
             content="详情"
             placement="top"
           >
-            <i
-              class="el-icon-view tb-icon"
-              @click="openModal(scope.row.id, true)"
-            ></i>
+            <i class="el-icon-view tb-icon" @click="openModal(scope.row.id, true)"></i>
           </el-tooltip>
           <el-tooltip
             v-if="powers.some((item) => item == '005')"
@@ -194,15 +177,10 @@
             content="修改"
             placement="top"
           >
-            <i
-              class="el-icon-edit tb-icon"
-              @click="openModal(scope.row.id, false)"
-            ></i>
+            <i class="el-icon-edit tb-icon" @click="openModal(scope.row.id, false)"></i>
           </el-tooltip>
           <el-tooltip
-            v-if="
-              powers.some((item) => item == '004') && scope.row.status === '1'
-            "
+            v-if="powers.some((item) => item == '004') && scope.row.status === '1'"
             effect="dark"
             content="禁用"
             placement="top"
@@ -213,9 +191,7 @@
             ></i>
           </el-tooltip>
           <el-tooltip
-            v-if="
-              powers.some((item) => item == '004') && scope.row.status === '0'
-            "
+            v-if="powers.some((item) => item == '004') && scope.row.status === '0'"
             effect="dark"
             content="启用"
             placement="top"
@@ -251,7 +227,7 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import resToken from "@/mixins/resToken";
 import asyncRequest from "@/apis/service/serviceParam/storeSet";
@@ -267,9 +243,7 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size"]),
     powers() {
       let tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "storeSet"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "storeSet") || {};
       if (tran && tran.action && tran.action.length > 0) {
         return tran.action;
       } else {
@@ -306,7 +280,7 @@ export default {
       supplierNo: [], //供应商
       stock_sn: "", //企业/仓库编码
       stock_name: "", //企业/仓库名称
-        company_new_name: "", //负责人部门
+      company_new_name: "", //负责人部门
       link: "", //联系电话/联系人
       loading: true,
       showModel: false,
@@ -320,6 +294,8 @@ export default {
         end: "", //新建结束时间
         mobile: "", //手机号
         contactor_name: "", //联系人
+        size: 15,
+        page: 1,
       },
       tableData: [],
       passwordModel: false,
@@ -454,7 +430,7 @@ export default {
       this.parmValue = {
         supplierNo: "", //供应商编码
         wsm_code: "", //仓库编码
-        wsm_type:"",
+        wsm_type: "",
         start: "", //新建起始时间
         company_new_name: "", //负责人部门
         end: "", //新建结束时间
@@ -484,12 +460,12 @@ export default {
       this.parmValue.contactor_name = this.select === "2" ? this.input : "";
       this.parmValue.mobile = this.select === "3" ? 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);
-        this.tableData = res.data.list;
-        this.pageInfo.total = Number(res.data.count);
-      } else if (res && res.code >= 100 && res.code <= 104) {
+      const { code, data } = await asyncRequest.list(this.parmValue);
+      if (code === 0) {
+        const { list, count } = data ?? {};
+        this.tableData = list;
+        this.pageInfo.total = Number(count ?? "0");
+      } else if (code >= 100 && code <= 104) {
         await this.logout();
       } else {
         this.tableData = [];
@@ -564,6 +540,4 @@ export default {
   },
 };
 </script>
-   <style lang="scss" scoped>
-</style>
-   
+<style lang="scss" scoped></style>

この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません