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

备注调整展示后6位

Browse Source
This commit is contained in:
wuteng 2025-06-23 18:21:54 +08:00
parent e84279ffd7
commit 486d0d28d8
4 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -558,7 +558,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 ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
{{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>
</el-table-column>
@ -581,7 +581,7 @@
</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="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
</XdTable>
@ -905,6 +905,14 @@ export default {
this.dateTimeRange=[start,end];
},
methods: {
//拼接虚拟单后6位
conCatVirtualRemark(virtualRemark) {
if (virtualRemark != null) {
return virtualRemark.split(',').map((item) => {
return item.substring(item.length - 6);
}).join(',');
}
},
rowKey (row) {
return row.id;
},

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

@ -557,7 +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 ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
{{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>
</el-table-column>
@ -581,7 +582,7 @@
</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="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
</XdTable>
@ -884,6 +885,13 @@ export default {
},
methods: {
conCatVirtualRemark(virtualRemark) {
if (virtualRemark != null) {
return virtualRemark.split(',').map((item) => {
return item.substring(item.length - 6);
}).join(',');
}
},
rowKey (row) {
return row.id;
},

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

@ -524,7 +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 ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
{{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>
</el-table-column>
@ -547,7 +547,7 @@
</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="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
</XdTable>
@ -924,6 +924,14 @@ export default {
},
methods: {
//拼接虚拟单后6位
conCatVirtualRemark(virtualRemark) {
if (virtualRemark != null) {
return virtualRemark.split(',').map((item) => {
return item.substring(item.length - 6);
}).join(',');
}
},
rowKey (row) {
return row.id;
},

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

@ -530,7 +530,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 ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
{{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>
</el-table-column>
@ -553,7 +554,7 @@
</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="virtualRemark" min-width="80" :show-overflow-tooltip="true"/>
<el-table-column :label="$t('始发网点')" align="center" prop="startSiteName" min-width="80" :show-overflow-tooltip="true"/>
</XdTable>
@ -875,6 +876,13 @@ export default {
},
methods: {
conCatVirtualRemark(virtualRemark) {
if (virtualRemark != null) {
return virtualRemark.split(',').map((item) => {
return item.substring(item.length - 6);
}).join(',');
}
},
rowKey (row) {
return row.id;
},