Skip to content

J
jiedao-app-operator-master
Commit d3b7d7e2 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 2ccab2b7 811db4bf
Hide whitespace changes
Inline Side-by-side
Showing with 114 additions and 47 deletions
src/utils/dict.js
View file @ d3b7d7e2
......@@ -224,6 +224,7 @@ export const DICT_TYPE = {
BOX_ARRIVAL_ERROR_TYPE: "arrival_error_type",// 到港异常状态
APP_TYPE:"app_type", //系统类型
AIR_SHIPMENT_PROCESS:'air_shipment_process'
}
/**
......
src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue
View file @ d3b7d7e2
......@@ -107,7 +107,7 @@
<pkg-page v-if="pkgPageType == 2" :pkgData="pkgData" :shipmentObj="shipmentObj" @closeDialog="closeDialog" />
</el-dialog>
<!-- 打印标签 -->
<el-dialog :title="$t('集运封箱标签')" :visible.sync="printdialogVisible" width="300px" :modal-append-to-body="false" append-to-body>
<el-dialog :title="$t('集运封箱标签')" :visible.sync="printdialogVisible" width="350px" :modal-append-to-body="false" append-to-body>
<print-tag v-if="printdialogVisible" :tagData="tagData" />
</el-dialog>
......
src/views/ecw/box/shippingAir/nodePage/mergePkg/printTag.vue
View file @ d3b7d7e2
<template>
<div>
<div class="tag">
<div style="display: flex;height: 200px;">
<div style="border-right: 1px solid #999; width: 125px">
<div style="display: flex;height: 180px;">
<div style="border-right: 1px solid #999; width: 140px">
<div>
<p style="margin-top: 1mm; text-align: center">
<span style="text-align: center; font-weight: 600; font-size: 3mm">{{ $t('扫码查看产品数量') }}</span>
......@@ -13,7 +13,7 @@
</p>
</div>
</div>
<div style="width: 125px">
<div style="width: 140px">
<p style="margin-top: 1mm; text-align: center">
<span style="text-align: center; font-weight: 600; font-size: 4mm">EC001141212</span>
</p>
......@@ -27,29 +27,30 @@
</p>
<div style="border: 1px solid #999;margin-left: 10px;" />
<div style="display: flex;margin-top: 10px;">
<div style="border-right: 2px solid #999;width: 35px;">
<div style="border-right: 2px solid #999;width: 45px;">
<p style="margin-top: 1mm; text-align: center">
<span style="text-align: center; font-weight: 600; font-size: 4mm">{{ tagData.transportName }}</span>
</p>
</div>
<div style="width: 75px;">
<div style="width: 90px;">
<p style="margin-top: 1mm; text-align: center">
<span style="text-align: center; font-weight: 600; font-size: 3mm">{{ tagData.date }}</span>
<span style="text-align: center; font-weight: 600; font-size: 4mm">{{ tagData.date }}</span>
</p>
</div>
</div>
</div>
</div>
<div style="border: 1px solid #999;margin: 10px;" />
<div>
<!-- <img :src="tagData.qrCodeUrl" style="margin-left: 10px;width:17mm;vertical-align:middle" /> -->
<img :src="tagData.barcodeUrl" style="width:250px;height: 50px;" />
</div>
<div style="height: 50px;border-top: 1px solid #999;">
<div style="height: 50px;">
<p style="margin-top: 1mm; text-align: center">
<span style="text-align: center; font-weight: 600; font-size: 3mm">E&C Logistics: www.groupage.com</span>
</p>
</div>
</div>
<div style="text-align:center;">
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" @click="print">{{$t('确定打印')}}</el-button>
</div>
</div>
......@@ -101,8 +102,8 @@ export default {
<style scoped>
.tag {
width: 250px;
height: 250px;
width: 300px;
height: 300px;
/* background-color: #e2dede; */
text-align: center;
padding: 15px;
......
src/views/ecw/box/shippingAir/shippingAir.vue
View file @ d3b7d7e2
......@@ -61,6 +61,7 @@ export default {
},
data() {
return {
airBaseData,
shipmentObj: {},
warehouseList: [],
// 供应商
......@@ -72,7 +73,7 @@ export default {
// 用户
allUsers: [],
// 流程图节点
seaBaseData: airBaseData(),
seaBaseData: [],
// 状态
statusLabel: "",
};
......@@ -119,6 +120,24 @@ export default {
getbox(this.shipmentId).then((res) => {
const { data } = res;
this.shipmentObj = data ?? {};
this.seaBaseData = this.airBaseData()
if(this.shipmentObj.destinationClearance==3&&this.shipmentObj.deliveryType==2){
this.seaBaseData = this.seaBaseData.filter(item=>{
var flag = true
item.forEach(element => {
if(element.type == 'agent'){
flag = false
}
if(element.type == 'unloading'){
flag = false
}
if(element.type == 'clrDocument'){
flag = false
}
});
return flag
})
}
});
},
},
......
src/views/ecw/deptTarget/myDeptTarget.vue
View file @ d3b7d7e2
......@@ -57,6 +57,12 @@
</template>
</el-table-column>
<el-table-column :label="$t('部门人数')" align="center" prop="deptEmpCount"/>
<el-table-column :label="$t('目标值')" align="center" prop="cubeNum"/>
<el-table-column :label="$t('目标单位')" align="center">
<template v-slot="{row}">
<dict-tag :type="DICT_TYPE.CEBE_UNIT" :value="row.cubeUnit" ></dict-tag>
</template>
</el-table-column>
<el-table-column :label="$t('目标方数')" align="center" prop="cubeNum"/>
<el-table-column :label="$t('运输方式')" align="center" prop="transportType">
<template slot-scope="scope">
......@@ -156,10 +162,11 @@
import {getChannelList} from '@/api/ecw/channel';
import dayjs from "dayjs";
import { parseTime } from '@/utils/ruoyi';
import Template from "@/views/cms/template/index.vue";
export default {
name: "EcwDepttargetMydepttarget",
components: {},
components: {Template},
data() {
return {
// 遮罩层
......@@ -332,7 +339,6 @@ import { parseTime } from '@/utils/ruoyi';
})
},
showChannel(val){
console.log(val);
if(val===3 || val===4){
this.showFlag = true;
} else {
......
src/views/ecw/product/index.vue
View file @ d3b7d7e2
......@@ -449,9 +449,9 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.form.priceLineCount = val.id;
this.lineNum = val.priceStepClearanceCount;
this.form.priceLineCount = val.id;
// this.form.priceLineCount = val.id;
this.lineNum = val.priceLineCount;
this.form.productTemplateId = val.id;
this.isCopyProductPriceTemplate = true;
copy()
this.open = true;
......@@ -595,14 +595,27 @@ export default {
})
});
},
verify(row){
return (row.startNum !== '' && row.endNum !== '' && row.clearancePrice !== '' && row.clearancePriceUnit !== '' && row.clearanceVolumeUnit !== '')
},
/** 提交按钮 */
submitForm() {
console.log(this.form);
this.$refs["form"].validate(valid => {
if (!valid) {
return;
}
if(!this.form.airWeightLimit){
return this.$message.warning('请输入空运订单重量上限')
}
if(this.form.priceStepClearanceList.length === 0){
return this.$message.warning('阶梯定价输入不完整！')
}else {
let bol = this.form.priceStepClearanceList.every(this.verify)
if(!bol){
return this.$message.warning('阶梯定价输入不完整！')
}
}
//商品特性转字符串
this.form.attrId = this.form.attrArray.join(',');
// 修改的提交
......
src/views/ecw/productAttr/edit.vue
View file @ d3b7d7e2
......@@ -181,7 +181,7 @@ export default {
}).then(() => {
this.form.priceLineCount = val.id;
this.lineNum = val.priceStepClearanceCount;
this.form.priceLineCount = val.id;
this.form.productTemplateId = val.id;
this.isCopyProductPriceTemplate = true;
copy()
this.open = true;
......@@ -219,25 +219,38 @@ export default {
this.attrIds = []
this.resetForm("form");
},
verify(row){
return (row.startNum !== '' && row.endNum !== '' && row.clearancePrice !== '' && row.clearancePriceUnit !== '' && row.clearanceVolumeUnit !== '')
},
/** 提交按钮 */
submitForm() {
this.reset()
console.log(this.form.priceStepClearanceList,'priceStepClearanceList')
// this.$refs["form"].validate((valid) => {
// if (!valid) {
// return;
// }
// let data = Object.assign({}, this.form)
// if(!data.isAllProduct && !data.idList.length){
// return this.$message(this.$t('请选择商品或勾选全部'))
// }
// batchUpdateProduct(data).then((response) => {
// this.$modal.msgSuccess(this.$t("修改成功"));
// this.$forceUpdate()
// // this.$store.dispatch('tagsView/delCurrentView')
// });
// });
this.$refs["form"].validate((valid) => {
if (!valid) {
return;
}
let data = Object.assign({}, this.form)
if(!data.isAllProduct && !data.idList.length){
return this.$message(this.$t('请选择商品或勾选全部'))
}
if(!this.form.airWeightLimit){
return this.$message.warning('请输入空运订单重量上限')
}
if(this.form.priceStepClearanceList.length === 0){
return this.$message.warning('阶梯定价输入不完整！')
}else {
let bol = this.form.priceStepClearanceList.every(this.verify)
if(!bol){
return this.$message.warning('阶梯定价输入不完整！')
}
}
batchUpdateProduct(data).then((response) => {
this.$modal.msgSuccess(this.$t("修改成功"));
this.reset()
this.$forceUpdate()
// this.$store.dispatch('tagsView/delCurrentView')
});
});
},
},
};
......
src/views/ecw/warehouse/index.vue
View file @ d3b7d7e2
......@@ -268,7 +268,7 @@
<el-input v-model="form.remark" :placeholder="$t('请输入备注')" />
</el-form-item>
<el-form-item :label="$t('会员控货下单要求')" prop="kycStatus">
<el-radio-group v-model="form.kycStatus">
<el-radio v-for="dict in kycDatas" :key="dict.value" :label="dict.value">{{$l(dict, 'label')}}</el-radio>
......@@ -295,7 +295,7 @@
</div>
<br/>
<el-form ref="form" :model="lineform" :rules="rules" label-width="120px">
<el-form ref="form" :model="lineform" :rules="rules" label-width="160px">
<el-form-item :label="$t('始发港服务')">
<el-checkbox-group v-model="lineform.otherService">
<el-checkbox v-for="item in serviceGroup" :label="item.id" :key="item.id" :value="item.id"> {{item.text}}</el-checkbox>
......@@ -306,6 +306,17 @@
<el-checkbox v-for="item in endServiceGroup" :label="item.id" :key="item.id" :value="item.id" v-show="isShowError(item)"> {{item.text}}</el-checkbox>
</el-checkbox-group>
</el-form-item>
<el-form-item v-if="['3','4'].includes(lineform.transportType)" label="空运提单制作节点">
<el-select v-model="ladingform.makeBillNode">
<el-option v-show="item.value !== '1'" v-for="(item, index) in getDictDatas(DICT_TYPE.AIR_SHIPMENT_PROCESS)" :label="$l(item, 'label')" :value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="线路是否在客户端显示">
<el-radio-group v-model="ladingform.isClientShow">
<el-radio :label="1">可见</el-radio>
<el-radio :label="0">不可见</el-radio>
</el-radio-group>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -393,7 +404,7 @@ import { createWarehouse, updateWarehouse, deleteWarehouse, getWarehouse, getWar
exportWarehouseExcel,routerList,changeRouteStatus,deptBind,deptList,serviceConfig } from "@/api/ecw/warehouse";
import { getNodePage } from "@/api/ecw/node";
import { getListTree } from "@/api/ecw/region";
import { getDictDatas, DICT_TYPE } from '@/utils/dict'
import {getDictDatas, DICT_TYPE, getDictDataL, getDictDataLabel} from '@/utils/dict'
import {CommonStatusEnum} from '@/utils/constants'
import { uploadFile } from "@/api/infra/file";
import { listDept } from "@/api/system/dept";
......@@ -405,7 +416,6 @@ import Template from "../../cms/template/index";
// 海运和空运的抬头模板
import tpl from './tpl'
console.log(tpl)
export default {
name: "Warehouse",
components: {
......@@ -523,8 +533,8 @@ export default {
},
// 表单参数
form: {checkList:[],},
ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]},
lineform: {otherService:[]},
ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[],isClientShow:1,makeBillNode:''},
lineform: {otherService:[],},
startName:'',
destName:'',
......@@ -559,6 +569,12 @@ export default {
},
computed: {
DICT_TYPE() {
return DICT_TYPE
},
getDictDataL() {
return getDictDataL
},
isShowError() {
return (item) => {
if(item.id !== '5') return true;
......@@ -652,10 +668,9 @@ export default {
this.getList();
this.getNodeList();
this.getContinentsList();
console.log("regionTypeDatas:"+JSON.stringify(this.regionTypeDatas));
console.log("transportDatas:"+JSON.stringify(this.transportDatas));
},
methods: {
getDictDataLabel,
setTpl(type){
this.ladingform.titleZh = tpl[type]
},
......@@ -1092,7 +1107,6 @@ export default {
});
this.ladingform.lineId=lineId.substr(0,lineId.length-1);
}
console.log(this.ladingform.lineId);
this.ladingform.account = JSON.stringify(this.arr);
createTemplate(this.ladingform).then(response => {
this.$modal.msgSuccess(this.$t("设置路线提单模板成功"));
......
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