From 420955d14bdd4b1038e2b788f8e06bc81ad18095 Mon Sep 17 00:00:00 2001
From: luojie <125330818@qq.com>
Date: Thu, 22 Jan 2026 23:34:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86][upd?=
 =?UTF-8?q?ate]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Template/HandleFormItem.vue         |  21 +-
 .../Template/operation/TableOpertaion.vue          |  17 +-
 src/utils/volumeTools.js                           | 110 ++++++++
 .../business/comps/template/TemplateTable.vue      |  11 +-
 .../comps/template/dialog/SubPackageDialog.vue     | 314 +++++++++++++++++++++
 5 files changed, 466 insertions(+), 7 deletions(-)
 create mode 100644 src/utils/volumeTools.js
 create mode 100644 src/views/business/comps/template/dialog/SubPackageDialog.vue

diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue
index fce2b75..617230a 100644
--- a/src/components/Template/HandleFormItem.vue
+++ b/src/components/Template/HandleFormItem.vue
@@ -147,6 +147,11 @@ export default {
         fieldItemLabel: {
             type: String,
             default: "",
+        },
+        //是否记录修改
+        isFieldsRecord: {
+            type: Boolean,
+            default: true,
         }
     },
     data() {
@@ -373,6 +378,12 @@ export default {
                 return;
             }
             if (this.oldValue && !isSame && this.templateFillType === "actFill") {
+                if(!this.isFieldsRecord){//是否需要记录修改记录
+                    this.$emit("blur", this.inputValue);
+                    this.$emit('input', this.inputValue);
+                    this.$emit("change", this.inputValue);
+                    return;
+                }
                 this.$refs.editSignRef.show()
                 // this.handleUpdateRecord();
             }else{//如果是第一次填写，不需要密码验证
@@ -406,9 +417,7 @@ export default {
             if (data) {
                 record.reason = data.remark
             }
-            if(this.templateFillType === "actFill"){//只有实际填报的时候才记录修改记录
-                this.updateZdxgjl(record);
-            }
+            
             const params = {
                 type: "fieldChanged",
                 newRecord: record,
@@ -419,6 +428,12 @@ export default {
             this.$emit("blur", this.inputValue);
             this.$emit('input', this.inputValue);
             this.$emit("change", this.inputValue);
+            if(!this.isFieldsRecord){//是否需要记录修改记录
+                return;
+            }
+            if(this.templateFillType === "actFill"){//只有实际填报的时候才记录修改记录
+                this.updateZdxgjl(record);
+            }
             setTimeout(() => {
                 EventBus.$emit('onModifyRecord', params,)
             }, 10);
diff --git a/src/components/Template/operation/TableOpertaion.vue b/src/components/Template/operation/TableOpertaion.vue
index 6e6e9ca..2140b67 100644
--- a/src/components/Template/operation/TableOpertaion.vue
+++ b/src/components/Template/operation/TableOpertaion.vue
@@ -17,6 +17,8 @@
 </template>
 
 <script>
+import { EventBus } from "@/utils/eventBus";
+
 export default {
     name: "TableOpertaion",
     props: {
@@ -37,6 +39,12 @@ export default {
             default: "preFill",
         },
     },
+    
+    mounted() {
+        EventBus.$on("subPackageSubmit", (data) => {
+            this.onSubPackageSubmit(data)
+        })
+    },
     methods: {
         // 开始配置
         onStartConfig() {
@@ -60,8 +68,13 @@ export default {
             myCodeFields.forEach((key)=>{
                 fields.push(row[key])
             })
-            console.log(fields,"fields")
-            this.$emit("subPackage", this.row)
+            EventBus.$emit("showSubPackageDialog",{mybh:fields.join(""),maxVolume:10,volumeUnit:"ml",rowIndex:this.rowIndex})
+        },
+        onSubPackageSubmit(data){
+            if(data.rowIndex === this.rowIndex){
+                console.log(data,"onSubPackageSubmit")
+                this.$emit("subPackageSubmit", data)
+            }
         },
         // 删除行
         deleteRow(index) {
diff --git a/src/utils/volumeTools.js b/src/utils/volumeTools.js
new file mode 100644
index 0000000..d910cae
--- /dev/null
+++ b/src/utils/volumeTools.js
@@ -0,0 +1,110 @@
+/**
+ * 体积单位换算工具
+ * 单位关系（基于SI单位制）：
+ * 1 L = 1000 mL
+ * 1 mL = 1000 μL (ul)
+ * 1 μL = 1000 nL
+ * 1 nL = 1000 pL
+ */
+const VolumeUnit = {
+  // 完整单位名称和缩写
+  LITER: { name: 'liter', symbol: 'l', factor: 1e0 },      // 基础单位：升
+  MILLILITER: { name: 'milliliter', symbol: 'ml', factor: 1e-3 },  // 10^-3 升
+  MICROLITER: { name: 'microliter', symbol: 'μl', factor: 1e-6 },  // 10^-6 升 (也可用ul)
+  NANOLITER: { name: 'nanoliter', symbol: 'nl', factor: 1e-9 },    // 10^-9 升
+  PICOLITER: { name: 'picoliter', symbol: 'pl', factor: 1e-12 }    // 10^-12 升
+}
+
+// 单位符号到标准单位的映射
+const UNIT_MAP = {
+  // 标准符号
+  'l': VolumeUnit.LITER,
+  'ml': VolumeUnit.MILLILITER,
+  'μl': VolumeUnit.MICROLITER,
+  'ul': VolumeUnit.MICROLITER, // ul 是 μl 的替代写法
+  'nl': VolumeUnit.NANOLITER,
+  'pl': VolumeUnit.PICOLITER,
+  
+  // 大写形式
+  'L': VolumeUnit.LITER,
+  'ML': VolumeUnit.MILLILITER,
+  'ML': VolumeUnit.MILLILITER,
+  'UL': VolumeUnit.MICROLITER,
+  'NL': VolumeUnit.NANOLITER,
+  'PL': VolumeUnit.PICOLITER
+}
+
+/**
+ * 将任意单位的值转换为升（基础单位）
+ * @param {number} value - 数值
+ * @param {string} unit - 单位符号 (l/ml/μl/ul/nl/pl)
+ * @returns {number} 换算为升的值
+ */
+export function convertToLiter(value, unit) {
+  const normalizedUnit = unit.toLowerCase()
+  const unitConfig = UNIT_MAP[normalizedUnit]
+  
+  if (!unitConfig) {
+    console.warn(`不支持的体积单位: ${unit}. 支持的单位: ${Object.keys(UNIT_MAP).join(', ')}`)
+  }
+  
+  return value * unitConfig.factor
+}
+
+/**
+ * 将值从一种单位转换为另一种单位
+ * @param {number} value - 原始值
+ * @param {string} fromUnit - 原始单位
+ * @param {string} toUnit - 目标单位
+ * @returns {number} 转换后的值
+ */
+export function convertVolume(value, fromUnit, toUnit) {
+  // 先转换为升，再转换为目标单位
+  const valueInLiters = convertToLiter(value, fromUnit)
+  const toUnitConfig = UNIT_MAP[toUnit.toLowerCase()]
+  
+  if (!toUnitConfig) {
+    console.warn(`不支持的体积单位: ${toUnit}`)
+  }
+  
+  // 从升转换为目标单位
+  return valueInLiters / toUnitConfig.factor
+}
+
+/**
+ * 比较两个不同单位的体积值
+ * @param {number} value1 - 第一个值
+ * @param {string} unit1 - 第一个值的单位
+ * @param {number} value2 - 第二个值
+ * @param {string} unit2 - 第二个值的单位
+ * @returns {number} 
+ *   -1: value1 < value2
+ *    0: value1 = value2
+ *    1: value1 > value2
+ */
+export function compareVolume(value1, unit1, value2, unit2) {
+  const v1InLiters = convertToLiter(value1, unit1)
+  const v2InLiters = convertToLiter(value2, unit2)
+  
+  if (Math.abs(v1InLiters - v2InLiters) < 1e-15) { // 处理浮点数精度
+    return 0
+  }
+  return v1InLiters < v2InLiters ? -1 : 1
+}
+
+/**
+ * 获取单位换算比例
+ * @param {string} fromUnit - 原始单位
+ * @param {string} toUnit - 目标单位
+ * @returns {number} 换算比例（fromUnit * ratio = toUnit）
+ */
+export function getConversionRatio(fromUnit, toUnit) {
+  const fromConfig = UNIT_MAP[fromUnit.toLowerCase()]
+  const toConfig = UNIT_MAP[toUnit.toLowerCase()]
+  
+  if (!fromConfig || !toConfig) {
+    console.warn('不支持的体积单位')
+  }
+  
+  return fromConfig.factor / toConfig.factor
+}
\ No newline at end of file
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 6b46c32..cf40746 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -2,11 +2,12 @@
   <div class="template-table">
     <component ref="templateComponent" :is="getTemplateComponent()" :templateData="templateData" :fillType="fillType">
     </component>
+    <SubPackageDialog ref = "subPackageDialogRef"></SubPackageDialog>
   </div>
 </template>
 
 <script>
-import { EventBus } from "@/utils/eventBus"
+import { EventBus } from "@/utils/eventBus";
 //色谱
 import SWYPFXRYPZB from "./comps/sp/SWYPFXRYPZB.vue";
 import SWYPFXCBYPZB from "./comps/sp/SWYPFXCBYPZB.vue";
@@ -28,10 +29,12 @@ import Demo from "./comps/sp/Demo.vue";
 //供试品
 import SYWZPZJHB from "./comps/gsp/SYWZPZJHB.vue";
 import MJYLQSQD from "./comps/gsp/MJYLQSQD.vue";
+import SubPackageDialog from "./dialog/SubPackageDialog.vue"
 
 export default {
   name: "TemplateTable",
   components: {
+    SubPackageDialog,
     //供试品
     MJYLQSQD, SYWZPZJHB,
     //色谱
@@ -147,11 +150,15 @@ export default {
   mounted() {
     EventBus.$on('onModifyRecord', (data) => {
       this.$emit(this.emitName, data)
+    });
+    EventBus.$on("showSubPackageDialog",(data)=>{
+      this.$refs.subPackageDialogRef.show(data)
     })
   },
   beforeDestroy() {
     // 记得移除监听，避免内存泄漏
-    EventBus.$off('onModifyRecord')
+    EventBus.$off('onModifyRecord');
+    EventBus.$off("showSubPackageDialog");
   },
   methods: {
     async getFormData() {
diff --git a/src/views/business/comps/template/dialog/SubPackageDialog.vue b/src/views/business/comps/template/dialog/SubPackageDialog.vue
new file mode 100644
index 0000000..646c4bb
--- /dev/null
+++ b/src/views/business/comps/template/dialog/SubPackageDialog.vue
@@ -0,0 +1,314 @@
+<template>
+    <el-dialog title="分装（分装后的编号可用于下一步关联选择）" append-to-body :visible.sync="visible" @close="close" width="1100px">
+        <div class="dialog-content">
+            <div class="header-container">
+                <div class="header-item">
+                    <div class="header-title">母液编号</div>
+                    <HandleFormItem :isFieldsRecord="false" :item="inputItem" :error="formErrors.mybh"
+                        v-model="formData.mybh" />
+                </div>
+                <div class="header-item">
+                    <div class="header-title">分装数量</div>
+                    <HandleFormItem :isFieldsRecord="false" @blur="onBlurFzsl" :item="integerInputNumberItem"
+                        :error="formErrors.fzsl" v-model="formData.fzsl" />
+                </div>
+            </div>
+            <div class="content-container">
+                <div class="content-item">
+                    <span>分装编号</span>
+                    <span class="ml-20">单位：</span>
+                    <div class="unit-select">
+                        <HandleFormItem :isFieldsRecord="false" :item="unitItem" type="select" :error="formErrors.dw"
+                            @blur="(e) => onCommonBlur(e, 'dw')" v-model="formData.dw" />
+                    </div>
+                    <span class="ml-20">每份包装量：</span>
+                    <div class="unit-select">
+                        <HandleFormItem :isFieldsRecord="false" :item="inputNumberItem"  v-model="formData.mfbzl" />
+                    </div>
+                    <el-button type="primary" plain @click="onAverage">平均分配</el-button>
+                    <el-button type="primary" plain @click="onReset">重置</el-button>
+                </div>
+                <div class="header-container">
+                    <div v-for="(item, index) in fzList" class="list-item" :key="index">
+                        <div class="list-label">{{ formData.mybh }}-set01</div>
+                        <HandleFormItem :isFieldsRecord="false" :item="inputNumberItem" :error="fzListErrors[index]"
+                            @blur="onBlurFzNum(index)" v-model="item.num" />
+                        <el-button type="primary" plain @click="onPrint">打印</el-button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <template slot="footer" class="dialog-footer">
+            <el-button @click="close">{{ $t('form.cancel') }}</el-button>
+            <el-button type="primary" @click="onSubmit">{{ $t('form.saveConfirm') }}</el-button>
+        </template>
+    </el-dialog>
+</template>
+
+<script>
+import HandleFormItem from '@/components/Template/HandleFormItem.vue';
+import { compareVolume } from '@/utils/volumeTools.js';
+import { EventBus } from '@/utils/eventBus'
+export default {
+    dicts: [
+        'business_tjdw',
+    ],
+    components: {
+        HandleFormItem,
+    },
+    data() {
+        return {
+            visible: false,
+            inputItem: {
+                type: "input",
+                fillType: "actFill",
+                disabled: true,
+            },
+            integerInputNumberItem: {
+                type: "inputNumber",
+                fillType: "actFill",
+                precision: 0,
+                maxlength: 3
+            },
+            inputNumberItem: {
+                type: "inputNumber",
+                fillType: "actFill",
+            },
+            formData: {
+                mybh: "",//母液编号
+                fzsl: "",//分装数量
+                dw: "",//单位
+                mfbzl: "",//每份包装量
+            },
+            fzList: [],//分装列表
+            // 错误状态字段
+            formErrors: {
+                mybh: false,
+                fzsl: false,
+                dw: false,
+            },
+            fzListErrors: [] // 分装列表错误状态
+        }
+    },
+    computed: {
+        unitItem() {
+            return {
+                type: "select",
+                fillType: "actFill",
+                options: this.dict.type.business_tjdw
+            }
+        }
+    },
+    methods: {
+        close() {
+            this.visible = false;
+            this.resetErrors();
+        },
+        show(data) {
+            if (data.fzList) {
+                this.fzList = data.fzList;
+                // 初始化分装列表错误状态
+                this.fzListErrors = new Array(this.fzList.length).fill(false);
+            }
+            this.formData = data;
+            // 重置错误状态
+            this.resetErrors();
+            this.visible = true;
+        },
+        onSubmit() {
+            // 验证表单数据
+            if (!this.validateFormData()) {
+                this.$message.error('表单内容未填完,请填写后再提交')
+                return;
+            } else {
+                const errMsg = "分装后小份容量之和大于母液容量，是否确认分装？"
+                const {maxVolume,volumeUnit,dw} = this.formData;
+                const totalVolume = this.fzList.reduce((acc, cur) => acc + Number(cur.num), 0);
+                const compareResult = compareVolume(totalVolume,dw,maxVolume, volumeUnit);
+                if(compareResult > 0){
+                    this.$modal.confirm(errMsg, '提示', {
+                        confirmButtonText: this.$t('form.saveConfirm'),
+                        cancelButtonText: this.$t('form.cancel'),
+                        type: 'warning'
+                    }).then(() => {
+                        this.submitEmit();
+                    }).catch(() => {
+                        // 取消操作，不执行任何操作
+                    });
+                    return;
+                }
+                this.submitEmit();
+                
+            }
+
+
+        },
+        submitEmit(){
+            EventBus.$emit('subPackageSubmit', {...this.formData, fzList: this.fzList});
+            this.fzList = [];
+            this.formData = {};
+            this.close();
+        },
+        validateFormData() {
+            let isValid = true;
+
+            // 验证母液编号
+            if (!this.formData.mybh) {
+                this.formErrors.mybh = true;
+                isValid = false;
+            }
+
+            // 验证分装数量
+            if (!this.formData.fzsl) {
+                this.formErrors.fzsl = true;
+                isValid = false;
+            }
+
+            // 验证单位
+            if (!this.formData.dw) {
+                this.formErrors.dw = true;
+                isValid = false;
+            }
+
+            // 验证分装列表中的数值
+            if (this.fzList && this.fzList.length > 0) {
+                for (let i = 0; i < this.fzList.length; i++) {
+                    if (!this.fzList[i].num) {
+                        // 确保fzListErrors数组有足够的元素
+                        if (this.fzListErrors.length <= i) {
+                            this.$set(this.fzListErrors, i, true);
+                        } else {
+                            this.fzListErrors[i] = true;
+                        }
+                        isValid = false;
+                    }
+                }
+            }
+
+            return isValid;
+        },
+        resetErrors() {
+            // 重置表单错误状态
+            Object.keys(this.formErrors).forEach(key => {
+                this.formErrors[key] = false;
+            });
+
+            // 重置分装列表错误状态
+            this.fzListErrors.forEach((_, index) => {
+                this.$set(this.fzListErrors, index, false);
+            });
+        },
+        // 分装数量失去焦点时，根据数量生成分装列表
+        onBlurFzsl(e) {
+            // 清除当前字段的错误状态
+            if (e) {
+                this.formErrors.fzsl = false;
+            }
+            // 清空现有列表
+            this.fzList = [];
+            this.fzListErrors = [];
+
+            // 根据输入的数量生成新列表
+            for (let i = 0; i < e; i++) {
+                this.fzList.push({
+                    num: "",
+                });
+                // 同步初始化错误状态数组
+                this.fzListErrors.push(false);
+            }
+        },
+        onAverage() {
+            const { mfbzl } = this.formData;
+            this.fzList.forEach((item, index) => {
+                item.num = mfbzl;
+                // 同时更新错误状态
+                if (this.fzListErrors[index] !== undefined) {
+                    this.$set(this.fzListErrors, index, false);
+                }
+            })
+            // 清除相关字段的错误状态
+            this.formErrors.mfbzl = false;
+        },
+        onReset() {
+            this.fzList.forEach((item, index) => {
+                item.num = "";
+                // 同时更新错误状态
+                if (this.fzListErrors[index] !== undefined) {
+                    this.$set(this.fzListErrors, index, false);
+                }
+            })
+            // 清除相关字段的错误状态
+            this.formErrors.mfbzl = false;
+        },
+        onPrint() { },
+        onCommonBlur(e, field) {
+            if (this.formData[field]) {
+                this.formErrors[field] = false;
+            }
+        },
+        onBlurFzNum(index) {
+            if (this.fzList[index] && this.fzList[index].num) {
+                if (this.fzListErrors[index] !== undefined) {
+                    this.$set(this.fzListErrors, index, false);
+                }
+            }
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.dialog-content {
+    padding: 20px;
+}
+
+.unit-select {
+    width: 100px;
+}
+
+.content-item {
+    display: flex;
+    align-items: center;
+}
+
+.header-container {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    grid-gap: 20px;
+    margin-top: 20px;
+}
+
+.header-item {
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    background: #fff;
+    border-radius: 4px;
+    padding: 20px;
+}
+
+.header-title {
+    margin-bottom: 10px;
+}
+
+.content-container {
+    margin-top: 20px;
+    padding: 20px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
+    max-height: 50vh;
+    overflow: auto;
+}
+
+.ml-20 {
+    margin-left: 20px;
+}
+
+.list-item {
+    display: flex;
+    align-items: center;
+    // margin-top: 20px;
+}
+
+.list-label {
+    margin-right: 5px;
+    // width: 200px;
+}
+</style>
\ No newline at end of file