Browse Source

fix:[模板管理]导出新增showWidth

lkf
15881625488@163.com 2 months ago
parent
commit
d05cb086e1
3 changed files with 12 additions and 4 deletions
  1. +3
    -3
      src/components/Template/CustomTable.vue
  2. +8
    -0
      src/views/business/comps/template/comps/sp/SP003.vue
  3. +1
    -1
      src/views/business/study/comp/tbbd/Xq.vue

+ 3
- 3
src/components/Template/CustomTable.vue View File

@ -4,7 +4,7 @@
<div class="custom-table-header"> <div class="custom-table-header">
<div class="custom-table-row"> <div class="custom-table-row">
<div v-for="(col, index) in columns" :key="index" class="custom-table-cell header-cell" <div v-for="(col, index) in columns" :key="index" class="custom-table-cell header-cell"
:style="{ width: col.width ? col.width + 'px' : 'auto' }">
:style="{ width: (templateFillType !== 'actFill'&&col.showWidth)?col.showWidth + 'px' :(col.width ? col.width + 'px' : 'auto') }">
<div class="header-cell-content"> <div class="header-cell-content">
<div>{{ $t(col.label) }}</div> <div>{{ $t(col.label) }}</div>
<template <template
@ -16,7 +16,7 @@
:error="hasError(-1, index, col.headerSelectKey)" :error="hasError(-1, index, col.headerSelectKey)"
@update:error="onErrorUpdate(-1, index, col.headerSelectKey, $event)" /> @update:error="onErrorUpdate(-1, index, col.headerSelectKey, $event)" />
</template> </template>
<div v-else-if="headerSelectFields[col.headerSelectKey]" class="fill-type-icon">({{
<div v-else-if="headerSelectFields[col.headerSelectKey]" class="fill-type-icon" :style="{ width: (templateFillType !== 'actFill')? '60px' : 'auto' }">({{
headerSelectFields[col.headerSelectKey] }})</div> headerSelectFields[col.headerSelectKey] }})</div>
</div> </div>
@ -34,7 +34,7 @@
<div class="custom-table-body"> <div class="custom-table-body">
<div v-for="(row, rowIndex) in localDataSource" :key="rowIndex" class="custometable-row"> <div v-for="(row, rowIndex) in localDataSource" :key="rowIndex" class="custometable-row">
<div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell body-cell" <div v-for="(col, colIndex) in columns" :key="colIndex" class="custom-table-cell body-cell"
:style="{ width: col.width ? col.width + 'px' : 'auto' }">
:style="{ width: (templateFillType !== 'actFill'&&col.showWidth)?col.showWidth + 'px' :(col.width ? col.width + 'px' : 'auto') }">
<div class="inner-table-cell"> <div class="inner-table-cell">
<div class="flex1"> <div class="flex1">
<template v-if="col.bodyType === 'input'"> <template v-if="col.bodyType === 'input'">

+ 8
- 0
src/views/business/comps/template/comps/sp/SP003.vue View File

@ -285,6 +285,7 @@ export default {
label: "template.sp.sp003.ysqsrytj", label: "template.sp.sp003.ysqsrytj",
prop: "targetStartSolutionVolume", prop: "targetStartSolutionVolume",
width: 180, width: 180,
showWidth: 90,
headerSelectKey: "targetStartSolutionVolumeUnit", headerSelectKey: "targetStartSolutionVolumeUnit",
fillType: "preFill", fillType: "preFill",
headerOptions: this.getDictOptions('business_tjdw'), headerOptions: this.getDictOptions('business_tjdw'),
@ -303,6 +304,7 @@ export default {
label: "template.sp.sp003.sjqsrytj", label: "template.sp.sp003.sjqsrytj",
prop: "actStartSolutionVolume", prop: "actStartSolutionVolume",
width: 180, width: 180,
showWidth: 90,
headerSelectKey: "actStartSolutionVolumeUnit", headerSelectKey: "actStartSolutionVolumeUnit",
fillType: "preFill", fillType: "preFill",
headerOptions: this.getDictOptions('business_tjdw'), headerOptions: this.getDictOptions('business_tjdw'),
@ -316,6 +318,7 @@ export default {
label: "template.sp.sp003.ysxsytj", label: "template.sp.sp003.ysxsytj",
prop: "targetDiluentVolume", prop: "targetDiluentVolume",
width: 180, width: 180,
showWidth: 90,
headerSelectKey: "targetDiluentVolumeUnit", headerSelectKey: "targetDiluentVolumeUnit",
fillType: "preFill", fillType: "preFill",
headerOptions: this.getDictOptions('business_tjdw'), headerOptions: this.getDictOptions('business_tjdw'),
@ -334,6 +337,7 @@ export default {
label: "template.sp.sp003.sjxsytj", label: "template.sp.sp003.sjxsytj",
prop: "actDiluentVolume", prop: "actDiluentVolume",
width: 180, width: 180,
showWidth: 90,
headerSelectKey: "actDiluentVolumeUnit", headerSelectKey: "actDiluentVolumeUnit",
fillType: "preFill", fillType: "preFill",
headerOptions: this.getDictOptions('business_tjdw'), headerOptions: this.getDictOptions('business_tjdw'),
@ -347,6 +351,7 @@ export default {
label: "template.sp.sp003.ysmbrynd", label: "template.sp.sp003.ysmbrynd",
prop: "targetSolutionConcentration", prop: "targetSolutionConcentration",
width: 180, width: 180,
showWidth: 100,
headerSelectKey: "targetSolutionConcentrationUnit", headerSelectKey: "targetSolutionConcentrationUnit",
fillType: "preFill", fillType: "preFill",
headerOptions: this.getDictOptions('business_nddw'), headerOptions: this.getDictOptions('business_nddw'),
@ -358,6 +363,7 @@ export default {
label: "template.sp.sp003.sjmbrynd", label: "template.sp.sp003.sjmbrynd",
prop: "actSolutionConcentration", prop: "actSolutionConcentration",
width: 190, width: 190,
showWidth: 100,
headerSelectKey: "actSolutionConcentrationUnit", headerSelectKey: "actSolutionConcentrationUnit",
fillType: "preFill", fillType: "preFill",
headerOptions: this.getDictOptions('business_nddw'), headerOptions: this.getDictOptions('business_nddw'),
@ -377,6 +383,7 @@ export default {
label: "template.sp.sp003.ysmbrytj", label: "template.sp.sp003.ysmbrytj",
prop: "targetSolutionVolume", prop: "targetSolutionVolume",
width: 180, width: 180,
showWidth: 100,
headerSelectKey: "targetSolutionVolumeUnit", headerSelectKey: "targetSolutionVolumeUnit",
fillType: "preFill", fillType: "preFill",
headerOptions: this.getDictOptions('business_tjdw'), headerOptions: this.getDictOptions('business_tjdw'),
@ -388,6 +395,7 @@ export default {
label: "template.sp.sp003.sjmbrytj", label: "template.sp.sp003.sjmbrytj",
prop: "actSolutionVolume", prop: "actSolutionVolume",
width: 180, width: 180,
showWidth: 100,
headerSelectKey: "actSolutionVolumeUnit", headerSelectKey: "actSolutionVolumeUnit",
fillType: "preFill", fillType: "preFill",
headerOptions: this.getDictOptions('business_tjdw'), headerOptions: this.getDictOptions('business_tjdw'),

+ 1
- 1
src/views/business/study/comp/tbbd/Xq.vue View File

@ -441,7 +441,7 @@ export default {
.pdf-content { .pdf-content {
padding: 20px;
padding: 0px;
font-family: Arial, sans-serif; font-family: Arial, sans-serif;

Loading…
Cancel
Save