Merge branch 'hotfix/Hotfix-zh-309' into develop

src/api/supply/policy.js

@@ -194,7 +194,6 @@ export function getConditionDetail(params) {
 }
 
 // 政策条件
-
 export function getPolicyConditionList(params) {
   return request({
     url: '/policy/condition/list',

src/views/supply/apply/components/apply_detail.vue

@@ -4,7 +4,7 @@
       <el-page-header @back="goBack" content="详情"></el-page-header>
 
       <div class="main-title">
-        <div class="title">发货申请单信息</div>
+        <div class="title">{{ orderTypeList[detailData.type - 1].label }}信息</div>
       </div>
 
       <div class="diy-table-1">
@@ -323,7 +323,12 @@ export default {
       detailData: {},
       printType: 1,
       printId: '',
-      isShowPrint: false
+      isShowPrint: false,
+      orderTypeList: [
+        { label: '发货申请单', value: 1 },
+        { label: '退货申请单', value: 2 },
+        { label: '直调发货单', value: 3 }
+      ]
     }
   },
 

src/views/supply/apply/components/apply_examine.vue

@@ -3,7 +3,7 @@
     <el-page-header @back="goBack" content="审批"></el-page-header>
 
     <div class="main-title">
-      <div class="title">发货申请单信息</div>
+      <div class="title">{{ orderTypeList[detailData.type - 1].label }}信息</div>
     </div>
 
     <div class="diy-table-1">
@@ -288,7 +288,12 @@ export default {
       examineForm: {
         status: true,
         remark: ''
-      }
+      },
+      orderTypeList: [
+        { label: '发货申请单', value: 1 },
+        { label: '退货申请单', value: 2 },
+        { label: '直调发货单', value: 3 }
+      ]
     }
   },
 

src/views/supply/apply/components/apply_return_form.vue

@@ -1,9 +1,12 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" :content="listItem ? '编辑-退货申请' : '新增-退货申请'"></el-page-header>
+    <el-page-header
+      @back="goBack"
+      :content="listItem ? `编辑-${orderTypeList[listItem.type - 1].label}` : '新增-退货申请'"
+    ></el-page-header>
 
     <div class="main-title">
-      <div class="title">退货申请单信息</div>
+      <div class="title">{{ listItem ? orderTypeList[listItem.type - 1].label : '退货申请单' }}信息</div>
     </div>
 
     <div style="font-size: 12px; color: #333; margin-bottom: 20px">
@@ -439,7 +442,12 @@ export default {
       categoryList: [],
 
       tableGoodsList: [],
-      isFirst: false
+      isFirst: false,
+      orderTypeList: [
+        { label: '发货申请单', value: 1 },
+        { label: '退货申请单', value: 2 },
+        { label: '直调发货单', value: 3 }
+      ]
     }
   },