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

调整备注

Browse Source
This commit is contained in:
wuteng 2025-06-24 17:58:43 +08:00
parent 1f52f0e485
commit 46be6eb2f2
5 changed files with 56 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/views/emis/emisWaybill/centerWaybillList.vue
View File

@ -1,6 +1,6 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<!-- label-width="100px" -->
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="6">
@ -558,9 +558,8 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
</span>
</template>
{{remarkFormat(scope.row)}}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
<el-table-column :label="$t('图片上传')" align="center" prop="blUploadPic" min-width="100" >
@ -913,6 +912,17 @@ export default {
}).join(',');
}
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
rowKey (row) {
return row.id;
},

19
src/views/emis/emisWaybill/dispatchWaybillList.vue
View File

@ -1,6 +1,6 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<!-- label-width="100px" -->
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="9">
@ -557,10 +557,8 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" >
<template slot-scope="scope">
{{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
</span>
</template>
{{ remarkFormat(scope.row) }}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
@ -892,6 +890,17 @@ export default {
}).join(',');
}
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
rowKey (row) {
return row.id;
},

22
src/views/emis/emisWaybill/sendWaybillList.vue
View File

@ -1,7 +1,7 @@
<template>
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<el-col :span="9">
@ -524,8 +524,7 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark)}}
</span>
{{ remarkFormat(scope.row) }}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
@ -540,12 +539,6 @@
<el-table-column :label="$t('目的港')" align="center" prop="destinationPortName" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('箱量')" align="center" prop="boxQuantity" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('贵司编号')" align="center" prop="companyCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('是否为虚拟单')" align="center" prop="blVirtual" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
<el-tag v-if="scope.row.blVirtual==1" type="success">是</el-tag>
<el-tag v-else type="danger">否</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('主单号')" align="center" prop="masterBillCode" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('主单对应的虚拟单')" align="center" prop="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
@ -932,6 +925,17 @@ export default {
}).join(',');
}
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
rowKey (row) {
return row.id;
},

17
src/views/emis/emisWaybill/sendWaybillListNew.vue
View File

@ -2,7 +2,7 @@
<XdPageContainer class="app-container">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="9" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<SearchForm slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm" size="mini" :maxShow="10" label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
<!-- :span="6" -->
@ -530,9 +530,7 @@
<el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true">
<template slot-scope="scope">
{{scope.row.remark }}{{ scope.row.remark && scope.row.remark.trim()!=='' && scope.row.virtualRemark && scope.row.virtualRemark.trim()!==''?',':'' }}<span v-if="scope.row.blVirtual==0 && scope.row.virtualRemark!=='' && scope.row.virtualRemark!== null ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(scope.row.virtualRemark) }}
</span>
{{ remarkFormat(scope.row) }}
</template>
</el-table-column>
<el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
@ -883,6 +881,17 @@ export default {
}).join(',');
}
},
//格式化录单备注显示
remarkFormat(row){
let remark=row.remark;
if(row.blVirtual==0 && row.virtualRemark!=='' && row.virtualRemark!== null&& row.transLineType ==='002'&& row.sendDate > '2025-06-23 20:00:00'){
if(remark && remark.trim()!==''){
remark=remark+','
}
remark=`${remark}该运单为主单，对应虚拟单为${this.conCatVirtualRemark(row.virtualRemark)}`;
}
return remark;
},
rowKey (row) {
return row.id;
},

4
src/views/emis/emisWaybill/waybillDetailReadOnly.vue
View File

@ -233,8 +233,8 @@
</el-row>
<el-descriptions title="" size="small" :column="1" style="margin-top:10px;margin-bottom: 30px;">
<el-descriptions-item label="运单备注" :span="4">
{{form.remark }} {{ form.remark && form.remark.trim()!=='' && form.virtualRemark && form.virtualRemark.trim()!==''?',':'' }}
<span v-if="form.blVirtual==0 && form.virtualRemark!== null && form.virtualRemark!=='' ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(form.virtualRemark) }}
{{form.remark }} {{ form.remark && form.remark.trim()!=='' && form.virtualRemark && form.virtualRemark.trim()!=='' && form.transLine==='002' && form.sendDate > '2025-06-23 20:00:00'?',':'' }}
<span v-if="form.blVirtual==0 && form.virtualRemark!== null && form.virtualRemark!=='' && form.transLine==='002' && form.sendDate > '2025-06-23 20:00:00' ">该运单为主单，对应虚拟单为{{ conCatVirtualRemark(form.virtualRemark) }}
</span>
</el-descriptions-item>
</el-descriptions>