|
|
@@ -320,8 +320,8 @@
|
|
|
<select class="form-control form-control-sm"
|
|
|
v-model="item.logistic_express_remission"
|
|
|
@change="changeWorkOrderInfo(item,'logistic_express_remission',$event)">
|
|
|
- <option v-for="type in workOrderRemissionType" :value="type"
|
|
|
- v-text="type"></option>
|
|
|
+ <option v-for="type in workOrderRemissionType" :value="type.name"
|
|
|
+ v-text="type.name"></option>
|
|
|
</select>
|
|
|
</td>
|
|
|
<td>
|
|
|
@@ -334,8 +334,8 @@
|
|
|
class="form-control form-control-sm"
|
|
|
v-model="item.bao_shi_express_remission"
|
|
|
@change="changeWorkOrderInfo(item,'bao_shi_express_remission',$event)">
|
|
|
- <option v-for="type in workOrderRemissionType" :value="type"
|
|
|
- v-text="type"></option>
|
|
|
+ <option v-for="type in workOrderRemissionType" :value="type.name"
|
|
|
+ v-text="type.name"></option>
|
|
|
</select>
|
|
|
</td>
|
|
|
|
|
|
@@ -638,7 +638,11 @@
|
|
|
commodities: [],
|
|
|
},
|
|
|
order_info_commodities_key: 101,
|
|
|
- workOrderRemissionType: ['原单减免', '补发减免', '全部减免'],
|
|
|
+ workOrderRemissionType: [
|
|
|
+ {name:'原单减免',value:'原单减免'},
|
|
|
+ {name:'补发减免',value:'补发减免'},
|
|
|
+ {name:'全部减免',value:'全部减免'},
|
|
|
+ ],
|
|
|
rejectingStatus:[
|
|
|
{name:'无',value:'无'},
|
|
|
{name:'未退回',value:'未退回'},
|
|
|
@@ -735,9 +739,9 @@
|
|
|
{name: 'is_end', type: 'checkbox', tip: '是否已拦截', data: [{name: 'ture', value: '已完成'}]},
|
|
|
], [
|
|
|
{name: 'logistic_indemnity_money', type: 'input', placeholder: '承运商赔偿金额'},
|
|
|
- {name: 'logistic_express_remission', type: 'input', placeholder: '承运商快递减免'},
|
|
|
+ {name: 'logistic_express_remission', type: 'select', placeholder: '承运商快递减免',data:this.workOrderRemissionType},
|
|
|
{name: 'bao_shi_indemnity_money', type: 'input', placeholder: '宝时赔偿金额'},
|
|
|
- {name: 'bao_shi_express_remission', type: 'input', placeholder: '宝时快递减免'},
|
|
|
+ {name: 'bao_shi_express_remission', type: 'select', placeholder: '宝时快递减免',data:this.workOrderRemissionType},
|
|
|
{name: 'user_work_group_id', type: 'select_multiple_select',
|
|
|
tip: ['输入关键词快速定位下拉列表，回车确定', '选择要显示的仓库责任方'],
|
|
|
placeholder: ['仓库责任方', '定位或多选仓库责任方'],data:this.userWorkgroup},
|
loustwo