Browse Source

修改bug

chenrui 9 months ago
parent
commit
565e21c526

+ 12 - 0
src/api/shopProduct.js

@@ -75,6 +75,18 @@ export const shopProductDetail = params => {
 
 
 // 商城产品 批量保存
 // 商城产品 批量保存
 export const saveBatchProduct = params => {
 export const saveBatchProduct = params => {
+  return axios({
+    url: '/shopProduct/saveBatchProduct',
+    data: params,
+    method: 'post',
+    headers: {
+      'module': encodeURIComponent('批量保存')
+    }
+  })
+}
+
+// 商城产品 选择产品批量保存
+export const saveBatchProductExcel = params => {
   return axios({
   return axios({
     url: '/shopProduct/saveBatchProductExcel',
     url: '/shopProduct/saveBatchProductExcel',
     data: params,
     data: params,

+ 50 - 50
src/config/router.config.js

@@ -3468,53 +3468,6 @@ export const asyncRouterMap = [
           permission: 'M_promotionRulesManagement'
           permission: 'M_promotionRulesManagement'
         },
         },
         children: [
         children: [
-          {
-            path: '/promotionRulesManagement/promotionManagement',
-            redirect: '/promotionRulesManagement/promotionManagement/list',
-            name: 'promotionManagement',
-            component: BlankLayout,
-            meta: {
-              title: '修理厂促销',
-              icon: 'file-ppt',
-              permission: 'M_promotionManagementList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'promotionManagementList',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/list.vue'),
-                meta: {
-                  title: '修理厂促销列表',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'M_promotionManagementList'
-                }
-              },
-              {
-                path: 'add/:sn/:pageType',
-                name: 'promotionManagementAdd',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/edit.vue'),
-                meta: {
-                  title: '新增修理厂促销',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'B_promotionManagementAdd'
-                }
-              },
-              {
-                path: 'edit/:sn/:pageType',
-                name: 'promotionManagementEdit',
-                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/edit.vue'),
-                meta: {
-                  title: '编辑修理厂促销',
-                  icon: 'file-ppt',
-                  hidden: true,
-                  permission: 'B_promotionManagementEdit'
-                }
-              }
-            ]
-          },
           {
           {
             path: '/promotionRulesManagement/dealerPromotions',
             path: '/promotionRulesManagement/dealerPromotions',
             redirect: '/promotionRulesManagement/dealerPromotions/list',
             redirect: '/promotionRulesManagement/dealerPromotions/list',
@@ -3580,7 +3533,7 @@ export const asyncRouterMap = [
             name: 'shoppingManagement',
             name: 'shoppingManagement',
             component: BlankLayout,
             component: BlankLayout,
             meta: {
             meta: {
-              title: '易码通商城',
+              title: '商城类目',
               icon: 'file-ppt'
               icon: 'file-ppt'
               // permission: 'M_shoppingManagementList'
               // permission: 'M_shoppingManagementList'
             },
             },
@@ -3591,7 +3544,7 @@ export const asyncRouterMap = [
                 name: 'shoppingManagementList',
                 name: 'shoppingManagementList',
                 component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingManagement/list.vue'),
                 component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingManagement/list.vue'),
                 meta: {
                 meta: {
-                  title: '易码通商城',
+                  title: '商城类目列表',
                   icon: 'file-ppt',
                   icon: 'file-ppt',
                   hidden: true
                   hidden: true
                   // permission: 'M_shoppingManagementList'
                   // permission: 'M_shoppingManagementList'
@@ -3602,7 +3555,7 @@ export const asyncRouterMap = [
                 name: 'chooseProductList',
                 name: 'chooseProductList',
                 component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingManagement/chooseProduct.vue'),
                 component: () => import(/* webpackChunkName: "easyPassManagement" */ '@/views/easyPassManagement/shoppingManagement/chooseProduct.vue'),
                 meta: {
                 meta: {
-                  title: '管辖产品设置',
+                  title: '商城产品列表',
                   icon: 'file-ppt',
                   icon: 'file-ppt',
                   hidden: true
                   hidden: true
                   // permission: 'M_shoppingManagementList'
                   // permission: 'M_shoppingManagementList'
@@ -3634,6 +3587,53 @@ export const asyncRouterMap = [
                 }
                 }
               }
               }
             ]
             ]
+          },
+          {
+            path: '/promotionRulesManagement/promotionManagement',
+            redirect: '/promotionRulesManagement/promotionManagement/list',
+            name: 'promotionManagement',
+            component: BlankLayout,
+            meta: {
+              title: '修理厂促销',
+              icon: 'file-ppt',
+              permission: 'M_promotionManagementList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'promotionManagementList',
+                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/list.vue'),
+                meta: {
+                  title: '修理厂促销列表',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'M_promotionManagementList'
+                }
+              },
+              {
+                path: 'add/:sn/:pageType',
+                name: 'promotionManagementAdd',
+                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/edit.vue'),
+                meta: {
+                  title: '新增修理厂促销',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'B_promotionManagementAdd'
+                }
+              },
+              {
+                path: 'edit/:sn/:pageType',
+                name: 'promotionManagementEdit',
+                component: () => import(/* webpackChunkName: "promotionRulesManagement" */ '@/views/promotionRulesManagement/promotionManagement/edit.vue'),
+                meta: {
+                  title: '编辑修理厂促销',
+                  icon: 'file-ppt',
+                  hidden: true,
+                  permission: 'B_promotionManagementEdit'
+                }
+              }
+            ]
           }
           }
         ]
         ]
       },
       },

+ 2 - 2
src/views/easyPassManagement/shoppingProducts/list.vue

@@ -134,7 +134,7 @@ import productType from '@/views/common/productType.js'
 import productBrand from '@/views/common/productBrand.js'
 import productBrand from '@/views/common/productBrand.js'
 import chooseProduct from '@/views/easyPassManagement/shoppingManagement/chooseProductsModal'
 import chooseProduct from '@/views/easyPassManagement/shoppingManagement/chooseProductsModal'
 // 接口
 // 接口
-import { shopProductList, saveBatchProduct, shopProductDel, shopProductUpdateStatus, queryProductSnList } from '@/api/shopProduct'
+import { shopProductList, saveBatchProductExcel, shopProductDel, shopProductUpdateStatus, queryProductSnList } from '@/api/shopProduct'
 export default {
 export default {
   name: 'ShoppingProductsList',
   name: 'ShoppingProductsList',
   mixins: [commonMixin],
   mixins: [commonMixin],
@@ -254,7 +254,7 @@ export default {
     hanldeOk (list) {
     hanldeOk (list) {
       const _this = this
       const _this = this
       _this.spinning = true
       _this.spinning = true
-      saveBatchProduct(list).then(res => {
+      saveBatchProductExcel(list).then(res => {
         if (res.status == 200) {
         if (res.status == 200) {
           _this.$message.success(res.message)
           _this.$message.success(res.message)
           _this.$nextTick(() => {
           _this.$nextTick(() => {