fix：[模板管理]导出

src/components/Template/CustomTable.vue

@@ -16,8 +16,8 @@
 									:error="hasError(-1, index, col.headerSelectKey)"
 									@update:error="onErrorUpdate(-1, index, col.headerSelectKey, $event)" />
 							</template>
-							<span v-else-if="headerSelectFields[col.headerSelectKey]" class="fill-type-icon">({{
-								headerSelectFields[col.headerSelectKey] }})</span>
+							<div v-else-if="headerSelectFields[col.headerSelectKey]" class="fill-type-icon">({{
+								headerSelectFields[col.headerSelectKey] }})</div>
 
 						</div>
 
@@ -929,11 +929,15 @@ export default {
 }
 
 .header-cell {
-	font-weight: bold;
 	color: #909399;
 	background-color: #f5f7fa;
+	font-size: 12px;
+	 word-break: break-word;
+  white-space: normal;
 }
 
+
+
 .body-cell {
 	color: #606266;
 	background-color: #fff;

src/views/business/comps/template/comps/sp/SP003.vue

@@ -273,7 +273,7 @@ export default {
 					bodySubType: "span",
 					bodySubKey: "subTargetSolutionCode",
 					bodyFillType: "preFill",
-					width: 280,
+					width: 180,
 					myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
 					maxVolumeField: "actSolutionVolume",//分装的最大量字段
 					maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
@@ -283,7 +283,7 @@ export default {
 				{
 					label: "template.sp.sp003.qsrybh",
 					prop: "startSolutionCode",
-					width: 280,
+					width: 180,
 					bodyType: "input",
 					bodyFillType: "actFill",
 					bodyMaxlength: 10,
@@ -291,7 +291,7 @@ export default {
 				{
 					label: "template.sp.sp003.ysqsrytj",
 					prop: "targetStartSolutionVolume",
-					width: 280,
+					width: 180,
 					headerSelectKey: "targetStartSolutionVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_tjdw'),
@@ -309,7 +309,7 @@ export default {
 				{
 					label: "template.sp.sp003.sjqsrytj",
 					prop: "actStartSolutionVolume",
-					width: 280,
+					width: 180,
 					headerSelectKey: "actStartSolutionVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_tjdw'),
@@ -322,7 +322,7 @@ export default {
 				{
 					label: "template.sp.sp003.ysxsytj",
 					prop: "targetDiluentVolume",
-					width: 280,
+					width: 180,
 					headerSelectKey: "targetDiluentVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_tjdw'),
@@ -340,7 +340,7 @@ export default {
 				{
 					label: "template.sp.sp003.sjxsytj",
 					prop: "actDiluentVolume",
-					width: 280,
+					width: 180,
 					headerSelectKey: "actDiluentVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_tjdw'),
@@ -353,7 +353,7 @@ export default {
 				{
 					label: "template.sp.sp003.ysmbrynd",
 					prop: "targetSolutionConcentration",
-					width: 280,
+					width: 180,
 					headerSelectKey: "targetSolutionConcentrationUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_nddw'),
@@ -364,7 +364,7 @@ export default {
 				{
 					label: "template.sp.sp003.sjmbrynd",
 					prop: "actSolutionConcentration",
-					width: 280,
+					width: 180,
 					headerSelectKey: "actSolutionConcentrationUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_nddw'),
@@ -382,7 +382,7 @@ export default {
 				{
 					label: "template.sp.sp003.ysmbrytj",
 					prop: "targetSolutionVolume",
-					width: 280,
+					width: 180,
 					headerSelectKey: "targetSolutionVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_tjdw'),
@@ -393,7 +393,7 @@ export default {
 				{
 					label: "template.sp.sp003.sjmbrytj",
 					prop: "actSolutionVolume",
-					width: 280,
+					width: 180,
 					headerSelectKey: "actSolutionVolumeUnit",
 					fillType: "preFill",
 					headerOptions: this.getDictOptions('business_tjdw'),

src/views/business/comps/template/comps/sp/SP00456.vue

@@ -683,9 +683,11 @@ export default {
 				}
 			}
             //使用的试剂、仪器
-			const stepResource = this.$refs.stepRef.getStepResource()
-			this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
-			this.yqResourceTmp = stepResource.yqResource||[]
+			// const stepResource = this.$refs.stepRef.getStepResource()
+			// this.resourceTmp =uniqeResource(tmpResource,stepResource.sjResource||[])
+			// this.yqResourceTmp = stepResource.yqResource||[]
+
+			this.resourceTmp=tmpResource
 			return content;
 		},
 		async onSave() {

src/views/business/comps/template/formConfig/paralleAndLadderConfig.js

@@ -8,7 +8,7 @@ export const getLadderColumnsConfig = ($this) => {
       bodySubType: 'span',
       bodySubKey: 'subTargetSolutionCode',
       bodyFillType: 'preFill',
-      width: 280,
+      width: 180,
       myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
       maxVolumeField: "actSolutionVolume",//分装的最大量字段
       maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
@@ -16,7 +16,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.qsrybh',
       prop: 'startSolutionCode',
-      width: 280,
+      width: 180,
       bodyType: 'input',
       bodyFillType: 'actFill',
       bodyMaxlength: 10
@@ -24,7 +24,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.ysqsrytj',
       prop: 'targetStartSolutionVolume',
-      width: 280,
+      width: 180,
       headerSelectKey: 'targetStartSolutionVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
@@ -42,7 +42,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.sjqsrytj',
       prop: 'actStartSolutionVolume',
-      width: 280,
+      width: 180,
       headerSelectKey: 'actStartSolutionVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
@@ -55,7 +55,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.ysxsytj',
       prop: 'targetDiluentVolume',
-      width: 280,
+      width: 180,
       headerSelectKey: 'targetDiluentVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
@@ -74,7 +74,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.sjxsytj',
       prop: 'actDiluentVolume',
-      width: 280,
+      width: 180,
       headerSelectKey: 'actDiluentVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
@@ -87,7 +87,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.ysmbrynd',
       prop: 'targetSolutionConcentration',
-      width: 280,
+      width: 180,
       headerSelectKey: 'targetSolutionConcentrationUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_nddw'),
@@ -98,7 +98,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.sjmbrynd',
       prop: 'actSolutionConcentration',
-      width: 280,
+      width: 180,
       headerSelectKey: 'actSolutionConcentrationUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_nddw'),
@@ -118,7 +118,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.ysmbrytj',
       prop: 'targetSolutionVolume',
-      width: 280,
+      width: 180,
       headerSelectKey: 'targetSolutionVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
@@ -129,7 +129,7 @@ export const getLadderColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.sjmbrytj',
       prop: 'actSolutionVolume',
-      width: 280,
+      width: 180,
       headerSelectKey: 'actSolutionVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
@@ -169,12 +169,12 @@ export const getParallelColumnsConfig = ($this) => {
       myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
       maxVolumeField: "actSolutionVolume",//分装的最大量字段
       maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
-      width: 280
+      width: 120
     },
     {
       label: 'template.sp.sp00456.ysmbrynd',
       prop: 'targetSolutionConcentration',
-      width: 280,
+      width: 180,
       headerSelectKey: 'targetSolutionConcentrationUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_nddw'),
@@ -185,7 +185,7 @@ export const getParallelColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.sjmbrynd',
       prop: 'actSolutionConcentration',
-      width: 280,
+      width: 180,
       headerSelectKey: 'actSolutionConcentrationUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_nddw'),
@@ -204,7 +204,7 @@ export const getParallelColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.ysmbrytj',
       prop: 'targetSolutionVolume',
-      width: 280,
+      width: 180,
       headerSelectKey: 'targetSolutionVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
@@ -215,7 +215,7 @@ export const getParallelColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.sjmbrytj',
       prop: 'actSolutionVolume',
-      width: 280,
+      width: 180,
       headerSelectKey: 'actSolutionVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
@@ -234,7 +234,7 @@ export const getParallelColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.mbryyxzq',
       prop: 'targetSolutionCycle',
-      width: 280,
+      width: 180,
       fillType: 'preFill',
       bodyType: 'inputNumber',
       bodySubType: 'select',
@@ -248,20 +248,20 @@ export const getParallelColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.mbrysxr',
       prop: 'targetSolutionExpirationDate',
-      width: 180,
+      width: 160,
       bodyType: 'span'
     },
     {
       label: 'template.sp.sp00456.ysysrybh',
       prop: 'startSolutionCode',
-      width: 280,
+      width: 160,
       bodyType: 'input',
       bodyFillType: 'preFill'
     },
     {
       label: 'template.sp.sp00456.sjysrybh',
       prop: 'actStartSolutionCode',
-      width: 280,
+      width: 250,
       bodyType: 'clickable',
       bodyFillType: 'actFill',
       compareTo: 'startSolutionCode', //比较哪个字段
@@ -269,7 +269,7 @@ export const getParallelColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.ysysrynd',
       prop: 'targetStartSolutionConcentration',
-      width: 280,
+      width: 160,
       bodyType: 'inputNumber',
       bodyFillType: 'preFill',
       bodySubType: 'select',
@@ -282,7 +282,7 @@ export const getParallelColumnsConfig = ($this) => {
     {
       label: 'template.sp.sp00456.sjysrynd',
       prop: 'targetAcSolution',
-      width: 280,
+      width: 160,
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyDisabled: true,
@@ -294,7 +294,7 @@ export const getParallelColumnsConfig = ($this) => {
       headerSelectKey: 'targetStartSolutionVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
-      width: 280,
+      width: 160,
       bodyType: 'inputNumber',
       bodyFillType: 'preFill',
       bodySubType: 'inputNumber',
@@ -315,7 +315,7 @@ export const getParallelColumnsConfig = ($this) => {
       headerSelectKey: 'actStartSolutionVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
-      width: 280,
+      width: 160,
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,
@@ -329,7 +329,7 @@ export const getParallelColumnsConfig = ($this) => {
       headerSelectKey: 'preDiluentVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
-      width: 280,
+      width: 160,
       bodyType: 'inputNumber',
       bodyFillType: 'preFill',
       bodySubType: 'inputNumber',
@@ -347,7 +347,7 @@ export const getParallelColumnsConfig = ($this) => {
       headerSelectKey: 'actDiluentVolumeUnit',
       fillType: 'preFill',
       headerOptions: $this.getDictOptions('business_tjdw'),
-      width: 280,
+      width: 160,
       bodyType: 'inputNumber',
       bodyFillType: 'actFill',
       bodyMaxlength: 10,

src/views/business/study/comp/tbbd/Xq.vue

@@ -29,7 +29,7 @@
       </el-button>
       <div class="edit-content ">
         <div class="content" style="width: 100%; height: 100%;">
-          <vue-html2pdf :show-layout="false" pdf-content-width="100%" :pdf-quality="3" :float-layout="false"
+          <vue-html2pdf :show-layout="false" pdf-content-width="100%" :pdf-format="'a1'" :pdf-quality="3" :float-layout="false"
             pdf-orientation="landscape" :paginate-elements-by-height="794" :enable-download="true" :preview-modal="true"
             ref="html2Pdf" @hasStartedGeneration="hasStarted" @hasGenerated="hasGenerated">
             <section slot="pdf-content">