Skip to content

J
jiedao-app-operator-master
Commit bff9fcf3 authored by wanglianghe's avatar wanglianghe
Browse files
Options

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

parents 742e07a7 5c4857f3
Hide whitespace changes
Inline Side-by-side
Showing with 98 additions and 83 deletions
src/api/ecw/warehouseArea.js
View file @ bff9fcf3
......@@ -35,10 +35,11 @@ export function getWarehouseArea(id) {
}
// 获得仓库查询库域
export function getByWarehouseId() {
export function getByWarehouseId(params) {
return request({
url: '/ecw/warehouse-area/getByWarehouseId',
method: 'get'
method: 'get',
params
})
}
......
src/components/OrderBaseInfo/index.vue
View file @ bff9fcf3
......@@ -2,7 +2,7 @@
<div>
<el-descriptions border v-if="order.orderId">
<el-descriptions-item label="唛头">{{ order.marks }}</el-descriptions-item>
<el-descriptions-item label="已到箱数">{{ order.sumNum }}</el-descriptions-item>
<el-descriptions-item label="已到箱数/总箱数">{{ order.sumNum }}/{{ order.costVO.totalNum }}</el-descriptions-item>
<el-descriptions-item label="订单状态"><dict-tag :type="DICT_TYPE.ORDER_STATUS" :value="order.status" :class="{red: order.status === 1, green: order.status === 5 || order.status === 2}" /></el-descriptions-item>
<el-descriptions-item label="送货时间">{{ order.consigneeVO && order.consigneeVO.deliveryDate || '' }}</el-descriptions-item>
<el-descriptions-item label="运输方式">
......
src/components/WarehouseAreaDialog/index.vue
View file @ bff9fcf3
......@@ -63,7 +63,11 @@ export default {
default: false
},
value: Array,
orderId: Number
orderId: Number,
cityId: {
type: Number,
default: undefined
}
},
data() {
......@@ -82,6 +86,25 @@ export default {
visible(val) {
if (val) {
this.opened = true
getByWarehouseId({cityId: this.cityId}).then(r => {
const area = r.data
area.forEach(e => {
// 仓库
e.children.forEach(f => {
// 区域
f.selected = false
if(f.positionList) f.positionList.forEach(g => {
// 位置
g.children.forEach(k => {
// 子位置
k.selected = false
})
})
})
})
this.area = area
})
} else {
}
},
......@@ -144,28 +167,7 @@ export default {
},
mounted() {
if (this.visible) {
this.opened = true
}
getByWarehouseId().then(r => {
const area = r.data
area.forEach(e => {
// 仓库
e.children.forEach(f => {
// 区域
f.selected = false
if(f.positionList) f.positionList.forEach(g => {
// 位置
g.children.forEach(k => {
// 子位置
k.selected = false
})
})
})
})
this.area = area
})
console.log('area dialog mounted')
},
computed: {
......
src/views/ecw/box/query.vue
View file @ bff9fcf3
......@@ -217,7 +217,6 @@ export default {
editForm,
},
created() {
console.log();
this.transportTypes = this.getDictDatas(
this.DICT_TYPE.ECW_TRANSPORT_TYPE
).filter((item) => item.value == "1" || item.value == "2");
......
src/views/ecw/box/shippingSea/seaProcess.vue
View file @ bff9fcf3
......@@ -147,7 +147,7 @@ export default {
case "preinstall":
// 预装反审
const preStatus = this.shipmentObj[node.keyName];
if ([24, 25].includes(preStatus)) {
if ([25].includes(preStatus)) {
this.currentComponent = `reviewWidget`;
this.$set(this.dialogConfig, "width", "700px");
this.$set(this.dialogConfig, "title", "预装反审");
......@@ -159,7 +159,7 @@ export default {
case "unloading":
// 卸柜反审
const unStatus = this.shipmentObj[node.keyName];
if ([184, 185].includes(unStatus)) {
if ([186].includes(unStatus)) {
this.currentComponent = `reviewWidget`;
this.$set(this.dialogConfig, "width", "700px");
this.$set(this.dialogConfig, "title", "卸柜反审");
......
src/views/ecw/customer/components/quickCreate.vue
View file @ bff9fcf3
......@@ -39,7 +39,7 @@
:key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
</el-form-item>
<el-form-item label="备注" prop="remarks">
<el-input v-model="form.remarks" placeholder="请输入备注"/>
</el-form-item>
......@@ -61,7 +61,7 @@ export default {
props:{
default: Object,
},
data(){
return {
show: true,
......@@ -77,9 +77,9 @@ export default {
type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
},
serviceUserList: [],
countryList: [],
......@@ -132,4 +132,4 @@ export default {
.quick-create-customer .el-form-item{
margin-bottom: 22px;
}
</style>
\ No newline at end of file
</style>
src/views/ecw/customer/edit.vue
View file @ bff9fcf3
......@@ -102,8 +102,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="跟进客服" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择跟进客服">
<el-form-item label="客户经理" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择客户经理">
<el-option v-for="item in serviceUserList"
:key="item.id" :label="item.nickname" :value="item.id" />
</el-select>
......@@ -459,7 +459,7 @@ export default {
type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
},
......
src/views/ecw/customer/index.vue
View file @ bff9fcf3
......@@ -21,8 +21,8 @@
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="跟进客服" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
<el-form-item label="客户经理" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
<el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
......@@ -73,7 +73,7 @@
<dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
</template>
</el-table-column>
<el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
<el-table-column label="客户经理" align="center" prop="customerService" :formatter="customerServiceFn">
</el-table-column>
<el-table-column label="客户状态" align="center" prop="status">
<template slot-scope="scope">
......@@ -211,8 +211,8 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="跟进客服" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择跟进客服">
<el-form-item label="客户经理" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择客户经理">
<el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
......@@ -519,7 +519,7 @@ export default {
type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
// createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
},
......
src/views/ecw/customer/query.vue
View file @ bff9fcf3
......@@ -26,7 +26,7 @@
<el-descriptions-item label="客户类别">{{ getDictDataLabel(DICT_TYPE.CUSTOMER_TYPE, customer.type) }}</el-descriptions-item>
<!-- <el-descriptions-item label="联系方式">{{ customer }}</el-descriptions-item>-->
<el-descriptions-item label="推介人">{{ promoter }}</el-descriptions-item>
<el-descriptions-item label="跟进客服">{{ customerService }}</el-descriptions-item>
<el-descriptions-item label="客户经理">{{ customerService }}</el-descriptions-item>
<el-descriptions-item label="公司名称">{{ customer.company }}</el-descriptions-item>
<el-descriptions-item label="联系地址">{{ customer.address }}</el-descriptions-item>
<el-descriptions-item label="创建时间">{{ parseTime(customer.createTime) }}</el-descriptions-item>
......
src/views/ecw/customerConfirm/index.vue
View file @ bff9fcf3
......@@ -21,8 +21,8 @@
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="跟进客服" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
<el-form-item label="客户经理" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
......@@ -70,7 +70,7 @@
<dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
</template>
</el-table-column>
<el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
<el-table-column label="客户经理" align="center" prop="customerService" :formatter="customerServiceFn">
</el-table-column>
<el-table-column label="客户状态" align="center" prop="status">
<template slot-scope="scope">
......@@ -193,8 +193,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="跟进客服" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择跟进客服">
<el-form-item label="客户经理" prop="customerService">
<el-select v-model="form.customerService" placeholder="请选择客户经理">
<el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
</el-select>
......@@ -291,8 +291,8 @@
<!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="openHandOver" width="500px" append-to-body>
<el-form ref="handOverForm" :model="handOverForm" :rules="rules" label-width="80px">
<el-form-item label="跟进客服" prop="customerServiceId">
<el-select v-model="handOverForm.customerServiceId" placeholder="请选择跟进客服" clearable filterable>
<el-form-item label="客户经理" prop="customerServiceId">
<el-select v-model="handOverForm.customerServiceId" placeholder="请选择客户经理" clearable filterable>
<el-option v-for="user in serviceStaffOptions"
:key="user.id" :value="user.id"
:label="user.nickname" />
......
src/views/ecw/customerToBeAssigned/index.vue
View file @ bff9fcf3
......@@ -22,8 +22,8 @@
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="跟进客服" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
<el-form-item label="客户经理" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
<el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
......@@ -74,7 +74,7 @@
<dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
</template>
</el-table-column>
<el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
<el-table-column label="客户经理" align="center" prop="customerService" :formatter="customerServiceFn">
</el-table-column>
<el-table-column label="客户状态" align="center" prop="status">
<template slot-scope="scope">
......@@ -176,7 +176,7 @@ export default {
type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
// createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
},
......@@ -332,7 +332,7 @@ export default {
},
transferFn(){
if(!this.service){
return this.$message.warning('请选择跟进客服！');
return this.$message.warning('请选择客户经理！');
}
handOverCustomer({
customerServiceId:this.service,
......
src/views/ecw/oceanCustomer/index.vue
View file @ bff9fcf3
......@@ -22,8 +22,8 @@
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
</el-form-item>
<el-form-item label="跟进客服" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择跟进客服" clearable size="small">
<el-form-item label="客户经理" prop="customerService">
<el-select v-model="queryParams.customerService" placeholder="请选择客户经理" clearable size="small">
<el-option v-for="dict in getDictDatas(DICT_TYPE.COMMON_STATUS)"
:key="dict.value" :label="dict.label" :value="dict.value"/>
</el-select>
......@@ -83,7 +83,7 @@
<dict-tag :type="DICT_TYPE.COUNTRY" :value="scope.row.country" />
</template>
</el-table-column>
<el-table-column label="跟进客服" align="center" prop="customerService" :formatter="customerServiceFn">
<el-table-column label="客户经理" align="center" prop="customerService" :formatter="customerServiceFn">
</el-table-column>
<el-table-column label="客户状态" align="center" prop="status">
<template slot-scope="scope">
......@@ -181,7 +181,7 @@ export default {
type: [{ required: true, message: "客户类别不能为空", trigger: "blur" }],
// createTime: [{ required: true, message: "创建时间不能为空", trigger: "blur" }],
source: [{ required: true, message: "客户来源不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "跟进客服不能为空", trigger: "blur" }],
customerService: [{ required: true, message: "客户经理不能为空", trigger: "blur" }],
status: [{ required: true, message: "客户状态不能为空", trigger: "blur" }],
founder: [{ required: true, message: "创建人不能为空", trigger: "blur" }],
},
......@@ -365,7 +365,7 @@ export default {
},
transferFn(val){
if(!this.service){
return this.$message.warning('请选择跟进客服！');
return this.$message.warning('请选择客户经理！');
}
handOverCustomer({
customerServiceId:this.service,
......
src/views/ecw/order/warehousing/components/editDialog.vue
View file @ bff9fcf3
......@@ -10,7 +10,7 @@
<el-descriptions-item label="中文品名">{{ warehousing.prodTitleZh }}</el-descriptions-item>
<el-descriptions-item label="英文品名">{{ warehousing.prodTitleEn }}</el-descriptions-item>
<el-descriptions-item label="品牌">
<span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ form.brand || '无' }}</span>
<span v-if="warehousing.orderWarehouseInBackItemDoList && warehousing.orderWarehouseInBackItemDoList.length">{{ form.brand ? brand : '无' }}</span>
<el-select
v-else v-model="form.brand"
placeholder="可修改"
......@@ -316,6 +316,15 @@ export default {
},
isBeian(){
return this.brandList.find(e => e.titleZh === this.form.brand) ? '有备案' : '无备案'
},
brand(){
if (!!this.form.brand){
const brand = this.brandList.find(e => e.id === this.form.brand)
if (brand) {
return brand.titleZh
}
}
return ''
}
}
}
......
src/views/ecw/order/warehousing/index.vue
View file @ bff9fcf3
......@@ -25,7 +25,7 @@
<el-table-column
label="填单货物属性">
<template v-slot="{row}">
品牌：{{ row.brand ? '有' : '无' }}<br>
品牌：{{ row.brand !== '0' ? '有' : '无' }}<br>
箱数：{{ row.num }}<br>
体积：{{ row.volume }}m³<br>
重量：{{ row.weight }}Kg
......@@ -34,10 +34,10 @@
<el-table-column
label="入库货物属性">
<template v-slot="{row}">
品牌：{{ row.brand ? '有' : '无' }}<br>
箱数：{{ row.num }}<br>
体积：{{ row.volume }}m³<br>
重量：{{ row.weight }}Kg
品牌：{{ row.brand !== '0' ? '有' : '无' }}<br>
箱数：{{ row.warehouseInInfoVO.cartonsNum }}<br>
体积：{{ row.warehouseInInfoVO.volume }}m³<br>
重量：{{ row.warehouseInInfoVO.weight }}Kg
</template>
</el-table-column>
<el-table-column
......@@ -58,6 +58,7 @@
v-slot="{row}"
label="状态">
<dict-tag v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.diffType" :type="DICT_TYPE.ORDER_WAREHOUSE_IN_STATUS" :value="row.warehouseInInfoVO.diffType" class="red" :class="{green: row.warehouseInInfoVO.diffType === 4}"/>
<span class="red" v-if="row.warehouseInInfoVO && row.warehouseInInfoVO.cartonsNumDiff">{{ row.warehouseInInfoVO.cartonsNumDiff }}箱</span>
</el-table-column>
<el-table-column
prop="address"
......@@ -104,7 +105,8 @@
</div>
</el-form>
<warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList" :order-id="orderId"></warehouse-area-dialog>
<warehouse-area-dialog ref="area" :visible.sync="areaVisible" v-model="form.orderLocationCreateReqVOList"
:order-id="orderId" :city-id="cityId"></warehouse-area-dialog>
<edit-dialog :visible.sync="warehousingVisible" :warehousing="warehousing" :edit="order.status === 5"></edit-dialog>
......@@ -317,6 +319,9 @@ export default {
}
})
return result
},
cityId(){
return this.order?.departureVO?.departureId
}
}
}
......
src/views/system/user/index.vue
View file @ bff9fcf3
......@@ -146,7 +146,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="岗位">
<el-select @change="changList" v-model="form.postIds" multiple placeholder="请选择">
<el-select v-model="form.postIds" multiple placeholder="请选择">
<el-option
v-for="item in postOptions"
:key="item.id"
......@@ -369,6 +369,18 @@ export default {
// 根据名称筛选部门树
deptName(val) {
this.$refs.tree.filter(val);
},
'form.postIds'(val){
let codes = this.postOptions.filter(i => {
if(val.indexOf(i.id) > -1) return i
}).map(v => v.code).join(',');
if(codes){
userList(codes).then(r => {
this.followUpList = r.data;
})
}else {
this.followUpList = [];
}
}
},
created() {
......@@ -652,20 +664,7 @@ export default {
children: node.children
}
},
changList(e){
let codes = this.postOptions.filter(i => {
if( e.indexOf(i.id) > -1) return i.code
}).map(v => v.code).join(',');
if(codes){
userList(codes).then(r => {
console.log(r,'r');
this.followUpList = r.data;
})
}else {
this.followUpList = [];
}
},
},
}
};
</script>
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