Jelajahi Sumber

Merge branch 'develop_yh17_fencang' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh17_fencang

chenrui 2 tahun lalu
induk
melakukan
53b2d41bde

+ 10 - 0
src/config/router.config.js

@@ -91,6 +91,16 @@ export const asyncRouterMap = [
                 },
                 hidden: true
               },
+              {
+                path: '/newProduct/list/:onlineFalg',
+                name: 'oldProductList',
+                component: () => import(/* webpackChunkName: "home" */ '@/views/productManagement/newProduct/list'),
+                meta: {
+                  title: '下线产品列表',
+                  icon: 'home'
+                },
+                hidden: true
+              },
               // 产品详情
               {
                 path: '/viewProduct/:sn',

+ 3 - 3
src/views/Home.vue

@@ -15,10 +15,10 @@
       v-model="openResetPwd">
       <ResetPwd />
     </a-modal>
-    <!-- 产品上线提醒 -->
+    <!-- 产品上线提醒 -->
     <a-modal
       class="newProductTips"
-      :title="'产品'+(onlineFalg=='1'?'上':'下')+'线提醒'"
+      :title="'产品'+(onlineFalg=='1'?'上':'下')+'线提醒'"
       :width="800"
       centered
       :footer="null"
@@ -83,7 +83,7 @@ export default {
     // 查看更多产品
     seeMore () {
       this.openNewProduct = false
-      this.$router.push({ name: 'newProductList', params: { onlineFalg: this.onlineFalg } })
+      this.$router.push({ name: this.onlineFalg == 1 ? 'newProductList' : 'oldProductList', params: { onlineFalg: this.onlineFalg } })
     },
     // 关闭弹框
     cancelProductTips () {

+ 1 - 1
src/views/productManagement/newProduct/modal.vue

@@ -15,7 +15,7 @@
         bordered>
       </s-table>
       <div style="padding-top: 15px;">
-        <a-button @click="viewMore" block type="primary" ghost>查看更多新品</a-button>
+        <a-button @click="viewMore" block type="primary" ghost>查看更多{{onlineFalg==1?'新品':'下线产品'}}</a-button>
       </div>
     </a-spin>
   </div>

+ 2 - 2
src/views/salesReturnManagement/salesReturn/importGuideModal.vue

@@ -15,8 +15,8 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“数量”、“价格”、“退货原因”的列,且名称必须相同</li>
-            <li>2) 除了“产品编码”、“数量”、“价格”、“退货原因”四列,其他列可自定义,不影响数据导入</li>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“数量”、“退货原因”的列,且名称必须相同</li>
+            <li>2) 除了“产品编码”、“数量”、“退货原因”四列,其他列可自定义,不影响数据导入</li>
             <li>3) 如果导入的产品已经存在,则不会导入该行</li>
           </ul>
           <a-button type="link" icon="download" style="padding: 0 0 0 23px;" :loading="exportLoading" @click="handleExport">下载导入模板</a-button>