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 19:18:45 +08:00
parent fd78596eff
commit 4b744d9620
19 changed files with 189 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
View File

@ -109,9 +109,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/arrivalScan.vue
View File

@ -108,9 +108,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
View File

@ -109,9 +109,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/coPackageScanning.vue
View File

@ -114,9 +114,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
View File

@ -109,9 +109,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/deliveryScan.vue
View File

@ -101,9 +101,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/loadingScan.vue
View File

@ -106,9 +106,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/outgoingScan.vue
View File

@ -109,9 +109,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/positionScanning.vue
View File

@ -112,9 +112,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/scanRecord.vue
View File

@ -108,9 +108,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

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

@ -186,9 +186,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
View File

@ -159,9 +159,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/unloadingScan.vue
View File

@ -102,9 +102,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

3
src/views/emis/emisTmsScanRecord/unpackScan.vue
View File

@ -100,9 +100,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">

12
src/views/emis/emisWaybillProblemInfo/centralProblemInquiry.vue
View File

@ -167,7 +167,11 @@
<el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
<el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
<el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" width="200">
<template slot-scope="scope">
<span class="ellipsis">{{scope.row.remark}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
</xd-table>
</div>
@ -725,4 +729,10 @@ export default {
margin-right: 0;
}
}
.ellipsis {
width:200px;
overflow: hidden; /* 确保超出容器的内容被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
</style>

222
src/views/emis/emisWaybillProblemInfo/problemEntry.vue
View File

@ -7,7 +7,7 @@
<span slot="label">
<span style="color: red">扫描单号</span>
</span>
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<el-input v-model="form.billCode" clearable="" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" >
<i slot="suffix" class="iconfont">&#xe656;</i>
</el-input>
</el-form-item>
@ -16,7 +16,10 @@
</el-col>
<el-col :span="8">
<el-form-item :label="$t('通知网点')" prop="notifySite" label-width="80px">
<EmisSiteSimplePicker v-model="form.notifySite" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker>
<!-- <EmisSiteSimplePicker v-model="form.notifySite" @onChange="onScanSiteSelect" ></EmisSiteSimplePicker> -->
<el-select v-model="form.notifySiteCode" @change="onScanSiteSelect">
<el-option v-for="item in notifySiteDataSource" :key="item.siteCode" :value="item" :label="item.siteName" ></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
@ -38,16 +41,6 @@
<ImageUpload v-model="form.picUrl" @input="handleInput" :isShowTip="false" ></ImageUpload>
</el-form-item>
</el-col>
<el-col :span="8">
<el-button
type="primary"
plain
icon=""
size="mini"
@click="handleScanInput"
>登记</el-button>
</el-col>
</el-row>
</el-form>
@ -66,6 +59,15 @@
>
<div slot="toolbar">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon=""
size="mini"
@click="handleRegister"
>登记</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="primary"
@ -125,13 +127,13 @@
</div>
<el-table-column type="selection" width="55" align="center" />
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
<el-table-column :label="$t('状态')" align="center" prop="currentStatus" min-width="100" />
<el-table-column :label="$t('通知网点')" align="center" prop="notifySiteName" min-width="100" />
<el-table-column :label="$t('登记网点')" align="center" prop="scanSite" min-width="100" />
<el-table-column :label="$t('登记日期')" align="center" prop="scanDate" min-width="100">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.scanDate) }}</span>
</template>
</el-table-column>
<span>{{ parseTime(scope.row.scanDate) }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" />
<el-table-column :label="$t('登记人')" align="center" prop="scanMan" min-width="100" />
@ -173,9 +175,6 @@
<el-input v-model="formBatch.billCode" type="textarea" :rows="8" placeholder="运单号" />
</el-form-item>
</el-col>
<el-col :span="24">
<div style="padding-left: 60px;font-size: 12px;"> T0123219321 有问题</div>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align:center">
@ -218,6 +217,8 @@ export default {
// 问题件表格数据
emisWaybillList: [],
notifySiteDataSource:[],
title: "",
open: false,
titleBatch:"",
@ -227,10 +228,9 @@ export default {
problemType:null,
openForm: false,
titleForm: "",
tempRecord:{},
titleEmisWaybillProblemInfo: "",
openEmisWaybillProblemInfo: false,
// 显示编辑框更多
moreInputVisible: false,
@ -286,13 +286,14 @@ export default {
this.multiple = !selection.length
},
onScanSiteSelect(item){
// debugger
if(!item){
this.form.modifyNotifySite = null;
this.form.modifyNotifySiteName = null;
this.form.notifySiteCode = null;
this.form.notifySiteName = null;
return;
}
this.form.notifySite=item && item.siteCode;
this.form.notifySiteName=item && item.siteName;
this.form.notifySiteCode=item.siteCode;
this.form.notifySiteName=item.siteName;
},
onproblemTypeSelect(item){
// debugger;
@ -345,22 +346,68 @@ export default {
this.$message.error("输入单号后回车");
return;
}
// if(this.form.notifySite==null || this.form.notifySite==''){
// this.$message.error("请选择通知网点");
// return;
// }
// this.getWaybill(this.form.billCode)
this.loading = true;
listEmisWaybill({billCode:this.form.billCode}).then(response => {
this.loading = false;
let scanDate = new Date();
if(response.code != 200){
this.$message.error(response.msg);
return;
}
let rows = response.rows;
if(!rows || rows.length == 0){
this.$message.error("未查到单号");
this.form.billCode=null;
return;
}
if(rows.length>0) {
let rsItem = rows[0];
console.log(rsItem);
this.tempRecord =Object.assign({}, rsItem)
// tempRecord.notifySite = tempRecord.sendSiteCode;
// tempRecord.notifySiteName = tempRecord.sendSiteName;
this.tempRecord.scanSiteCode=this.form.scanSiteCode;
this.tempRecord.scanSite=this.form.scanSite;
this.tempRecord.scanDate=scanDate;
this.tempRecord.scanMan=this.form.scanMan;
this.tempRecord.scanManCode=this.form.scanManCode;
this.tempRecord.dataFrom="PC";
this.notifySiteDataSource=[
{
siteCode:this.tempRecord.sendSiteCode,
siteName:this.tempRecord.sendSiteName,
},
{
siteCode:this.tempRecord.dispatchUnderlingSiteCode,
siteName:this.tempRecord.dispatchUnderlingSiteName,
}
]
// this.billInputDisabled = true;
// this.emisWaybillList.push(tempRecord);
// this.dataMap[this.form.billCode]=tempRecord;
}
// this.form.billCode=null;
})
},
handleRegister(){
// if(this.form.problemType==null || this.form.problemType==''){
// this.$message.error("请选择问题类型");
// return;
// }
this.tempRecord.notifySiteCode = this.form.notifySiteCode;
this.tempRecord.notifySiteName = this.form.notifySiteName;
this.tempRecord.problemType = this.form.problemType;
this.tempRecord.problemId = this.form.problemId;
this.tempRecord.remark = this.form.remark;
this.tempRecord.picUrl=this.form.picUrl;
this.emisWaybillList.push(this.tempRecord);
this.dataMap[this.form.billCode]=this.tempRecord;
// if(this.dataMap[this.form.billCode]){
// this.$message.error("重复登记");
// this.playNoticeTone(1);
// return;
// }
this.getWaybill(this.form.billCode)
//清理数据
this.form.notifySiteCode="";
this.form.notifySiteName="";
this.tempRecord=null;
this.form.billCode=null;
this.notifySiteDataSource=[];
console.log(this.emisWaybillList)
},
getWaybill(billCode){
this.loading = true;
@ -380,12 +427,13 @@ export default {
let rsItem = rows[index];
console.log(rsItem);
let record =Object.assign({}, rsItem)
record.notifySite = this.form.notifySite;
record.notifySiteName = this.form.notifySiteName;
record.notifySiteCode = recs;
record.notifySiteName = record.sendSiteName;
record.scanSiteCode=this.form.scanSiteCode;
record.scanSite=this.form.scanSite;
record.scanDate=scanDate;
record.problemType=this.form.problemType;
record.problemId=this.form.problemId;
record.scanMan=this.form.scanMan;
record.scanManCode=this.form.scanManCode;
record.picUrl=this.form.picUrl;
@ -399,48 +447,49 @@ export default {
},
handleUpload(){
let scanData=[];
let problemInfoList=[];
// let problemInfoList=[];
this.emisWaybillList.forEach(item=>{
// item.currentStatus="已上传";
if(this.ids.indexOf(item.id) > -1){
scanData.push(
{
billCode:item.billCode,
problemType:item.problemType,
notifySite:item.notifySite,
problemType:item.problemId,
notifySite:item.notifySiteCode,
picUrl:item.picUrl,
remark:item.remark,
scanWeight:item.scanWeight,
scanDate:item.scanDate
}
)
problemInfoList.push({
billCode: item.billCode,
problemType: item.problemType,
problemTitle: null,
problemCause: item.remark,
sendSite: item.sendSiteName,
sendSiteCode: item.sendSiteCode,
registerManCode: item.registerManCode,
registerManDept: null,
registerSiteCode: item.registerSiteCode,
registerDate: item.registerDate,
registerSaveDate: null,
dataFrom: item.dataFrom,
status: null,//item.waybillStatus,//？？？？？？？？是否正确
isSendSiteRegister: null,
// blReversion: false,//？？？？？？？？是否正确
blReversion: null,
reversionStr: null,
reversionMan: null,
reversionManCode: null,
reversionDate: null,
blCheckok: null,
blSee: null,
filePath: item.picUrl,
modifySiteCode: null,
delFlag: item.delFlag,//？？？？？？？？是否正确
remark: item.remark,//？？？？？？？？是否正确
})
// problemInfoList.push({
// billCode: item.billCode,
// problemType: item.problemType,
// problemTitle: null,
// problemCause: item.remark,
// sendSite: item.sendSiteName,
// sendSiteCode: item.sendSiteCode,
// registerManCode: item.registerManCode,
// registerManDept: null,
// registerSiteCode: item.registerSiteCode,
// registerDate: item.registerDate,
// registerSaveDate: null,
// dataFrom: item.dataFrom,
// status: null,//item.waybillStatus,//？？？？？？？？是否正确
// isSendSiteRegister: null,
// // blReversion: false,//？？？？？？？？是否正确
// blReversion: null,
// reversionStr: null,
// reversionMan: null,
// reversionManCode: null,
// reversionDate: null,
// blCheckok: null,
// blSee: null,
// filePath: item.picUrl,
// modifySiteCode: null,
// delFlag: item.delFlag,//？？？？？？？？是否正确
// remark: item.remark,//？？？？？？？？是否正确
// })
}
});
@ -450,6 +499,8 @@ export default {
scanData:scanData
};
let newList = [];
doScan(scanProblemInfo).then(response => {
let scanRstItem = response.data.scanResult[0];
console.log(scanRstItem);
@ -457,24 +508,29 @@ export default {
this.$modal.msgError(scanRstItem.message);
return;
}
this.emisWaybillList.forEach(item=>{
if(this.ids.indexOf(item.id) > -1){
item.currentStatus="已上传";
}
newList.push(item);
})
this.emisWaybillList = newList;
this.$modal.msgSuccess(scanRstItem.message);
});
problemInfoList.forEach(item => {
addEmisWaybillProblemInfo(item).then(response => {
// debugger;
if(response.code != "200"){
this.$modal.msgError(response.msg);
return;
}
this.$modal.msgSuccess(response.msg);
})
})
// problemInfoList.forEach(item => {
// addEmisWaybillProblemInfo(item).then(response => {
// // debugger;
// if(response.code != "200"){
// this.$modal.msgError(response.msg);
// return;
// }
// this.$modal.msgSuccess(response.msg);
// })
// })
},
/** 提交按钮 */
submitForm() {
let newList = [];
debugger
for(let i = 0; i< this.emisWaybillList.length;i++){
let waybill = {...this.emisWaybillList[i]};
if(this.ids.indexOf(waybill.id) > -1){

13
src/views/emis/emisWaybillProblemInfo/receivedProblemInquiries.vue
View File

@ -131,7 +131,11 @@
<el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
<el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
<el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" width="200">
<template slot-scope="scope">
<span class="ellipsis">{{scope.row.remark}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
</xd-table>
<el-divider class="divider"></el-divider>
@ -880,4 +884,11 @@ export default {
padding: 0 12px 0 0;
box-sizing: border-box;
}
.ellipsis {
width:200px;
overflow: hidden; /* 确保超出容器的内容被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
</style>

12
src/views/emis/emisWaybillProblemInfo/registrationProblemInquiry.vue
View File

@ -126,7 +126,11 @@
<el-table-column :label="$t('是否回复')" align="center" prop="blReversion" min-width="100" />
<el-table-column :label="$t('问题件路径')" align="center" prop="problemCause" min-width="100" />
<el-table-column :label="$t('问题件主题')" align="center" prop="problemTitle" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" width="200">
<template slot-scope="scope">
<span class="ellipsis">{{scope.row.remark}}</span>
</template>
</el-table-column>
<el-table-column :label="$t('数据产生来源')" align="center" prop="xxx" min-width="100" />
</xd-table>
<el-divider class="divider"></el-divider>
@ -830,4 +834,10 @@ export default {
padding: 0 12px 0 0;
box-sizing: border-box;
}
.ellipsis {
width:200px;
overflow: hidden; /* 确保超出容器的内容被裁剪 */
white-space: nowrap; /* 确保文本在一行内显示 */
text-overflow: ellipsis; /* 超出部分显示省略号 */
}
</style>

20
src/views/emis/emisWaybillTransfer/waybillTransfer.vue
View File

@ -50,7 +50,7 @@
</el-col>
<el-col :span="16">
<el-form-item label="转件时间" prop="dateTimeRange" label-width="80px">
<elDateAdvPicker clearable v-model="queryParams.dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
<elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
</el-form-item>
</el-col>
</el-col>
@ -156,11 +156,16 @@
<el-table-column :label="$t('目的城市')" align="center" prop="transferCity" min-width="100" />
<el-table-column :label="$t('物流公司联系人')" align="center" prop="linkMan" min-width="100" />
<el-table-column :label="$t('电话')" align="center" prop="linkPhone" min-width="100" />
<el-table-column :label="$t('签收状态')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('签收状态')" align="center" prop="xxxx" min-width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.waybillStatus=='50'" type="success">已签收</el-tag>
<el-tag v-else type="danger">未签收</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('转件重量')" align="center" prop="transferWeight" min-width="100" />
<el-table-column :label="$t('转件体积')" align="center" prop="transferVolume" min-width="100" />
<el-table-column :label="$t('转件网点')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('操作人')" align="center" prop="xxxx" min-width="100" />
<el-table-column :label="$t('转件网点')" align="center" prop="createSiteName" min-width="100" />
<el-table-column :label="$t('操作人')" align="center" prop="createByName" min-width="100" />
<el-table-column :label="$t('转件原因')" align="center" prop="transferResean" min-width="100" />
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
</xd-table>
@ -366,6 +371,13 @@ export default {
});
// this.getList();
},
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() {