Skip to content

J
jiedao-app-operator-master
Commit aaa64d58 authored by 我在何方's avatar 我在何方
Browse files
Options

Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

parents d295c9db cd16f157
Hide whitespace changes
Inline Side-by-side
Showing with 187 additions and 83 deletions
src/components/CustomerFollow/index.vue
View file @ aaa64d58
...@@ -162,6 +162,7 @@ export default { ...@@ -162,6 +162,7 @@ export default {
if (!!this.customerId) getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => { if (!!this.customerId) getCustomerContactsListByCustomer({customerId: this.customerId}).then(r => {
this.customerContactsList = r.data this.customerContactsList = r.data
this.customerFollow.form.customerId = this.customerId this.customerFollow.form.customerId = this.customerId
this.customerFollow.form.bizId = this.id
}) })
listServiceUser().then(r => { listServiceUser().then(r => {
this.serviceUserList = r.data this.serviceUserList = r.data
......
src/components/Selector/index.vue
View file @ aaa64d58
...@@ -29,7 +29,8 @@ export default { ...@@ -29,7 +29,8 @@ export default {
multiple: Boolean, multiple: Boolean,
clearable: Boolean, clearable: Boolean,
defaultable: Boolean, // 没有值的时候是否选择第一项 defaultable: Boolean, // 没有值的时候是否选择第一项
disabled: Boolean disabled: Boolean,
test: String
}, },
computed:{ computed:{
optionsFormated(){ optionsFormated(){
...@@ -53,9 +54,15 @@ export default { ...@@ -53,9 +54,15 @@ export default {
}, },
optionsFormated(){ optionsFormated(){
this.setDefault() this.setDefault()
},
test(val, old){
console.warn('test变化', val, old)
} }
}, },
created(){ created(){
if(this.test == 'allPriceUnit'){
console.log('allPriceUnit selector', this.value, this.defaultable)
}
this.valueSync = this.value this.valueSync = this.value
this.setDefault() this.setDefault()
}, },
......
src/views/ecw/customerComplaint/index.vue
View file @ aaa64d58
...@@ -52,27 +52,43 @@ ...@@ -52,27 +52,43 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list"> <el-table v-loading="loading" :data="list">
<el-table-column :label="$t('客货投诉')" align="center" prop="code" >
</el-table-column>
<el-table-column :label="$t('投诉类型')" align="center" prop="type">
<template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="scope.row.type" />
</template>
</el-table-column>
<el-table-column :label="$t('客户名称')" align="center" > <el-table-column :label="$t('客户名称')" align="center" >
<template slot-scope="scope"> <template slot-scope="scope">
<div>{{ formatCustomerName(scope.row.customerId) }}</div> <div>{{ formatCustomerName(scope.row.customerId) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('投诉类型')" align="center" prop="type"> <el-table-column :label="$t('投诉日期')" align="center" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_TYPE" :value="scope.row.type" /> <span>{{ parseTime(scope.row.createTime)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('订单号')" align="center" prop="orderId" /> <el-table-column :label="$t('登记客服')" align="center" prop="adminNickname">
<el-table-column :label="$t('提单号')" align="center" prop="ladingbillId" /> </el-table-column>
<el-table-column :label="$t('投诉内容')" align="center" prop="content" /> <el-table-column :label="$t('状态')" align="center" prop="status">
<el-table-column :label="$t('处理状态')" align="center" prop="status">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('创建时间')" align="center" prop="createTime" width="180"> <el-table-column :label="$t('提单号')" align="center" prop="ladingbillId" />
<el-table-column :label="$t('订单号')" align="center" prop="orderId" />
<el-table-column :label="$t('处理时间')" align="center" prop="handleAt" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span> <span>{{ parseTime(scope.row.handleAt)}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('赔付金额')" align="center" prop="handleAt" width="180">
<template slot-scope="scope">
{{scope.row.indemnity || '0.00'}}
<dict-tag
:value="scope.row.currencyUnit"
:type="DICT_TYPE.COMMISSION_CURRENCY_TYPE"></dict-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width"> <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
...@@ -194,8 +210,7 @@ ...@@ -194,8 +210,7 @@
<el-dialog :title="title" :visible.sync="openCustomer" width="900px" append-to-body> <el-dialog :title="title" :visible.sync="openCustomer" width="900px" append-to-body>
<el-form ref="form" :model="form" label-width="80px"> <el-form ref="form" :inline="true" :model="form" label-width="80px">
<div class="formShow">
<el-form-item :label="$t('客户名称')+':'"> <el-form-item :label="$t('客户名称')+':'">
<div>{{ formatCustomerName(form.customerId) }}</div> <div>{{ formatCustomerName(form.customerId) }}</div>
</el-form-item> </el-form-item>
...@@ -216,7 +231,6 @@ ...@@ -216,7 +231,6 @@
<dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="form.status" /> <dict-tag :type="DICT_TYPE.CUSTOMER_COMPLAINT_STATUS" :value="form.status" />
</el-form-item> </el-form-item>
</div> </div>
</div>
<el-form-item :label="$t('投诉内容')+':'" > <el-form-item :label="$t('投诉内容')+':'" >
<div>{{form.content|| $t('无')}}</div> <div>{{form.content|| $t('无')}}</div>
</el-form-item> </el-form-item>
...@@ -536,7 +550,7 @@ export default { ...@@ -536,7 +550,7 @@ export default {
this.exportLoading = true; this.exportLoading = true;
return exportCustomerComplaintExcel(params); return exportCustomerComplaintExcel(params);
}).then(response => { }).then(response => {
this.$download.excel(response, '${table.classComment}.xls'); this.$download.excel(response, '客户投诉列表.xls');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); }).catch(() => {});
}, },
......
src/views/ecw/order/components/MergeDetail.vue
View file @ aaa64d58
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
<!-- <el-table-column label="已到箱数/总箱数"> <!-- <el-table-column label="已到箱数/总箱数">
<template slot-scope="{row}">/{{row.sumNum}}/{{row.sumNum}}</template> <template slot-scope="{row}">/{{row.sumNum}}/{{row.sumNum}}</template>
</el-table-column> --> </el-table-column> -->
<el-table-column :label="$t('下单统计')"> <el-table-column :label="$t('填单统计')">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{row.costVO.totalNum}}{{$t('箱')}}<br/>{{row.costVO.totalVolume}}m³<br/>{{row.costVO.totalWeight}}kg {{row.costVO.totalNum}}{{$t('箱')}}<br/>{{row.costVO.totalVolume}}m³<br/>{{row.costVO.totalWeight}}kg
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('入仓你统计')"> <el-table-column :label="$t('入仓统计')">
<template slot-scope="{row}"> <template slot-scope="{row}">
{{row.sumNum}}{{$t('箱')}}<br/>{{row.sumVolume}}m³<br/>{{row.sumWeight}}kg {{row.sumNum}}{{$t('箱')}}<br/>{{row.sumVolume}}m³<br/>{{row.sumWeight}}kg
</template> </template>
......
src/views/ecw/order/components/PrepayExceptionDetail.vue
View file @ aaa64d58
...@@ -75,6 +75,11 @@ ...@@ -75,6 +75,11 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-form-item :label="$t('备注')+':'">
{{orderFee.notes}}
</el-form-item>
</el-row>
</el-form> </el-form>
</div> </div>
</template> </template>
......
src/views/ecw/order/pending.vue
View file @ aaa64d58
...@@ -68,12 +68,18 @@ ...@@ -68,12 +68,18 @@
<span v-if="scope.row.orderExceptionDescVO">{{$l(scope.row.orderExceptionDescVO, 'desc')}}</span> <span v-if="scope.row.orderExceptionDescVO">{{$l(scope.row.orderExceptionDescVO, 'desc')}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('金额')" align="center" scope="orderExceptionAmount" /> <el-table-column :label="$t('金额')" align="center" scope="orderExceptionAmount">
<el-table-column :label="$t('状态')" align="center"> <template slot-scope="{row}">
{{row.orderExceptionAmount}}
{{currencyMap[row.orderExceptionAmountCurrencyId]}}
</template>
</el-table-column>
</el-table-column>
<el-table-column :label="$t('状态')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" /> <dict-tag :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :value="scope.row.orderExceptionStatus" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('附件')" align="center"> <el-table-column :label="$t('附件')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="filelist"> <div class="filelist">
...@@ -81,6 +87,13 @@ ...@@ -81,6 +87,13 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('备注')" align="center">
<template slot-scope="{row}">
<el-tooltip class="item" effect="dark" :content="row.orderExceptionNotes" placement="top-start">
<div class="clamp3">{{row.orderExceptionNotes}}</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column :label="$t('处理人')" align="center" prop="userName" /> <el-table-column :label="$t('处理人')" align="center" prop="userName" />
<el-table-column :label="$t('处理时间')" align="center"> <el-table-column :label="$t('处理时间')" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -103,7 +116,7 @@ ...@@ -103,7 +116,7 @@
<script> <script>
import {getExceptionListByOrderId} from "@/api/ecw/orderException" import {getExceptionListByOrderId} from "@/api/ecw/orderException"
import {DICT_TYPE} from '@/utils/dict' import { getCurrencyList } from '@/api/ecw/currency'
import {getOrder} from '@/api/ecw/order' import {getOrder} from '@/api/ecw/order'
import FilePreview from '@/components/FilePreview' import FilePreview from '@/components/FilePreview'
import {getProduct} from '@/api/ecw/product' import {getProduct} from '@/api/ecw/product'
...@@ -125,9 +138,20 @@ export default { ...@@ -125,9 +138,20 @@ export default {
timers:"", //时间戳 timers:"", //时间戳
FilePreAll:[], // 预览数组 FilePreAll:[], // 预览数组
TragetPic:{}, TragetPic:{},
currencyList:[]
}; };
}, },
computed:{
currencyMap(){
let map = {}
this.currencyList.forEach(item => {
map[item.id] = this.$l(item, 'title')
})
return map
},
},
created() { created() {
getCurrencyList().then(res => this.currencyList = res.data)
if(this.$route.query.id){ if(this.$route.query.id){
this.orderId = this.$route.query.id this.orderId = this.$route.query.id
this.getList() this.getList()
...@@ -253,4 +277,10 @@ export default { ...@@ -253,4 +277,10 @@ export default {
.card{ .card{
margin-top: 20px; margin-top: 20px;
} }
.clamp3{
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 3;
}
</style> </style>
src/views/ecw/order/prepayDeal.vue
View file @ aaa64d58
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</el-form-item> </el-form-item>
<el-form-item :label="$t('代收金额')+':'" v-if="orderExceptionData.orderExceptionType == 'order_cod_exception'"> <el-form-item :label="$t('代收金额')+':'" v-if="orderExceptionData.orderExceptionType == 'order_cod_exception'">
<template v-if="orderData && orderData.costVO"> <template v-if="orderData && orderData.costVO">
{{orderExceptionData.orderExceptionAmount}} {{currencyMap[orderExceptionData.orderExceptionCurrencyId]}} {{orderExceptionData.orderExceptionAmount}} {{currencyMap[orderExceptionData.orderExceptionAmountCurrencyId]}}
</template> </template>
</el-form-item> </el-form-item>
</el-row> </el-row>
...@@ -133,10 +133,9 @@ ...@@ -133,10 +133,9 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('付款人')"> <el-table-column :label="$t('付款人')">
<template slot-scope="scope"> <template slot-scope="{row}">
<span> <span>
// TODO <dict-tag :type="DICT_TYPE.DRAWEE" :value="row.paymentUser"></dict-tag>
<!-- <dict-tag :type="DICT_TYPE.DRAWEE" :value="order.drawee"></dict-tag> -->
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
...@@ -262,8 +261,22 @@ ...@@ -262,8 +261,22 @@
<el-option :disabled="dict.value=='pending'" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/> <el-option :disabled="dict.value=='pending'" :key="dict.value" :label="$l(dict, 'label')" :value="dict.value"/>
</template> </template>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-row> </el-row>
<!-- 代收货款 时需要填写代收金额 -->
<el-row v-if="handlerParams.orderExceptionHandlerResult == 'cod'" >
<el-form-item :label="$t('代收金额')+':'" size="medium" required>
<el-input class="w-100" type="text" v-model="handlerParams.amount" />
<!-- <el-select v-model="handlerParams.currency" clearable>
<el-option v-for="dict in getDictDatas('shipping_price_unit') "
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select> -->
<dict-tag type="shipping_price_unit" v-model="handlerParams.currency" class="w-100 ml-10" />
</el-form-item>
</el-row>
<el-row :span="8" v-if="orderExceptionData.orderExceptionType=='order_pick_up_exception'&&handlerParams.orderExceptionHandlerResult=='cost_required'"> <el-row :span="8" v-if="orderExceptionData.orderExceptionType=='order_pick_up_exception'&&handlerParams.orderExceptionHandlerResult=='cost_required'">
<el-form-item :label="$t('送货费用')+':'" size="medium"> <el-form-item :label="$t('送货费用')+':'" size="medium">
<el-input style="width: 100px;" type="text" v-model="handlerParams.amount" /> <el-input style="width: 100px;" type="text" v-model="handlerParams.amount" />
...@@ -394,6 +407,11 @@ ...@@ -394,6 +407,11 @@
if(val == 'no_pay'){ if(val == 'no_pay'){
this.showWorkFlow = true this.showWorkFlow = true
}else this.showWorkFlow = false }else this.showWorkFlow = false
// 如果是代收货款，则给默认单位
if(val == 'cod' && this.orderExceptionData.orderExceptionAmountCurrencyId){
this.$set(this.handlerParams, 'currency', this.orderExceptionData.orderExceptionAmountCurrencyId)
}
} }
}, },
computed: { computed: {
......
src/views/ecw/productPrice/edit.vue
View file @ aaa64d58
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item :label="$t('单价模式')" prop="priceType"> <el-form-item :label="$t('单价模式')" prop="priceType">
<dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" formatter="number" defaultable /> <dict-selector :type="DICT_TYPE.ECW_PRICE_TYPE" v-model="form.priceType" form-type="radio" formatter="number" defaultable2 />
</el-form-item> </el-form-item>
<!--阶梯定价--> <!--阶梯定价-->
<template v-if="form.stepPrice==1" > <template v-if="form.stepPrice==1" >
...@@ -92,45 +92,46 @@ ...@@ -92,45 +92,46 @@
- -
<el-input v-model="item.endNum" type="number" placeholder="" class="w-100"></el-input> <el-input v-model="item.endNum" type="number" placeholder="" class="w-100"></el-input>
/ /
<selector v-model="form.weightUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> <selector v-model="form.weightUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('默认运费')" v-if="form.priceType != 1"> <el-form-item :label="$t('默认运费')" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="item.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<selector v-model="item.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> <selector v-model="item.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
/ <selector v-model="item.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> / <selector v-model="item.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('默认清关费')" v-if="form.priceType != 1"> <el-form-item :label="$t('默认清关费')" v-if="form.priceType != 1">
<inputor default="0" v-model.number="item.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="item.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<selector v-model="item.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> <selector v-model="item.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
/ <selector v-model="item.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> / <selector v-model="item.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1"> <el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
<selector v-model="item.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> <selector v-model="item.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
<inputor default="0" v-model.number="item.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="item.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
/ <selector v-model="item.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> / <selector v-model="item.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
</div> </div>
</template> </template>
<template v-else> <template v-else>
<el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1"> <el-form-item :label="$t('默认全包价')" v-if="form.priceType == 1">
<selector v-model="form.allPriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 mr-10" /> <selector test="allPriceUnit" v-model="form.allPriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100 mr-10 aaa" />
<inputor default="0" v-model.number="form.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w100 mr10" /> <inputor default2="0" v-model.number="form.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr10" />
/ <selector v-model="form.allVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable class="w-100" /> <span class="mr-10">/</span>
<selector v-model="form.allVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
<template v-else> <template v-else>
<el-form-item :label="$t('默认运费')" prop="transportPrice"> <el-form-item :label="$t('默认运费')" prop="transportPrice">
<selector v-model="form.transportPriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 mr-10" /> <selector v-model="form.transportPriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100 mr-10" />
<inputor default="0" v-model.number="form.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="form.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span> <span class="mr-10">/</span>
<selector v-model="form.transportVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable class="w-100" /> <selector v-model="form.transportVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('默认清关费')" prop="clearancePrice"> <el-form-item :label="$t('默认清关费')" prop="clearancePrice">
<selector v-model="form.clearancePriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable class="w-100 mr-10" /> <selector v-model="form.clearancePriceUnit" :options="currencyList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100 mr-10" />
<inputor default="0" v-model.number="form.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="form.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span> <span class="mr-10">/</span>
<selector v-model="form.clearanceVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable class="w-100" /> <selector v-model="form.clearanceVolumeUnit" :options="unitList" :label-field="$l('title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
</template> </template>
...@@ -141,28 +142,28 @@ ...@@ -141,28 +142,28 @@
v-for="(special, specialIndex) in this.specialProducts" v-for="(special, specialIndex) in this.specialProducts"
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('全包价')" :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('全包价')"
:key="specialIndex + 'transport'"> :key="specialIndex + 'transport'">
<selector v-model="special.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100 mr-10" /> <selector v-model="special.allPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
<inputor default="0" v-model.number="special.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="special.allPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span> <span class="mr-10">/</span>
<selector v-model="special.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> <selector v-model="special.allVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
</template> </template>
<template v-else v-for="(special, specialIndex) in this.specialProducts"> <template v-else v-for="(special, specialIndex) in this.specialProducts">
<el-form-item <el-form-item
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('运费')" :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('运费')"
:key="specialIndex + 'transport'"> :key="specialIndex + 'transport'">
<selector v-model="special.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100 mr-10" /> <selector v-model="special.transportPriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
<inputor default="0" v-model.number="special.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="special.transportPrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span> <span class="mr-10">/</span>
<selector v-model="special.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> <selector v-model="special.transportVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
<el-form-item <el-form-item
:label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('清关费')" :label="getDictDataLabel(DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS, special.specialDictType) + $t('清关费')"
:key="specialIndex + 'clearance'"> :key="specialIndex + 'clearance'">
<selector v-model="special.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100 mr-10" /> <selector v-model="special.clearancePriceUnit" :options="currencyList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100 mr-10" />
<inputor default="0" v-model.number="special.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" /> <inputor default2="0" v-model.number="special.clearancePrice" type="number" :placeholder="$t('整数或者两位小数')" class="w-100 mr-10" />
<span class="mr-10">/</span> <span class="mr-10">/</span>
<selector v-model="special.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable class="w-100" /> <selector v-model="special.clearanceVolumeUnit" :options="unitList" :label-field="$l(null, 'title')" value-field="id" defaultable2 class="w-100" />
</el-form-item> </el-form-item>
</template> </template>
</template> </template>
...@@ -222,14 +223,7 @@ export default { ...@@ -222,14 +223,7 @@ export default {
return { return {
checkList: [], checkList: [],
selectedRoutes: [], // 勾选的路线渠道 selectedRoutes: [], // 勾选的路线渠道
form: { form: {},
stepPrice: 0,
advanceStatus: 0,
needBook: 0,
dayLimit: 10000,
validateEndDate: undefined,
validateStartDate: undefined
},
needPay: false, // 是否需要预付 needPay: false, // 是否需要预付
stepPrice: false, // 是否阶梯订单 stepPrice: false, // 是否阶梯订单
specialProducts: [], specialProducts: [],
...@@ -269,10 +263,13 @@ export default { ...@@ -269,10 +263,13 @@ export default {
/* getProductType(this.product.typeId).then(res => { /* getProductType(this.product.typeId).then(res => {
this.productType = res.data this.productType = res.data
}) */ }) */
this.$set(this.form, 'needBook', this.product.needBook) // 只有新建才需要把参数带过来
this.$set(this.form, 'square', this.product.square) if(!this.$route.query.action){
this.$set(this.form, 'dayLimit', this.product.dayLimit) this.$set(this.form, 'needBook', this.product.needBook)
this.$set(this.form, 'containerLocation', this.product.containerLocation) this.$set(this.form, 'square', this.product.square)
this.$set(this.form, 'dayLimit', this.product.dayLimit)
this.$set(this.form, 'containerLocation', this.product.containerLocation)
}
}, },
form(val) { form(val) {
...@@ -296,6 +293,12 @@ export default { ...@@ -296,6 +293,12 @@ export default {
}) */ }) */
} }
}, },
'form.priceType'(priceType){
// 切换全包价的时候给默认货币单位
if(priceType == 1){
this.$set(this.form, 'allPriceUnit', 1)
}
},
'form.transportVolumeUnit'(val){ 'form.transportVolumeUnit'(val){
this.specialProducts.forEach(item => { this.specialProducts.forEach(item => {
item.transportVolumeUnit = val item.transportVolumeUnit = val
...@@ -370,10 +373,6 @@ export default { ...@@ -370,10 +373,6 @@ export default {
if(res.data.validateEndDate){ if(res.data.validateEndDate){
this.form.validateEndDate = parseTime(res.data.validateEndDate) this.form.validateEndDate = parseTime(res.data.validateEndDate)
} }
// 特需价格更新
this.lineList = [res.data] this.lineList = [res.data]
}) })
} }
...@@ -402,22 +401,34 @@ export default { ...@@ -402,22 +401,34 @@ export default {
// 获取类型列表 // 获取类型列表
getProductTypeList().then(res => this.productTypeList = res.data) getProductTypeList().then(res => this.productTypeList = res.data)
if (this.$route.query.product_type) {
this.$set(this.form, 'productType', +this.$route.query.product_type)
}
if (this.$route.query.product_id) {
this.$set(this.form, 'productId', +this.$route.query.product_id)
}
// 修改单条路线不回显单位
if(this.$route.query.action !== 'update'){
this.setDefaultVolumeUnit(7)
}
// 没有操作标识的就是新建，给有效期默认值 // 没有操作标识的就是新建，给有效期默认值
if(!this.$route.query.action){ if(!this.$route.query.action){
this.form = {
priceType: 0,
stepPrice: 0,
advanceStatus: 0,
needBook: 0,
// dayLimit: 10000,
validateEndDate: undefined,
validateStartDate: undefined,
clearancePrice: 0,
transportPrice: 0
}
// 默认体积单位（立方米）
this.setDefaultVolumeUnit(7)
// 默认货币单位（美元）
this.setDefaultPriceUnit(1)
this.form.validateStartDate = parseTime(Date.now()) this.form.validateStartDate = parseTime(Date.now())
this.form.validateEndDate = parseTime(Date.now() + 86400*365*2*1000) this.form.validateEndDate = parseTime(Date.now() + 86400*365*2*1000)
}
if (this.$route.query.product_type) {
this.$set(this.form, 'productType', +this.$route.query.product_type)
}
if (this.$route.query.product_id) {
this.$set(this.form, 'productId', +this.$route.query.product_id)
} }
getCurrencyList().then(res => this.currencyList = res.data) getCurrencyList().then(res => this.currencyList = res.data)
...@@ -425,11 +436,11 @@ export default { ...@@ -425,11 +436,11 @@ export default {
this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => { this.getDictDatas(this.DICT_TYPE.ECW_SPECIAL_REQ_FOR_LINE_PRODUCTS).forEach(item => {
this.specialProducts.push({ this.specialProducts.push({
"clearancePrice": null, "clearancePrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
"clearancePriceUnit": null, "clearancePriceUnit": null,
"clearanceVolumeUnit": null, "clearanceVolumeUnit": null,
"specialDictType": item.value, "specialDictType": item.value,
"transportPrice": null, "transportPrice": !this.$route.query.action ? 0 : null, // 新建默认给0，否则默认是null
"transportPriceUnit": null, "transportPriceUnit": null,
"transportVolumeUnit": null, "transportVolumeUnit": null,
}) })
...@@ -441,6 +452,11 @@ export default { ...@@ -441,6 +452,11 @@ export default {
this.$set(this.form, 'clearanceVolumeUnit', unit) this.$set(this.form, 'clearanceVolumeUnit', unit)
this.$set(this.form, 'allVolumeUnit', unit) this.$set(this.form, 'allVolumeUnit', unit)
}, },
setDefaultPriceUnit(priceUnit){
this.$set(this.form, 'transportPriceUnit', priceUnit)
this.$set(this.form, 'clearancePriceUnit', priceUnit)
this.$set(this.form, 'allPriceUnit', priceUnit)
},
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (!valid) { if (!valid) {
...@@ -529,7 +545,7 @@ export default { ...@@ -529,7 +545,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
.w100{ .w-100{
width: 100px; width: 100px;
} }
.mr10{ .mr10{
......
src/views/system/user/index.vue
View file @ aaa64d58
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12" v-if="hasCustomerServicePost">
<el-form-item label="跟单客服"> <el-form-item label="跟单客服">
<el-select v-model="form.customerServiceId" placeholder="请选择"> <el-select v-model="form.customerServiceId" placeholder="请选择">
<el-option v-for="dict in followUpList" :key="parseInt(dict.id)" :label="dict.nickname" :value="parseInt(dict.id)"/> <el-option v-for="dict in followUpList" :key="parseInt(dict.id)" :label="dict.nickname" :value="parseInt(dict.id)"/>
...@@ -383,6 +383,18 @@ export default { ...@@ -383,6 +383,18 @@ export default {
} }
} }
}, },
computed:{
hasCustomerServicePost(){
if(!this.form.postIds) return false
let has = false
this.postOptions.forEach(item => {
if(this.form.postIds.indexOf(item.id) > -1 && item.code == 'customer service'){
has = true
}
})
return has
}
},
created() { created() {
this.getList(); this.getList();
this.getTreeselect(); this.getTreeselect();
...@@ -444,6 +456,7 @@ export default { ...@@ -444,6 +456,7 @@ export default {
}, },
// 节点单击事件 // 节点单击事件
handleNodeClick(data) { handleNodeClick(data) {
this.queryParams.pageNo = 1
this.queryParams.deptId = data.id; this.queryParams.deptId = data.id;
this.getList(); this.getList();
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment