Bläddra i källkod

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

chenrui 1 år sedan
förälder
incheckning
5f2991228d

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

@@ -3058,6 +3058,31 @@ export const asyncRouterMap = [
               }
             ]
           },
+          {
+            path: '/dealerManagement/rebateSettings',
+            redirect: '/dealerManagement/rebateSettings/list',
+            name: 'rebateSettings',
+            component: BlankLayout,
+            meta: {
+              title: '差价归属设置',
+              icon: 'stock',
+              permission: 'M_rebateSettingsList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'rebateSettingsList',
+                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/rebateSettings/list.vue'),
+                meta: {
+                  title: '差价归属设置列表',
+                  icon: 'stock',
+                  hidden: true,
+                  permission: 'M_rebateSettingsList'
+                }
+              }
+            ]
+          },
           {
             path: '/dealerManagement/provincialWarehouseManagement',
             redirect: '/dealerManagement/provincialWarehouseManagement/list',
@@ -3095,31 +3120,6 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/dealerManagement/rebateSettings',
-            redirect: '/dealerManagement/rebateSettings/list',
-            name: 'rebateSettings',
-            component: BlankLayout,
-            meta: {
-              title: '差价归属设置',
-              icon: 'stock',
-              permission: 'M_rebateSettingsList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'rebateSettingsList',
-                component: () => import(/* webpackChunkName: "dealerManagement" */ '@/views/dealerManagement/rebateSettings/list.vue'),
-                meta: {
-                  title: '差价归属设置列表',
-                  icon: 'stock',
-                  hidden: true,
-                  permission: 'M_rebateSettingsList'
-                }
-              }
-            ]
-          },
           {
             path: '/dealerManagement/marketingDivisionSetNew',
             redirect: '/dealerManagement/marketingDivisionSetNew/list',

+ 1 - 1
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -81,7 +81,7 @@
           </div>
           <div>
             <span style="margin-right: 10px;" v-if="selNums">已选{{ selNums }}项</span>
-            <a-button type="default" class="button-info" @click="openPlSetReason(1)">整单设置退货原因</a-button>
+            <a-button v-if="goodFlag == 'GOOD_PRODUCT_RETURN'" type="default" class="button-info" @click="openPlSetReason(1)">整单设置退货原因</a-button>
             <a-button type="default" class="button-info" style="margin-left: 5px;" @click="openPlSetReason(0)">批量设置退货原因</a-button>
             <a-button type="primary" class="button-info" id="salesReturnEdit-import-btn" @click="openGuideModal=true">导入产品</a-button>
           </div>

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.117:8602/ocs-admin',
+        // target: 'http://192.168.2.117:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {