修复bug

public/uploadSku.csv

 *上架有效期,*商品型号,*制造商,*库存数量,"*最小起订量
 (MOQ)",标准包装量（MPQ）,*递增量,封装,*批次,大陆交期,香港交期,简短描述,物料编码,*显示类型（国内现货，国际现货，猎芯期货）,含税成本价(RMB),美金成本价(USD),阶梯数量1,国内含税价1(￥),香港交货价1($),阶梯数量2,国内含税价2(￥),香港交货价2($),阶梯数量3,国内含税价3(￥),香港交货价3($),阶梯数量4,国内含税价4（￥）,香港交货价4（$）,阶梯数量5,国内含税价5（￥）,香港交货价5（$）,阶梯数量6,国内含税价6（￥）,香港交货价6（$）,阶梯数量7,国内含税价7（￥）,香港交货价7（$）,阶梯数量8,国内含税价8（￥）,香港交货价8（$）,阶梯数量9,国内含税价9（￥）,香港交货价9（$）
-2022/2/20,NFM18CC471R1C3D,ws-brand-test-1,1200,1000,1000,1,,2205,2-5工作日,7-10工作日,,,国内现货,10,,1000,10,1.5,,,,,,,,,,,,,,,,,,,,,,,,
-2022/2/20,FM18CC1R1C3,ws-brand-01,1200,1000,1000,1,,22+,2-5工作日,7-10工作日,,,国际现货,10,,1000,10,1.5,,,,,,,,,,,,,,,,,,,,,,,,
-2022/2/20,FM18CC1R1C3,ws-brand-01,1200,1000,1000,1,,2201-2205,2-5工作日,7-10工作日,,,猎芯期货,10,,1000,10,1.5,,,,,,,,,,,,,,,,,,,,,,,,
+2023/7/25,NFM18CC471R1C3D,ws-brand-test-1,1200,1000,1000,1,,2301,2-5工作日,7-10工作日,,,国内现货,10,,1000,10,1.5,,,,,,,,,,,,,,,,,,,,,,,,
+2023/7/25,FM18CC1R1C3,ws-brand-01,1200,1000,1000,1,,23+,2-5工作日,7-10工作日,,,国际现货,10,,1000,10,1.5,,,,,,,,,,,,,,,,,,,,,,,,
+2023/7/25,FM18CC1R1C3,ws-brand-01,1200,1000,1000,1,,2315,2-5工作日,7-10工作日,,,猎芯期货,10,,1000,10,1.5,,,,,,,,,,,,,,,,,,,,,,,,

src/main.js

@@ -8,11 +8,15 @@ import axios from 'axios'
 
 import {hideLoading, showLoading} from './ajax/loading';
 import Util from "./tool";
+import { Message} from 'element-ui'
 
 //加载全局样式
 import '@/assets/css/public/common.min.css'
 import '@/assets/css/font/iconfont.css'
 
+Vue.prototype.$message = Message
+
+
 //本地环境开启提示信息
 Vue.config.productionTip = true;
 
@@ -83,7 +87,10 @@ axios.interceptors.response.use(res => {
   }
   return res.data;
 }, error => {
-  Message('网络出现问题,请检查网络');
+  Message({
+    message: '网络出现问题,请检查网络',
+    type: 'error'
+  });
   hideLoading();
   return Promise.reject(new Error(error))
 })

src/views/Store/list.vue

@@ -16,6 +16,13 @@
             <el-option label="下架" value="3"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="来源" prop="status">
+          <el-select v-model="formParam.source" placeholder="请选择" clearable>
+            <el-option label="全部" value=""></el-option>
+            <el-option label="自主上传" value="7"></el-option>
+            <el-option label="代上传" value="9"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="更新日期" prop="date">
           <el-date-picker :unlink-panels=true style="width:193px" prefix-icon="prefix-icon-time-style" v-model="formParam.date" type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
@@ -377,7 +384,7 @@
         </el-table>
       </el-dialog>
       <!--弹窗日志详情-->
-      <el-dialog title="修改详情" :close-on-click-modal="false" :visible.sync="dialogVisibleLogDetail" width="1000px">
+      <el-dialog title="修改详情" :close-on-click-modal="false" :visible.sync="dialogVisibleLogDetail" width="1000px" @close="closeBothDialogs">
         <div class="row verCenter bothSide">
           <div style="width:470px">
             <el-table :data="message.pre_data" border max-height="600">
@@ -435,7 +442,8 @@ export default {
         status: '',
         brand_name: '',
         date: '',
-        cp_time: ''
+        cp_time: '',
+        source:''
       },
       multipleSelection: [],
       selectData: [],
@@ -467,6 +475,10 @@ export default {
     this.getSkuRankList();
   },
   methods: {
+    closeBothDialogs(){
+      this.dialogVisibleLog = false;
+      this.dialogVisibleLogDetail = false;
+    },
     /**
      * 查看日志
      * @param row

src/views/Store/listDetail.vue

@@ -33,7 +33,8 @@
             <el-tag v-else-if="scope.row.status==4" type="warning">审核未通过</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="error_msg" label="失败原因" width="75" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="error_msg" label="失败原因" width="200" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column prop="reject_msg" label="审核不通过原因" width="200" :show-overflow-tooltip="true"></el-table-column>
         <el-table-column prop="goods_name" label="型号"></el-table-column>
         <el-table-column prop="brand_name" label="品牌"></el-table-column>
         <el-table-column prop="stock" label="库存数量" width="100"></el-table-column>