From c710e5dea3a32ab9391874b40653caf33de143c8 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Sun, 1 Feb 2026 21:50:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][?=
=?UTF-8?q?=E7=83=A6=E4=BA=BA=E7=9A=84=E6=8F=90=E4=BA=A4=E8=AE=B0=E5=BD=95?=
=?UTF-8?q?]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Template/Step.vue | 3 +-
src/components/Template/StepComponents/ry/cs.vue | 6 +-
src/components/Template/StepComponents/ry/jd.vue | 2 +
.../Template/StepComponents/ry/tpjysd.vue | 422 ++++++++++-----------
src/components/Template/StepFormPackage.vue | 4 +-
.../business/comps/select/SelectTemplateDialog.vue | 1 -
.../business/comps/template/comps/sp/SP001.vue | 2 +-
.../business/comps/template/comps/sp/SP003.vue | 3 +-
.../business/comps/template/comps/sp/SP00456.vue | 4 +-
.../template/formConfig/paralleAndLadderConfig.js | 54 +--
10 files changed, 249 insertions(+), 252 deletions(-)
diff --git a/src/components/Template/Step.vue b/src/components/Template/Step.vue
index f92ad1d..0951317 100644
--- a/src/components/Template/Step.vue
+++ b/src/components/Template/Step.vue
@@ -15,7 +15,7 @@
-
diff --git a/src/components/Template/StepComponents/ry/cs.vue b/src/components/Template/StepComponents/ry/cs.vue
index 2628aac..55e7884 100644
--- a/src/components/Template/StepComponents/ry/cs.vue
+++ b/src/components/Template/StepComponents/ry/cs.vue
@@ -53,7 +53,7 @@ export default {
},
yjscdw: {
type: "select",
- options: this.getDictOptions("business_tjdw"),
+ options: this.getDictOptions("business_yqscdw"),
selectTo: "sjscdw",
fillType: "preFill",
},
@@ -63,13 +63,13 @@ export default {
},
sjsc: {
type: "inputNumber",
- fillType: "preFill",
+ fillType: "actFill",
compareTo: "yjsc",
copyFrom: "yjsc",
},
sjscdw: {
type: "select",
- options: this.getDictOptions("business_tjdw"),
+ options: this.getDictOptions("business_yqscdw"),
fillType: "preFill",
},
text6: {
diff --git a/src/components/Template/StepComponents/ry/jd.vue b/src/components/Template/StepComponents/ry/jd.vue
index 1790ea6..fe2fa17 100644
--- a/src/components/Template/StepComponents/ry/jd.vue
+++ b/src/components/Template/StepComponents/ry/jd.vue
@@ -75,12 +75,14 @@ export default {
options: this.getDictOptions("business_wddw"),
fillType: "actFill",
otherCode: "sjwdOther",
+ compareTo: "yjwd",
},
sjhj: {
type: "select",
options: this.getDictOptions("business_hjxx"),
fillType: "actFill",
otherCode: "sjhjOther",
+ compareTo: "yjhj",
},
text6: {
label: ",放置",
diff --git a/src/components/Template/StepComponents/ry/tpjysd.vue b/src/components/Template/StepComponents/ry/tpjysd.vue
index d63b78b..ca0a308 100644
--- a/src/components/Template/StepComponents/ry/tpjysd.vue
+++ b/src/components/Template/StepComponents/ry/tpjysd.vue
@@ -1,230 +1,226 @@
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/components/Template/StepFormPackage.vue b/src/components/Template/StepFormPackage.vue
index 4b2690e..b1a6dc1 100644
--- a/src/components/Template/StepFormPackage.vue
+++ b/src/components/Template/StepFormPackage.vue
@@ -154,9 +154,9 @@ export default {
const {buttonName = ""} = e;
const {config} = item;
if(buttonName === '开始' && config.hasOwnProperty("startDate")){
- this.formFields["startDate"] = moment().format('YYYY-MM-DD HH:mm:ss');
+ this.updateFormData("startDate",moment().format('YYYY-MM-DD HH:mm:ss'))
}else if(buttonName === '结束' && config.hasOwnProperty("endDate")){
- this.formFields["endDate"] = moment().format('YYYY-MM-DD HH:mm:ss');
+ this.updateFormData("endDate",moment().format('YYYY-MM-DD HH:mm:ss'))
}
this.$emit("clickButton",e,item)
},
diff --git a/src/views/business/comps/select/SelectTemplateDialog.vue b/src/views/business/comps/select/SelectTemplateDialog.vue
index a7daae9..751aceb 100644
--- a/src/views/business/comps/select/SelectTemplateDialog.vue
+++ b/src/views/business/comps/select/SelectTemplateDialog.vue
@@ -105,7 +105,6 @@ export default {
handleSelect() {
let that = this
let _index = _.findIndex(this.list, function (item) { return item.id == that.selectedId })
- debugger
this.$emit('callback', this.list[_index]);
this.open = false
}
diff --git a/src/views/business/comps/template/comps/sp/SP001.vue b/src/views/business/comps/template/comps/sp/SP001.vue
index c693abe..ec1d762 100644
--- a/src/views/business/comps/template/comps/sp/SP001.vue
+++ b/src/views/business/comps/template/comps/sp/SP001.vue
@@ -27,7 +27,7 @@
-
+
diff --git a/src/views/business/comps/template/comps/sp/SP003.vue b/src/views/business/comps/template/comps/sp/SP003.vue
index 8a9f714..3a3bb70 100644
--- a/src/views/business/comps/template/comps/sp/SP003.vue
+++ b/src/views/business/comps/template/comps/sp/SP003.vue
@@ -380,6 +380,7 @@ export default {
bodyPrecisionKey: "actSolutionConcentrationPrecision",
bodyMaxlength: 10,
bodySubPlaceholder: "请输入保留小数位数",
+ compareTo: "targetSolutionConcentration",//与哪个字段比较
},
{
label: "template.sp.sp003.ysmbrytj",
@@ -409,6 +410,7 @@ export default {
bodyPrecisionKey: "actSolutionVolumePrecision",
bodyMaxlength: 10,
bodySubPlaceholder: "请输入保留小数位数",
+ compareTo: "targetSolutionVolume",//与哪个字段比较
},
]
},
@@ -564,7 +566,6 @@ export default {
let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
//生成resource
let tmpResource = []
- debugger
if (this.fillType === "actFill") {
//生成
let tableList = content.stepTableFormData
diff --git a/src/views/business/comps/template/comps/sp/SP00456.vue b/src/views/business/comps/template/comps/sp/SP00456.vue
index f0d9381..7713992 100644
--- a/src/views/business/comps/template/comps/sp/SP00456.vue
+++ b/src/views/business/comps/template/comps/sp/SP00456.vue
@@ -32,7 +32,7 @@
@resetRecord="(e) => resetRecord('ladder', ladderIndex, e)"
@onSureModifyRecord="(e) => onSureModifyRecord('ladder', ladderIndex, e)"
:ref="`ladderStepFormPackageRef_${ladderIndex}`" :formConfig="ladderStepFormConfig"
- @blur="onHandleBlur" :formData="ladderConfig" fieldItemLabel="阶梯配制"
+ :formData="ladderConfig" fieldItemLabel="阶梯配制"
:prefixKey="'ladder_' + ladderIndex" />
onHandleTableBlur('ladder', ladderIndex, e)"
:ref="`ladderStepTableRef_${ladderIndex}`" :columns="ladderStepColumns"
@@ -66,7 +66,7 @@
handleClickable('paralle', paralleIndex, e)"
:ref="`paralleStepFormPackageRef_${paralleIndex}`" :formConfig="paralleStepFormConfig"
- @blur="onHandleBlur" :formData="paralleConfig" :prefixKey="'paralle' + paralleIndex"
+ :formData="paralleConfig" :prefixKey="'paralle' + paralleIndex"
fieldItemLabel="平行配制" />
onHandleTableBlur('paralle', paralleIndex, e)"
:ref="`paralleStepTableRef_${paralleIndex}`" :columns="paralleStepColumns"
diff --git a/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js b/src/views/business/comps/template/formConfig/paralleAndLadderConfig.js
index 5d60402..1a1d8a6 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: 180,
+ width: 280,
myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
maxVolumeField: "actSolutionVolume",//分装的最大量字段
maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
@@ -16,7 +16,7 @@ export const getLadderColumnsConfig = ($this) => {
{
label: 'template.sp.sp00456.qsrybh',
prop: 'startSolutionCode',
- width: 180,
+ width: 280,
bodyType: 'input',
bodyFillType: 'actFill',
bodyMaxlength: 10
@@ -24,7 +24,7 @@ export const getLadderColumnsConfig = ($this) => {
{
label: 'template.sp.sp00456.ysqsrytj',
prop: 'targetStartSolutionVolume',
- width: 180,
+ width: 280,
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: 180,
+ width: 280,
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: 180,
+ width: 280,
headerSelectKey: 'targetDiluentVolumeUnit',
fillType: 'preFill',
headerOptions: $this.getDictOptions('business_tjdw'),
@@ -74,20 +74,20 @@ export const getLadderColumnsConfig = ($this) => {
{
label: 'template.sp.sp00456.sjxsytj',
prop: 'actDiluentVolume',
- width: 180,
+ width: 280,
headerSelectKey: 'actDiluentVolumeUnit',
fillType: 'preFill',
headerOptions: $this.getDictOptions('business_tjdw'),
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
- // copyFrom: 'targetDiluentVolume', //复制哪个字段
+ copyFrom: 'targetDiluentVolume', //复制哪个字段
compareTo: 'targetDiluentVolume', //比较哪个字段
},
{
label: 'template.sp.sp00456.ysmbrynd',
prop: 'targetSolutionConcentration',
- width: 180,
+ width: 280,
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: 180,
+ width: 280,
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: 180,
+ width: 280,
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: 180,
+ width: 280,
headerSelectKey: 'actSolutionVolumeUnit',
fillType: 'preFill',
headerOptions: $this.getDictOptions('business_tjdw'),
@@ -143,7 +143,7 @@ export const getLadderColumnsConfig = ($this) => {
bodyPrecisionKey: 'actSolutionVolumePrecision',
bodyMaxlength: 10,
- copyFrom: 'targetSolutionVolume', //复制哪个字段
+ // copyFrom: 'targetSolutionVolume', //复制哪个字段
bodySubPlaceholder: 'template.common.xswsPlaceholder',
compareTo: 'targetSolutionVolume', //比较哪个字段
}
@@ -169,12 +169,12 @@ export const getParallelColumnsConfig = ($this) => {
myCodeFields: ["targetSolutionCode", "subTargetSolutionCode"],//分装的母液编号字段
maxVolumeField: "actSolutionVolume",//分装的最大量字段
maxVolumeFieldUnit: "actSolutionVolumeUnit",//分装的最大量单位字段
- width: 120
+ width: 280
},
{
label: 'template.sp.sp00456.ysmbrynd',
prop: 'targetSolutionConcentration',
- width: 180,
+ width: 280,
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: 180,
+ width: 280,
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: 180,
+ width: 280,
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: 180,
+ width: 280,
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: 180,
+ width: 280,
fillType: 'preFill',
bodyType: 'inputNumber',
bodySubType: 'select',
@@ -248,20 +248,20 @@ export const getParallelColumnsConfig = ($this) => {
{
label: 'template.sp.sp00456.mbrysxr',
prop: 'targetSolutionExpirationDate',
- width: 160,
+ width: 180,
bodyType: 'span'
},
{
label: 'template.sp.sp00456.ysysrybh',
prop: 'startSolutionCode',
- width: 160,
+ width: 280,
bodyType: 'input',
bodyFillType: 'preFill'
},
{
label: 'template.sp.sp00456.sjysrybh',
prop: 'actStartSolutionCode',
- width: 250,
+ width: 280,
bodyType: 'clickable',
bodyFillType: 'actFill',
compareTo: 'startSolutionCode', //比较哪个字段
@@ -269,7 +269,7 @@ export const getParallelColumnsConfig = ($this) => {
{
label: 'template.sp.sp00456.ysysrynd',
prop: 'targetStartSolutionConcentration',
- width: 160,
+ width: 280,
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodySubType: 'select',
@@ -282,7 +282,7 @@ export const getParallelColumnsConfig = ($this) => {
{
label: 'template.sp.sp00456.sjysrynd',
prop: 'targetAcSolution',
- width: 160,
+ width: 280,
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyDisabled: true,
@@ -294,7 +294,7 @@ export const getParallelColumnsConfig = ($this) => {
headerSelectKey: 'targetStartSolutionVolumeUnit',
fillType: 'preFill',
headerOptions: $this.getDictOptions('business_tjdw'),
- width: 160,
+ width: 280,
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodySubType: 'inputNumber',
@@ -315,7 +315,7 @@ export const getParallelColumnsConfig = ($this) => {
headerSelectKey: 'actStartSolutionVolumeUnit',
fillType: 'preFill',
headerOptions: $this.getDictOptions('business_tjdw'),
- width: 160,
+ width: 280,
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,
@@ -329,7 +329,7 @@ export const getParallelColumnsConfig = ($this) => {
headerSelectKey: 'preDiluentVolumeUnit',
fillType: 'preFill',
headerOptions: $this.getDictOptions('business_tjdw'),
- width: 160,
+ width: 280,
bodyType: 'inputNumber',
bodyFillType: 'preFill',
bodySubType: 'inputNumber',
@@ -347,7 +347,7 @@ export const getParallelColumnsConfig = ($this) => {
headerSelectKey: 'actDiluentVolumeUnit',
fillType: 'preFill',
headerOptions: $this.getDictOptions('business_tjdw'),
- width: 160,
+ width: 280,
bodyType: 'inputNumber',
bodyFillType: 'actFill',
bodyMaxlength: 10,