Skip to content

J
jiedao-app-operator-master
Commit 3c4db856 authored by zhoutong's avatar zhoutong
Browse files
Options

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

parents 23b010d7 e32b9b84
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1158 additions and 551 deletions
.gitignore
View file @ 3c4db856
...@@ -5,7 +5,7 @@ npm-debug.log* ...@@ -5,7 +5,7 @@ npm-debug.log*
yarn-debug.log* yarn-debug.log*
yarn-error.log* yarn-error.log*
**/*.log **/*.log
*.stackdump
tests/**/coverage/ tests/**/coverage/
tests/e2e/reports tests/e2e/reports
selenium-debug.log selenium-debug.log
......
bash.exe.stackdump deleted 100644 → 0
View file @ 23b010d7
Stack trace:
Frame Function Args
00800000010 0018006401E (001802839A0, 0018026EFD1, 00000000059, 000FFFFB700)
00800000010 0018004973A (00800000010, 00100000000, 00000000000, 00000000001)
00800000010 00180049772 (00000000000, 00000000000, 00000000059, 00180354100)
00800000010 00180070FE9 (00000000000, 000FFFFC7D0, 0000000000B, 00000000000)
00800000010 001800712A0 (00000000003, 000FFFFC8F0, 00180045BCF, 000FFFFC8F0)
00800000010 00180072AB9 (000FFFFC8F0, 00180271795, 001801004A7, 0000000000D)
00800000010 0018005B2A3 (7FF8018B1490, 00000000000, 00000000000, 000FFFFFFFF)
00800000010 0018005C655 (00800029390, 1D400000000, 00000000000, 00000000008)
00800000010 0018005CB3F (000FFFFCCE0, 000FFFFCC45, 00000000000, 205C745C615C635C)
000FFFFCBBC 0018005CF2F (635C655C205C265C, 3E5C205C6F5C685C, 765C655C645C2F5C, 795C745C745C2F5C)
000FFFFCCE0 00180049EE8 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 00180048846 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 001800488F4 (00000000000, 00000000000, 00000000000, 00000000000)
End of stack trace
package.json
View file @ 3c4db856
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
"clipboard": "2.0.8", "clipboard": "2.0.8",
"core-js": "^3.21.1", "core-js": "^3.21.1",
"dayjs": "^1.11.4", "dayjs": "^1.11.4",
"decimal.js": "^10.4.1",
"echarts": "4.9.0", "echarts": "4.9.0",
"element-ui": "^2.15.6", "element-ui": "^2.15.6",
"file-saver": "2.0.5", "file-saver": "2.0.5",
......
sh.exe.stackdump deleted 100644 → 0
View file @ 23b010d7
Stack trace:
Frame Function Args
00800000010 0018006401E (001802839A0, 0018026EFD1, 00000000059, 000FFFFB710)
00800000010 0018004973A (00800000010, 00100000000, 00000000000, 00000000001)
00800000010 00180049772 (00000000000, 00000000000, 00000000059, 00180353FD0)
00800000010 00180070FE9 (00000000002, 000FFFFC7E0, 0000000000B, 00000000000)
00800000010 001800712A0 (000FFFFCBC0, 00800000010, 00180045B55, 000FFFFC900)
00800000010 00180072AB9 (000FFFFC900, 00180271795, 001801004A7, 0000000000D)
00800000010 0018005B2A3 (7FF8018B1490, 00000000000, 00000000000, 040FFFFFFFF)
00800000010 0018005C655 (00000000002, 00180350D08, 00000000002, 00000000008)
00800000010 0018005CB3F (000FFFFCC9C, 000FFFFCCE0, 000FFFFCC9D, 000FFFFCC00)
000FFFFCBCC 0018005CF2F (6D5C2D5C6C5C615C, 675C615C6E5C615C, 635C2D5C725C655C, 205C655C725C6F5C)
000FFFFCCE0 00180049EE8 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 00180048846 (00000000000, 00000000000, 00000000000, 00000000000)
000FFFFFFF0 001800488F4 (00000000000, 00000000000, 00000000000, 00000000000)
End of stack trace
src/api/ecw/customerCommission.js
View file @ 3c4db856
...@@ -29,3 +29,12 @@ export function exportCustomerCommissionExcel(query) { ...@@ -29,3 +29,12 @@ export function exportCustomerCommissionExcel(query) {
}) })
} }
//
export function getDarkReturnCommission(data){
return request({
url: '/ecw/customer-commission/get-dark-return-commission',
method: 'post',
data
})
}
\ No newline at end of file
src/api/ecw/futureBox.js
View file @ 3c4db856
...@@ -52,3 +52,28 @@ export function exportFutureBoxExcel(query) { ...@@ -52,3 +52,28 @@ export function exportFutureBoxExcel(query) {
responseType: 'blob' responseType: 'blob'
}) })
} }
// 根据运输方式ID得到已封柜方数
export function getBoxedVolume(params){
return request({
url: '/ecw/future-box/getBoxedVolume',
method: 'get',
params
})
}
// 根据运输方式ID得到待入仓方数
export function getToBeWareHousedVolume(params){
return request({
url: '/ecw/future-box/getToBeWareHousedVolume',
method: 'get',
params
})
}
// 根据运输方式ID得到已入仓方数
export function getWareHousedVolume(params){
return request({
url: '/ecw/future-box/getWareHousedVolume',
method: 'get',
params
})
}
\ No newline at end of file
src/api/ecw/offer.js
View file @ 3c4db856
...@@ -106,3 +106,21 @@ export function getOfferSpecialByApproveId(approveId) { ...@@ -106,3 +106,21 @@ export function getOfferSpecialByApproveId(approveId) {
}) })
} }
// 取消报价管理
export function cancel(id) {
return request({
url: '/ecw/offer/cancel',
method: 'delete',
params: {id}
})
}
// 恢复取消的报价管理
export function recovery(id) {
return request({
url: '/ecw/offer/recovery',
method: 'delete',
params: {id}
})
}
\ No newline at end of file
src/api/ecw/orderCargoControl.js
View file @ 3c4db856
...@@ -116,3 +116,19 @@ export function seasoningCondimentsSelect(params){ ...@@ -116,3 +116,19 @@ export function seasoningCondimentsSelect(params){
}) })
} }
// 根据放货ID查询控货订单放货修改审核详情
export function getPpickUpdateInfo(id){
return request({
url: '/ecw/order-cargo-control-pick/update/info/{id}/' + id,
method: 'get'
})
}
// 获得控货订单放货修改申请详情 {approveId: 1}
export function getPickUpdateApproveInfo(params){
return request({
url: '/ecw/order-cargo-control-pick/update/info',
method: 'get',
params
})
}
\ No newline at end of file
src/assets/styles/variables.scss
View file @ 3c4db856
...@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17; ...@@ -36,7 +36,7 @@ $base-sub-menu-background:#000c17;
$base-sub-menu-hover:#001528; $base-sub-menu-hover:#001528;
*/ */
$base-sidebar-width: 200px; $base-sidebar-width: 250px;
// the :export directive is the magic sauce for webpack // the :export directive is the magic sauce for webpack
// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass // https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
......
src/components/AreaCodeSelector/index.vue
View file @ 3c4db856
<template> <template>
<selector v-model="valueSync" :options="countryList" value-field="tel" key-field="id" :label-field="item => item.nameZh + item.tel" filterable clearable :disabled="disabled"></selector> <selector v-model="valueSync" :options="countryList" value-field="tel" key-field="id" :label-field="item => $l(item, 'name') + ' +' + item.tel" filterable clearable :disabled="disabled"></selector>
</template> </template>
<script> <script>
import {getCountryListAll} from '@/api/ecw/country' import {getCountryListAll} from '@/api/ecw/country'
...@@ -18,7 +18,7 @@ export default { ...@@ -18,7 +18,7 @@ export default {
}, },
watch:{ watch:{
valueSync(){ valueSync(){
this.$emit('input', this.valueSync) this.$emit('input', this.valueSync.replace('+', ''))
}, },
value(){ value(){
if(this.value)this.valueSync = this.value if(this.value)this.valueSync = this.value
...@@ -29,7 +29,10 @@ export default { ...@@ -29,7 +29,10 @@ export default {
this.valueSync = this.value this.valueSync = this.value
} }
getCountryListAll().then(res => { getCountryListAll().then(res => {
this.countryList = res.data this.countryList = res.data.map(item => {
item.tel = item.tel.replace('+', '')
return item
})
}) })
}, },
methods:{ methods:{
......
src/components/ChooseContactDialog/index.vue
View file @ 3c4db856
...@@ -55,7 +55,7 @@ export default { ...@@ -55,7 +55,7 @@ export default {
}, },
methods:{ methods:{
handleQuery(){ handleQuery(){
// this.form.pageNo = 1 this.form.pageNo = 1
this.loadList() this.loadList()
}, },
loadList(){ loadList(){
......
src/components/CustomerFollow/index.vue
View file @ 3c4db856
...@@ -158,7 +158,7 @@ export default { ...@@ -158,7 +158,7 @@ export default {
}, },
created() { created() {
this.resetCustomerFollowForm() // this.resetCustomerFollowForm()
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
...@@ -213,6 +213,7 @@ export default { ...@@ -213,6 +213,7 @@ export default {
this.customerFollow.dialogVisible = false this.customerFollow.dialogVisible = false
}, },
resetCustomerFollowForm() { resetCustomerFollowForm() {
console.log(11)
this.customerFollow.form = { this.customerFollow.form = {
"bizId": this.id, "bizId": this.id,
"contactName": undefined, "contactName": undefined,
......
src/components/CustomerFollowList/index.vue
View file @ 3c4db856
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
<el-row :gutter="10"> <el-row :gutter="10">
<el-col> <el-col>
<el-form-item label="跟进类型" required> <el-form-item label="跟进类型" required>
<span>{{form.followType}}</span>
<dict-selector ref="dictTag" form-type="radio" v-model="form.followType" :type="DICT_TYPE.CUSTOMER_FOLLOW_TYPE"></dict-selector> <dict-selector ref="dictTag" form-type="radio" v-model="form.followType" :type="DICT_TYPE.CUSTOMER_FOLLOW_TYPE"></dict-selector>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -104,7 +103,7 @@ export default { ...@@ -104,7 +103,7 @@ export default {
}, },
created() { created() {
this.resetCustomerFollowForm() // this.resetCustomerFollowForm()
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.$set(form, 'customerId', this.customerId) // this.$set(form, 'customerId', this.customerId)
......
src/components/FileUpload/index.vue
View file @ 3c4db856
...@@ -73,7 +73,7 @@ export default { ...@@ -73,7 +73,7 @@ export default {
number: 0, number: 0,
uploadList: [], uploadList: [],
baseUrl: process.env.VUE_APP_BASE_API, baseUrl: process.env.VUE_APP_BASE_API,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/app-api/file/upload", // 上传的文件服务器地址 uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/org-name/up", // 上传的文件服务器地址
headers: { headers: {
Authorization: "Bearer " + getToken(), Authorization: "Bearer " + getToken(),
}, },
......
src/components/RoutersSelector/index.vue
View file @ 3c4db856
...@@ -187,8 +187,9 @@ export default { ...@@ -187,8 +187,9 @@ export default {
}) })
getTradeCityList().then(res => { getTradeCityList().then(res => {
this.tradeCityList = res.data this.tradeCityList = res.data
}) // 路线需要过滤失效的进出口城市，所以在程序加载后再加载路线
this.getOpenedRouterList() this.getOpenedRouterList()
})
if(this.value && this.value.length){ if(this.value && this.value.length){
this.selectedRoutes = this.value this.selectedRoutes = this.value
......
src/components/SupplierSelector/index.vue
View file @ 3c4db856
...@@ -57,7 +57,8 @@ export default { ...@@ -57,7 +57,8 @@ export default {
}, },
remoteMethod(keyword){ remoteMethod(keyword){
let params = { let params = {
pageSize: 100 pageSize: 500,
companyType: this.companyType
} }
params.keyword = keyword params.keyword = keyword
this.loading = true this.loading = true
......
src/i18n/index.js
View file @ 3c4db856
...@@ -12,10 +12,20 @@ const i18n = new VueI18n({ ...@@ -12,10 +12,20 @@ const i18n = new VueI18n({
} }
}) })
console.log({i18n}) console.log({i18n})
/*
用法
$l('title') => titleZh
$l(item, 'title') => item.titleZh
$l(null, 'title') => titleZh
$l() => Zh
*/
Vue.prototype.$l = (object, field = '') => { Vue.prototype.$l = (object, field = '') => {
let prefix = i18n.locale.split('_')[0] let prefix = i18n.locale.split('_')[0]
let append = prefix.charAt(0).toUpperCase() + prefix.toLowerCase().substr(1) let append = prefix.charAt(0).toUpperCase() + prefix.toLowerCase().substr(1)
// 如果object是null则返回字段名 if(typeof object == 'string'){
return object + append
}
// 如果object是null或者字符串则返回字段名
if(!object) return field + append if(!object) return field + append
return object[field + append] || object[field] return object[field + append] || object[field]
......
src/store/index.js
View file @ 3c4db856
...@@ -17,7 +17,7 @@ const store = new Vuex.Store({ ...@@ -17,7 +17,7 @@ const store = new Vuex.Store({
tagsView, tagsView,
permission, permission,
settings, settings,
dict dict,
}, },
getters getters
}) })
......
src/store/modules/tagsView.js
View file @ 3c4db856
...@@ -82,6 +82,26 @@ const mutations = { ...@@ -82,6 +82,26 @@ const mutations = {
} }
return false return false
}) })
},
DEL_LEFT_VIEWS: (state, view) => {
const index = state.visitedViews.findIndex(v => v.path === view.path)
if (index === -1) {
return
}
state.visitedViews = state.visitedViews.filter((item, idx) => {
if (idx >= index || (item.meta && item.meta.affix)) {
return true
}
const i = state.cachedViews.indexOf(item.name)
if (i > -1) {
state.cachedViews.splice(i, 1)
}
if(item.meta.link) {
const fi = state.iframeViews.findIndex(v => v.path === item.path)
state.iframeViews.splice(fi, 1)
}
return false
})
} }
} }
...@@ -176,6 +196,12 @@ const actions = { ...@@ -176,6 +196,12 @@ const actions = {
resolve([...state.visitedViews]) resolve([...state.visitedViews])
}) })
}, },
delLeftTags({ commit }, view){
return new Promise(resolve => {
commit('DEL_LEFT_VIEWS', view)
resolve([...state.visitedViews])
})
},
delCurrentView({ dispatch }){ delCurrentView({ dispatch }){
const view = router.history.current const view = router.history.current
return dispatch('delView', view).then(({visitedViews}) => { return dispatch('delView', view).then(({visitedViews}) => {
......
src/utils/cache.js 0 → 100644
View file @ 3c4db856
import store from '../store'
export default {
getChannels(){
if(!store.state.cache.channelList){
store.dispatch('cache/getChannelList')
}
return store.state.cache.channelList
}
}
\ No newline at end of file
src/utils/dict.js
View file @ 3c4db856
...@@ -110,6 +110,7 @@ export const DICT_TYPE = { ...@@ -110,6 +110,7 @@ export const DICT_TYPE = {
ECW_RELEASE_STATUS: 'release_status', // 放货状态 ECW_RELEASE_STATUS: 'release_status', // 放货状态
ECW_PICK_RECURRENT_NUCLEAR_TYPE: 'PICK_RECURRENT_NUCLEAR_TYPE', // 放货反复核类型 ECW_PICK_RECURRENT_NUCLEAR_TYPE: 'PICK_RECURRENT_NUCLEAR_TYPE', // 放货反复核类型
ECW_COST_FEE_TYPE: 'cost_fee_type', // 清单费用类型 ECW_COST_FEE_TYPE: 'cost_fee_type', // 清单费用类型
ECW_PRICE_AUDIT_STATUS: 'price_audit_status', // 路线价格审核状态
//--------ecw--------- //--------ecw---------
CUSTOMER_STATUS: 'customer_status', CUSTOMER_STATUS: 'customer_status',
CUSTOMER_SOURCE: 'customer_source', CUSTOMER_SOURCE: 'customer_source',
......
src/views/bpm/processInstance/detail.vue
View file @ 3c4db856
...@@ -131,22 +131,23 @@ import {approveTask, getTaskListByProcessInstanceId, rejectTask, updateTaskAssig ...@@ -131,22 +131,23 @@ import {approveTask, getTaskListByProcessInstanceId, rejectTask, updateTaskAssig
import {getDate} from "@/utils/dateUtils"; import {getDate} from "@/utils/dateUtils";
import {listSimpleUsers} from "@/api/system/user"; import {listSimpleUsers} from "@/api/system/user";
import {getActivityList} from "@/api/bpm/activity"; import {getActivityList} from "@/api/bpm/activity";
import specialDetail from "@/views/ecw/offer/components/specialDetail" import SpecialDetail from "@/views/ecw/offer/components/SpecialDetail"
import warehouseDetails from "@/views/ecw/order/components/warehouseDetails"; import warehouseDetails from "@/views/ecw/order/components/warehouseDetails";
import shippingDetail from '@/views/ecw/box/shippingDetail' import shippingDetail from '@/views/ecw/box/shippingDetail'
import SplitDetail from '@/views/ecw/order/components/SplitDetail' import SplitDetail from '@/views/ecw/order/components/SplitDetail'
import MergeDetail from '@/views/ecw/order/components/MergeDetail' import MergeDetail from '@/views/ecw/order/components/MergeDetail'
import CargoControlDetail from '@/views/ecw/order/components/CargoControlDetail'
// 流程实例的详情页，可用于审批 // 流程实例的详情页，可用于审批
export default { export default {
name: "ProcessInstanceDetail", name: "ProcessInstanceDetail",
components: { components: {
Parser, Parser,
specialDetail, SpecialDetail,
warehouseDetails, warehouseDetails,
shippingDetail, shippingDetail,
SplitDetail, SplitDetail,
MergeDetail MergeDetail,
CargoControlDetail
}, },
computed:{ computed:{
matterNum(){ matterNum(){
...@@ -253,9 +254,33 @@ export default { ...@@ -253,9 +254,33 @@ export default {
merge_detail: { merge_detail: {
component: "MergeDetail", component: "MergeDetail",
id: this.processInstance.businessKey, id: this.processInstance.businessKey,
},
// 放货修改
order_update_release: {
component: 'CargoControlDetail',
id: this.processInstance.businessKey,
applyType: 7
},
// 反复核
order_fallback: {
component: 'CargoControlDetail',
id: this.processInstance.businessKey,
applyType: 8
},
// 调货审核
order_cargo_transfer: {
component: 'CargoControlDetail',
id: this.processInstance.businessKey,
applyType: 9
},
// 取消放货审核 // TODO 接口待完善，applyType待完善
order_cancel_release: {
component: 'CargoControlDetail',
id: this.processInstance.businessKey,
applyType: 10
} }
} }
return map[this.processInstance.processDefinition.formCustomViewPath] return map[this.processInstance.processDefinition.formCustomViewPath.trim()]
} }
}, },
data() { data() {
......
src/views/ecw/box/indexFutureBox.vue
View file @ 3c4db856
This diff is collapsed.
src/views/ecw/customer/index.vue
View file @ 3c4db856
...@@ -692,7 +692,7 @@ export default { ...@@ -692,7 +692,7 @@ export default {
this.exportLoading = true; this.exportLoading = true;
return exportCustomerExcel(params); return exportCustomerExcel(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/customerCommission/index.vue
View file @ 3c4db856
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button></div> <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button></div>
<div style="flex: 1; text-align: right;"> <div style="flex: 1; text-align: right;">
<router-link :to="'/customerCommissionInfo/'+ 0 "> <router-link :to="'/customerCommissionInfo/'+ 0 ">
<el-button>佣金设置</el-button> <el-button type="primary">佣金设置</el-button>
</router-link> </router-link>
</div> </div>
</div> </div>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button> <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">编辑</el-button>-->
<el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button> <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -194,6 +194,9 @@ export default { ...@@ -194,6 +194,9 @@ export default {
}, },
}, },
created() { created() {
if(this.$route.query.customerId){
this.queryParams.customerId = this.$route.query.customerId
}
this.getList(); this.getList();
getTradeCityList().then(res => { getTradeCityList().then(res => {
this.tradeCityList = res.data this.tradeCityList = res.data
......
src/views/ecw/customerCommissionInfo/customSelectorsDictionary.vue
View file @ 3c4db856
<template> <template>
<el-select v-if="options" v-model="selectVal" placeholder="请选择"> <el-select v-if="options" v-model="selectVal" placeholder="请选择">
<el-option v-if="allShow" label="全部" :value='0'></el-option>
<el-option <el-option
v-for="item in options" v-for="item in options"
:key="item[valueKey]" :key="item[valueKey]"
...@@ -26,6 +27,10 @@ export default { ...@@ -26,6 +27,10 @@ export default {
type:String, type:String,
default: 'value', default: 'value',
}, },
allShow:{
type:Boolean,
default:false
}
}, },
data(){ data(){
return{ return{
......
src/views/ecw/financial/creatPayment.vue
View file @ 3c4db856
...@@ -736,7 +736,7 @@ export default { ...@@ -736,7 +736,7 @@ export default {
}; };
</script> </script>
<style> <style scoped>
.card { .card {
margin-top: 20px; margin-top: 20px;
} }
......
src/views/ecw/financial/paymentVoucher.vue
View file @ 3c4db856
...@@ -330,7 +330,7 @@ export default { ...@@ -330,7 +330,7 @@ export default {
}; };
</script> </script>
<style> <style scoped>
.card { .card {
margin-top: 20px; margin-top: 20px;
} }
......
src/views/ecw/financial/receivable.vue
View file @ 3c4db856
...@@ -319,7 +319,7 @@ export default { ...@@ -319,7 +319,7 @@ export default {
}; };
</script> </script>
<style> <style scoped>
.card { .card {
margin-top: 20px; margin-top: 20px;
} }
......
src/views/ecw/financial/voucher.vue
View file @ 3c4db856
...@@ -384,7 +384,7 @@ export default { ...@@ -384,7 +384,7 @@ export default {
}; };
</script> </script>
<style> <style scoped>
.card { .card {
margin-top: 20px; margin-top: 20px;
} }
......
src/views/ecw/offer/components/Commossion.vue 0 → 100644
View file @ 3c4db856
<template>
<el-dialog visible :close-on-click-modal="false" :before-close="closeDialog" :title="$t('佣金规则申请')">
<el-form ref="form" :model="form" label-width="80px" :rules="rules">
<el-form-item :label="$t('商品类型')">
<span>{{ getProductAttrNameById(form.productType) }}</span>
</el-form-item>
<el-form-item :label="$t('商品名称')">
<span>{{ form.prodTitleZh }}</span>
</el-form-item>
<el-form-item :label="$t('英文名称')">
<span>{{ form.prodTitleEn }}</span>
</el-form-item>
<el-form-item :label="$t('线路')">
{{ `【${getDictDataLabel(DICT_TYPE.TRANSPORT_TYPE, form.transportId)}】${ getChannelNameById(form.channelId) }`}}
{{$t("从【{departureName}】发往【{objectiveName}】", {departureName: form.departureName, objectiveName: form.objectiveName})}}
</el-form-item>
<el-row v-if="!form.charging">
<el-col :span="12">
<el-form-item :label="$t('运费')">
{{form.orgSeaFreight}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item :label="$t('清关费')">
{{form.orgClearanceFreight}} {{ currentMap[form.orgClearanceFreightCurrency] }} / {{ unitMap[form.orgClearanceFreightVolume] }}
</el-form-item>
</el-col>
</el-row>
<el-form-item :label="$t('全包价')" v-if="form.charging">
{{form.orgSeaFreight}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
</el-form-item>
<el-form-item :label="$t('佣金类型')" prop="commissionType">
<dict-selector :type="DICT_TYPE.COMMISSION_TYPE" v-model="form.commissionType" form-type="radio" />
</el-form-item>
<!-- 明佣或者明佣+暗佣才显示 -->
<el-form-item label="明佣佣金" v-if="form.commissionType == 1 || form.commissionType == 3">
<el-input v-model.number="form.lightCommissionAmount" placeholder="" class="w-100"></el-input>
{{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
</el-form-item>
<!-- 明佣+暗佣才显示 -->
<el-form-item label="暗佣佣金" v-if="form.commissionType == 3">
<el-input v-model.number="form.shadeCommissionAmount" placeholder="" class="w-100"></el-input>
{{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
</el-form-item>
<!-- 无佣金不显示 -->
<div class="pl-50" v-if="form.commissionType != 0">
<div>{{$l(form, 'prodTitle')}}</div>
<!-- 明佣+暗佣显示 -->
<div v-if="form.commissionType == 3">
成本价：{{form.orgSeaFreight}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
</div>
<!-- 暗佣显示 -->
<div v-if="form.commissionType == 2">
{{$l(form, 'prodTitle')}}
<template v-if="darkCommission">
{{$t('暗佣')}}：{{darkCommission}} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}
</template>
<el-link type="primary" @click.native="$router.push('/customer/customerCommission?customerId=' + customerId)">去设置</el-link>
</div>
<div v-if="form.commissionType == 1 || form.commissionType == 3">销售价：{{form.orgSeaFreight + form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}</div>
<div v-if="form.commissionType == 3">实际佣金返点：{{form.shadeCommissionAmount + form.lightCommissionAmount }} {{ currentMap[form.orgSeaFreightCurrency] }} / {{ unitMap[form.orgSeaFreightVolume] }}</div>
</div>
</el-form>
<div class="page-title">审批流程</div>
<work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
<div v-if="!form.applyStatus">
<el-button type="primary" @click="handleSubmit">提交</el-button>
</div>
<div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button>
</div>
</el-dialog>
</template>
<script>
import {createOfferSpecial, getOfferSpecial, getOfferSpecialByApproveId} from "@/api/ecw/offer"
import {DICT_TYPE, getDictDataLabel} from "@/utils/dict"
import DictSelector from "@/components/DictSelector"
import {getUnitList} from "@/api/ecw/unit"
import {getChannelList} from "@/api/ecw/channel"
import { getCurrencyList } from '@/api/ecw/currency'
import { getProductAttrList } from '@/api/ecw/productAttr'
import WorkFlow from '@/components/WorkFlow'
import {getDarkReturnCommission} from '@/api/ecw/customerCommission'
export default {
name: "Commossion",
props: {
offer: Object,
offerProd: Object,
/*
offerProdId: Number,
customerId: Number */
},
components: {
DictSelector, WorkFlow
},
created() {
this.getOfferSpecial()
getUnitList().then(res => this.unitList = res.data)
getChannelList().then(res => this.channelList = res.data)
getCurrencyList().then(res => this.currencyList = res.data)
getProductAttrList().then(res => this.productAttrList = res.data)
},
data() {
return {
getDictDataLabel,
DICT_TYPE,
unitList:[],
channelList:[],
currencyList:[],
productAttrList:[],
ccIdArr: [],
form: {
type: 2
},
rules:{
commissionType : {required: true, message: '请选择佣金类型'},
},
darkCommission: null, // 暗佣佣金
}
},
computed: {
// 根据渠道id显示渠道名
getChannelNameById(){
return channelId => {
const s = this.channelList.find(item => item.channelId == channelId) ?. nameZh
return s ? '【' + s + '】' : ''
}
},
currentMap(){
let map = {}
this.currencyList.forEach(item => {
map[item.id] = this.$l(item, 'title')
})
return map
},
unitMap(){
let map = {}
this.unitList.forEach(item => {
map[item.id] = this.$l(item, 'title')
})
return map
},
},
watch:{
ccIdArr(){
this.$set(this.form, 'ccIds', this.ccIdArr.join(','))
},
'form.commissionType'(val){
this.$set(this.form, 'lightCommissionAmount', 0)
this.$set(this.form, 'shadeCommissionAmount', 0)
// 暗佣需要查询暗佣设置
if(val == 2){
this.getCommission()
}
}
},
methods: {
handleSubmit(){
this.$refs.form.validate().then(res => {
// 接口运费不能为空，所以这里提交了运费字段
createOfferSpecial(Object.assign({
clearanceFreight: this.form.orgClearanceFreight,
seaFreight: this.form.orgSeaFreight
}, this.form, {type: 2})).then(res => {
this.$message.success(this.$t('提交成功'))
this.$emit('success')
})
})
},
getOfferSpecial(){
getOfferSpecial(this.offerProd.offerProdId, {type: 2}).then(r => {
this.form = r.data
})
},
getProductAttrNameById(id){
return this.productAttrList.find(e => e.id === id)?.attrName || ''
},
closeDialog(){
this.$emit('close')
},
getCommission(){
getDarkReturnCommission({
customerId: this.offer.relationId,
customsType: this.offer.customsType,
darkCurrency: this.form.orgSeaFreightCurrency,
darkUnit: this.form.orgSeaFreightVolume,
departureId: this.offer.departureId,
objectiveId: this.offer.objectiveId,
productAttr: 3, //this.offerProd.prodAttrIds,
productType: this.offerProd.productType,
transportId: this.offer.transportId,
type: 2, // 暗佣
}).then(res => {
this.darkCommission = res.data?.darkCommission
})
}
}
}
</script>
src/views/ecw/offer/components/specialDiscount.vue → src/views/ecw/offer/components/SpecialDiscount.vue
View file @ 3c4db856
...@@ -55,9 +55,14 @@ ...@@ -55,9 +55,14 @@
</el-form> </el-form>
<div class="page-title">审批流程</div> <div class="page-title">审批流程</div>
<work-flow xmlkey="sheet_sale" v-model="ccIdArr" /> <work-flow xmlkey="sheet_sale" v-model="ccIdArr" />
<div> <div v-if="!form.applyStatus">
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">提交</el-button>
</div> </div>
<div v-else>
<el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
<dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
</el-button>
</div>
</el-dialog> </el-dialog>
</template> </template>
...@@ -116,10 +121,9 @@ export default { ...@@ -116,10 +121,9 @@ export default {
methods: { methods: {
handleSubmit(){ handleSubmit(){
this.$refs.form.validate().then(res => { this.$refs.form.validate().then(res => {
console.log(this.form.type)
createOfferSpecial(Object.assign({}, this.form, {type: 1})).then(res => { createOfferSpecial(Object.assign({}, this.form, {type: 1})).then(res => {
this.$message.success(this.$t('提交成功')) this.$message.success(this.$t('提交成功'))
this.$emit('success')
}) })
}) })
}, },
......
src/views/ecw/offer/detail.vue
View file @ 3c4db856
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
{{consigneeData.length>0?consigneeData[0].customerName||$t('无'):$t('无')}} {{consigneeData.length>0?consigneeData[0].customerName||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('手机号:')"> <el-descriptions-item :label="$t('手机号:')">
{{consigneeData.length>0?(consigneeData[0].areaCode+consigneeData[0].phoneNew)||$t('无'):$t('无')}} {{consigneeData.length>0?(checkCode(consigneeData[0].areaCode)+consigneeData[0].phoneNew)||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('联系地址:')"> <el-descriptions-item :label="$t('联系地址:')">
{{consigneeData.length>0?consigneeData[0].address||$t('无'):$t('无')}} {{consigneeData.length>0?consigneeData[0].address||$t('无'):$t('无')}}
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
{{consigneeData.length>1?consigneeData[1].customerName||$t('无'):$t('无')}} {{consigneeData.length>1?consigneeData[1].customerName||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('手机号:')"> <el-descriptions-item :label="$t('手机号:')">
{{consigneeData.length>1?(consigneeData[1].areaCode+consigneeData[1].phoneNew)||$t('无'):$t('无')}} {{consigneeData.length>1?(checkCode(consigneeData[1].areaCode)+consigneeData[1].phoneNew)||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('联系地址:')"> <el-descriptions-item :label="$t('联系地址:')">
{{consigneeData.length>1?consigneeData[1].address||$t('无'):$t('无')}} {{consigneeData.length>1?consigneeData[1].address||$t('无'):$t('无')}}
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
<div slot="header" class="card-title">{{$t('通用信息')}}</div> <div slot="header" class="card-title">{{$t('通用信息')}}</div>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item :label="$t('唛头')"> <el-descriptions-item :label="$t('唛头')">
{{list.marks}} {{list.marks||'/'}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('报关方式')"> <el-descriptions-item :label="$t('报关方式')">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="list.customsType"></dict-tag> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="list.customsType"></dict-tag>
...@@ -242,13 +242,13 @@ ...@@ -242,13 +242,13 @@
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
<el-descriptions-item :label="$t('预计结束时间')"> <el-descriptions-item :label="$t('预计结束时间')">
{{list.stopTime}} {{list.stopTime||'/'}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('控货')"> <el-descriptions-item :label="$t('控货')">
{{list.control?$t('是'):$t('否')}} {{list.control?$t('是'):$t('否')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('竞争对手')"> <el-descriptions-item :label="$t('竞争对手')">
{{list.competitor}} {{list.competitor||'/'}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('重要程度')"> <el-descriptions-item :label="$t('重要程度')">
<el-rate v-model="list.importance"></el-rate> <el-rate v-model="list.importance"></el-rate>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</el-descriptions> </el-descriptions>
<el-descriptions > <el-descriptions >
<el-descriptions-item :label="$t('备注')"> <el-descriptions-item :label="$t('备注')">
{{list.remarks}} {{list.remarks||'/'}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
...@@ -276,12 +276,12 @@ ...@@ -276,12 +276,12 @@
<div class="line"> <div class="line">
<el-descriptions> <el-descriptions>
<el-descriptions-item :label="[3,4].indexOf(list.transportId)>-1?$t('空运路线'):$t('海运路线')"> <el-descriptions-item :label="[3,4].indexOf(list.transportId)>-1?$t('空运路线'):$t('海运路线')">
{{getRouterNameById(list.lineId)}} {{getRouterNameById(list.lineId)||'/'}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions v-if="[3,4].indexOf(list.transportId) > -1"> <el-descriptions v-if="[3,4].indexOf(list.transportId) > -1">
<el-descriptions-item :label="$t('出货渠道')"> <el-descriptions-item :label="$t('出货渠道')">
{{channelName}} {{channelName||'/'}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>
...@@ -292,12 +292,12 @@ ...@@ -292,12 +292,12 @@
</el-descriptions> </el-descriptions>
<el-descriptions v-if="[3,4].indexOf(list.transportId) > -1"> <el-descriptions v-if="[3,4].indexOf(list.transportId) > -1">
<el-descriptions-item :label="$t('航空公司')"> <el-descriptions-item :label="$t('航空公司')">
{{getSupplierData(list.transportVO.airlineCompany)}} {{getSupplierData(list.transportVO.airlineCompany)||'/'}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions v-if="list.transportId==2"> <el-descriptions v-if="list.transportId==2">
<el-descriptions-item :label="$t('船公司')"> <el-descriptions-item :label="$t('船公司')">
{{getSupplierData(list.transportVO.shippingCompany)}} {{getSupplierData(list.transportVO.shippingCompany)||'/'}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1"> <el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1">
...@@ -307,7 +307,7 @@ ...@@ -307,7 +307,7 @@
</el-descriptions> </el-descriptions>
<el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1"> <el-descriptions v-if="[2,3,4].indexOf(list.transportId) > -1">
<el-descriptions-item :label="$t('清关证书备注')"> <el-descriptions-item :label="$t('清关证书备注')">
{{list.transportVO.remarks}} {{list.transportVO.remarks||'/'}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions class="card" v-if="[3,4].indexOf(list.transportId) > -1"> <el-descriptions class="card" v-if="[3,4].indexOf(list.transportId) > -1">
...@@ -330,7 +330,7 @@ ...@@ -330,7 +330,7 @@
</el-descriptions> </el-descriptions>
<el-descriptions> <el-descriptions>
<el-descriptions-item :label="$t('特殊要求备注')"> <el-descriptions-item :label="$t('特殊要求备注')">
{{list.transportVO.packageRemarks}} {{list.transportVO.packageRemarks||'/'}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
...@@ -466,6 +466,12 @@ ...@@ -466,6 +466,12 @@
} }
}, },
methods: { methods: {
checkCode(data){
if(data.indexOf('+')==-1){
return '+'+data
}
return data
},
getOrderData(id) { getOrderData(id) {
let that = this let that = this
that.loading = true; that.loading = true;
......
src/views/ecw/offer/edit.vue
View file @ 3c4db856
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<el-card class="mt-10"> <el-card class="mt-10">
<div slot="header" class="card-title"> <div slot="header" class="card-title">
<div class="card-name">{{$t('商品信息')}}</div> <div class="card-name">{{$t('商品信息')}}</div>
<el-button type="primary" size="mini" icon="el-icon-plus" @click="addProduct()" :disabled="!form.lineId"></el-button> <el-button type="primary" size="mini" icon="el-icon-plus" @click="addProduct()" :disabled="!canAddProduct"></el-button>
</div> </div>
<el-table :data="form.prodCreateReqVOList" border class="product-list"> <el-table :data="form.prodCreateReqVOList" border class="product-list">
<el-table-column :label="$t('序号')" width="60px" fixed> <el-table-column :label="$t('序号')" width="60px" fixed>
...@@ -152,13 +152,13 @@ ...@@ -152,13 +152,13 @@
}" }"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
<product-selector v-model="scope.row.prodId" @change="onProductChange(scope.row, $event)" /> <product-selector v-model="scope.row.prodId" @change="onProductChange(scope.row, $event)" :disabled="!canAddProduct" />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('英文品名')" width="160px"> <el-table-column :label="$t('英文品名')" width="160px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<product-selector lang="En" v-model="row.prodId" @change="onProductChange(row, $event)" /> <product-selector lang="En" v-model="row.prodId" @change="onProductChange(row, $event)" :disabled="!canAddProduct" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('品牌')" width="100px"> <el-table-column :label="$t('品牌')" width="100px">
...@@ -170,34 +170,34 @@ ...@@ -170,34 +170,34 @@
}" }"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
<dict-selector v-model="scope.row.brand" :type="DICT_TYPE.ECW_IS_BRAND" defaultable @input="calculationPrice" /> <dict-selector v-model="scope.row.brand" :type="DICT_TYPE.ECW_IS_BRAND" defaultable @input="calculationPrice" :disabled="!canAddProduct" />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('件数')" width="90px"> <el-table-column :label="$t('件数')" width="90px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input v-model.number="row.num" @input="calculationPrice" /> <el-input v-model.number="row.num" @input="calculationPrice" :disabled="!canAddProduct" />
</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}">
<dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable @input="calculationPrice" /> <dict-selector v-model="row.unit" :type="DICT_TYPE.ECW_PACKAGE_TYPE" defaultable @input="calculationPrice" :disabled="!canAddProduct" />
</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}">
<el-input v-model.number="row.quantity" @input="calculationPrice" /> <el-input v-model.number="row.quantity" @input="calculationPrice" :disabled="!canAddProduct" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('总体积') + '(m³)'" width="100px"> <el-table-column :label="$t('总体积') + '(m³)'" width="100px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input v-model="row.volume" @input="calculationPrice"/> <el-input v-model="row.volume" @input="calculationPrice" :disabled="!canAddProduct"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('总重量') + '(kg)'" width="100px"> <el-table-column :label="$t('总重量') + '(kg)'" width="100px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input v-model="row.weight" @input="calculationPrice" /> <el-input v-model="row.weight" @input="calculationPrice" :disabled="!canAddProduct" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('总货值') + '(RMB)'" width="100px"> <el-table-column :label="$t('总货值') + '(RMB)'" width="100px">
...@@ -209,13 +209,13 @@ ...@@ -209,13 +209,13 @@
}" }"
class="mb-0 mr-0" class="mb-0 mr-0"
> >
<el-input v-model="scope.row.worth" @input="calculationPrice" /> <el-input v-model="scope.row.worth" @input="calculationPrice" :disabled="!canAddProduct" />
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('商品特性')" width="250px"> <el-table-column :label="$t('商品特性')" width="250px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-checkbox-group v-model="row.prodAttrArr" @change="onProductAttrChange(row, $event)"> <el-checkbox-group v-model="row.prodAttrArr" @change="onProductAttrChange(row, $event)" :disabled="!canAddProduct">
<el-checkbox v-for="item in productAttrList" :label="item.id" :key="item.id">{{item.attrName}}</el-checkbox> <el-checkbox v-for="item in productAttrList" :label="item.id" :key="item.id">{{item.attrName}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</template> </template>
...@@ -247,14 +247,14 @@ ...@@ -247,14 +247,14 @@
<el-table-column :label="$t('商品链接')" width="200px" align="center"> <el-table-column :label="$t('商品链接')" width="200px" align="center">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-link type="primary" :href="row.link" target="_blank" style="display:block">{{row.link}}</el-link> <el-link type="primary" :href="row.link" target="_blank" style="display:block">{{row.link}}</el-link>
<el-button type="primary" size="mini" @click="setLink(row)"> <el-button type="primary" size="mini" @click="setLink(row)" :disabled="!canAddProduct">
{{row.link ? $t('编辑商品链接') : $t('添加商品链接')}} {{row.link ? $t('编辑商品链接') : $t('添加商品链接')}}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('快递单号')" width="100px"> <el-table-column :label="$t('快递单号')" width="100px">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-input v-model="row.expressNo" placeholder="" /> <el-input v-model="row.expressNo" placeholder="" :disabled="!canAddProduct" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('操作')" width="180px" fixed="right"> <el-table-column :label="$t('操作')" width="180px" fixed="right">
...@@ -269,20 +269,20 @@ ...@@ -269,20 +269,20 @@
<div class="card-title" style="padding:20px 0;">{{$t('合计')}}</div> <div class="card-title" style="padding:20px 0;">{{$t('合计')}}</div>
<el-descriptions :column="4" border> <el-descriptions :column="4" border>
<el-descriptions-item :label="$t('总件数')"> <el-descriptions-item :label="$t('总件数')">
{{sum.totalNum || 0}} {{sum.totalNum.toFixed() || 0}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="总体积"> <el-descriptions-item label="总体积">
{{sum.totalVolume || 0}}m³ {{sum.totalVolume.toFixed() || 0}}m³
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="总重量"> <el-descriptions-item label="总重量">
{{sum.totalWeight || 0}}kg {{sum.totalWeight.toFixed() || 0}}kg
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="总数量"> <el-descriptions-item label="总数量">
{{sum.totalQuatity || 0}} {{sum.totalQuatity.toFixed() || 0}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('总货值') + '(RMB)'"> <el-descriptions-item :label="$t('总货值') + '(RMB)'">
{{sum.totalWorth || 0}}{{$t('元')}} {{sum.totalWorth.toFixed() || 0}}{{$t('元')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
...@@ -498,6 +498,7 @@ import SupplierSelector from '@/components/SupplierSelector' ...@@ -498,6 +498,7 @@ import SupplierSelector from '@/components/SupplierSelector'
import ChooseContactDialog from '@/components/ChooseContactDialog' import ChooseContactDialog from '@/components/ChooseContactDialog'
import QuickCreateCustomer from '@/components/QuickCreateCustomer' import QuickCreateCustomer from '@/components/QuickCreateCustomer'
import {getCustomerContactsSelect} from '@/api/ecw/customerContacts' import {getCustomerContactsSelect} from '@/api/ecw/customerContacts'
import Decimal from 'decimal.js'
export default { export default {
name: "EcwOfferEdit", name: "EcwOfferEdit",
...@@ -605,17 +606,18 @@ export default { ...@@ -605,17 +606,18 @@ export default {
}, },
sum(){ sum(){
let sum = { let sum = {
totalNum: 0, totalNum: new Decimal(0),
totalVolume: 0, totalVolume: new Decimal(0),
totalWeight: 0, totalWeight: new Decimal(0),
totalWorth: 0, totalWorth: new Decimal(0),
totalQuatity: new Decimal(0)
} }
this.form.prodCreateReqVOList.forEach(item => { this.form.prodCreateReqVOList.forEach(item => {
sum.totalNum += parseInt(item.num) || 0 sum.totalNum = sum.totalNum.plus(item.num || 0)
sum.totalVolume += parseFloat(item.volume) || 0 sum.totalVolume = sum.totalVolume.plus(item.volume || 0)
sum.totalWeight += parseFloat(item.weight) || 0 sum.totalWeight = sum.totalWeight.plus(item.weight || 0)
sum.totalWorth += parseFloat(item.worth) || 0 sum.totaltotalWorthNum = sum.totalWorth.plus(item.worth || 0)
sum.totalQuatity = sum.totalQuatity.plus(item.quantity || 0)
}) })
return sum return sum
}, },
...@@ -681,6 +683,17 @@ export default { ...@@ -681,6 +683,17 @@ export default {
routeOtherServices(){ routeOtherServices(){
if(!this.selectedRouter || !this.selectedRouter.otherService) return [] if(!this.selectedRouter || !this.selectedRouter.otherService) return []
return this.selectedRouter.otherService.split(',') return this.selectedRouter.otherService.split(',')
},
// 是否可以添加商品
canAddProduct(){
if(!this.form.lineId){
return false
}
// 如果是海空联运或者空运专线则必须选择渠道
if(this.transport && this.transport.cssClass == 'channel' && !this.form.channelId ){
return false
}
return true
} }
}, },
watch:{ watch:{
......
src/views/ecw/offer/index.vue
View file @ 3c4db856
This diff is collapsed.
src/views/ecw/offer/special.vue
View file @ 3c4db856
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
:label="$t('操作')"> :label="$t('操作')">
<template v-slot="{row}"> <template v-slot="{row}">
<el-button size="mini" type="text" @click="showOfferProdId=row.offerProdId">{{$t('优惠申请')}}</el-button> <el-button size="mini" type="text" @click="showOfferProdId=row.offerProdId">{{$t('优惠申请')}}</el-button>
<el-button size="mini" type="text" @click="$alert('// TODO')">{{$t('佣金规则')}}</el-button> <el-button size="mini" type="text" @click="showCommissionProd=row">{{$t('佣金规则')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -84,6 +84,7 @@ ...@@ -84,6 +84,7 @@
<el-button type="primary">关闭窗口</el-button> <el-button type="primary">关闭窗口</el-button>
</div> --> </div> -->
<special-discount v-if="showOfferProdId" :offerProdId="showOfferProdId" @close="showOfferProdId=null" @success="onSuccess" /> <special-discount v-if="showOfferProdId" :offerProdId="showOfferProdId" @close="showOfferProdId=null" @success="onSuccess" />
<commossion v-if="showCommissionProd" :offer="offer" :offerProd="showCommissionProd" @close="showCommissionProd=null" @success="onSuccess" />
</el-card> </el-card>
</div> </div>
</template> </template>
...@@ -97,11 +98,13 @@ import {getProductAttrList} from "@/api/ecw/productAttr" ...@@ -97,11 +98,13 @@ import {getProductAttrList} from "@/api/ecw/productAttr"
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import {listByIds} from '@/api/ecw/region' import {listByIds} from '@/api/ecw/region'
import {getChannel} from '@/api/ecw/channel' import {getChannel} from '@/api/ecw/channel'
import specialDiscount from '@/views/ecw/offer/components/specialDiscount' import SpecialDiscount from '@/views/ecw/offer/components/SpecialDiscount'
import Commossion from '@/views/ecw/offer/components/Commossion'
export default { export default {
name: "OfferSpecial", name: "OfferSpecial",
components: { components: {
specialDiscount SpecialDiscount, Commossion
}, },
props: { props: {
offerId: String offerId: String
...@@ -133,7 +136,8 @@ export default { ...@@ -133,7 +136,8 @@ export default {
objective: null, objective: null,
departure: null, departure: null,
channel: null, // 渠道信息 channel: null, // 渠道信息
showOfferProdId: null // 显示申请优惠的产品id showOfferProdId: null, // 显示申请优惠的产品id
showCommissionProd: null, // 修改佣金规则的产品ID
}; };
}, },
watch:{ watch:{
...@@ -181,6 +185,7 @@ export default { ...@@ -181,6 +185,7 @@ export default {
}, },
onSuccess(){ onSuccess(){
this.showOfferProdId = null this.showOfferProdId = null
this.showCommissionProd = null
} }
}, },
computed: { computed: {
......
src/views/ecw/order/cargoControl.vue
View file @ 3c4db856
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<transfer v-if="showTransferOrder" v-bind="showTransferOrder" @close="showTransferOrder=null" /> <transfer v-if="showTransferOrder" v-bind="showTransferOrder" @close="showTransferOrder=null" />
<release v-if="showReleaseOrderId" :order-id="showReleaseOrderId" @close="showReleaseOrderId=null" @success="onReleaseSuccess" /> <release v-if="showReleaseOrderId" :order-id="showReleaseOrderId" @close="showReleaseOrderId=null" @success="onReleaseSuccess" />
<transfer-cargo v-if="showTransferCargoOrderId" :order-id="showTransferCargoOrderId" @close="showTransferCargoOrderId=null" @success="onReansferCargoSuccess" /> <transfer-cargo v-if="showTransferCargoOrderId" :order-id="showTransferCargoOrderId" @close="showTransferCargoOrderId=null" @success="onTransferCargoSuccess" />
<fallback v-if="showFallbackOrder !== null" :order="showFallbackOrder" @close="showFallbackOrder=null" @success="onFallbackSuccess" :index="null" /> <fallback v-if="showFallbackOrder !== null" :order="showFallbackOrder" @close="showFallbackOrder=null" @success="onFallbackSuccess" :index="null" />
</div> </div>
</template> </template>
...@@ -153,7 +153,7 @@ import { getTradeCityList } from '@/api/ecw/region' ...@@ -153,7 +153,7 @@ import { getTradeCityList } from '@/api/ecw/region'
import Transfer from '@/views/ecw/order/components/Transfer' import Transfer from '@/views/ecw/order/components/Transfer'
import Release from './components/Release' import Release from './components/Release'
import CargoControlEdit from './components/CargoControlEdit' import CargoControlEdit from './components/CargoControlEdit'
import { getCargoControlOrderPage, batchReview } from "@/api/ecw/orderCargoControl" import { getCargoControlOrderPage, batchReview, orderReview } from "@/api/ecw/orderCargoControl"
import TransferCargo from '@/views/ecw/order/components/TransferCargo' import TransferCargo from '@/views/ecw/order/components/TransferCargo'
import Fallback from './components/Fallback' import Fallback from './components/Fallback'
...@@ -296,7 +296,7 @@ export default { ...@@ -296,7 +296,7 @@ export default {
this.showFallbackOrder = null this.showFallbackOrder = null
this.handleQuery() this.handleQuery()
}, },
onReansferCargoSuccess(){ onTransferCargoSuccess(){
this.showTransferCargoOrderId = null this.showTransferCargoOrderId = null
this.handleQuery() this.handleQuery()
} }
......
src/views/ecw/order/components/CargoControlDetail.vue 0 → 100644
View file @ 3c4db856
<!--拆单审核中的申请信息部分-->
<template>
<div v-if="order">
<el-descriptions :column="3">
<el-descriptions-item label="订单号">{{detail.orderNo}}</el-descriptions-item>
<el-descriptions-item label="运输方式">
<dict-tag :type="DICT_TYPE.TRANSPORT_TYPE" :value="order.transportId" />
</el-descriptions-item>
<el-descriptions-item label="出货方式">
{{channelName}}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
<dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" />
</el-descriptions-item>
<el-descriptions-item label="唛头">{{order.marks}}</el-descriptions-item>
<el-descriptions-item label="始发仓">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
<el-descriptions-item label="目的仓">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
<!-- 放货修改 -->
<el-descriptions-item label="放货件数" v-if="applyType == 7">
【{{detail.pickNum}}】{{$t('改')}} {{detail.currentPickNum}}
</el-descriptions-item>
<!-- 反复核 -->
<el-descriptions-item label="申请原因" v-if="applyType == 8">
<dict-tag :type="DICT_TYPE.ECW_PICK_RECURRENT_NUCLEAR_TYPE" :value="detail.recurrentNuclearType" />
</el-descriptions-item>
<!-- 调货 -->
<el-descriptions-item label="申请原因" v-if="applyType == 9">
EC0063600N调为EC0063094N进行放货，放货箱数为：6，EC0063095N进行放货，放货箱数为：4，EC0063096N进行放货，放货箱数为：2，备注：123123
</el-descriptions-item>
</el-descriptions>
</div>
</template>
<script>
import {getPickUpdateApproveInfo} from '@/api/ecw/orderCargoControl'
import {getOrder} from '@/api/ecw/order'
import {getChannelListByIds} from '@/api/ecw/channel'
import {parseTime} from '@/utils/ruoyi'
export default {
filters: {parseTime},
props:{
id: [String, Number],
applyType: Number, // 申请类型 7 放货修改申请 8 放货反复核申 9 调货审核
},
data(){
return {
detail: null,
order: null,
channels: [],
channelName: '/'
}
},
watch:{
id(){
this.getData()
}
},
computed:{
jsonParse(){
return d => {
return JSON.parse(d)
}
},
getChannelName(){
return id => {
let channel = this.channels.find(item => item.channelId == id)
return channel ? channel.nameZh : '/'
}
}
},
created(){
if(this.id){
this.getData()
}
},
methods:{
getData(){
getPickUpdateApproveInfo({approveId: this.id}).then(res => {
this.detail = res.data
return getOrder(this.detail.orderId)
}).then(res => {
this.order = res.data
this.getChannel()
})
},
getChannel(){
if(!this.order || !this.order.channelId) return
getChannel(this.order.channelId).then(res => {
this.channelName = this.$l(res.data, 'name')
})
},
}
}
</script>
<style scoped lang="scss">
.title{
padding: 10px 0;
span{
font-size: 14px;
font-weight: bold;
}
}
</style>
\ No newline at end of file
src/views/ecw/order/components/Fallback.vue
View file @ 3c4db856
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('收货人电话')"> <el-form-item :label="$t('收货人电话')">
+{{info.consigneeCountryCode}} {{info.consigneePhone}} +{{info.consigneeCountryCode.replace(/\+/g, '')}} {{info.consigneePhone}}
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
src/views/ecw/order/components/Release.vue
View file @ 3c4db856
...@@ -142,7 +142,13 @@ export default { ...@@ -142,7 +142,13 @@ export default {
}, },
methods:{ methods:{
loadData(){ loadData(){
getRleaseInfo(this.orderId).then(res => this.detail = res.data) getRleaseInfo(this.orderId).then(res => {
this.detail = res.data
this.$set(this.formData, 'consigneeName', res.data.consigneeName)
this.$set(this.formData, 'consigneeCountryCode', '+' + res.data.consigneeCountryCode)
this.$set(this.formData, 'consigneePhone', res.data.consigneePhone)
this.$set(this.formData, 'consigneeEmail', res.data.consigneeEmail)
})
}, },
closeDialog(){ closeDialog(){
this.show = false this.show = false
......
src/views/ecw/order/components/TransferCargo.vue
View file @ 3c4db856
...@@ -24,7 +24,9 @@ ...@@ -24,7 +24,9 @@
<el-table :data="selectedOrders" border> <el-table :data="selectedOrders" border>
<el-table-column :label="$t('订单号')"> <el-table-column :label="$t('订单号')">
{{detail.orderNo}} <template slot-scope="{row}">
{{row.orderNo}}
</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}">
......
src/views/ecw/order/components/warehouseLocation.vue
View file @ 3c4db856
...@@ -9,12 +9,12 @@ ...@@ -9,12 +9,12 @@
v-bind="$attrs" v-bind="$attrs"
> >
<el-tabs v-model="activeName" type="card" @tab-click="activeWarehouse = {}"> <el-tabs v-model="activeName" type="card" @tab-click="activeWarehouse = {}">
<el-tab-pane v-if="item.warehouseId === warehouseId" :label="item.name" :name="'' + index" v-for="(item, index) in area" :key="index"> <el-tab-pane v-if="item.warehouseId === warehouseId" :label="item.name" :name="'' + index" v-for="(item, index) in area" :key="item.id + index">
<div> <div>
<div style="text-align: center">区域</div> <div style="text-align: center">区域</div>
<div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px"> <div style="background-color: #efefef;padding: 10px 10px 0;border: #dcdcdc solid 1px;border-radius: 2px">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="12" v-for="(warehouse, i) in item.children" :key="i"> <el-col :span="12" v-for="(warehouse, i) in item.children" :key="warehouse.id + i">
<div <div
class="warehouse-block" class="warehouse-block"
:class="{'warehouse-block-selected': warehouse.selected, 'warehouse-block-active': warehouse.id === activeWarehouse.id}" :class="{'warehouse-block-selected': warehouse.selected, 'warehouse-block-active': warehouse.id === activeWarehouse.id}"
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<div> <div>
<div style="text-align: center">仓位</div> <div style="text-align: center">仓位</div>
<div class="position-group"> <div class="position-group">
<div class="position" v-for="position in activeWarehouse.positionList" :key="item.id"> <div class="position" v-for="(position ,index) in activeWarehouse.positionList" :key="item.id + index ">
<div <div
class="position-item" class="position-item"
v-for="item in position.children" v-for="item in position.children"
......
src/views/ecw/order/detail.vue
View file @ 3c4db856
...@@ -76,6 +76,9 @@ ...@@ -76,6 +76,9 @@
<el-descriptions-item :label="$t('单证报关')"> <el-descriptions-item :label="$t('单证报关')">
<dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" /> <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('出单方式')">
<dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
</el-descriptions-item>
<el-descriptions-item :label="$t('代收货款')"> <el-descriptions-item :label="$t('代收货款')">
<dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" /> <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="order.isCollection" />
</el-descriptions-item> </el-descriptions-item>
...@@ -128,15 +131,15 @@ ...@@ -128,15 +131,15 @@
<template v-if="row.charging ==1"> <template v-if="row.charging ==1">
<template v-if="!row.seaFreight">未报价</template> <template v-if="!row.seaFreight">未报价</template>
<template>{{$t('全包价')}} {{row.seaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template> <template>{{$t('全包价')}} {{row.oneSeaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}</template>
</template> </template>
<template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template> <template v-else-if="!row.seaFreight && !row.clearanceFreight">未报价</template>
<template v-else> <template v-else>
<div> <div>
{{$t('运费')}}：{{row.seaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}} {{$t('运费')}}：{{row.oneSeaFreight}} {{currentcyMap[row.seaFreightCurrency]}} / {{unitMap[row.seaFreightVolume]}}
</div> </div>
<div> <div>
{{$t('清关费')}}：{{row.clearanceFreight}} {{currentcyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}} {{$t('清关费')}}：{{row.oneClearanceFreight}} {{currentcyMap[row.clearanceFreightCurrency]}} / {{unitMap[row.clearanceFreightVolume]}}
</div> </div>
</template> </template>
</template> </template>
......
src/views/ecw/order/edit.vue
View file @ 3c4db856
This diff is collapsed.
src/views/ecw/order/exception/index.vue
View file @ 3c4db856
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
<el-row> <el-row>
<el-form-item > <el-form-item >
<el-select v-model="queryParams.dateType" style="width: 172px;"> <el-select v-model="queryParams.dateType" style="width: 172px;" clearable>
<el-option :label="$t('入仓时间')" value="1"/> <el-option :label="$t('入仓时间')" value="1"/>
<el-option :label="$t('处理时间')" value="2"/> <el-option :label="$t('处理时间')" value="2"/>
</el-select> </el-select>
...@@ -13,28 +13,28 @@ ...@@ -13,28 +13,28 @@
<el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" /> <el-date-picker clearable v-model="queryParams.endCreateTime" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" type="datetime" :placeholder="$t('请选择结束日期')" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('始发地:')"> <el-form-item :label="$t('始发地:')">
<el-select v-model="queryParams.originId" :placeholder="$t('请选择始发地')"> <el-select v-model="queryParams.originId" :placeholder="$t('请选择始发地')" clearable>
<el-option v-for="item in expoerCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option> <el-option v-for="item in expoerCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('目的地:')" > <el-form-item :label="$t('目的地:')" >
<el-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的地')"> <el-select v-model="queryParams.destinationId" :placeholder="$t('请选择目的地')" clearable>
<el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id" ></el-option> <el-option v-for="item in importCityList" :label="$l(item, 'title')" :value="item.id" :key="item.id" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('运输方式:')" > <el-form-item :label="$t('运输方式:')" >
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportId" formatter="number"/> <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :clearable="true" v-model="queryParams.transportId" />
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item :label="$t('控货:')"> <el-form-item :label="$t('控货:')">
<dict-selector :type="DICT_TYPE.ECW_YESNO" v-model="queryParams.isCargoControl" @keyup.enter.native="handleQuery"/> <dict-selector :type="DICT_TYPE.ECW_YESNO" :clearable="true" v-model="queryParams.isCargoControl" @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('异常状态:')"> <el-form-item :label="$t('异常状态:')">
<dict-selector :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" v-model="queryParams.orderExceptionStatus" @keyup.enter.native="handleQuery"/> <dict-selector :type="DICT_TYPE.ORDER_EXCEPTION_STATUS" :clearable="true" v-model="queryParams.orderExceptionStatus" @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('异常类型:')"> <el-form-item :label="$t('异常类型:')">
<dict-selector :type="DICT_TYPE.ORDER_ERROR_TYPE" v-model="queryParams.orderExceptionType" @keyup.enter.native="handleQuery"/> <dict-selector :type="DICT_TYPE.ORDER_ERROR_TYPE" :clearable="true" v-model="queryParams.orderExceptionType" @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('订单号:')"> <el-form-item :label="$t('订单号:')">
<el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.orderNo" :placeholder="$t('请输入订单号')" clearable @keyup.enter.native="handleQuery"/>
...@@ -42,21 +42,21 @@ ...@@ -42,21 +42,21 @@
</el-row> </el-row>
<el-row> <el-row>
<el-form-item :label="$t('发货人:')"> <el-form-item :label="$t('发货人:')">
<customer-selector v-model="queryParams.consignor" @change="consignor = $event" /> <customer-selector v-model="queryParams.consignor" :clearable="true" @change="consignor = $event" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('唛头:')"> <el-form-item :label="$t('唛头:')">
<el-input v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.marks" :placeholder="$t('请输入唛头')" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item :label="$t('品名:')"> <el-form-item :label="$t('品名:')">
<product-selector v-model="queryParams.goodsName" @keyup.enter.native="handleQuery" /> <product-selector v-model="queryParams.goodsName" :clearable="true" @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('备案:')"> <el-form-item :label="$t('备案:')">
<dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/> <dict-selector :type="DICT_TYPE.PRODUCT_RECORD_ATTRIBUTE" :clearable="true" v-model="queryParams.productRecord" @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
</el-row> </el-row>
<el-row> <el-row>
<el-form-item :label="$t('跟进业务:')"> <el-form-item :label="$t('跟进业务:')">
<el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择跟进业务')"> <el-select v-model="queryParams.salesmanId" :placeholder="$t('请选择跟进业务')" clearable>
<el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/> <el-option v-for="item in creatorData" :key="item.id" :label="item.nickname" :value="item.id"/>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -98,7 +98,8 @@ ...@@ -98,7 +98,8 @@
</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">
<span>{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span> <span v-if="scope.row.orderStatus >= 5 ">{{scope.row.volume+"m³/"+scope.row.weight+"kg"}}</span>
<span v-else>{{scope.row.totalVolume+"m³/"+scope.row.totalWeight+"kg"}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('运输方式/目的地')" align="center"> <el-table-column :label="$t('运输方式/目的地')" align="center">
...@@ -144,7 +145,8 @@ ...@@ -144,7 +145,8 @@
import {getOrderExceptionPage} from "@/api/ecw/orderException" import {getOrderExceptionPage} from "@/api/ecw/orderException"
import {getTradeCityList} from '@/api/ecw/region' import {getTradeCityList} from '@/api/ecw/region'
import {DICT_TYPE} from '@/utils/dict' import {DICT_TYPE} from '@/utils/dict'
import { userList } from "@/api/system/user" // import { userList } from "@/api/system/user"
import {listServiceUser} from "@/api/system/user"
import CustomerSelector from '@/components/CustomerSelector' import CustomerSelector from '@/components/CustomerSelector'
import ProductSelector from '@/components/ProductSelector' import ProductSelector from '@/components/ProductSelector'
...@@ -176,7 +178,10 @@ export default { ...@@ -176,7 +178,10 @@ export default {
created() { created() {
this.getList(); this.getList();
getTradeCityList().then(res => this.tradeCityList = res.data) getTradeCityList().then(res => this.tradeCityList = res.data)
userList('salesman').then(res =>this.creatorData = res.data) listServiceUser().then(r => {
this.creatorData = r.data
})
// userList('salesman').then(res =>this.creatorData = res.data)
}, },
computed:{ computed:{
expoerCityList(){ expoerCityList(){
...@@ -198,6 +203,7 @@ export default { ...@@ -198,6 +203,7 @@ export default {
this.list = response.data.list; this.list = response.data.list;
this.total = response.data.total; this.total = response.data.total;
this.loading = false; this.loading = false;
this.reset()
}); });
}, },
/** 表单重置 */ /** 表单重置 */
...@@ -206,14 +212,12 @@ export default { ...@@ -206,14 +212,12 @@ export default {
page: 1, page: 1,
rows: 10, rows: 10,
}; };
this.resetForm("queryForm");
}, },
importCityName(id){ importCityName(id){
return this.tradeCityList.filter(item => item.id == id) return this.tradeCityList.filter(item => item.id == id)
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.page = 1;
this.getList(); this.getList();
}, },
handEdit(id){ handEdit(id){
......
src/views/ecw/order/index.vue
View file @ 3c4db856
This diff is collapsed.
src/views/ecw/order/pending.vue
View file @ 3c4db856
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
{{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}} {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('发货电话')"> <el-descriptions-item :label="$t('发货电话')">
{{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}} {{orderData.consignorVO?((orderData.consignorVO.countryCode?checkCode(orderData.consignorVO.countryCode):'')+orderData.consignorVO.phone)||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
{{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}} {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('收货电话')"> <el-descriptions-item :label="$t('收货电话')">
{{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}} {{orderData.consigneeVO?((orderData.consigneeVO.countryCode?checkCode(orderData.consigneeVO.countryCode):'')+orderData.consigneeVO.phone)||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</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">
<el-tag v-if="scope.row.orderExceptionStatus>0">{{$t('已完成')}}</el-tag> <el-tag v-if="scope.row.orderExceptionStatus==2">{{$t('已完成')}}</el-tag>
<el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button> <el-button v-else size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row)">{{$t('处理')}}</el-button>
</template> </template>
</el-table-column> </el-table-column>
...@@ -151,6 +151,12 @@ export default { ...@@ -151,6 +151,12 @@ export default {
this.loading = false; this.loading = false;
}); });
}, },
checkCode(data){
if(data.indexOf('+')==-1){
return '+'+data
}
return data
},
getOrders(){ getOrders(){
getOrder(this.orderId).then(response => { getOrder(this.orderId).then(response => {
this.orderData = response.data this.orderData = response.data
...@@ -159,14 +165,19 @@ export default { ...@@ -159,14 +165,19 @@ export default {
handEdit(row){ handEdit(row){
if(row.orderExceptionType=='order_no_quote_exception'){ if(row.orderExceptionType=='order_no_quote_exception'){
let url = '../../lineProject/product-price/edit' if(row.orderItemId){
var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
if(row.orderItem){ if(productData){
getProduct(row.orderItemId).then(res=>{ getProduct(productData.prodId).then(res=>{
url = '../../lineProject/product-price/edit?product_id='+row.orderItemId+'&product_type='+res.data.typeId let url = '../../lineProject/product-price/edit?product_id='+productData.prodId+'&product_type='+res.data.typeId
return this.$router.push(url)
}) })
} }
}else{
let url = '../../lineProject/product-price/edit'
return this.$router.push(url) return this.$router.push(url)
}
}else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){ }else if(row.orderExceptionType == 'order_heavy_cargo_exception'||row.orderExceptionType=='order_bulky_cargo_exception'){
this.$router.push({ this.$router.push({
path:"/order/weightDeal?id="+row.id+'&type='+row.orderExceptionType, path:"/order/weightDeal?id="+row.id+'&type='+row.orderExceptionType,
......
src/views/ecw/order/release.vue
View file @ 3c4db856
...@@ -48,7 +48,8 @@ ...@@ -48,7 +48,8 @@
</div> </div>
</template> </template>
<script> <script>
import {getOrder, createOrderPickup} from '@/api/ecw/order' import {getOrder} from '@/api/ecw/order'
import {create} from '@/api/ecw/orderPickup'
import ImageUpload from '@/components/ImageUpload' import ImageUpload from '@/components/ImageUpload'
export default { export default {
components: {ImageUpload}, components: {ImageUpload},
...@@ -69,10 +70,10 @@ export default { ...@@ -69,10 +70,10 @@ export default {
}) })
}, },
submit(){ submit(){
createOrderPickup(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => { create(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => {
return this.$alert(res.message || this.$t('操作成功')) return this.$alert(res.message || this.$t('操作成功'))
}).then(res => { }).then(res => {
this.$router.back() this.$store.dispatch('tagsView/delCurrentView')
}) })
} }
} }
......
src/views/ecw/order/singleApply.vue
View file @ 3c4db856
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
{{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}} {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('发货电话')"> <el-descriptions-item :label="$t('发货电话')">
{{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}} {{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(checkCode(orderData.consignorVO.countryCode)+orderData.consignorVO.phone)}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
{{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}} {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('收货电话')"> <el-descriptions-item :label="$t('收货电话')">
{{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}} {{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(checkCode(orderData.consigneeVO.countryCode)+orderData.consigneeVO.phone)}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
...@@ -209,6 +209,12 @@ export default { ...@@ -209,6 +209,12 @@ export default {
getTradeCityList().then(res => this.tradeCityList = res.data) getTradeCityList().then(res => this.tradeCityList = res.data)
}, },
methods: { methods: {
checkCode(data){
if(data.indexOf('+')==-1){
return '+'+data
}
return data
},
/** 查询列表 */ /** 查询列表 */
getList() { getList() {
this.loading = true; this.loading = true;
......
src/views/ecw/order/special/discount.vue
View file @ 3c4db856
...@@ -36,45 +36,24 @@ ...@@ -36,45 +36,24 @@
</el-form-item> </el-form-item>
<el-form-item label="新运费" required style="width: 400px"> <el-form-item label="新运费" required style="width: 400px">
<el-input v-model="form.freight" type="number" class="input-with-select"> <el-input v-model="form.freight" type="number" class="input-with-select">
<el-select v-model="form.freightCurrency" placeholder="请选择" slot="prepend" style="width: 100px"> <div slot="prepend" style="width: 60px">{{ currentMap[form.freightCurrency] }}</div>
<el-option <div slot="append" style="width: 60px">{{ unitMap[form.freightVolume] }}</div>
v-for="item in currencyList"
:key="item.id"
:label="item.titleZh"
:value="item.id">
</el-option>
</el-select>
<el-select v-model="form.freightVolume" placeholder="请选择" slot="append" style="width: 100px">
<el-option
v-for="item in unitList"
:key="item.id"
:label="item.titleZh"
:value="item.id">
</el-option>
</el-select>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="新清关费" required style="width: 400px"> <el-form-item label="新清关费" required style="width: 400px">
<el-input v-model="form.clearanceFreight" type="number" class="input-with-select"> <el-input v-model="form.clearanceFreight" type="number" class="input-with-select">
<el-select v-model="form.clearanceFreightCurrency" placeholder="请选择" slot="prepend" style="width: 100px"> <div slot="prepend" style="width: 60px">{{ currentMap[form.clearanceFreightCurrency] }}</div>
<el-option <div slot="append" style="width: 60px">{{ unitMap[form.clearanceFreightVolume] }}</div>
v-for="item in currencyList"
:key="item.id"
:label="item.titleZh"
:value="item.id">
</el-option>
</el-select>
<el-select v-model="form.clearanceFreightVolume" placeholder="请选择" slot="append" style="width: 100px">
<el-option
v-for="item in unitList"
:key="item.id"
:label="item.titleZh"
:value="item.id">
</el-option>
</el-select>
</el-input> </el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div >
<h2>审批流程</h2>
<work-flow xmlkey="free_apply" v-model="form.channelId" />
<!-- <div>选择的用户：{{selectedUsers}}</div>-->
</div>
<div v-if="!readonly"> <div v-if="!readonly">
<el-button type="primary" @click="handleSubmit">提交</el-button> <el-button type="primary" @click="handleSubmit">提交</el-button>
</div> </div>
...@@ -107,6 +86,7 @@ import {getChannelList} from "@/api/ecw/channel" ...@@ -107,6 +86,7 @@ import {getChannelList} from "@/api/ecw/channel"
import { getCurrencyList } from '@/api/ecw/currency' import { getCurrencyList } from '@/api/ecw/currency'
import { getProductAttrList } from '@/api/ecw/productAttr' import { getProductAttrList } from '@/api/ecw/productAttr'
import {openedRouterList} from "@/api/ecw/warehouse" import {openedRouterList} from "@/api/ecw/warehouse"
import WorkFlow from "@/components/WorkFlow"
export default { export default {
name: "specialDiscount", name: "specialDiscount",
...@@ -119,7 +99,8 @@ export default { ...@@ -119,7 +99,8 @@ export default {
} }
}, },
components: { components: {
DictSelector DictSelector,
WorkFlow
}, },
created() { created() {
// 临时 // 临时
...@@ -227,6 +208,7 @@ export default { ...@@ -227,6 +208,7 @@ export default {
freightVolume: this.form.freightVolume, freightVolume: this.form.freightVolume,
}).then(r => { }).then(r => {
this.$message.success(r.msg || '提交成功') this.$message.success(r.msg || '提交成功')
this.$tab.closePage()
}) })
}, },
getOrderSpecial(){ getOrderSpecial(){
...@@ -287,9 +269,4 @@ export default { ...@@ -287,9 +269,4 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
::v-deep .input-with-select {
.el-input-group__prepend, .el-input-group__append {
background-color: #fff;
}
}
</style> </style>
src/views/ecw/order/special/index.vue
View file @ 3c4db856
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
体积：{{ row.warehouseInInfoVO.volume }}m³<br> 体积：{{ row.warehouseInInfoVO.volume }}m³<br>
重量：{{ row.warehouseInInfoVO.weight }}Kg 重量：{{ row.warehouseInInfoVO.weight }}Kg
</template> </template>
<span v-else>展示没有入库信息</span> <span v-else>暂时没有入库信息</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
</el-table> </el-table>
<div style="text-align: center;margin-top: 80px"> <div style="text-align: center;margin-top: 80px">
<el-button type="primary" @click="toweight" v-if="hasWarehouseInInfo && order.transportId === 1">申请重货优惠</el-button> <el-button type="primary" @click="toweight" v-if="hasWarehouseInInfo && (order.transportId === 1 || order.transportId === 2)">申请重货优惠</el-button>
<el-button type="primary" @click="tolight" v-if="hasWarehouseInInfo && order.transportId === 2">申请泡货优惠</el-button> <el-button type="primary" @click="tolight" v-if="hasWarehouseInInfo && (order.transportId === 3 || order.transportId === 4)">申请泡货优惠</el-button>
<el-button type="primary" @click="$tab.closePage()">关闭窗口</el-button> <el-button type="primary" @click="$tab.closePage()">关闭窗口</el-button>
</div> </div>
</el-card> </el-card>
......
src/views/ecw/order/splitApply.vue
View file @ 3c4db856
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
{{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}} {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('发货电话')"> <el-descriptions-item :label="$t('发货电话')">
{{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(orderData.consignorVO.countryCode+orderData.consignorVO.phone)}} {{!orderData.consignorVO?$t('无'):!orderData.consignorVO.phone?$t('无'):(checkCode(orderData.consignorVO.countryCode)+orderData.consignorVO.phone)}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
{{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}} {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('收货电话')"> <el-descriptions-item :label="$t('收货电话')">
{{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(orderData.consigneeVO.countryCode+orderData.consigneeVO.phone)}} {{!orderData.consigneeVO?$t('无'):!orderData.consigneeVO.phone?$t('无'):(checkCode(orderData.consigneeVO.countryCode)+orderData.consigneeVO.phone)}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
...@@ -359,6 +359,12 @@ export default { ...@@ -359,6 +359,12 @@ export default {
} }
}, },
methods: { methods: {
checkCode(data){
if(data.indexOf('+')==-1){
return '+'+data
}
return data
},
getOrder(){ getOrder(){
this.loading = true; this.loading = true;
getOrder(this.queryParams.orderId).then(response => { getOrder(this.queryParams.orderId).then(response => {
......
src/views/ecw/order/transferWarehousing.vue
View file @ 3c4db856
...@@ -67,25 +67,26 @@ ...@@ -67,25 +67,26 @@
<el-descriptions style="margin-top: 20px" :column="4" border> <el-descriptions style="margin-top: 20px" :column="4" border>
<el-descriptions-item label="集运仓库">{{ warehouseDetails && warehouseDetails.warehouseOutName ? warehouseDetails.warehouseOutName : '' }}</el-descriptions-item> <el-descriptions-item label="集运仓库">{{ warehouseDetails && warehouseDetails.warehouseOutName ? warehouseDetails.warehouseOutName : '' }}</el-descriptions-item>
<el-descriptions-item label="储位"> <el-descriptions-item label="储位">
<div v-for="item in storageSpaceList" style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} 区</div></div> <div v-for="item in storageSpaceList" style="display: flex;"><div>{{item.warehouseName ? item.warehouseName : ''}}</div><div>{{item.warehouseName ? item.regionName :''}} 区</div> <div>{{item.code}}</div></div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item v-if="type == 2" label="选择储位"> <el-descriptions-item v-if="type == 2" label="选择储位">
<div @click="areaVisible = true" style="color: #0a84ff;cursor: pointer;">选择储位</div> <div @click="areaVisible = true" style="color: #0a84ff;cursor: pointer;">选择储位</div>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="调拨目标仓">{{ warehouseDetails && warehouseDetails.warehouseInName ? warehouseDetails.warehouseInName : '' }}</el-descriptions-item> <el-descriptions-item label="调拨目标仓">{{ warehouseDetails && warehouseDetails.warehouseInName ? warehouseDetails.warehouseInName : '' }}</el-descriptions-item>
<el-descriptions-item label="物流公司"> <el-descriptions-item label="物流公司">
<el-select v-model="params.logisticsCompany" > <el-select :disabled="type == 2" v-model="params.logisticsCompany" >
<el-option v-for="(item,index) in expressList " :key="index" :value="item.id" :label="item.companyZh"></el-option> <el-option v-for="(item,index) in expressList " :key="index" :value="item.id" :label="item.companyZh"></el-option>
</el-select> </el-select>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="物流单号"> <el-descriptions-item label="物流单号">
<el-input v-model="params.logisticsNo"></el-input> <el-input :disabled="type == 2" v-model="params.logisticsNo"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="联系电话"> <el-descriptions-item label="联系电话">
<el-input v-model="params.phone"></el-input> <el-input :disabled="type == 2" v-model="params.phone"></el-input>
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item label="出仓日期" > <el-descriptions-item label="出仓日期" >
<el-date-picker <el-date-picker
:disabled="type == 2"
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
v-model="params.deliveryDate" v-model="params.deliveryDate"
type="date" type="date"
...@@ -276,15 +277,27 @@ export default { ...@@ -276,15 +277,27 @@ export default {
if(item.wareId === itemm.id){ if(item.wareId === itemm.id){
itemm.children.forEach(itemmm => { itemm.children.forEach(itemmm => {
if(itemmm.id === item.areaId){ if(itemmm.id === item.areaId){
if(itemmm.positionList.length > 0){
itemmm.positionList.forEach(ic =>{
if(ic.children.length > 0){
ic.children.forEach(icc => {
if(icc.id === item.locationId){
obj.push({ obj.push({
warehouseName:itemm.name, warehouseName:itemm.name,
regionName:itemmm.name regionName:itemmm.name,
code:icc.code
}) })
} }
}) })
} }
}) })
}
}
})
}
}) })
})
console.log(obj)
this.storageSpaceList = obj; this.storageSpaceList = obj;
}) })
} }
...@@ -366,6 +379,42 @@ export default { ...@@ -366,6 +379,42 @@ export default {
}); });
}, },
}, },
watch:{
'params.orderLocationCreateReqVOList'(val){
console.log(val,'123')
getByWarehouseId().then(r =>{
console.log(r,'仓库')
let obj = [];
val.forEach(item => {
r.data.forEach(itemm => {
if(item.wareId === itemm.id){
itemm.children.forEach(itemmm => {
if(itemmm.id === item.areaId){
if(itemmm.positionList.length > 0){
itemmm.positionList.forEach(ic =>{
if(ic.children.length > 0){
ic.children.forEach(icc => {
if(icc.id === item.locationId){
obj.push({
warehouseName:itemm.name,
regionName:itemmm.name,
code:icc.code
})
}
})
}
})
}
}
})
}
})
})
console.log(obj,'obj')
this.storageSpaceList = obj;
})
}
}
} }
</script> </script>
......
src/views/ecw/order/weightDeal.vue
View file @ 3c4db856
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
{{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}} {{orderData.consignorVO?orderData.consignorVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('发货电话')"> <el-descriptions-item :label="$t('发货电话')">
{{orderData.consignorVO?orderData.consignorVO.phone||$t('无'):$t('无')}} {{orderData.consignorVO?((orderData.consignorVO.countryCode?checkCode(orderData.consignorVO.countryCode):'')+orderData.consignorVO.phone)||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
<el-descriptions :column="4"> <el-descriptions :column="4">
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
{{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}} {{orderData.consigneeVO?orderData.consigneeVO.company||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
<el-descriptions-item :label="$t('收货电话')"> <el-descriptions-item :label="$t('收货电话')">
{{orderData.consigneeVO?orderData.consigneeVO.phone||$t('无'):$t('无')}} {{orderData.consigneeVO?((orderData.consigneeVO.countryCode?checkCode(orderData.consigneeVO.countryCode):'')+orderData.consigneeVO.phone)||$t('无'):$t('无')}}
</el-descriptions-item> </el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-card> </el-card>
...@@ -74,9 +74,9 @@ ...@@ -74,9 +74,9 @@
</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">
<span>{{$t('品牌')}}：{{scope.row.boxGauge||0}}</span> <span>{{$t('箱规')}}：{{scope.row.boxGauge||0}}</span>
<p> <p>
<span>品牌：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span> <span>{{$t('品牌')}}：<dict-tag :value="scope.row.brandType" :type="DICT_TYPE.ECW_IS_BRAND" /></span>
<span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span> <span>{{$t('箱数')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.cartonsNum:0}}</span>
<span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span> <span>{{$t('体积')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.volume:0}}CBM</span>
<span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span> <span>{{$t('重量')}}：{{scope.row.warehouseInInfoVO?scope.row.warehouseInInfoVO.weight:0}}KG</span>
...@@ -147,6 +147,12 @@ export default { ...@@ -147,6 +147,12 @@ export default {
this.getOrders() this.getOrders()
}); });
}, },
checkCode(data){
if(data.indexOf('+')==-1){
return '+'+data
}
return data
},
getOrders(){ getOrders(){
getOrder(this.list.orderId).then(response => { getOrder(this.list.orderId).then(response => {
this.orderData = response.data this.orderData = response.data
......
src/views/ecw/productPrice/edit.vue
View file @ 3c4db856
This diff is collapsed.
src/views/ecw/productPrice/index.vue
View file @ 3c4db856
...@@ -48,7 +48,10 @@ ...@@ -48,7 +48,10 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('状态')" prop="destCityId" v-if="!$route.query.product_id"> <el-form-item :label="$t('审核状态')" prop="auditStatus">
<dict-selector :type="DICT_TYPE.ECW_PRICE_AUDIT_STATUS" v-model="queryParams.auditStatus" />
</el-form-item>
<el-form-item :label="$t('状态')" prop="status">
// TODO // TODO
</el-form-item> </el-form-item>
......
src/views/ecw/supplier/index.vue
View file @ 3c4db856
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<el-option v-for="dict in this.getDictDatas('company_type')" <el-option v-for="dict in this.getDictDatas('company_type')"
:key="dict.value" :label="dict.label" :value="dict.value"/> :key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select--> </el-select-->
<dict-selector :type="DICT_TYPE.COMPANY_TYPE" v-model="queryParams.companyType" /> <dict-selector :type="DICT_TYPE.ECW_COMPANY_TYPE" v-model="queryParams.companyType" />
</el-form-item> </el-form-item>
<el-form-item :label="$t('合作类型')" prop="cooperationType"> <el-form-item :label="$t('合作类型')" prop="cooperationType">
<dict-selector :type="DICT_TYPE.ECW_COOPERATION_TYPE" v-model="queryParams.cooperationType" /> <dict-selector :type="DICT_TYPE.ECW_COOPERATION_TYPE" v-model="queryParams.cooperationType" />
......
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