Skip to content

J
jiedao-app-operator-master
Commit 083f0740 authored by dragondean@qq.com's avatar dragondean@qq.com
Browse files
Options

修bug

parent 07265d9d
Hide whitespace changes
Inline Side-by-side
Showing with 225 additions and 30 deletions
src/components/ProductSelector/index.vue
View file @ 083f0740
......@@ -8,13 +8,13 @@
:placeholder="$t('请输入商品关键词')"
:disabled="disabled"
:remote-method="remoteMethod"
@focus="remoteMethod()"
@focus="onFocus"
@clear="onClear"
:loading="loading">
<el-option
v-for="(item, index) in list"
:key="item.id"
:label="item['title' + lang]"
:value="index">
</el-option>
</el-select>
......@@ -70,6 +70,14 @@ export default {
})
}else this.index = index
},
onFocus(){
if(!this.list.length){
this.remoteMethod()
}
},
onClear(){
this.list = []
},
remoteMethod(keyword){
let params = {
pageSize: keyword ? 100000 : 10
......
src/views/bpm/processInstance/detail.vue
View file @ 083f0740
......@@ -280,7 +280,7 @@ export default {
applyType: 8
},
// 调货审核
order_cargo_transfer: {
order_transfer: {
component: 'CargoControlDetail',
id: this.processInstance.businessKey,
applyType: 9
......@@ -290,7 +290,7 @@ export default {
component: 'CargoControlDetail',
id: this.processInstance.businessKey,
applyType: 10
}
},
}
return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
}
......
src/views/ecw/offer/components/SpecialDiscount.vue
View file @ 083f0740
......@@ -20,12 +20,12 @@
<el-row v-if="!form.charging">
<el-col :span="12">
<el-form-item :label="$t('旧运费')">
{{form.orgSeaFreight}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
{{form.orgSeaFreight}} {{ currentMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('旧清关费')">
{{form.orgClearanceFreight}} {{ currentMap[form.orgClearanceFreightCurrency] }} / {{ unitMap[form.orgClearanceFreightVolume] }}
{{form.orgClearanceFreight}} {{ currentMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
</el-form-item>
</el-col>
</el-row>
......@@ -33,23 +33,23 @@
<el-col :span="12">
<el-form-item :label="$t('新运费')" style="width: 400px" prop="seaFreight">
<el-input v-model="form.seaFreight" type="number" class="w-100" />
{{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
{{ currentMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('新清关费')" style="width: 400px" prop="clearanceFreight">
<el-input v-model="form.clearanceFreight" type="number" class="w-100" />
{{ currentMap[form.orgClearanceFreightCurrency] }} / {{ unitMap[form.orgClearanceFreightVolume] }}
{{ currentMap[form.clearanceFreightCurrency] }} / {{ unitMap[form.clearanceFreightVolume] }}
</el-form-item>
</el-col>
</el-row>
<el-form-item :label="$t('旧全包价')" v-if="form.charging">
{{form.orgSeaFreight}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
{{form.orgSeaFreight}} {{ currentMap[form.seaFreightCurrency] }} / {{ unitMap[form.seaFreightVolume] }}
</el-form-item>
<el-form-item :label="$t('新全包价')" style="width: 400px" prop="clearanceFreight" v-if="form.charging">
<el-input v-model="form.seaFreight" type="number" class="w-100" />
{{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
{{ currentMap[form.seaFreightCurrency] }} / {{ unitMap[form.sorgSeaFreightVolume] }}
</el-form-item>
</el-form>
......
src/views/ecw/offer/create.vue 0 → 100644
View file @ 083f0740
<script>
// 对edit组件复用并更名，防止keepalive缓存数据
import edit from './edit.vue'
edit.name = 'OfferCreate'
export default edit
</script>
\ No newline at end of file
src/views/ecw/offer/edit.vue
View file @ 083f0740
......@@ -354,7 +354,7 @@
{{item.totalAmount}} {{currencyMap[item.currencyId]}}
</div>
</el-descriptions-item>
<el-descriptions-item :label="$t('预计费用')">
<el-descriptions-item :label="$t('预计费用')" :span="1">
<template v-for="item in estimatedCosts">
<div :key="item.currencyId">{{item.amount || 0}}{{currencyMap[item.currencyId]}}</div>
</template>
......@@ -455,7 +455,7 @@
</el-form-item>
<br/>
<el-form-item :label="$t('特殊要求')" >
<dict-selector v-model="form.transportVO.packageType" form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple />
<dict-selector v-model="form.transportVO.packageTypeArr" form-type="checkbox" :type="DICT_TYPE.ORDER_SPECIAL_NEEDS" multiple />
</el-form-item>
<br/>
<el-form-item :label="$t('特殊要求备注')">
......@@ -752,6 +752,9 @@ export default {
this.$set(this.form, 'departureId', router.startCityId)
this.$set(this.form, 'objectiveId', router.destCityId)
},
'form.transportVO.packageTypeArr'(val){
this.$set(this.form.transportVO, 'packageType', val.join(','))
},
// 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择
selectedRouter(val){
if(!val) return
......@@ -835,10 +838,13 @@ export default {
console.log(product)
// row.goodsType = product ? product.typeId : null
row.prodAttrArr = !product ? [] : product.attrId.split(',').filter(item => item !== '').map(item => +item)
this.$set(this.productNames, product.id, {
titleZh: product.titleZh,
titleEn: product.titleEn
})
if(product){
this.$set(this.productNames, product.id, {
titleZh: product.titleZh,
titleEn: product.titleEn
})
}
this.calculationPrice()
},
onLineChange(row){
......
src/views/ecw/offer/special.vue
View file @ 083f0740
......@@ -71,8 +71,8 @@
<el-table-column
:label="$t('操作')">
<template v-slot="{row}">
<el-button size="mini" type="text" @click="showOfferProdId=row.offerProdId">{{$t('优惠申请')}}</el-button>
<el-button size="mini" type="text" @click="showCommissionProd=row">{{$t('佣金规则')}}</el-button>
<el-button v-if="row.seaFreight > 0" size="mini" type="text" @click="showOfferProdId=row.offerProdId">{{$t('优惠申请')}}</el-button>
<el-button v-if="row.seaFreight > 0" size="mini" type="text" @click="showCommissionProd=row">{{$t('佣金规则')}}</el-button>
</template>
</el-table-column>
......
src/views/ecw/order/cargoControlDetail.vue
View file @ 083f0740
......@@ -67,8 +67,8 @@
<el-button v-if="scope.row.status == 3" type="danger" size="mini" @click="fallbackIndex=scope.$index">{{$t('反复核')}}</el-button>
<el-button v-if="scope.row.status == 3" type="success" size="mini" @click="cargoControlPickId=scope.row.id">{{$t('调货')}}</el-button>
<el-button v-if="[2,4].indexOf(scope.row.status) > -1" type="primary" size="mini" @click="showApprovalDetail(scope.row.id)">{{$t('审核详情')}}</el-button>
<el-button v-if="[2,4].indexOf(scope.row.status) > -1" type="danger" size="mini" @click="cancelApproval(scope.row.id)">{{$t('取消审核')}}</el-button>
<el-button v-if="[2,4, 5, 6].indexOf(scope.row.status) > -1" type="primary" size="mini" @click="showApprovalDetail(scope.row.id)">{{$t('审核详情')}}</el-button>
<el-button v-if="[2,4, 5, 6].indexOf(scope.row.status) > -1" type="danger" size="mini" @click="cancelApproval(scope.row.id)">{{$t('取消审核')}}</el-button>
</template>
</el-table-column>
</el-table>
......
src/views/ecw/order/components/CancelCargo.vue 0 → 100644
View file @ 083f0740
<template>
<el-dialog :title="$t('取消放货')" visible :before-close="closeDialog" :close-on-click-modal="false" width="800px">
<el-form ref="form" :model="formData" :rules="rules" size="small" label-width="150px" v-if="detail" >
<el-form-item :label="$t('订单号')">
{{order.orderNo}}
</el-form-item>
<el-row>
<el-col :span="12">
<el-form-item :label="$t('收货人')">
{{info.consigneeName}}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('收货人电话')">
+{{info.consigneeCountryCode}} {{info.consigneePhone}}
</el-form-item>
</el-col>
</el-row>
<el-form-item :label="$t('总控货箱数')">
{{order.sumNum}}
</el-form-item>
<el-form-item :label="$t('取消放货原因')">
</el-form-item>
<el-form-item :label="$t('上传凭证')">
</el-form-item>
<el-form-item :label="$t('控货手机号')">
+{{info.countryCode}} {{info.phone}}
</el-form-item>
<el-form-item :label="$t('手机验证码')">
<el-input v-model="formData.code" placeholder="" style="width: 100px; margin-right:10px"></el-input>
<send-sms-code :order-id="order.orderId" :scene="5" />
</el-form-item>
<div class="title">{{$t('审批流程')}}</div>
<work-flow xmlkey="cancel_goods" v-model="ccIdArr" />
<el-form-item label="">
<el-button type="primary" @click="submit">{{$t('提交申请')}}</el-button>
<el-button @click="closeDialog">{{$t('关闭')}}</el-button>
</el-form-item>
<el-form-item label="" style="margin-top:20px">
<el-button type="success" @click="submit">{{$t('提交申请')}}</el-button>
<el-button type="default" @click="closeDialog">{{$t('关闭')}}</el-button>
</el-form-item>
</el-form>
</el-dialog>
</template>
<script>
import {createPick, getRleaseInfo, seasoningCondimentsSelect, updateApply} from '@/api/ecw/orderCargoControl'
import AreaCodeSelector from '@/components/AreaCodeSelector'
import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
import WorkFlow from '@/components/WorkFlow'
export default {
props:{
orderId: [String, Number],
cargoControlPickId: Number
},
components: {AreaCodeSelector, SendSmsCode, WorkFlow},
data(){
return {
show: false,
detail: null,
ccIdArr: [],
formData:{
applyType: 10, // 调货审核
ccIds: ''
},
rules:{
code: {required: true, message: this.$t('请填写验证码')}
},
orders: [],
selectedOrders:[]
}
},
watch:{
'formData.orderIds'(val){
this.selectedOrders = this.orders.filter(item => val.indexOf(item.orderId) > -1)
},
ccIdArr(val){
this.formData.ccIds = val.join(',')
}
},
created(){
this.show = true
this.loadData()
},
methods:{
loadData(){
getRleaseInfo(this.orderId).then(res => this.detail = res.data)
seasoningCondimentsSelect({orderId: this.orderId}).then(res => {
this.orders = res.data
})
},
closeDialog(){
this.show = false
this.$emit('close');
},
submit(){
this.$refs.form.validate(valid => {
if(!valid){
return false
}
console.log('submit')
updateApply(Object.assign({
cargoControlPickId: this.cargoControlPickId,
orderBackPageVOList: this.selectedOrders,
orderId: this.orderId
}, this.formData)).then(res => {
this.$message.success(this.$t('操作成功'))
this.show = false
this.$emit('success')
})
})
}
}
}
</script>
<style lang="scss" scoped>
.title{
font-size:16px;
margin:20px 0;
display:flex;
align-items:center;
&:before{
content: '';
width:5px;
height: 15px;
background:#666;
margin-right:10px;
}
}
</style>
\ No newline at end of file
src/views/ecw/order/components/CargoControlDetail.vue
View file @ 083f0740
......@@ -28,7 +28,12 @@
<!-- 调货 -->
<el-descriptions-item label="申请原因" v-if="applyType == 9">
EC0063600N调为EC0063094N进行放货，放货箱数为：6，EC0063095N进行放货，放货箱数为：4，EC0063096N进行放货，放货箱数为：2，备注：123123
{{detail.reason}}
</el-descriptions-item>
<!-- 取消放货 -->
<el-descriptions-item label="申请原因" v-if="applyType == 10">
{{detail.reason}}
</el-descriptions-item>
</el-descriptions>
......
src/views/ecw/order/detail.vue
View file @ 083f0740
......@@ -62,13 +62,22 @@
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCargoControl" />
</el-descriptions-item>
<el-descriptions-item :label="$t('填单信息')">
{{order.costVO.totalNum}}{{$t('箱')}} {{order.costVO.totalWeight}}Kg {{order.costVO.totalVolume}}m³
{{order.costVO.totalNum}}{{$t('箱')}}
{{order.costVO.totalWeight}}Kg
{{order.costVO.totalVolume}}m³
{{order.costVO.totalQuantity}}{{$t('个')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('仓库实测')">
{{order.sumNum}}{{$t('箱')}} {{order.sumWeight}}Kg {{order.sumVolume}}m³
{{order.sumNum}}{{$t('箱')}}
{{order.sumWeight}}Kg
{{order.sumVolume}}m³
{{order.sumQuantity}}{{$t('个')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('收款数据')">
{{order.entryNum}}{{$t('箱')}} {{order.entryWeight}}Kg {{order.entryVolume}}m³
{{order.entryNum}}{{$t('箱')}}
{{order.entryWeight}}Kg
{{order.entryVolume}}m³
{{order.entryQuantity}}{{$t('个')}}
</el-descriptions-item>
<el-descriptions-item :label="$t('入仓类型')">
<dict-tag :type="DICT_TYPE.ECW_WAREHOUSING_TYPE" :value="order.warehouseType" />
......@@ -118,8 +127,16 @@
<dict-tag :type="DICT_TYPE.ECW_PRODUCT_MATERIAL" :value="row.material" />
</template>
</el-table-column>
<el-table-column prop="volume" :label="$t('体积') + '(m³)'" width="90px"/>
<el-table-column prop="weight" :label="$t('重量') + '(kg)'" width="90px"/>
<el-table-column prop="volume" :label="$t('体积') + '(m³)'" width="90px">
<template slot-scope="{row}">
{{order.inWarehouseState > 1 ? row.warehouseInInfoVO.volume : row.volume}}
</template>
</el-table-column>
<el-table-column prop="weight" :label="$t('重量') + '(kg)'" width="90px">
<template slot-scope="{row}">
{{order.inWarehouseState > 1 ? row.warehouseInInfoVO.weight : row.weight}}
</template>
</el-table-column>
<el-table-column prop="quantity" :label="$t('数量') + '(个)'" width="90px"/>
<el-table-column prop="" :label="$t('费用类型')">
<template slot-scope="{row}">
......
src/views/ecw/order/edit.vue
View file @ 083f0740
......@@ -425,7 +425,7 @@
</div>
<div v-if="[2,3,4].indexOf(+form.transportId) > -1">
<el-form-item :label="$t('清关证书')">
<dict-selector v-model="form.customsClearCert" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" defaultable />
<dict-selector v-model="form.customsClearCert" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable />
</el-form-item>
<el-form-item label="清关证书备注" >
<el-input v-model="form.remarks" ></el-input>
......@@ -433,12 +433,12 @@
</div>
<div v-if="[3,4].indexOf(+form.transportId) > -1">
<el-form-item label="是否拆包">
<dict-selector v-model="form.isUnpack" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" defaultable />
<dict-selector v-model="form.isUnpack" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable />
</el-form-item>
</div>
<div class="form-section">
<el-form-item :label="$t('单票立刻转运')" v-if="[3,4].indexOf(+form.transportId) > -1">
<dict-selector v-model="form.isSingleTicketTransport" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" defaultable />
<dict-selector v-model="form.isSingleTicketTransport" form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" defaultable />
<span style="margin-left:10px">{{$t('注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”')}}</span>
</el-form-item>
</div>
......@@ -710,6 +710,17 @@ export default {
this.getOpenedRouterList()
},
'form.transportId'(){
// 海运拼柜给表单默认值
if(this.form.transportId == 4){
this.$nextTick(() => {
this.$set(this, 'form', Object.assign(this.form, {
doubleClear: 2,
customsClearCert: false,
isUnpack: false,
isSingleTicketTransport: false
}))
})
}
this.getOpenedRouterList()
},
'form.lineId'(lineId){
......@@ -719,7 +730,7 @@ export default {
this.$set(this.form, 'objectiveId', router.destCityId)
},
'form.packageTypeArr'(val){
this.$set(this.form, 'form.packageType', val.join(','))
this.$set(this.form, 'packageType', val.join(','))
},
// 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择
selectedRouter(val){
......
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