浏览代码

Finish Hotfix-zh-302

howie 2 年之前
父节点
当前提交
75fc22ae13

+ 4 - 9
src/router/index.js

@@ -49,29 +49,24 @@ export const constantRoutes = [
   },
 
   {
-    path: "/supply",
+    path: "/return_goods",
     component: Layout,
     children: [
       {
-        path: "deliver/new_apply",
+        path: "new_apply",
         name: "new_apply",
         component: () => import("@/views/supply/apply/new_apply"),
         meta: { title: "零售退货申请", icon: "" },
       },
-    ],
-  },
-  {
-    path: "/supply",
-    component: Layout,
-    children: [
       {
-        path: "deliver/new_engin",
+        path: "new_engin",
         name: "new_apply",
         component: () => import("@/views/supply/apply/new_engin"),
         meta: { title: "工程退货申请", icon: "" },
       },
     ],
   },
+
   // {
   //   path: '/goods',
   //   component: Layout,

+ 2 - 2
src/views/supply/deliver/sum_list.vue

@@ -283,7 +283,7 @@
               type="primary"
               style="margin-right: 10px"
               icon="el-icon-plus"
-              @click="$router.push('/supply/deliver/new_apply?isShow=true')"
+              @click="$router.push('/return_goods/new_apply?isShow=true')"
               >零售退货申请</el-button
             >
             <el-button
@@ -292,7 +292,7 @@
               type="primary"
               style="margin-right: 10px"
               icon="el-icon-plus"
-              @click="$router.push('/supply/deliver/new_engin?isShow=true')"
+              @click="$router.push('/return_goods/new_engin?isShow=true')"
               >工程退货申请</el-button
             >
             <!-- <el-button   size="mini"

+ 1 - 1
src/views/supply/engin/components/home_form.vue

@@ -1729,7 +1729,7 @@ export default {
         pageSize: 10,
         saleId: this.mainForm.saleType,
         billType: "HOME",
-        materialCode: this.goodsScreenForm.proNum,
+        materialOldNumber: this.goodsScreenForm.proNum,
         materialName: this.goodsScreenForm.proName,
         specification: this.goodsScreenForm.proModel,
         price1: this.goodsScreenForm.price1,

文件差异内容过多而无法显示
+ 347 - 334
src/views/supply/policy/components/retail_form.vue


部分文件因为文件数量过多而无法显示