Skip to content

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

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

parents b6c2de2b 3e7cbec4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 449 additions and 262 deletions
src/views/ecw/deptTarget/index.vue
View file @ 0aac82ea
......@@ -4,18 +4,18 @@
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item :label="$t('部门')" prop="deptId">
<el-select v-model="queryParams.deptId" style="width: 300px;" :placeholder="$t('请选择部门')">
<el-select v-model="queryParams.deptId" style="width: 300px;" :placeholder="$t('请选择部门')" clearable>
<el-option v-for="item in this.deptData" :key="item.id" :label="item.name" :value="item.id"/>
</el-select>
</el-form-item>
<el-form-item :label="$t('目标类型')" prop="targetType">
<dict-selector :type="DICT_TYPE.TARGET_TYPE" v-model="queryParams.targetType" formatter="number"/>
<el-form-item :label="$t('目标类型')" prop="targetType" >
<dict-selector :type="DICT_TYPE.TARGET_TYPE" v-model="queryParams.targetType" formatter="number" clearable/>
</el-form-item>
<el-form-item :label="$t('运输方式')" prop="transportType">
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number"/>
<dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable/>
</el-form-item>
<el-form-item :label="$t('出货渠道')" prop="shippingChannel">
<el-select v-model="queryParams.shippingChannel" :placeholder="$t('请选择出货渠道')">
<el-select v-model="queryParams.shippingChannel" :placeholder="$t('请选择出货渠道')" clearable>
<el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId"
:key="item.channelId"></el-option>
</el-select>
......@@ -148,7 +148,7 @@
getCreateInitData,
getPersonTargetPage
} from "@/api/ecw/deptTarget";
import {listSimpleDepts} from "@/api/system/dept";
import {listDept, listSimpleDepts} from "@/api/system/dept";
import {getChannelList} from '@/api/ecw/channel';
import dayjs from "dayjs";
import { parseTime } from '@/utils/ruoyi';
......@@ -237,24 +237,27 @@ import { parseTime } from '@/utils/ruoyi';
}
},
created() {
listSimpleDepts().then(res => {
res.data.forEach((item) => {
if (item.parentId == 0) {
this.getDeptList();
this.deptArr.push(item)
} else {
this.deptData.push(item)
}
})
this.deptData.forEach((value) => {
var dept = this.deptArr.filter(itt => itt.id == value.parentId)
if (dept.length > 0) {
value.name = dept[0].name + ' | ' + value.name
}
})
});
// listSimpleDepts().then(res => {
// this.deptList = this.handleTree(res, "id");
// console.log("this.deptList:"+JSON.stringify(this.deptList));
// res.data.forEach((item) => {
// if (item.parentId == 0) {
// this.deptArr.push(item)
// }
// else {
// this.deptData.push(item)
// }
// })
// this.deptData.forEach((value) => {
// var dept = this.deptArr.filter(itt => itt.id == value.parentId)
// if (dept.length > 0) {
// value.name = dept[0].name + ' | ' + value.name
// }
//
// })
// });
getCreateInitData().then(res => {
this.monthList = res.data.month;
this.quarterList = res.data.quarter;
......@@ -264,6 +267,36 @@ import { parseTime } from '@/utils/ruoyi';
this.getList();
},
methods: {
/** 查询部门列表 */
getDeptList(){
this.loading = true;
listDept(this.queryParams).then(response => {
this.deptList = this.handleTree(response.data, "id");
console.log("this.deptList:"+JSON.stringify(this.deptList));
this.deptList.forEach((item) => {
this.normalizer(item);
// this.deptData.push(item);
// if(item.children!=null&&item.children.length>0){
// item.children.forEach((c) => {
// c.name = item.name +"|"+ c.name;
// this.deptData.push(c);
// });
// }
});
// this.loading = false;
});
},
normalizer(item) {
this.deptData.push(item);
if(item.children!=null&&item.children.length>0){
item.children.forEach((c) => {
c.name = item.name +"|"+ c.name;
this.normalizer(c);
// this.deptData.push(c);
});
}
return item;
},
getChannelList() {
getChannelList().then(res => this.channelList = res.data)
},
......
src/views/ecw/order/components/SplitDetail.vue
View file @ 0aac82ea
......@@ -23,7 +23,7 @@
</el-descriptions-item>
</el-descriptions>
<template v-for="item in detail.orderSplitBackVOList">
<template v-for="item in orderSplitBackVOList">
<div class="title mt-20" :key="item.orderNo">
<span class="mr-10">{{item.orderNo}}</span>
<dict-tag class="mr-10" :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="item.transportId" />
......@@ -31,28 +31,32 @@
<span>{{$t('发往')}}{{item.dstWarehouseName}}</span>
</div>
<el-table :data="item.orderSplitItemBackVOList" :key="'items-' + item.orderNo">
<el-table-column :label="$t('序号')">
<template slot-scope="scope">{{scope.$index+1}}</template>
</el-table-column>
<el-table-column :label="$t('中文品名')">
<template slot-scope="{row}">{{row.prodTitleZh}}</template>
</el-table-column>
<el-table-column :label="$t('英文品名')">
<template slot-scope="{row}">{{row.prodTitleEn}}</template>
</el-table-column>
<el-table-column :label="$t('品牌')">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
</template>
</el-table-column>
<el-table-column :label="$t('体积')">
<template slot-scope="{row}">{{row.volume}} m³</template>
</el-table-column>
<el-table-column :label="$t('重量')">
<template slot-scope="{row}">{{row.weight}}kg</template>
</el-table-column>
<el-table-column :label="$t('箱数')">
<template slot-scope="{row}">{{row.num}}</template></el-table-column>
<el-table-column :label="$t('序号')">
<template slot-scope="scope">{{scope.$index+1}}</template>
</el-table-column>
<el-table-column :label="$t('中文品名')">
<template slot-scope="{row}">{{row.prodTitleZh}}</template>
</el-table-column>
<el-table-column :label="$t('英文品名')">
<template slot-scope="{row}">{{row.prodTitleEn}}</template>
</el-table-column>
<el-table-column :label="$t('品牌')">
<template slot-scope="{row}">
<dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="row.brandType" />
</template>
</el-table-column>
<el-table-column :label="$t('体积')">
<template slot-scope="{row}">{{row.volume}} m³</template>
</el-table-column>
<el-table-column :label="$t('重量')">
<template slot-scope="{row}">{{row.weight}}kg</template>
</el-table-column>
<el-table-column :label="$t('箱数')">
<template slot-scope="{row}">{{row.num}}</template>
</el-table-column>
<el-table-column :label="$t('备注')">
<template slot-scope="{row}">{{row.remark}}</template>
</el-table-column>
</el-table>
</template>
</div>
......@@ -60,6 +64,7 @@
<script>
import {getApproval, getOrder} from '@/api/ecw/order'
import {getChannel} from '@/api/ecw/channel'
import {getSplitList} from '@/api/ecw/orderHandle'
export default {
props:{
id: [String, Number]
......@@ -68,7 +73,8 @@ export default {
return {
detail: null,
order: null,
channel: null
channel: null,
orderSplitBackVOList: []
}
},
watch:{
......@@ -76,6 +82,7 @@ export default {
this.getData()
},
detail(){
this.getSplit()
this.getOrder()
},
order(){
......@@ -95,6 +102,12 @@ export default {
this.detail = JSON.parse(res.data.details)
})
},
getSplit(){
getSplitList({orderId: this.detail.orderId, lang: this.$i18n.locale.toLowerCase().indexOf('zh') > -1 ? 0 : 1 }).then(res => {
console.log('getSplitList', res)
this.orderSplitBackVOList = res.data.orderSplitBackVOList
})
},
getOrder(){
getOrder(this.detail.orderId).then(res => {
this.order = res.data
......
src/views/ecw/order/splitApply.vue
View file @ 0aac82ea
......@@ -236,7 +236,7 @@
<el-input-number v-model="shopForm.quantity" controls-position="right" :min="1" :max="quantitySum"></el-input-number>
</el-form-item>
<el-form-item :label="$t('备注信息')+':'">
<el-input v-model="shopForm.remarks"></el-input>
<el-input v-model="shopForm.remark"></el-input>
</el-form-item>
</el-row>
</el-form>
......@@ -552,7 +552,7 @@ export default {
num:this.shopForm.num,
orderItemId:this.shopForm.orderItemId,
orderSplitId:this.splitData[this.splitItemIndex].id,
remarks:this.shopForm.remarks
remark:this.shopForm.remark
}
createSplitItem(params).then(res=>{
this.$message.success(this.$t("放入成功"));
......
src/views/ecw/productPrice/batchEdit.vue
View file @ 0aac82ea
This diff is collapsed.
src/views/ecw/productPrice/edit.vue
View file @ 0aac82ea
This diff is collapsed.
src/views/ecw/warehouse/index.vue
View file @ 0aac82ea
......@@ -313,6 +313,7 @@
<el-input v-model="ladingform.prefixCounter" :placeholder="$t('请输入货柜前缀')" />
</el-form-item>
<el-form-item :label="$t('抬头')" prop="titleZh">
<el-link type="primary" @click.native="setTpl('sea')">海运模板</el-link> | <el-link type="primary" @click.native="setTpl('air')">空运模板</el-link>
<ueditor v-model="ladingform.titleZh" :min-height="192" style="width:960px"/>
</el-form-item>
......@@ -393,6 +394,9 @@ import RoutersSelectorWithoutChannel from '@/components/RoutersSelectorWithoutCh
import { has } from 'min-dash';
import Template from "../../cms/template/index";
// 海运和空运的抬头模板
import tpl from './tpl'
console.log(tpl)
export default {
name: "Warehouse",
components: {
......@@ -642,6 +646,9 @@ export default {
console.log("transportDatas:"+JSON.stringify(this.transportDatas));
},
methods: {
setTpl(type){
this.ladingform.titleZh = tpl[type]
},
/** 查询列表 */
getList() {
this.loading = true;
......
src/views/ecw/warehouse/tpl.js 0 → 100644
View file @ 0aac82ea
const sea = `
<table style="width:96%;">
<tbody>
<tr class="firstRow">
<td style="text-align:center;">
<img src="https://static2.groupage.cn/logo.png" alt="" style="width:118px;"/>
</td>
<td class="laymain" style="vertical-align:text-top;">
<p style="font-size:36px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
E&C LOGISTICS LIMITED
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
China Head Add.: +8618058993570/ 13556084412/13660548225/
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Yiwu Branch: +15957997302/ 18058993571/13105572235
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
NGR head office: 07011331745/ 08140352000/
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Alaba Branch (Air-Cargo) : 07082148641/ 08105496751/ 07011331745
</p>
</td>
<td style="text-align:center;">
<img src="https://static2.groupage.cn/weixin.jpg" alt="" style="width:142px;"/>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Website: www.groupage.cn
</p>
</td>
</tr>
</tbody>
</table>
<table style="width:96%;">
<tbody>
<tr class="firstRow">
<td style="font-size: 16px; color: rgb(0, 143, 215); word-break: break-all;">
<span style="color: rgb(0, 143, 215); font-family: "></span><span style="color: rgb(0, 143, 215); font-family: ">Lagos Airport Branch</span>: 07018291182/07082148641
</td>
<td style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Trade fair Branch: 07013178195/ 09023762194
</td>
</tr>
</tbody>
</table>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
IDUMOTA/ISLAND : 07010775374/09025168630/09024538636
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Complaint Line：+86 15920356527(CHINA) / +2349021774695 (NIGERIA）
</p>
<p style="font-size:33px;color:#000;font-family:&#39;Times New Roman&#39;;text-align:center;">
PACKING LIST
</p>
`
const air= `
<table style="width:96%;">
<tbody>
<tr class="firstRow">
<td style="text-align:center;">
<img src="https://jd.static.jdshangmen.com/logo.png" alt="" style="width:118px;"/>
</td>
<td class="laymain" style="vertical-align:text-top;">
<p style="font-size:36px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
E&C LOGISTICS LIMITED
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
China Head Add.: +8618058993570/ 13556084412/13660548225/
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Yiwu Branch: +15957997302/ 18058993571/13105572235
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
NGR head office: 07011331745/ 08140352000/
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Alaba Branch (Air-Cargo) : 07082148641/ 08105496751/ 07011331745
</p>
</td>
<td style="text-align:center;">
<img src="https://jd.static.jdshangmen.com/weixin.jpg" alt="" style="width:142px;"/>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Website: www.groupage.cn
</p>
</td>
</tr>
</tbody>
</table>
<table style="width:96%;">
<tbody>
<tr class="firstRow">
<td style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Lagos Airport Branch: 07018291182/07082148641
</td>
<td style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Trade fair Branch: 07013178195/ 09023762194
</td>
</tr>
</tbody>
</table>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
IDUMOTA/ISLAND : 07010775374/09025168630/09024538636
</p>
<p style="font-size:16px;color:#008fd7;font-family:&#39;Times New Roman&#39;;text-align:center;">
Complaint Line：+86 15920356527(CHINA) / +2349021774695 (NIGERIA）
</p>
<p style="font-size:33px;color:#000;font-family:&#39;Times New Roman&#39;;text-align:center;">
AIR WAY BILL
</p>
`
module.exports = {
sea, air
}
\ No newline at end of file
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