diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index e111598..45e9c05 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -16,8 +16,8 @@ :error="hasError(-1, index, col.headerSelectKey)" @update:error="onErrorUpdate(-1, index, col.headerSelectKey, $event)" /> - ({{ - headerSelectFields[col.headerSelectKey] }}) +
({{ + headerSelectFields[col.headerSelectKey] }})
@@ -940,11 +940,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; diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue index a3f367a..8a9f714 100644 --- a/src/views/business/comps/template/comps/sp/SP003.vue +++ b/src/views/business/comps/template/comps/sp/SP003.vue @@ -275,7 +275,7 @@ export default { bodySubType: "span", bodySubKey: "subTargetSolutionCode", bodyFillType: "preFill", - width: 280, + width: 180, myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段 maxVolumeField: "actSolutionVolume",//分装的最大量字段 maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段 @@ -285,7 +285,7 @@ export default { { label: "template.sp.sp003.qsrybh", prop: "startSolutionCode", - width: 280, + width: 180, bodyType: "input", bodyFillType: "actFill", bodyMaxlength: 10, @@ -293,7 +293,7 @@ export default { { label: "template.sp.sp003.ysqsrytj", prop: "targetStartSolutionVolume", - width: 280, + width: 180, headerSelectKey: "targetStartSolutionVolumeUnit", fillType: "preFill", headerOptions: this.getDictOptions('business_tjdw'), @@ -311,7 +311,7 @@ export default { { label: "template.sp.sp003.sjqsrytj", prop: "actStartSolutionVolume", - width: 280, + width: 180, headerSelectKey: "actStartSolutionVolumeUnit", fillType: "preFill", headerOptions: this.getDictOptions('business_tjdw'), @@ -324,7 +324,7 @@ export default { { label: "template.sp.sp003.ysxsytj", prop: "targetDiluentVolume", - width: 280, + width: 180, headerSelectKey: "targetDiluentVolumeUnit", fillType: "preFill", headerOptions: this.getDictOptions('business_tjdw'), @@ -342,7 +342,7 @@ export default { { label: "template.sp.sp003.sjxsytj", prop: "actDiluentVolume", - width: 280, + width: 180, headerSelectKey: "actDiluentVolumeUnit", fillType: "preFill", headerOptions: this.getDictOptions('business_tjdw'), @@ -355,7 +355,7 @@ export default { { label: "template.sp.sp003.ysmbrynd", prop: "targetSolutionConcentration", - width: 280, + width: 180, headerSelectKey: "targetSolutionConcentrationUnit", fillType: "preFill", headerOptions: this.getDictOptions('business_nddw'), @@ -366,7 +366,7 @@ export default { { label: "template.sp.sp003.sjmbrynd", prop: "actSolutionConcentration", - width: 280, + width: 180, headerSelectKey: "actSolutionConcentrationUnit", fillType: "preFill", headerOptions: this.getDictOptions('business_nddw'), @@ -384,7 +384,7 @@ export default { { label: "template.sp.sp003.ysmbrytj", prop: "targetSolutionVolume", - width: 280, + width: 180, headerSelectKey: "targetSolutionVolumeUnit", fillType: "preFill", headerOptions: this.getDictOptions('business_tjdw'), @@ -395,7 +395,7 @@ export default { { label: "template.sp.sp003.sjmbrytj", prop: "actSolutionVolume", - width: 280, + width: 180, headerSelectKey: "actSolutionVolumeUnit", fillType: "preFill", headerOptions: this.getDictOptions('business_tjdw'), diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue index 173ea9f..f0d9381 100644 --- a/src/views/business/comps/template/comps/sp/SP00456.vue +++ b/src/views/business/comps/template/comps/sp/SP00456.vue @@ -687,9 +687,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() { diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js index 93520fb..5d60402 100644 --- a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js +++ b/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, diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue index e2b3176..5918421 100644 --- a/src/views/business/study/comp/tbbd/Xq.vue +++ b/src/views/business/study/comp/tbbd/Xq.vue @@ -26,38 +26,47 @@ {{ $t('page.business.study.studyFormFill.dcbhsjgj') }}
-
-
- -
-
-
{{ $t('page.business.study.studyFormFill.qmxx') }}
-
-
- - - - - - -
-
- -
-
-
-
{{ $t('page.business.study.studyFormFill.jcgj') }}
-
- - - -
+
+ +
+
+ +
+
+
{{ $t('page.business.study.studyFormFill.qmxx') }}
+
+ +
+
+
{{ $t('page.business.study.studyFormFill.jcgj') }}
+
+ +
+
+
@@ -96,7 +105,7 @@ - @@ -115,9 +124,10 @@ import { studyFormFill_tb, studyFormFill_info, studyFormFill_jcgj, studyFormFill import { mapGetters } from 'vuex' import JcgjList from "@/views/business/comps/common/JcgjList"; import TemplateTable from '@/views/business/comps/template/TemplateTable'; +import VueHtml2pdf from 'vue-html2pdf' export default { name: "Xq", - components: { JcgjList, TemplateTable }, + components: { JcgjList, TemplateTable, VueHtml2pdf }, data() { return { openApprove: false, @@ -164,7 +174,8 @@ export default { pageNum: 1, formId: null, pageSize: 9999, - } + }, + showExport: false, } }, computed: { @@ -175,29 +186,27 @@ export default { created() { }, methods: { + onProgress(progress) { + console.log(`生成进度: ${progress}%`) + if (progress == 100) { + this.$modal.closeLoading() + } + }, exportExcel(jcgjlx) { this.$modal.loading() + this.showExport = true + setTimeout(() => { + this.$refs.html2Pdf.generatePdf() + }, 200); + }, + exportExcel_bak(jcgjlx) { + this.$modal.loading() studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx, lang: this.$store.getters.language.split("_")[0] })).then(response => { window.open(process.env.VUE_APP_FILE_DOMAIN + response.msg) }).finally(() => { this.$modal.closeLoading() }) }, - dcqbjcgj() { - this.$refs.html2Pdf.generatePdf() - }, - dclcjcgj() { - this.$refs.html2Pdf.generatePdf() - }, - dcbjjcgj() { - this.$refs.html2Pdf.generatePdf() - }, - dcxgjcgj() { - this.$refs.html2Pdf.generatePdf() - }, - dcbhsjgj() { - this.$refs.html2Pdf.generatePdf() - }, getJjcgjList(val) { this.$modal.loading() studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => { @@ -265,3 +274,32 @@ export default { } } + \ No newline at end of file