diff --git a/src/common/directory.js b/src/common/directory.js index 1903a950..e21c2b51 100644 --- a/src/common/directory.js +++ b/src/common/directory.js @@ -675,4 +675,19 @@ export function getPriorityName(value) { } return resultInfo } -locationAreaTypeList \ No newline at end of file +//获取优先级 +export function getDeliverMethod(value) { + var resultInfo = ""; + if (priorityList.length == 0) { + priorityList = getDirectoryInfo("deliver_method") + } + if (priorityList.length > 0) { + for (let item of priorityList) { + if (item.value == value) { + resultInfo = item.label + break; + } + } + } + return resultInfo +} \ No newline at end of file diff --git a/src/pages/deliver/coms/comDeliverJobCard.vue b/src/pages/deliver/coms/comDeliverJobCard.vue index 3b948557..6e709aa5 100644 --- a/src/pages/deliver/coms/comDeliverJobCard.vue +++ b/src/pages/deliver/coms/comDeliverJobCard.vue @@ -3,12 +3,15 @@ <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard> <view class="card_view " style="margin-left: 10px;"> <text class="card_packing_code ">发货类型</text> - <text class="card_content ">{{dataContent.deliverType=='CUST'?'寄售库发货':'三方库发货'}}</text> + <text class="card_content ">{{getDeliverMethodTxt(dataContent.businessType)}}</text> </view> </job-com-main-card> </template> <script> + import { + getDeliverMethod + } from '@/common/directory.js'; import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue' import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue' export default { @@ -32,7 +35,9 @@ }, methods: { - + getDeliverMethodTxt(deliverType){ + return getDeliverMethod(deliverType) + } } } </script> diff --git a/src/pages/deliver/job/deliverDetailBatch.vue b/src/pages/deliver/job/deliverDetailBatch.vue index 8c397885..942c0226 100644 --- a/src/pages/deliver/job/deliverDetailBatch.vue +++ b/src/pages/deliver/job/deliverDetailBatch.vue @@ -9,7 +9,7 @@ <view class="cell_box uni-flex uni-row"> <view class="cell_info"> <view class="text_lightblue">发货类型</view> - <view>{{jobContent.deliverType}}</view> + <view>{{getDeliverMethodTxt(jobContent.businessType)}}</view> </view> <view class="cell_info"> @@ -65,6 +65,10 @@ cancleTakeDeliverJob, deliverJobSubmit } from '@/api/request2.js'; + + import { + getDeliverMethod + } from '@/common/directory.js'; import { @@ -176,6 +180,9 @@ }, methods: { + getDeliverMethodTxt(deliverType){ + return getDeliverMethod(deliverType) + }, //接收 receive(callback) { if (this.id != null) {