aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改字段对应问题

Browse Source
This commit is contained in:
liuyp 2024-06-03 12:06:42 +08:00
parent 0167625d20
commit 0982d28f3a
4 changed files with 159 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/emis/emisTmsPack/packageManagement.vue
View File

@ -886,7 +886,7 @@ export default {
this.coData.totalWaybillQty=this.emisCoPackDetail.length;
this.coData.totalParcelQty=totalParcelQty;
this.coData.totalWeight=totalWeight;
this.coData.totalVolume=totalVolume;
this.coData.totalVolume=parseFloat(totalVolume.toFixed(5));
},
// 排序 查询字段是表格中字段名字 动态取值排序顺序
handleSortChange(column) {

88
src/views/emis/emisTmsScanRecord/signAndRecord.vue
View File

@ -11,7 +11,20 @@
<el-col :span="12">
<el-form-item label="签收人" prop="signMan" label-width="70px">
<!-- <EmisUserSimplePicker v-model="form.signMan" postCode="RSD" @onChange="onSignStaffSelect" ></EmisUserSimplePicker> -->
<el-input v-model="form.signMan" clearable="" placeholder="" />
<!-- <el-input v-model="form.signMan" clearable="" placeholder="" /> -->
<span slot="label">
<span style="color: red">{{ $t('签收人') }}</span>
</span>
<el-select
style="width:100%"
filterable
allow-create
clearable
v-model="form.signMan"
default-first-option
>
<el-option v-for="item in dict.type.emis_signs_remark" :key="item.value" :label="item.label" :value="item.label" />
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12">
@ -22,7 +35,7 @@
<el-col :span="24">
<el-form-item label="扫描单号" prop="billCode" label-width="70px">
<span slot="label">
<span style="color: red">扫描单号</span>
<span style="color: red">{{ $t('扫描单号') }}</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
@ -128,7 +141,7 @@
<el-table ref="multipleTable" border stripe v-loading="loading" :data="emisTmsScanRecordList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('派件员')" align="center" prop="dispatchManName" min-width="100" />
<el-table-column :label="$t('派件员')" align="center" prop="dispatchMan" min-width="100" />
<el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
<el-table-column :label="$t('签收网点')" align="center" prop="signSiteCode" min-width="100" />
<el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
@ -153,15 +166,16 @@
<el-table-column :label="$t('录件重量')" align="center" prop="billWeight" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('签收图片')" align="center" min-width="100">
<el-table-column :label="$t('保存目录')" align="center" prop="picUrl" width="200" >
<el-table-column :label="$t('上传图片')" align="center" prop="picUrls" width="200" >
<template slot-scope="scope">
<span class="ellipsis">{{scope.row.picUrl}}</span>
<!-- <span class="ellipsis">{{scope.row.picUrl}}</span> -->
<ImagePreview v-for="pic in scope.row.picUrls" :key="pic" :src="pic" ></ImagePreview>
</template>
</el-table-column>
<el-table-column :label="$t('上传网点')" align="center" prop="xxxx" min-width="100" >
<el-table-column :label="$t('上传网点')" align="center" prop="scanSite" min-width="100" >
</el-table-column>
<el-table-column :label="$t('上传人')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('文件大小(KB)')" align="center" prop="xxxx" min-width="120" />
<el-table-column :label="$t('上传人')" align="center" prop="scanMan" min-width="100" />
<!-- <el-table-column :label="$t('文件大小(KB)')" align="center" prop="xxxx" min-width="120" /> -->
</el-table-column>
</el-table>
<el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
@ -197,7 +211,7 @@ export default {
id:undefined
},
components: { EmisUserSimplePicker, CustomerSimplePicker },
dicts: ['emis_scan_type'],
dicts: ['emis_scan_type', 'emis_signs_remark'],
data() {
return {
// 选中数组
@ -260,17 +274,17 @@ export default {
handleInput(item){
this.form.picUrl = item;
},
onCustomerSelect(item){
if(item != null){
this.form.customerCode=item.customerCode;
this.form.customerName=item.customerName;
}else{
this.form.customerCode=null;
this.form.customerName=null;
}
},
// onCustomerSelect(item){
// if(item != null){
// this.form.customerCode=item.customerCode;
// this.form.customerName=item.customerName;
// }else{
// this.form.customerCode=null;
// this.form.customerName=null;
// }
// },
onSendStaffSelect(item){
// this.form.dispatchMan=item.empName || this.$store.getters.empName;
this.form.dispatchMan=item.empName;
this.form.dispatchManCode=item.empCode;
},
onSignStaffSelect(item){
@ -484,20 +498,20 @@ export default {
handleScanUpload(){
var selData = this.$refs.multipleTable.selection;
console.log(selData);
let newList = [];
let scanData=[];
selData.forEach(item=>{
scanData.push(
{
billCode:item.billCode,
signMan:item.signMan,
signManCode:item.signManCode,
// signManCode:item.signManCode,
picUrl:item.picUrl,
remark:item.remark,
scanWeight:item.scanWeight,
dispatchManCode:item.dispatchManCode,
customerCode:item.customerCode,
customerName:item.customerName,
// customerCode:item.customerCode,
// customerName:item.customerName,
// dispatchOrSendManCode:item.dispatchOrSendManCode,
// scanDate:item.scanDate
scanDate:item.scanDate || new Date()
@ -518,6 +532,17 @@ export default {
return;
}
// 删除上传记录
for(let sd=0;sd<this.emisTmsScanRecordList.length;sd++){
if( selData.filter(item => {
return this.emisTmsScanRecordList[sd].billCode == item.billCode
}).length == 0){
newList.push(this.emisTmsScanRecordList[sd])
}
}
this.emisTmsScanRecordList = newList
// 清空数据
this.record={};
this.$modal.msgSuccess(scanRstItem.message);
});
},
@ -526,6 +551,10 @@ export default {
this.$message.error("输入单号后回车");
return;
}
if(!this.form.signMan){
this.$message.error("请先选择签收人");
return;
}
if(this.dataMap[this.form.billCode]){
this.$message.error("重复扫描");
this.playNoticeTone(1);
@ -546,17 +575,22 @@ export default {
this.$modal.msgError("已扫描");
return;
}
let record =Object.assign({}, scanRstItem)
let record =Object.assign({}, scanRstItem);
record.dispatchMan = this.form.dispatchMan;
record.dispatchManCode=this.form.dispatchManCode;
record.signManCode=this.form.signManCode;
record.signMan=this.form.signMan;
record.customerCode=this.form.customerCode;
record.customerName=this.form.customerName;
record.picUrl=this.form.picUrl;
// record.customerCode=this.form.customerCode;
// record.customerName=this.form.customerName;
record.picUrl=this.form.picUrl || "";
record.picUrls=record.picUrl.split(",");
record.scanSite=this.form.scanSite;
record.scanMan=this.form.scanMan;
let indexBillCode=record.billCode;
this.dataMap[indexBillCode]=record;
this.emisTmsScanRecordList.push(record);
isBatch || this.emisTmsScanRecordList.length > 1 ? this.record = {} : this.record = record;
this.form.picUrl = "";
});
}
}

107
src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
View File

@ -108,7 +108,9 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('签收状态')" align="center" prop="signState" min-width="100" />
<el-table-column :label="$t('签收状态')" align="center" prop="status" min-width="100">
{{ $t("已签收") }}
</el-table-column>/>
<el-table-column :label="$t('签收地址')" align="center" prop="signAddress" min-width="100" />
<el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
<el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="170" >
@ -116,40 +118,80 @@
<span>{{ parseTime(scope.row.scanDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100" />
<el-table-column :label="$t('寄件日期')" align="center" prop="xxx" min-width="170" >
<el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.dispatchManName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xxx) }}</span>
<span>{{ parseTime(scope.row.waybillDetail.sendDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('预计到达时间')" align="center" prop="xxx" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xxx) }}</span>
</template>
<el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.waybillDetail.estimateDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('线路')" align="center" prop="" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.transLineTypeName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('产品类型')" align="center" prop="" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.productTypeName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('时效')" align="center" prop="" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.timeType }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.registerManName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.registerSiteName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('线路')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('产品类型')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('时效')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('录入人')" align="center" prop="recordMan" min-width="100" />
<el-table-column :label="$t('录入网点')" align="center" prop="recordSiteCode" min-width="100" />
<el-table-column :label="$t('录入时间')" align="center" prop="xxx" min-width="170" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.xxx) }}</span>
<span>{{ parseTime(scope.row.waybillDetail.registerDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" />
<!-- <el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" /> -->
<el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
<el-table-column :label="$t('到付款')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('代收付款')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('机器码/PDA编号')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('数据推送标识')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('数据插入时间')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.customerName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.dataFrom }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('签收信息备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('收件国家')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('收件省份')" align="center" prop="xxx" min-width="100" />
<el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100"/>
<el-table-column :label="$t('收件国家')" align="center" prop="xxx" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.receiveCountryName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('收件省份')" align="center" prop="xxx" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.receiveProvinceName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100">
<template slot-scope="scope">
<ImagePreview v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
</template>
</el-table-column>
</xd-table>
</div>
</template>
@ -265,6 +307,13 @@ export default {
this.tableHeight = window.innerHeight - tableH;
});
},
mounted() {
const end = new Date()
const start = new Date()
start.setHours(0,0,0,0)
end.setHours(23,59,59,0)
this.dateTimeRange=[start,end];
},
methods: {
/** 查询扫描记录列表 */
getList() {
@ -272,11 +321,11 @@ export default {
console.log("---->this.queryParams,", this.queryParams);
let queryParams = Object.assign({},this.queryParams);
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
queryParams.params.beginSignDate = this.dateTimeRange[0];
queryParams.params.endSignDate = this.dateTimeRange[1];
queryParams.params.beginScanDate = this.dateTimeRange[0];
queryParams.params.endScanDate = this.dateTimeRange[1];
}else{
queryParams.params.beginSignDate = null;
queryParams.params.endSignDate = null;
queryParams.params.beginScanDate = null;
queryParams.params.endScanDate = null;
}
if(this.queryParams.params.queryOrderType == "1"){
queryParams.orderSN=null;

38
src/views/emis/emisTmsScanRecord/signatureRecordQuery.vue
View File

@ -44,7 +44,7 @@
<!-- <el-col :span="8"> -->
<el-form-item :label="$t('收件国家')" prop="country" label-width="70px">
<CountryPicker v-model="queryParams.params.country" @onChange="onCountrySelect" ></CountryPicker>
<CountryPicker v-model="queryParams.country" @onChange="onCountrySelect" ></CountryPicker>
</el-form-item>
<!-- </el-col> -->
@ -79,9 +79,6 @@
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="150" />
<el-table-column :label="$t('签收状态')" align="center" prop="status" min-width="100">
<!-- <template slot-scope="scope">
<dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.status"/>
</template> -->
{{ $t("已签收") }}
</el-table-column>/>
<!-- <el-table-column :label="$t('签收地址')" align="center" prop="signAddress" min-width="100" /> -->
@ -93,7 +90,7 @@
</el-table-column>
<el-table-column :label="$t('派件员')" align="center" prop="dispatchOrSendMan" min-width="100">
<template slot-scope="scope">
<span></span>{{ scope.row.waybillDetail.dispatchManName }}</span>
<span>{{ scope.row.waybillDetail.dispatchManName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="170" >
@ -138,12 +135,11 @@
</el-table-column>
<!-- <el-table-column :label="$t('录入网点所属省份')" align="center" prop="xxx" min-width="100" /> -->
<el-table-column :label="$t('签收网点')" align="center" prop="signSite" min-width="100" />
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
<!-- <el-table-column :label="$t('到付款')" align="center" prop="xxx" min-width="100" /> -->
<!-- <el-table-column :label="$t('代收付款')" align="center" prop="xxx" min-width="100" /> -->
<!-- <el-table-column :label="$t('机器码/PDA编号')" align="center" prop="xxx" min-width="100" /> -->
<!-- <el-table-column :label="$t('数据推送标识')" align="center" prop="xxx" min-width="100" /> -->
<!-- <el-table-column :label="$t('数据插入时间')" align="center" prop="xxx" min-width="100" /> -->
<el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.customerName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100">
<template slot-scope="scope">
<span>{{ scope.row.waybillDetail.dataFrom }}</span>
@ -160,7 +156,11 @@
<span>{{ scope.row.waybillDetail.receiveProvinceName }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100"/>
<el-table-column :label="$t('签收图片')" align="center" prop="picUrl" min-width="100">
<template slot-scope="scope">
<ImagePreview v-for="pic in (scope.row.picUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
</template>
</el-table-column>
</xd-table>
</div>
</template>
@ -226,7 +226,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 20,
pageSize: 10,
orderSN:null,
billCode: null,
scanType: null,
@ -298,11 +298,11 @@ export default {
console.log("---->this.queryParams,", this.queryParams);
let queryParams = Object.assign({},this.queryParams);
if (null != this.dateTimeRange && '' != this.dateTimeRange) {
queryParams.params.beginSignDate = this.dateTimeRange[0];
queryParams.params.endSignDate = this.dateTimeRange[1];
queryParams.params.beginScanDate = this.dateTimeRange[0];
queryParams.params.endScanDate = this.dateTimeRange[1];
}else{
queryParams.params.beginSignDate = null;
queryParams.params.endSignDate = null;
queryParams.params.beginScanDate = null;
queryParams.params.endScanDate = null;
}
if(this.queryParams.params.queryOrderType == "1"){
queryParams.orderSN=null;
@ -336,8 +336,8 @@ export default {
this.form.dispatchOrSendManCode=item.empCode || this.$store.getters.empCode;
},
onCountrySelect(item){
this.queryParams.params.countryName=item.name;
this.queryParams.params.countryCode=item.code;
this.queryParams.countryName=item.name;
this.queryParams.countryCode=item.code;
// this.form.countryName=item.name;
// this.form.countryCode=item.code;
},