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-20 17:45:39 +08:00
parent 1997180f10
commit c82402fd56
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" 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"> <template slot-scope="scope">
{{scope.row.remark }}<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 ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>

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

@ -557,7 +557,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="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" 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"> <template slot-scope="scope">
{{scope.row.remark }}<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 ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>

2
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="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" 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"> <template slot-scope="scope">
{{scope.row.remark }}<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 ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>

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

@ -530,7 +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="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('录单备注')" align="center" prop="remark" 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"> <template slot-scope="scope">
{{scope.row.remark }}<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 ">该运单为主单，对应虚拟单为{{ scope.row.virtualRemark }}
</span> </span>
</template> </template>
</el-table-column> </el-table-column>

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

@ -231,7 +231,11 @@
</el-col> </el-col>
</el-row> </el-row>
<el-descriptions title="" size="small" :column="1" style="margin-top:10px;margin-bottom: 30px;"> <el-descriptions title="" size="small" :column="1" style="margin-top:10px;margin-bottom: 30px;">
<el-descriptions-item label="运单备注" :span="4">{{ form.remark }}</el-descriptions-item> <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!=='' ">该运单为主单，对应虚拟单为{{ form.virtualRemark }}
</span>
</el-descriptions-item>
</el-descriptions> </el-descriptions>
</div> </div>