xiaodai2022 2 jaren geleden
bovenliggende
commit
4fba595abc
2 gewijzigde bestanden met toevoegingen van 44 en 41 verwijderingen
  1. 34 40
      src/views/stock/check/index.vue
  2. 10 1
      src/views/supplierPurchaseIn/supplierRecovery/columns.js

+ 34 - 40
src/views/stock/check/index.vue

@@ -1,8 +1,6 @@
 <template>
   <div class="check pagePadding">
-    <div
-      v-if=" powers.some((i) => i == '001')"
-    >
+    <div v-if="powers.some((i) => i == '001')">
       <ex-table
         v-loading="loading"
         :table="table"
@@ -156,8 +154,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>
@@ -166,8 +164,7 @@
             :size="tablebtnSize"
             :type="scope.row.type == '1' ? 'success' : ''"
             v-text="
-              (typeOptions.find((item) => item.id == scope.row.type) || {})
-                .label || '--'
+              (typeOptions.find((item) => item.id == scope.row.type) || {}).label || '--'
             "
           ></el-tag>
         </template>
@@ -180,7 +177,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="getRouter('checkDetail', scope.row.id )"
+              @click="getRouter('checkDetail', scope.row.id)"
             ></i>
           </el-tooltip>
         </template>
@@ -199,7 +196,7 @@
     </div>
   </div>
 </template>
-   <script>
+<script>
 import mixinPage from "@/mixins/elPaginationHandle";
 import companyHelper from "@/mixins/companyHelper";
 import resToken from "@/mixins/resToken";
@@ -216,9 +213,7 @@ export default {
     ...mapGetters(["tablebtnSize", "searchSize", "size", "isSupertube"]),
     powers() {
       const tran =
-        this.$store.getters.btnList.find(
-          (item) => item.menu_route == "check"
-        ) || {};
+        this.$store.getters.btnList.find((item) => item.menu_route == "check") || {};
       const { action } = tran ?? {};
       return action ?? [];
     },
@@ -278,26 +273,6 @@ export default {
           label: "盘点编号",
           width: "155px",
         },
-
-        {
-          prop: "wsm_code",
-          label: "仓库编码",
-          width: "170px",
-        },
-        {
-          prop: "name",
-          label: "仓库名称",
-        },
-
-        {
-          prop: "code",
-          label: "公司编码",
-          width: "140px",
-        },
-        {
-          prop: "caname",
-          label: "公司名称",
-        },
         {
           prop: "status",
           label: "盘点状态",
@@ -311,6 +286,26 @@ export default {
           _slot_: "type",
           width: "70px",
         },
+        {
+          prop: "companyNo",
+          label: "业务公司编号",
+          width: "160",
+        },
+        {
+          prop: "companyName",
+          label: "业务公司名称",
+          "min-width": "135",
+        },
+        {
+          prop: "wsm_code",
+          label: "仓库编码",
+          width: "170px",
+        },
+        {
+          prop: "name",
+          label: "仓库名称",
+        },
+
         {
           prop: "addtime",
           label: "创建时间",
@@ -331,12 +326,12 @@ export default {
     const { back } = this.$route.query;
     if (back) {
       this.parmValue = JSON.parse(back);
-      const {page,size}=this.parmValue
-       this.pageInfo= {
+      const { page, size } = this.parmValue;
+      this.pageInfo = {
         size: size,
         curr: page,
         total: 0,
-      }
+      };
     }
     this.searchList();
   },
@@ -348,7 +343,7 @@ export default {
           id: queryId,
         };
 
-         let routerModel = {
+        let routerModel = {
           options: JSON.parse(JSON.stringify(this.parmValue)),
           router: this.$route.path,
         };
@@ -413,10 +408,10 @@ export default {
       }
 
       this.loading = true;
-      
+
       const res = await asyncRequest.list({
         ...this.parmValue,
-        needRela: true
+        needRela: true,
       });
 
       if (res && res.code === 0 && res.data) {
@@ -433,5 +428,4 @@ export default {
   },
 };
 </script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>

+ 10 - 1
src/views/supplierPurchaseIn/supplierRecovery/columns.js

@@ -15,7 +15,16 @@ const columns = [
     label: "反馈商品编号",
     width: "153px",
   },
-
+  {
+    prop: "companyNo",
+    label: "业务公司编号",
+    width: "160",
+  },
+  {
+    prop: "companyName",
+    label: "业务公司名称",
+    "min-width": "135",
+  },
   {
     prop: "good_name",
     label: "商品名称",