feat:[模板管理][烦人的浓度计算和单位换算]

src/components/Template/BaseInfoFormPackage.vue

@@ -86,7 +86,7 @@
                                     :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
                             </div>
-                            <div v-else-if="sItem.type === 'input'" :class="sItem.subType === 'text'?'item-center':''">
+                            <div v-else-if="sItem.type === 'input'">
                                 <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+key" @blur="onBlur(key, $event)" :item="sItem" v-model="formFields[key]"
                                     @copy="onCopy(sItem, key)" :error="errors[key]" @update:error="errors[key] = false"
                                     :orange-bg="orangeBgFields[key]" />
@@ -153,6 +153,12 @@
                                 @change="(e,type)=>onSelectChange(sItem.subKey, e,type)" :error="errors[sItem.subKey]"
                                 @update:error="errors[sItem.subKey] = false"
                                 :orange-bg="orangeBgFields[sItem.subKey]" />
+                            <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.subKey" class="ml-10" v-if="sItem.subType === 'input'" type="input"
+                                :item="getSubItem(sItem)" v-model="formFields[sItem.subKey]" @copy="onCopy(sItem, key)"
+                                :error="errors[sItem.subKey]"
+                                @blur="onBlur(sItem.subKey, $event)" 
+                                @update:error="errors[sItem.subKey] = false"
+                                :orange-bg="orangeBgFields[sItem.subKey]" />
                             <div class="ml-10 item-span" v-else-if="sItem.subType === 'span'">{{ formFields[sItem.subKey] }}</div>
                             <span v-else-if="sItem.subType === 'text'" class="sub-text">{{ $t( sItem.subText) }}</span>
                             <HandleFormItem :field-item-label="fieldItemLabel" :field-key="prefixKey+'_'+sItem.subKey" class="ml-10" v-else-if="sItem.subType === 'clickable'" type="clickable"

src/components/Template/HandleFormItem.vue

@@ -422,6 +422,9 @@ export default {
                 params = {
                     ...params,
                     type: sjType[type]
+                };
+                if(type === "mix"){
+                    params.mixType = true;
                 }
             }
             EventBus.$emit(eventName, params)

src/components/Template/mixins/formPackageMixins.js

@@ -155,12 +155,16 @@ export default {
             }
         },
         getSubItem(sItem) {
-            return {
+            const config = {
                 label: "",
                 options: sItem.subOptions || [],
                 fillType: sItem.subFillType || sItem.fillType,
                 parentLabel: sItem.label,
             }
+            if(sItem.subDisabled){
+                config.disabled = sItem.subDisabled;
+            }
+            return config;
         },
         // 根据formConfig回填form表单数据
         handleFormField(update = false) {
@@ -221,6 +225,13 @@ export default {
                             this.compareFieldsIsEqual(currentValue, compareToValue, key)
 
                         }
+                        // 检查compareTo字段
+                        if (currentConfig.subCompareTo && formData[currentConfig.subCompareTo] && result[currentConfig.subKey]) {
+                            const compareToValue = formData[currentConfig.subCompareTo];
+                            const currentValue = result[currentConfig.subKey];
+                            this.compareFieldsIsEqual(currentValue, compareToValue, currentConfig.subKey)
+
+                        }
                     });
 
                     // 处理可能存在的直接otherCode字段

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

@@ -222,7 +222,9 @@ export default {
 							maxlength: 10,
 							compareTo: "targetStartSolution",
 							subKey: "subTargetAcSolutionUnit",
-							subType:"span"
+							subType:"input",
+							subDisabled:true,
+							subCompareTo:"subTargetStartSolution",      
 						},
 						solution: {
 							label: "template.sp.sp003.xsy",