build

src/components/good-online-platform-modal/main.vue

@@ -1,18 +1,18 @@
 <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">
       <ex-table
@@ -44,7 +44,7 @@
                     :value="parmValue.brandid"
                     :disabled="false"
                     :size="'mini'"
-                    :isDetail="false"
+                    :is-detail="false"
                     :names="''"
                     :placeholder="'品牌'"
                     @searchChange="brandidsearchChange"
@@ -53,11 +53,11 @@
                 <el-col :span="6" style="width: 370px; padding: 0 0 0 10px">
                   <good-class
                     :value="parmValue.cat_id"
-                    @handleChange="goods_class_change"
                     :disabled="false"
                     :size="searchSize"
-                    :isDetail="false"
+                    :is-detail="false"
                     :placeholder="'分类'"
+                    @handleChange="goods_class_change"
                   />
                 </el-col>
 
@@ -85,9 +85,9 @@
               <el-col :span="24" style="padding: 10px 0 0 0">
                 <el-col :span="4" style="width: 450px">
                   <el-input
+                    v-model="sinput"
                     clearable
                     :size="'mini'"
-                    v-model="sinput"
                     :maxlength="40"
                     placeholder="关键字"
                     @blur="
@@ -97,9 +97,9 @@
                     "
                   >
                     <el-select
+                      slot="prepend"
                       v-model="select"
                       style="width: 120px"
-                      slot="prepend"
                       placeholder="关键字类型"
                     >
                       <el-option label="商品名称" value="1" />
@@ -127,22 +127,20 @@
         <template #good_thumb_img="{ scope }">
           <div
             v-if="scope.row.good_thumb_img"
+            v-viewer
             style="width: 20px; height: 20px"
             class="hover"
-            v-viewer
           >
             <img
               :src="scope.row.good_thumb_img"
               style="display: inline-block; width: 100%; height: 100%"
               alt=""
-            />
+            >
           </div>
         </template>
         <template #model="{ scope }">
           <span v-for="(si, sii) in scope.row.specinfo" :key="si.spec_id">
-            <span v-if="sii !== 0">--</span
-            ><span>{{ si.spec_name }}[{{ si.spec_value }}]</span></span
-          >
+            <span v-if="sii !== 0">--</span><span>{{ si.spec_name }}[{{ si.spec_value }}]</span></span>
         </template>
         <template #is_stock="{ scope }">
           <span>{{ scope.row.is_stock + '' === "1" ? "库存品" : "非库存品" }} </span>
@@ -153,19 +151,19 @@
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/search-good-online-modal";
-import asyncYZRequest from "@/apis/service/youzan/othgoodsOnline";
-import resToken from "@/mixins/resToken";
-import mixinPage from "@/mixins/elPaginationHandle";
-import { mapGetters } from "vuex";
-import columns from "./columns";
+import asyncRequest from '@/apis/components/search-good-online-modal'
+import asyncYZRequest from '@/apis/service/youzan/othgoodsOnline'
+import resToken from '@/mixins/resToken'
+import mixinPage from '@/mixins/elPaginationHandle'
+import { mapGetters } from 'vuex'
+import columns from './columns'
 export default {
-  name: "searchGoodOnlineModal",
+  name: 'SearchGoodOnlineModal',
   mixins: [resToken, mixinPage],
   computed: {
-    ...mapGetters(["tablebtnSize", "searchSize", "size"]),
+    ...mapGetters(['tablebtnSize', 'searchSize', 'size'])
   },
-  props: ["showModel", "once", "sitem", "active","platform_type"],
+  props: ['showModel', 'once', 'sitem', 'active', 'platform_type'],
 
   /**
    * 属性集合
@@ -178,31 +176,31 @@ export default {
    */
   data() {
     return {
-      select: "1",
-      sinput: "",
+      select: '1',
+      sinput: '',
       is_stock: [
-        { id: "0", name: "非库存品" },
-        { id: "1", name: "库存品" },
+        { id: '0', name: '非库存品' },
+        { id: '1', name: '库存品' }
       ],
       selectLoading: false,
-      searchName: "",
+      searchName: '',
       supplierCode: [],
       loading: true,
       showModelThis: false,
       parmValue: {
-        platform_code: "",
-        companyNo: "",
-        is_stock: "",
-        exam_status: "",
+        platform_code: '',
+        companyNo: '',
+        is_stock: '',
+        exam_status: '',
         cat_id: [], // 商品属性code
         brandid: [],
-        skucode: "",
-        spucode: "", // 商品编码
-        good_name: "", // 商品名称
-        plat_code: "",
+        skucode: '',
+        spucode: '', // 商品编码
+        good_name: '', // 商品名称
+        plat_code: '',
 
         page: 1, // 页码
-        size: 15, // 每页显示条数
+        size: 15 // 每页显示条数
       },
       tableData: [],
       passwordModel: false,
@@ -213,163 +211,163 @@ export default {
       // 表格 - 参数
       table: {
         stripe: true,
-        border: true,
+        border: true
         // _defaultHeader_: ["setcol"],
       },
       // 表格 - 分页
       pageInfo: {
         size: 15,
         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.restSearch();
+        this.restSearch()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
 
   methods: {
     restSearch() {
-      console.log(this.active);
-      console.log(this.sitem);
-      const { platform_code, company_id, is_stock } = this.sitem;
+      console.log(this.active)
+      console.log(this.sitem)
+      const { platform_code, company_id, is_stock } = this.sitem
 
       this.parmValue = {
-        platform_code: platform_code || "",
-        companyNo: company_id || "", //业务企业编号
-        is_stock: is_stock || "",
+        platform_code: platform_code || '',
+        companyNo: company_id || '', // 业务企业编号
+        is_stock: is_stock || '',
         cat_id: [], // 商品属性code
         brandid: [],
-        exam_status: this.active ? "6" : "",
-       skucode: "",
-        spucode: "", // 商品编码
-        good_name: "", // 商品名称
-        plat_code: "",
+        exam_status: this.active ? '6' : '',
+        skucode: '',
+        spucode: '', // 商品编码
+        good_name: '', // 商品名称
+        plat_code: '',
         page: 1, // 页码
-        size: 15, // 每页显示条数
-      };
+        size: 15 // 每页显示条数
+      }
       // 表格 - 分页
       this.pageInfo = {
         size: 15,
         curr: 1,
-        total: 0,
-      };
-      this.searchList();
+        total: 0
+      }
+      this.searchList()
     },
     async goods_class_change(e) {
-      this.parmValue.cat_id = e;
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      this.parmValue.cat_id = e
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
     async brandidsearchChange(e) {
-      const { id } = e;
-      this.parmValue.brandid = id ? [id] : [];
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      const { id } = e
+      this.parmValue.brandid = id ? [id] : []
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
     async platform_codesearchChange(e) {
-      const { id, code, label } = e;
-      this.parmValue.platform_code = id ? [id] : [];
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      const { id, code, label } = e
+      this.parmValue.platform_code = id ? [id] : []
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
     async company_idsearchChange(e) {
-      const { id, code, label } = e;
-      this.parmValue.company_id = code || "";
-      this.pageInfo.curr = 1;
-      this.parmValue.page = 1;
-      await this.searchList();
+      const { id, code, label } = e
+      this.parmValue.company_id = code || ''
+      this.pageInfo.curr = 1
+      this.parmValue.page = 1
+      await this.searchList()
     },
     async searchList() {
-      this.loading = true;
-      let model = JSON.parse(JSON.stringify(this.parmValue));
+      this.loading = true
+      const model = JSON.parse(JSON.stringify(this.parmValue))
       model.cat_id =
-        model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : "";
+        model.cat_id.length > 0 ? model.cat_id[model.cat_id.length - 1] : ''
       model.brandid =
-        model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : "";
-      model.spucode = this.select === "2" ? this.sinput : ""; // 商品编码
-      model.good_name = this.select === "1" ? this.sinput : ""; // 商品名称
-      model.plat_code = this.select === "3" ? this.sinput : "";
-      model.skucode = this.select === "4" ? this.sinput : "";
+        model.brandid.length > 0 ? model.brandid[model.brandid.length - 1] : ''
+      model.spucode = this.select === '2' ? this.sinput : '' // 商品编码
+      model.good_name = this.select === '1' ? this.sinput : '' // 商品名称
+      model.plat_code = this.select === '3' ? this.sinput : ''
+      model.skucode = this.select === '4' ? this.sinput : ''
       // model.platform_code =
       //   model.platform_code.length > 0
       //     ? model.platform_code[model.platform_code.length - 1]
       //     : "";
 
-      const apis = this.platform_type + "" === '1' ? asyncYZRequest : asyncRequest;
+      const apis = this.platform_type + '' === '1' ? asyncYZRequest : asyncRequest
 
-      const res = await apis.list(model);
+      const res = await apis.list(model)
       if (res && res.code === 0 && res.data) {
-        this.tableData = res.data.list;
+        this.tableData = res.data.list
         this.tableData.map((e) => {
-          e.cat_name = "";
+          e.cat_name = ''
           if (e.cat_info && e.cat_info.length > 0) {
             e.cat_info.forEach((si, sii) => {
-              e.cat_name += `${sii !== 0 ? "_" : ""}${si.name}`;
-            });
+              e.cat_name += `${sii !== 0 ? '_' : ''}${si.name}`
+            })
           }
-          return e;
-        });
+          return e
+        })
 
-        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 remoteMethod(query) {
-      this.selectLoading = true;
-      if (query !== "") {
-        this.options = [];
-        let formValue = {
+      this.selectLoading = true
+      if (query !== '') {
+        this.options = []
+        const formValue = {
           page: 1,
           size: 100,
           name: query,
-          code: "",
-        };
+          code: ''
+        }
 
-        let res = await asyncRequest.supplierList(formValue);
+        const res = await asyncRequest.supplierList(formValue)
         if (res && res.code === 0 && res.data) {
-          const { list } = res.data;
-          this.options = list;
+          const { list } = res.data
+          this.options = list
         } 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 {
-        this.options = [];
+        this.options = []
       }
-      this.selectLoading = false;
+      this.selectLoading = false
     },
     async resultList(selection) {
       if (selection && selection.length > 1 && this.once) {
-        this.$message.warning("只能选择一条商品信息！");
-        return;
+        this.$message.warning('只能选择一条商品信息！')
+        return
       }
-      this.showModelThis = false;
-      this.$emit("resultList", selection);
-    },
-  },
-};
+      this.showModelThis = false
+      this.$emit('resultList', selection)
+    }
+  }
+}
 </script>
 
 <style>

src/views/goodStore/supplierGoodsCost/index.vue

@@ -233,7 +233,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="getRouter('goodsCostDetail', scope.row.spuCode)"
+            @click="getRouter('supplierGoodsCostDetail', scope.row.spuCode)"
           ></i>
         </el-tooltip>
         <el-tooltip

src/views/goodStore/supplierGoodsOffline/index.vue

@@ -113,7 +113,7 @@
         >
           <i
             class="el-icon-view tb-icon"
-            @click="getRouter('goodsOfflineDetail', scope.row.id)"
+            @click="getRouter('supplierGoodsOfflineDetail', scope.row.id)"
           ></i>
         </el-tooltip>
     

src/views/purchaseIn/purchaseOrder/detail.vue

@@ -271,6 +271,7 @@ export default {
       const tran =
         this.$store.getters.roleProcess.find((i) => i.process_type === "CGD") || {};
       const { action } = tran ?? {};
+      console.log(action)
       return action ?? [];
     },
   },

src/views/supplierSellOut/returnOrder/index.vue

@@ -158,7 +158,7 @@
           >
             <i
               class="el-icon-view tb-icon"
-              @click="getRouter('returnOrderDetail', scope.row.thNo)"
+              @click="getRouter('supplierReturnOrderDetail', scope.row.thNo)"
             ></i>
           </el-tooltip>
         </template>

src/views/supplierSellOut/sellAfterApply/components/wait-return.vue

@@ -1,11 +1,11 @@
 <template>
   <el-form ref="formRef" class="supplier-form" size="mini" label-width="80px" :model="formData" :rules="rules">
-    <el-form-item label="是否退货" prop="is_th">
+    <!-- <el-form-item label="是否退货" prop="is_th">
       <el-select v-model="formData.is_th" style="width:100%">
         <el-option label="是" value="1" />
         <el-option label="否" value="2" />
       </el-select>
-    </el-form-item>
+    </el-form-item> -->
 
     <template v-if="displayExpressField">
       <el-form-item label="物流公司" prop="company">