From f6941c90cd67461f77243c5728bd00358427fbc0 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 10:17:12 +0800
Subject: [PATCH 01/12] =?UTF-8?q?fix:[=E9=BA=BB=E7=B2=BE=E8=8D=AF=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95]=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/form/drug/comp/sqbdList.vue | 64 +++++++++++++++++++-------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue
index 12fc146..0c5983c 100644
--- a/src/views/business/form/drug/comp/sqbdList.vue
+++ b/src/views/business/form/drug/comp/sqbdList.vue
@@ -22,7 +22,7 @@
                   @change="userChange" />
               </el-form-item>
             </el-col>
-              <el-col :span="6">
+            <el-col :span="6">
               <el-form-item :label="$t('page.business.study.studyFormApply.xysj')">
                 <el-date-picker v-model="daterange" clearable type="daterange" @change="search" range-separator="-"
                   :start-placeholder="$t('page.business.form.startDate')"
@@ -37,13 +37,13 @@
                   style="width: 200px" />
               </el-form-item>
             </el-col>
-          <el-col :span="6">
+            <el-col :span="6">
               <el-form-item :label="$t('page.business.study.studyFormApply.sybhbm')" prop="templateName">
                 <el-input v-model="searchForm.sybhbm" :placeholder="$t('form.placeholderInput')" clearable
                   style="width: 200px" />
               </el-form-item>
             </el-col>
-             <el-col :span="6">
+            <el-col :span="6">
               <el-form-item :label="$t('page.business.study.studyFormApply.sfbl')">
                 <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="search">
@@ -61,7 +61,7 @@
             </el-col>
           </el-row>
           <el-row>
-             <el-col :span="6">
+            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.status')">
                 <el-select v-model="searchForm.bdzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="search">
@@ -85,26 +85,29 @@
               v-hasPermi="['business:drugFormApply:xz']">{{
                 $t('page.business.study.studyFormApply.xzbd') }}</el-button>
           </el-col>
-           <el-col :span="12" style="text-align: right;">
-                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-            </el-col>
+          <el-col :span="12" style="text-align: right;">
+            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+          </el-col>
         </el-row>
 
-        <el-table v-loading="loading" :data="list">
+        <el-table v-loading="loading" :data="list" :default-sort="{ prop: 'tjsj', order: 'descending' }"
+          @sort-change="sortChange">
           <el-table-column :label="$t('page.business.form.bh')" prop="bdbh" :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.form.bdmc')" prop="bdmc" :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateMc" :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.studyFormApply.sybhbm')" align="center" 
-            width="140">
+          <el-table-column :label="$t('page.business.study.studyFormApply.sybhbm')" align="center" width="140">
             <template slot-scope="scope">
-              {{ scope.row.sySn||'' }}
-              {{ scope.row.bmName||'' }}
+              {{ scope.row.sySn || '' }}
+              {{ scope.row.bmName || '' }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.study.studyFormApply.sywzmc')" prop="sywzmc" :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.studyFormApply.xynd')" prop="xynd" :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.study.studyFormApply.xysj')" prop="xysj" :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.study.studyFormApply.sywzmc')" prop="sywzmc"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.study.studyFormApply.xynd')" prop="xynd"
+            :show-overflow-tooltip="true" />
+          <el-table-column :label="$t('page.business.study.studyFormApply.xysj')" prop="xysj"
+            :show-overflow-tooltip="true" sortable />
           <!-- <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" /> -->
           <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
           <el-table-column :label="$t('page.business.study.studyFormApply.sfbl')" align="center" prop="status"
@@ -134,7 +137,7 @@
                 $t('page.business.study.studyFormApply.yfz') }}</span>
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" />
+          <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" sortable />
           <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
               <!-- 表单状态：1：填报中；3：已提交；5：已复核；6：未通过；7：已完成；9：待废止；11：已废止 -->
@@ -277,6 +280,8 @@ export default {
         sywzmc: '',
         bdbh: '',
         bdmc: '',
+        xyssort: null,
+        tjsjsort: 10,
         userId: '',
         userMc: '',
         templateMc: '',
@@ -297,6 +302,31 @@ export default {
   },
   created() { this.getIsQa() },
   methods: {
+    sortChange(e, event) {
+      //       column: {…}
+      // order: "ascending"
+      // prop: "tjsj"
+      if (e.prop == 'tjsj') {
+        if (e.order == 'ascending') {
+          this.searchForm.tjsjsort = 1
+        } else {
+          this.searchForm.tjsjsort = 10
+        }
+        this.searchForm.xyssort = null
+      }
+      if (e.prop == 'xysj') {
+        if (e.order == 'ascending') {
+          this.searchForm.xyssort = 1
+        } else {
+          this.searchForm.xyssort = 10
+        }
+        this.searchForm.tjsjsort = null
+      }
+      this.search()
+      event.preventDefault()
+      event.stopPropagation()
+      return
+    },
     checkPermi,
     checkRole,
     getIsQa() {

From 5a866645d82341b4e8c302a2818e9932581761f2 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 10:21:15 +0800
Subject: [PATCH 02/12] =?UTF-8?q?fix:[=E9=BA=BB=E7=B2=BE=E8=8D=AF=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95]=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/en/business/study/studyFormApply.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lang/en/business/study/studyFormApply.js b/src/lang/en/business/study/studyFormApply.js
index 6a690a0..758f653 100644
--- a/src/lang/en/business/study/studyFormApply.js
+++ b/src/lang/en/business/study/studyFormApply.js
@@ -65,4 +65,5 @@ export default {
   sywzmc: 'Study Material Name',
   xynd: 'Required Concentration',
   xysj: 'Required Time',
+  bdzt:'Status'
 }

From 600db24da56607365fac450c2c243eddab6b8840 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Wed, 18 Mar 2026 10:51:38 +0800
Subject: [PATCH 03/12] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=20=E6=AF=92=E7=90=86=E4=B8=8B=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=89=A9=E7=9A=84resource=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/dl/DL007.vue     | 12 +---
 .../business/comps/template/comps/dl/DL008.vue     | 12 +---
 .../business/comps/template/comps/dl/DL009.vue     | 12 +---
 .../business/comps/template/comps/dl/DL010.vue     | 64 ++--------------------
 .../business/comps/template/comps/dl/DL013.vue     | 17 +-----
 .../business/comps/template/comps/dl/DL015.vue     | 35 ------------
 .../business/comps/template/comps/dl/DL016.vue     | 13 -----
 .../business/comps/template/comps/dl/DL017.vue     | 12 ----
 .../business/comps/template/comps/dl/DL018.vue     | 13 -----
 .../business/comps/template/comps/dl/DL019.vue     | 13 -----
 .../business/comps/template/comps/dl/DL024.vue     | 12 +---
 .../business/comps/template/comps/yp/YP005.vue     |  2 +
 12 files changed, 13 insertions(+), 204 deletions(-)

diff --git a/src/views/business/comps/template/comps/dl/DL007.vue b/src/views/business/comps/template/comps/dl/DL007.vue
index 4b8e0a7..95d5173 100644
--- a/src/views/business/comps/template/comps/dl/DL007.vue
+++ b/src/views/business/comps/template/comps/dl/DL007.vue
@@ -280,17 +280,7 @@ export default {
       return await this.validFormFields(refNames)
     },
     getResource() {
-      const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
-      const yqsyList = yqsyData?.stepTableFormData || []
-
-      // 从仪器使用信息表格中提取仪器资源
-      this.yqResourceTmp = yqsyList
-        .filter((item) => item.yqbh)
-        .map((item) => ({
-          bh: item.yqbh,
-          type: 'yq'
-        }))
-
+      this.yqResourceTmp = []
       this.resourceTmp = []
       return this.resourceTmp
     },
diff --git a/src/views/business/comps/template/comps/dl/DL008.vue b/src/views/business/comps/template/comps/dl/DL008.vue
index 4d658d1..0019082 100644
--- a/src/views/business/comps/template/comps/dl/DL008.vue
+++ b/src/views/business/comps/template/comps/dl/DL008.vue
@@ -439,17 +439,7 @@ export default {
       return await this.validFormFields(refNames)
     },
     getResource() {
-      const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
-      const yqsyList = yqsyData?.stepTableFormData || []
-
-      // 从仪器使用信息表格中提取仪器资源
-      this.yqResourceTmp = yqsyList
-        .filter((item) => item.yqbh)
-        .map((item) => ({
-          bh: item.yqbh,
-          type: 'yq'
-        }))
-
+      this.yqResourceTmp = []
       this.resourceTmp = []
       return this.resourceTmp
     },
diff --git a/src/views/business/comps/template/comps/dl/DL009.vue b/src/views/business/comps/template/comps/dl/DL009.vue
index 86bd1b9..bcbbbc5 100644
--- a/src/views/business/comps/template/comps/dl/DL009.vue
+++ b/src/views/business/comps/template/comps/dl/DL009.vue
@@ -550,17 +550,7 @@ export default {
       return await this.validFormFields(refNames)
     },
     getResource() {
-      const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
-      const yqsyList = yqsyData?.stepTableFormData || []
-
-      // 从仪器使用信息表格中提取仪器资源
-      this.yqResourceTmp = yqsyList
-        .filter((item) => item.yqbh)
-        .map((item) => ({
-          bh: item.yqbh,
-          type: 'yq'
-        }))
-
+      this.yqResourceTmp = []
       this.resourceTmp = []
       return this.resourceTmp
     },
diff --git a/src/views/business/comps/template/comps/dl/DL010.vue b/src/views/business/comps/template/comps/dl/DL010.vue
index 23553da..5115496 100644
--- a/src/views/business/comps/template/comps/dl/DL010.vue
+++ b/src/views/business/comps/template/comps/dl/DL010.vue
@@ -485,66 +485,10 @@ export default {
       return await this.validFormFields(refsToValidate)
     },
     getResource() {
-      const sjxxStepResource = this.$refs.sjxxStepRef.getStepResource()
-      // 使用的试剂、仪器
-      this.resourceTmp = sjxxStepResource.sjResource || []
-      this.yqResourceTmp = sjxxStepResource.yqResource || []
-
-      // 获取采集信息表格数据
-      const sjxxTableData = this.$refs.sjxxTableRef?.getFilledFormData()
-      const sjxxList = sjxxTableData?.stepTableFormData || []
-      const headerSelectFields = sjxxTableData?.headerSelectFields || {}
-
-      // 提取实际0.9%氯化钠注射液加入量和实际加入血清的数据
-      // 转换为标准资源格式
-      const sjxxResource = []
-
-      sjxxList.forEach((item) => {
-        // 实际0.9%氯化钠注射液加入量
-        if (item.sjlhnzsjyjrl) {
-          sjxxResource.push({
-            mc: '0.9%氯化钠注射液', // 名称
-            bh: null, // 编号
-            ph: null, // 批号
-            nd: null, // 浓度
-            nddw: null, // 浓度单位
-            ndz: null, // 浓度值
-            ly: null, // 来源
-            sxrq: null, // 失效日期
-            kc: null, // 库存
-            kcdw: null, // 库存单位
-            type: 1, // 类型：1表示使用的资源
-            syl: item.sjlhnzsjyjrl, // 使用量
-            syldw: headerSelectFields.sjlhnUnit || '', // 使用量单位
-            yxzq: null, // 有效期
-            yxzqdw: null // 有效期单位
-          })
-        }
-
-        // 实际加入血清
-        if (item.sjjrxq) {
-          sjxxResource.push({
-            mc: '血清', // 名称
-            bh: null, // 编号
-            ph: null, // 批号
-            nd: null, // 浓度
-            nddw: null, // 浓度单位
-            ndz: null, // 浓度值
-            ly: null, // 来源
-            sxrq: null, // 失效日期
-            kc: null, // 库存
-            kcdw: null, // 库存单位
-            type: 1, // 类型：1表示使用的资源
-            syl: item.sjjrxq, // 使用量
-            syldw: headerSelectFields.sjjrxqUnit || '', // 使用量单位
-            yxzq: null, // 有效期
-            yxzqdw: null // 有效期单位
-          })
-        }
-      })
-
-      // 将采集信息数据添加到资源列表中
-      return [...this.resourceTmp, ...sjxxResource]
+      const stepResource = this.$refs.sjxxStepRef.getStepResource()
+			this.resourceTmp = stepResource.sjResource || []
+			this.yqResourceTmp = stepResource.yqResource || []
+			return this.resourceTmp;
     },
     onRegentSubmit(e) {
       // 预留方法，如果需要处理试剂提交事件可以在这里添加
diff --git a/src/views/business/comps/template/comps/dl/DL013.vue b/src/views/business/comps/template/comps/dl/DL013.vue
index 6112df9..503c098 100644
--- a/src/views/business/comps/template/comps/dl/DL013.vue
+++ b/src/views/business/comps/template/comps/dl/DL013.vue
@@ -614,22 +614,7 @@ export default {
       return await this.validFormFields(refsToValidate)
     },
     getResource() {
-      // 从仪器使用信息表格中获取仪器资源
-      const yqsyData = this.$refs.yqsyTableRef?.getFilledFormData()
-      const yqsyList = yqsyData?.stepTableFormData || []
-
-      // 从仪器使用信息表格中提取仪器资源
-      this.yqResourceTmp = yqsyList
-        .filter((item) => item.yqbh)
-        .map((item) => ({
-          type: 'yq',
-          value: item.yqbh,
-          bh: item.yqbh,
-          mc: item.yqmc,
-          xh: item.yqxh,
-          jzrq: item.xccsjzjdrq
-        }))
-
+      this.yqResourceTmp = []
       this.resourceTmp = []
       return this.resourceTmp
     },
diff --git a/src/views/business/comps/template/comps/dl/DL015.vue b/src/views/business/comps/template/comps/dl/DL015.vue
index 787c7ae..b15617a 100644
--- a/src/views/business/comps/template/comps/dl/DL015.vue
+++ b/src/views/business/comps/template/comps/dl/DL015.vue
@@ -327,43 +327,8 @@ export default {
     },
     getResource() {
       const stepResource = this.$refs.stepRef.getStepResource()
-      const hyqkData = this.$refs.hyqkTableRef?.getFilledFormData()
-      const hyqkList = hyqkData?.stepTableFormData || []
-
-      // 从操作步骤中提取试剂和仪器资源
       this.resourceTmp = stepResource.sjResource || []
       this.yqResourceTmp = stepResource.yqResource || []
-
-      // 从换液情况表格中提取悬液编号作为试剂资源
-      // 用于去重的Set
-      const xybhSet = new Set()
-      const sjResourceFromHyqk = []
-
-      hyqkList.forEach((item) => {
-        if (item.xybh && !xybhSet.has(item.xybh)) {
-          xybhSet.add(item.xybh)
-          sjResourceFromHyqk.push({
-            mc: '细胞悬液',
-            bh: item.xybh,
-            ph: null,
-            nd: null,
-            nddw: null,
-            ndz: null,
-            ly: null,
-            sxrq: null,
-            kc: null,
-            kcdw: null,
-            type: 1,
-            syl: item.pyybrl || null,
-            syldw: item.pyybrl ? 'mL' : null,
-            yxzq: null,
-            yxzqdw: null
-          })
-        }
-      })
-
-      this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk]
-
       return this.resourceTmp
     },
     onRegentSubmit(e) {
diff --git a/src/views/business/comps/template/comps/dl/DL016.vue b/src/views/business/comps/template/comps/dl/DL016.vue
index ddfbebd..14e6045 100644
--- a/src/views/business/comps/template/comps/dl/DL016.vue
+++ b/src/views/business/comps/template/comps/dl/DL016.vue
@@ -267,21 +267,8 @@ export default {
 		getResource() {
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
-      const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
-      // const tableList = hyqkData?.stepTableFormData || []
-      // 从操作步骤中提取试剂和仪器资源
 			this.resourceTmp = stepResource.sjResource || []
 			this.yqResourceTmp = stepResource.yqResource || []
-
-      const tableFromHyqk = tableList
-        .filter(item => item.xybh)
-        .map(item => ({
-          bh: item.xybh,
-          type: 'cell'
-        }))
-
-      this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
-      console.log('回显填写完成的表单数据==============',this.resourceTmp);
 			return this.resourceTmp;
 		},
 		//保存
diff --git a/src/views/business/comps/template/comps/dl/DL017.vue b/src/views/business/comps/template/comps/dl/DL017.vue
index b517588..a5a0a5c 100644
--- a/src/views/business/comps/template/comps/dl/DL017.vue
+++ b/src/views/business/comps/template/comps/dl/DL017.vue
@@ -369,20 +369,8 @@ export default {
 		getResource() {
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
-      const hyqkData = this.$refs.stepTableRef?.getFilledFormData()
-      const tableList = hyqkData?.stepTableFormData || []
-      // 从操作步骤中提取试剂和仪器资源
 			this.resourceTmp = stepResource.sjResource || []
 			this.yqResourceTmp = stepResource.yqResource || []
-
-      const sjResourceFromHyqk = tableList
-        .filter(item => item.xybh)
-        .map(item => ({
-          bh: item.xybh,
-          type: 'cell'
-        }))
-
-      this.resourceTmp = [...this.resourceTmp, ...sjResourceFromHyqk]
 			return this.resourceTmp;
 		},
 		//保存
diff --git a/src/views/business/comps/template/comps/dl/DL018.vue b/src/views/business/comps/template/comps/dl/DL018.vue
index 770704c..a7f91d3 100644
--- a/src/views/business/comps/template/comps/dl/DL018.vue
+++ b/src/views/business/comps/template/comps/dl/DL018.vue
@@ -331,22 +331,9 @@ export default {
 			return content;
 		},
 		getResource() {
-			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
-      const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
-
-			// 从操作步骤中提取试剂和仪器资源
 			this.resourceTmp = stepResource.sjResource || []
 			this.yqResourceTmp = stepResource.yqResource || []
-
-      const tableFromHyqk = tableList
-        .filter(item => item.xybh)
-        .map(item => ({
-          bh: item.xybh,
-          type: 'cell'
-        }))
-
-      this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
 			return this.resourceTmp;
 		},
 		//保存
diff --git a/src/views/business/comps/template/comps/dl/DL019.vue b/src/views/business/comps/template/comps/dl/DL019.vue
index b14cc43..56ad972 100644
--- a/src/views/business/comps/template/comps/dl/DL019.vue
+++ b/src/views/business/comps/template/comps/dl/DL019.vue
@@ -297,21 +297,8 @@ export default {
 		getResource() {
 			//使用的试剂、仪器
 			const stepResource = this.$refs.stepRef.getStepResource()
-      const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
-      // const tableList = hyqkData?.stepTableFormData || []
-      // 从操作步骤中提取试剂和仪器资源
 			this.resourceTmp = stepResource.sjResource || []
 			this.yqResourceTmp = stepResource.yqResource || []
-
-      const tableFromHyqk = tableList
-        .filter(item => item.xybh)
-        .map(item => ({
-          bh: item.xybh,
-          type: 'cell'
-        }))
-
-      this.resourceTmp = [...this.resourceTmp, ...tableFromHyqk]
-      console.log('回显填写完成的表单数据==============',this.resourceTmp);
 			return this.resourceTmp;
 		},
 		//保存
diff --git a/src/views/business/comps/template/comps/dl/DL024.vue b/src/views/business/comps/template/comps/dl/DL024.vue
index 2cc98b0..0b26114 100644
--- a/src/views/business/comps/template/comps/dl/DL024.vue
+++ b/src/views/business/comps/template/comps/dl/DL024.vue
@@ -9,7 +9,7 @@
 					<BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
 						ref="baseInfoRef" :formConfig="baseInfoFormConfig" :formData="formData" />
             <!-- 仪器使用信息 -->
-          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resource" />
+          <TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <LineLabel label="template.dl.dl024.xbpyxx" />
           <!-- 操作记录 -->
@@ -261,14 +261,8 @@ export default {
 			return content;
 		},
 		getResource() {
-      const tableList = this.$refs.qcxjjyqkTableRef?.getFilledFormData()?.stepTableFormData || []
-      // 从操作步骤中提取试剂和仪器资源
-			this.resourceTmp = tableList
-        .filter(item => item.xybh)
-        .map(item => ({
-          bh: item.xybh,
-          type: 'cell'
-        }))
+			this.resourceTmp = []
+			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
 		//保存
diff --git a/src/views/business/comps/template/comps/yp/YP005.vue b/src/views/business/comps/template/comps/yp/YP005.vue
index 580a870..82cb9c7 100644
--- a/src/views/business/comps/template/comps/yp/YP005.vue
+++ b/src/views/business/comps/template/comps/yp/YP005.vue
@@ -173,6 +173,8 @@ export default {
 				bodySubKey:"startBtn",
 				showBodySub:this.fillType === "actFill",
 				width: 280,
+				bodyDisabled:true,
+				bodySubDisabled:false,
 			}]
 		},
 	},

From 2c0d66c8786e45daa6612b5303076f6d9e9098f4 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 11:04:33 +0800
Subject: [PATCH 04/12] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?]=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/zh/business/study/studyFormFill.js        |  2 +-
 src/views/business/form/drug/comp/tbbdList.vue     | 98 +++++++++-------------
 src/views/business/form/drug/comp/ytbdList.vue     | 75 +++++++----------
 src/views/business/form/nonTrial/comp/tbbdList.vue | 98 +++++++++-------------
 src/views/business/form/nonTrial/comp/ytbdList.vue | 77 +++++++----------
 .../business/resource/gyzj/comps/gyzjList.vue      |  2 +-
 src/views/business/resource/mjy/comps/mjyList.vue  |  2 +-
 src/views/business/study/comp/jhbdList.vue         | 22 ++---
 src/views/business/study/comp/tbbdList.vue         | 49 ++++-------
 src/views/business/study/comp/wzlb/gyzjList.vue    |  2 +-
 src/views/business/study/comp/wzlb/mjyList.vue     |  2 +-
 src/views/business/study/comp/ytbdList.vue         | 34 ++------
 12 files changed, 170 insertions(+), 293 deletions(-)

diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js
index fd76c40..294bddf 100644
--- a/src/lang/zh/business/study/studyFormFill.js
+++ b/src/lang/zh/business/study/studyFormFill.js
@@ -31,7 +31,7 @@ export default {
   bzyy: '备注原因',
   jcgj: '稽查轨迹',
   cjjl: '创建记录',
-  sfbl: '是否为补录',
+  sfbl: '是否补录',
   yes: '是',
   no: '否',
   tjjl: '提交记录',
diff --git a/src/views/business/form/drug/comp/tbbdList.vue b/src/views/business/form/drug/comp/tbbdList.vue
index 885c49a..7c4beb6 100644
--- a/src/views/business/form/drug/comp/tbbdList.vue
+++ b/src/views/business/form/drug/comp/tbbdList.vue
@@ -3,65 +3,43 @@
     <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
       <div class="tbbd-search">
         <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
-                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-                <SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
-                  @change="userChange" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <div style="margin-left: 100px;">
-                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.cjsj')">
-                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.tjsj')">
-                <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
-                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
-                  @change="search">
-                  <el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
-                  <el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
+
+          <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+            <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+            <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+            <SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
+              @change="userChange" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+            <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.cjsj')">
+            <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
+              :start-placeholder="$t('page.business.form.startDate')"
+              :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.tjsj')">
+            <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
+              :start-placeholder="$t('page.business.form.startDate')"
+              :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
+            <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" style="width: 150px" clearable @change="search">
+              <el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
+              <el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="tbbd-content">
@@ -326,7 +304,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.searchForm.cjsjks = this.daterange[0]
-        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.searchForm.cjsjks = ''
         this.searchForm.cjsjjs = ''
diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue
index 8fdcae2..d6e4d29 100644
--- a/src/views/business/form/drug/comp/ytbdList.vue
+++ b/src/views/business/form/drug/comp/ytbdList.vue
@@ -2,48 +2,31 @@
   <div>
     <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
       <div class="ytbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
-                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-                <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
-                  @change="userChange" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.cjsj')">
-                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-form :model="searchForm" ref="searchForm" :inline="true">
+          <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+            <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+            <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+            <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" @change="userChange" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+            <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.cjsj')">
+            <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
+              :start-placeholder="$t('page.business.form.startDate')"
+              :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="ytbd-content">
@@ -114,11 +97,11 @@
                 </template>
                 <template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
                   <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')
-                    }}</el-button>
+                  }}</el-button>
                 </template>
                 <template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId">
                   <el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb')
-                    }}</el-button>
+                  }}</el-button>
                 </template>
               </template>
             </template>
@@ -396,7 +379,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.searchForm.startDate = this.daterange[0]
-        this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.searchForm.startDate = ''
         this.searchForm.endDate = ''
@@ -444,7 +427,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row, true,this.searchForm)
+      this.$refs.Xq.show(row, true, this.searchForm)
     },
     audit(row) {
       this.showAudit = true
diff --git a/src/views/business/form/nonTrial/comp/tbbdList.vue b/src/views/business/form/nonTrial/comp/tbbdList.vue
index 0e9d123..f3274c4 100644
--- a/src/views/business/form/nonTrial/comp/tbbdList.vue
+++ b/src/views/business/form/nonTrial/comp/tbbdList.vue
@@ -2,65 +2,43 @@
   <div>
     <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
       <div class="tbbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
-                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-                <SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
-                  @change="userChange" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <div style="margin-left: 100px;">
-                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.cjsj')">
-                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.tjsj')">
-                <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
-                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable>
-                  <el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
-                  <el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-form :model="searchForm" ref="searchForm" :inline="true">
+          <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+            <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+            <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+            <SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
+              @change="userChange" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+            <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.cjsj')">
+            <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
+              :start-placeholder="$t('page.business.form.startDate')"
+              :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.tjsj')">
+            <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
+              :start-placeholder="$t('page.business.form.startDate')"
+              :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
+            <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" style="width: 150px" clearable>
+              <el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
+              <el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
+            </el-select>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="tbbd-content">
@@ -391,7 +369,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.searchForm.cjsjks = this.daterange[0]
-        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.searchForm.cjsjks = ''
         this.searchForm.cjsjjs = ''
diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue
index fe3662a..1f838fc 100644
--- a/src/views/business/form/nonTrial/comp/ytbdList.vue
+++ b/src/views/business/form/nonTrial/comp/ytbdList.vue
@@ -2,48 +2,31 @@
   <div>
     <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
       <div class="ytbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
-                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-                <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
-                  @change="userChange" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('page.business.form.cjsj')">
-                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
-                  :start-placeholder="$t('page.business.form.startDate')"
-                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
-              </el-form-item>
-            </el-col>
-          </el-row>
+        <el-form :model="searchForm" ref="searchForm" :inline="true">
+          <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+            <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+            <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+            <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId" style="width: 150px" @change="userChange" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+            <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+              style="width: 150px" />
+          </el-form-item>
+          <el-form-item :label="$t('page.business.form.cjsj')">
+            <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
+              :start-placeholder="$t('page.business.form.startDate')"
+              :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
+          </el-form-item>
+           <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="ytbd-content">
@@ -113,11 +96,11 @@
                 </template>
                 <template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
                   <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')
-                    }}</el-button>
+                  }}</el-button>
                 </template>
                 <template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId">
                   <el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb')
-                    }}</el-button>
+                  }}</el-button>
                 </template>
               </template>
             </template>
@@ -265,7 +248,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         studyId: -1,
-        studyStatus:5,
+        studyStatus: 5,
         studySn: '',
         studyMc: '',
         bdbh: '',
@@ -424,7 +407,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.searchForm.startDate = this.daterange[0]
-        this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.searchForm.startDate = ''
         this.searchForm.endDate = ''
@@ -481,7 +464,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row, true,this.searchForm)
+      this.$refs.Xq.show(row, true, this.searchForm)
     },
     audit(row) {
       this.showAudit = true
diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue
index c5bf48d..b440992 100644
--- a/src/views/business/resource/gyzj/comps/gyzjList.vue
+++ b/src/views/business/resource/gyzj/comps/gyzjList.vue
@@ -522,7 +522,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.queryParams.startDate = this.daterange[0]
-        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.queryParams.startDate = ''
         this.queryParams.endDate = ''
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index c06594f..9dea244 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -521,7 +521,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.queryParams.startDate = this.daterange[0]
-        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.queryParams.startDate = ''
         this.queryParams.endDate = ''
diff --git a/src/views/business/study/comp/jhbdList.vue b/src/views/business/study/comp/jhbdList.vue
index 6a336cc..cc185c9 100644
--- a/src/views/business/study/comp/jhbdList.vue
+++ b/src/views/business/study/comp/jhbdList.vue
@@ -2,41 +2,29 @@
   <div class="tbbd-list">
     <div v-show="!showDetail && !showEdit && !showAudit && !showFh">
       <div class="tbbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
-          <el-row>
-            <el-col :span="5">
+        <el-form :model="searchForm" ref="searchForm" :inline="true" >
               <el-form-item :label="$t('page.business.form.bdmc')" prop="name"
                 :label-width="$i18n.locale === 'zh_CN' ? '100px' : '120px'">
                 <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 160px" />
+                  style="width: 150px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="5">
               <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
                 <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 160px" />
+                  style="width: 150px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="5">
               <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-                <SelectDeptUser v-model="searchForm.userId" style="width: 160px" :name="searchForm.userMc" key="userId"
+                <SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
                   @change="userChange" />
               </el-form-item>
-            </el-col>
-            <el-col :span="5">
               <el-form-item :label="$t('page.business.form.cjsj')">
                 <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
                   :start-placeholder="$t('page.business.form.startDate')"
                   :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="4">
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
                 <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
               </el-form-item>
-            </el-col>
-          </el-row>
         </el-form>
       </div>
       <div class="tbbd-content">
@@ -239,7 +227,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.searchForm.cjsjks = this.daterange[0]
-        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.searchForm.cjsjks = ''
         this.searchForm.cjsjjs = ''
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index fa5355b..1b196b4 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -2,65 +2,48 @@
   <div>
     <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
       <div class="tbbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
-          <el-row>
-            <el-col :span="6">
+        <el-form :model="searchForm" ref="searchForm" :inline="true" >
+        
               <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
                 <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
+                  style="width: 150px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
+          
               <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
                 <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
+                  style="width: 150px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
+         
               <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-                <SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
+                <SelectDeptUser v-model="searchForm.userId" style="width: 150px" :name="searchForm.userMc" key="userId"
                   @change="userChange" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <div style="margin-left: 100px;">
-                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-                </div>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
                 <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
+                  style="width: 150px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.cjsj')">
                 <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
                   :start-placeholder="$t('page.business.form.startDate')"
                   :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
+          
               <el-form-item :label="$t('page.business.form.tjsj')">
                 <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
                   :start-placeholder="$t('page.business.form.startDate')"
                   :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
+          
               <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
-                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable>
+                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable style="width: 150px">
                   <el-option :label="$t('page.business.study.studyFormFill.yes')" value="是" />
                   <el-option :label="$t('page.business.study.studyFormFill.no')" value="否" />
                 </el-select>
               </el-form-item>
-            </el-col>
-          </el-row>
+               <el-form-item>
+                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+              </el-form-item>
         </el-form>
       </div>
       <div class="tbbd-content">
@@ -386,7 +369,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.searchForm.cjsjks = this.daterange[0]
-        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.cjsjjs = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.searchForm.cjsjks = ''
         this.searchForm.cjsjjs = ''
diff --git a/src/views/business/study/comp/wzlb/gyzjList.vue b/src/views/business/study/comp/wzlb/gyzjList.vue
index 6a1d69d..da7e287 100644
--- a/src/views/business/study/comp/wzlb/gyzjList.vue
+++ b/src/views/business/study/comp/wzlb/gyzjList.vue
@@ -255,7 +255,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.queryParams.startDate = this.daterange[0]
-        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.queryParams.startDate = ''
         this.queryParams.endDate = ''
diff --git a/src/views/business/study/comp/wzlb/mjyList.vue b/src/views/business/study/comp/wzlb/mjyList.vue
index 414e1a8..b61d488 100644
--- a/src/views/business/study/comp/wzlb/mjyList.vue
+++ b/src/views/business/study/comp/wzlb/mjyList.vue
@@ -233,7 +233,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.queryParams.startDate = this.daterange[0]
-        this.queryParams.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.queryParams.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.queryParams.startDate = ''
         this.queryParams.endDate = ''
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 7dd0421..f539ff8 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -2,48 +2,32 @@
   <div>
     <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
       <div class="ytbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="110px">
-          <el-row>
-            <el-col :span="6">
+        <el-form :model="searchForm" ref="searchForm" :inline="true" >
               <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
                 <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
+                  style="width: 150px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
                 <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
+                  style="width: 150px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
                 <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
                   @change="userChange" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item>
-                <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-                <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
                 <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-                  style="width: 200px" />
+                  style="width: 150px" />
               </el-form-item>
-            </el-col>
-            <el-col :span="6">
               <el-form-item :label="$t('page.business.form.cjsj')">
                 <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
                   :start-placeholder="$t('page.business.form.startDate')"
                   :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" style="width: 200px" />
               </el-form-item>
-            </el-col>
-          </el-row>
+               <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+                <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+              </el-form-item>
         </el-form>
       </div>
       <div class="ytbd-content">
@@ -430,7 +414,7 @@ export default {
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
         this.searchForm.startDate = this.daterange[0]
-        this.searchForm.endDate = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+        this.searchForm.endDate = moment(this.daterange[1]).add(1, 'days').format('YYYY-MM-DD');
       } else {
         this.searchForm.startDate = ''
         this.searchForm.endDate = ''

From 1b6101d3d44f599980ac7e976bb7ac5153a1ee53 Mon Sep 17 00:00:00 2001
From: HanLong <404402223@qq.com>
Date: Wed, 18 Mar 2026 14:37:21 +0800
Subject: [PATCH 05/12] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/gsp/gspFfjl.js                    |  8 +++
 src/api/business/gsp/gspRkjl.js                    |  8 +++
 src/views/business/resource/gsp/comps/ffjlList.vue | 59 +++++++++++++-----
 src/views/business/resource/gsp/comps/gsp/Ff.vue   |  5 +-
 src/views/business/resource/gsp/comps/gsp/Ysff.vue | 61 ++++++++++---------
 src/views/business/resource/gsp/comps/gspList.vue  |  1 +
 src/views/business/resource/gsp/comps/rkjlList.vue | 69 +++++++++++++---------
 7 files changed, 135 insertions(+), 76 deletions(-)

diff --git a/src/api/business/gsp/gspFfjl.js b/src/api/business/gsp/gspFfjl.js
index 38886e8..a0833bc 100644
--- a/src/api/business/gsp/gspFfjl.js
+++ b/src/api/business/gsp/gspFfjl.js
@@ -88,4 +88,12 @@ export function jq(data) {
     method: 'post',
     data: data
   })
+}
+
+export function statistics(query) {
+  return request({
+    url: '/system/business/gspFfjl/statistics',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/api/business/gsp/gspRkjl.js b/src/api/business/gsp/gspRkjl.js
index 16a100b..90292d8 100644
--- a/src/api/business/gsp/gspRkjl.js
+++ b/src/api/business/gsp/gspRkjl.js
@@ -104,4 +104,12 @@ export function jq(data) {
     method: 'post',
     data: data
   })
+}
+//入库量统计
+export function sumRkl(query) {
+  return request({
+    url: '/system/business/gspRkjl/sumRkl',
+    method: 'get',
+    params: query
+  })
 }
\ No newline at end of file
diff --git a/src/views/business/resource/gsp/comps/ffjlList.vue b/src/views/business/resource/gsp/comps/ffjlList.vue
index 4524ff6..379a36d 100644
--- a/src/views/business/resource/gsp/comps/ffjlList.vue
+++ b/src/views/business/resource/gsp/comps/ffjlList.vue
@@ -7,22 +7,22 @@
           <el-row>
             <el-col :span="24">
               <!-- 名称 -->
-              <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'" prop="mc">
                 <el-input v-model="queryParams.mc" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 编号 -->
-              <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'" prop="bh">
                 <el-input v-model="queryParams.bh" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 目的 -->
-              <el-form-item :label="$t('page.business.resource.gsp.md') + '：'">
-                <el-input v-model="queryParams.mdId" clearable @change="handleQuery"
+              <el-form-item :label="$t('page.business.resource.gsp.md') + '：'" prop="md">
+                <el-input v-model="queryParams.md" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 记录状态 -->
-              <el-form-item :label="$t('page.business.resource.gsp.jlzt') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.jlzt') + '：'" prop="jlzt">
                 <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="handleQuery">
                   <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
@@ -33,7 +33,7 @@
                 </el-select>
               </el-form-item>
               <!-- 借阅状态 -->
-              <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'" prop="jyzt">
                 <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="handleQuery">
                   <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
@@ -42,13 +42,13 @@
                 </el-select>
               </el-form-item>
               <!-- 出库日期 -->
-              <el-form-item :label="$t('page.business.resource.mjy.cksj') + '：'">
+              <el-form-item :label="$t('page.business.resource.mjy.cksj') + '：'" prop="daterangeCk">
                 <el-date-picker v-model="daterangeCk" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
               </el-form-item>
               <!-- 入库日期 -->
-              <el-form-item :label="$t('page.business.resource.mjy.rksj') + '：'">
+              <el-form-item :label="$t('page.business.resource.mjy.rksj') + '：'" prop="daterangeRk">
                 <el-date-picker v-model="daterangeRk" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
@@ -78,6 +78,14 @@
             <el-button type="primary" @click="exportExcel" v-hasPermi="['business:resource:gsp:ffjldc']">{{
               $t('form.export') }}</el-button>
           </el-col>
+          <el-col :span="14" v-if="rkl">
+            <div class="tv_rkl">
+              <span style="margin-right: 20px;">{{ $t('page.business.resource.gsp.rkl') }}：{{ rkl }}</span>
+              <span style="margin-right: 20px;">{{ $t('page.business.resource.gsp.ckl') }}：{{ ckl }}</span>
+              <span style="margin-right: 20px;">{{ $t('page.business.resource.gsp.syl') }}：{{ syl }}</span>
+            </div>
+
+          </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -195,7 +203,7 @@
 </template>
 
 <script>
-import { list } from "@/api/business/gsp/gspFfjl"
+import { list, statistics } from "@/api/business/gsp/gspFfjl"
 import Sd from "./ffjl/Sd";
 import Jy from "./ffjl/Jy";
 import Js from "./ffjl/Js";
@@ -217,6 +225,9 @@ export default {
       single: true,
       multiple: true,
       total: 0,
+      rkl: null,
+      ckl: null,
+      syl: null,
       list: [],
       //勾选列表
       selectList: [],
@@ -225,7 +236,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         mc: null,
-        mdId: null,
+        md: null,
         jlzt: null,
         jyzt: null,
         bh: null,
@@ -436,15 +447,15 @@ export default {
     //获取列表
     getList() {
       if (this.daterangeCk != null && this.daterangeCk.length > 0) {
-        this.queryParams.startDateCk = this.daterangeCk[0]
-        this.queryParams.endDateCk = moment().add(this.daterangeCk[1], 'days').format('YYYY-MM-DD');
+        this.queryParams.startDateCk = this.daterangeCk[0] + ' 00:00:00'
+        this.queryParams.endDateCk = this.daterangeCk[1] + ' 23:59:59'
       } else {
         this.queryParams.startDateCk = ''
         this.queryParams.endDateCk = ''
       }
       if (this.daterangeRk != null && this.daterangeRk.length > 0) {
-        this.queryParams.startDateRk = this.daterangeRk[0]
-        this.queryParams.endDateRk = moment().add(this.daterangeRk[1], 'days').format('YYYY-MM-DD');
+        this.queryParams.startDateRk = this.daterangeRk[0] + ' 00:00:00'
+        this.queryParams.endDateRk = this.daterangeRk[1] + ' 23:59:59'
       } else {
         this.queryParams.startDateRk = ''
         this.queryParams.endDateRk = ''
@@ -455,6 +466,18 @@ export default {
         this.total = response.total
         this.loading = false
       })
+      if (this.queryParams.startDateCk || this.queryParams.startDateRk || this.queryParams.mc || this.queryParams.ph
+        || this.queryParams.gg || this.queryParams.jlzt || this.queryParams.jyzt || this.queryParams.md) {
+        statistics(this.queryParams).then(response => {
+          this.rkl = response.data.rkl
+          this.ckl = response.data.rkl
+          this.syl = response.data.rkl
+        })
+      } else {
+        this.rkl = null
+        this.ckl = null
+        this.syl = null
+      }
     },
     //查询
     handleQuery() {
@@ -464,6 +487,8 @@ export default {
     //重置
     resetQuery() {
       this.resetForm("queryForm")
+      this.daterangeCk = []
+      this.daterangeRk = []
       this.handleQuery()
     },
     //勾选回调
@@ -480,4 +505,10 @@ export default {
   background: #fff;
   padding: 10px 10px;
 }
+
+.tv_rkl {
+  color: #515a6e;
+  font-size: 13px;
+  margin-top: 5px;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/business/resource/gsp/comps/gsp/Ff.vue b/src/views/business/resource/gsp/comps/gsp/Ff.vue
index 7902e68..24c5e6c 100644
--- a/src/views/business/resource/gsp/comps/gsp/Ff.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Ff.vue
@@ -123,7 +123,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gsp.zytj')" prop="zytj">
-                <el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                <BusinessSelect v-model="form.zytj" dictType="business_zytj"></BusinessSelect>
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -222,9 +222,10 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 import SelectStudy from '@/views/business/comps/select/SelectStudy';
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 export default {
   name: "Ff",
-  components: { SelectList, SelectDeptUser, SelectStudy },
+  components: { SelectList, SelectDeptUser, SelectStudy, BusinessSelect },
   data() {
     return {
       isBatch: false,
diff --git a/src/views/business/resource/gsp/comps/gsp/Ysff.vue b/src/views/business/resource/gsp/comps/gsp/Ysff.vue
index e98b6f3..f9e3bf8 100644
--- a/src/views/business/resource/gsp/comps/gsp/Ysff.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Ysff.vue
@@ -4,26 +4,30 @@
     <el-dialog :title="$t('page.business.resource.mjy.ysff')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <div class="sbzdtcma"> <input type="text"> <input  type="password" show-password> </div>
+        <div class="sbzdtcma"> <input type="text"> <input type="password" show-password> </div>
         <div>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
-                <el-table-column :label="$t('page.business.resource.mjy.mc')" align="left" prop="mc"
+                <el-table-column :label="$t('page.business.resource.gsp.mc')" align="left" prop="mc"
                   :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.mjy.bh')" align="left" prop="bh"
+                <el-table-column :label="$t('page.business.resource.gsp.bh')" align="left" prop="bh"
                   :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.mjy.ckl')" align="center">
+                <el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph" />
+                <el-table-column :label="$t('page.business.resource.gsp.gg')" align="center">
                   <template slot-scope="scope">
-                    {{ scope.row.ckl }}{{ scope.row.ckldw }}
+                    {{ scope.row.gg }}{{ scope.row.ggdw }}
                   </template>
                 </el-table-column>
-
-                <el-table-column :label="$t('page.business.resource.mjy.ffzytj')" align="center" prop="ffzytj"
+                <el-table-column :label="$t('page.business.resource.gsp.yxq')" align="center" prop="yxq"
                   width="150px" />
-                <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" prop="ckmz" width="150px" />
-                <el-table-column :label="$t('page.business.resource.mjy.ckmzdw')" align="center" prop="ckmzdw"
+                <el-table-column :label="$t('page.business.resource.gsp.cksj')" align="center" prop="ffrq"
                   width="150px" />
+                <el-table-column :label="$t('page.business.resource.gsp.ckjz')" align="center" prop="kc" width="150px">
+                  <template slot-scope="scope">
+                    {{ scope.row.kc }}{{ scope.row.kcdw }}
+                  </template>
+                </el-table-column>
                 <el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc"
                   width="150px" />
                 <el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc"
@@ -33,16 +37,14 @@
                 <el-table-column :label="$t('page.business.resource.mjy.ffr2')" align="center" prop="ffr2Mc"
                   width="150px" />
                 <el-table-column :label="$t('form.remark')" align="center" prop="ffbz" width="150px" />
-                <el-table-column :label="$t('page.business.resource.mjy.md')" align="center" prop="ffxmMc"
-                  width="150px" />
               </el-table>
             </el-col>
           </el-row>
         </div>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.zcg')" prop="zcgId">
-              <el-input type="text" v-model="form.zcgId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gyzj.zcg')" prop="zcgId">
+              <SelectZcg v-model="form.zcgId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -55,8 +57,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="text" v-model="form.remark"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.remark" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -64,13 +65,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.lqr1')" prop="lqr1Id">
-              <SelectDeptUser  v-model="form.lqr1Id" key="lqr1Id"/>
+              <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="lqr1mm">
-              <el-input type="text" v-model="form.lqr1mm"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -78,13 +78,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.lqr2')" prop="lqr2Id">
-              <SelectDeptUser  v-model="form.lqr2Id" key="lqr2Id"/>
+              <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="lqr2mm">
-              <el-input type="text" v-model="form.lqr2mm"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -92,14 +91,14 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr')">
-              <el-input type="text" v-model="nickName" maxlength="50"
-                :placeholder="$t('form.placeholderInput')" disabled/>
+              <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+                disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="ffrmm">
               <div class="sbzdtcma"> <input type="text"></div>
-              <el-input type="password" v-model="form.ffrmm"  show-password  maxlength="20"
+              <el-input type="password" v-model="form.ffrmm" show-password maxlength="20"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -118,10 +117,10 @@
 import { ysff } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
-
+import SelectZcg from '@/views/business/comps/select/SelectZcg';
 export default {
   name: "Ysff",
-  components: {SelectDeptUser},
+  components: { SelectDeptUser, SelectZcg },
   data() {
     return {
       ids: [],
@@ -139,27 +138,27 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        lqr2mm:[{
+        lqr2mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr1mm:[{
+        lqr1mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr1Id:[{
+        lqr1Id: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr2Id:[{
+        lqr2Id: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        ffrmm:[{
+        ffrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
diff --git a/src/views/business/resource/gsp/comps/gspList.vue b/src/views/business/resource/gsp/comps/gspList.vue
index 530ff38..8417c4d 100644
--- a/src/views/business/resource/gsp/comps/gspList.vue
+++ b/src/views/business/resource/gsp/comps/gspList.vue
@@ -113,6 +113,7 @@
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.gsp.ph')" align="center" prop="ph" width="150px" />
           <el-table-column :label="$t('page.business.resource.gsp.jsrq')" align="center" prop="jsrq" width="150px" />
+          <el-table-column :label="$t('page.business.resource.gsp.yxq')" align="center" prop="yxq" width="150px" />
           <el-table-column :label="$t('page.business.resource.gsp.cctj')" align="center" prop="cctj" width="130px" />
 
           <el-table-column :label="$t('page.business.resource.gsp.zjzt')" align="center" width="100px" fixed="right">
diff --git a/src/views/business/resource/gsp/comps/rkjlList.vue b/src/views/business/resource/gsp/comps/rkjlList.vue
index 7d7e69f..ae6feaf 100644
--- a/src/views/business/resource/gsp/comps/rkjlList.vue
+++ b/src/views/business/resource/gsp/comps/rkjlList.vue
@@ -7,22 +7,22 @@
           <el-row>
             <el-col :span="24">
               <!-- 名称 -->
-              <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.mc') + '：'" prop="mc">
                 <el-input v-model="queryParams.mc" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
-              <!-- 编号 -->
-              <el-form-item :label="$t('page.business.resource.gsp.bh') + '：'">
-                <el-input v-model="queryParams.bh" clearable @change="handleQuery"
+              <!-- 批号 -->
+              <el-form-item :label="$t('page.business.resource.gsp.ph') + '：'" prop="ph">
+                <el-input v-model="queryParams.ph" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 规格 -->
-              <el-form-item :label="$t('page.business.resource.gsp.gg') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.gg') + '：'" prop="gg">
                 <el-input v-model="queryParams.gg" clearable @change="handleQuery"
                   :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
               <!-- 记录状态 -->
-              <el-form-item :label="$t('page.business.resource.gsp.jlzt') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.jlzt') + '：'" prop="jlzt">
                 <el-select v-model="queryParams.jlzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="handleQuery">
                   <el-option :label="$t('page.business.resource.resource.jlzt.wsd')" :value="1" />
@@ -33,7 +33,7 @@
                 </el-select>
               </el-form-item>
               <!-- 借阅状态 -->
-              <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'">
+              <el-form-item :label="$t('page.business.resource.gsp.jyzt') + '：'" prop="jyzt">
                 <el-select v-model="queryParams.jyzt" :placeholder="$t('form.placeholderSelect')" clearable
                   @change="handleQuery">
                   <el-option :label="$t('page.business.resource.resource.jyzt.wjy')" :value="1" />
@@ -42,8 +42,8 @@
                 </el-select>
               </el-form-item>
               <!-- 入库日期 -->
-              <el-form-item :label="$t('page.business.resource.mjy.rksj') + '：'">
-                <el-date-picker v-model="daterangeRk" class="chat-histogram-daterange" type="daterange"
+              <el-form-item :label="$t('page.business.resource.mjy.rksj') + '：'" prop="daterange">
+                <el-date-picker v-model="daterange" class="chat-histogram-daterange" type="daterange"
                   range-separator="-" :start-placeholder="$t('form.startDate')" :end-placeholder="$t('form.endDate')"
                   value-format="yyyy-MM-dd" @change="handleQuery" style="width: 250px;" />
               </el-form-item>
@@ -82,6 +82,9 @@
             <el-button type="primary" @click="exportExcel" v-hasPermi="['business:resource:gsp:rkdc']">{{
               $t('form.export') }}</el-button>
           </el-col>
+          <el-col :span="14" v-if="rkl">
+            <div class="tv_rkl">{{ $t('page.business.resource.gsp.rkl') }}：{{ rkl }}</div>
+          </el-col>
         </el-row>
 
         <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
@@ -185,7 +188,7 @@
 </template>
 
 <script>
-import { list } from "@/api/business/gsp/gspRkjl"
+import { list, sumRkl } from "@/api/business/gsp/gspRkjl"
 import Sd from "./rkjl/Sd";
 import Jy from "./rkjl/Jy";
 import Js from "./rkjl/Js";
@@ -202,8 +205,7 @@ export default {
   components: { Sd, Js, Gd, Jd, Jy, Xq, Xz, Bj, RkjlImport },
   data() {
     return {
-      daterangeCk: [],
-      daterangeRk: [],
+      daterange: [],
       loading: true,
       showDetail: false,
       single: true,
@@ -212,6 +214,7 @@ export default {
       list: [],
       //勾选列表
       selectList: [],
+      rkl: '',
       //查询条件
       queryParams: {
         pageNum: 1,
@@ -220,11 +223,9 @@ export default {
         mdId: null,
         jlzt: null,
         jyzt: null,
-        bh: null,
-        startDateCk: null,
-        endDateCk: null,
-        startDateRk: null,
-        endDateRk: null,
+        ph: null,
+        startDate: null,
+        endDate: null
       },
     }
   },
@@ -408,19 +409,12 @@ export default {
     },
     //获取列表
     getList() {
-      if (this.daterangeCk != null && this.daterangeCk.length > 0) {
-        this.queryParams.startDateCk = this.daterangeCk[0]
-        this.queryParams.endDateCk = moment().add(this.daterangeCk[1], 'days').format('YYYY-MM-DD');
-      } else {
-        this.queryParams.startDateCk = ''
-        this.queryParams.endDateCk = ''
-      }
-      if (this.daterangeRk != null && this.daterangeRk.length > 0) {
-        this.queryParams.startDateRk = this.daterangeRk[0]
-        this.queryParams.endDateRk = moment().add(this.daterangeRk[1], 'days').format('YYYY-MM-DD');
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.queryParams.startDate = this.daterange[0] + ' 00:00:00'
+        this.queryParams.endDate = this.daterange[1] + ' 23:59:59'
       } else {
-        this.queryParams.startDateRk = ''
-        this.queryParams.endDateRk = ''
+        this.queryParams.startDate = ''
+        this.queryParams.endDate = ''
       }
       this.loading = true
       list(this.queryParams).then(response => {
@@ -428,6 +422,16 @@ export default {
         this.total = response.total
         this.loading = false
       })
+
+      if (this.queryParams.startDate || this.queryParams.endDate || this.queryParams.mc || this.queryParams.ph
+        || this.queryParams.gg || this.queryParams.jlzt || this.queryParams.jyzt) {
+        sumRkl(this.queryParams).then(response => {
+          this.rkl = response.data.rkl
+        })
+      } else {
+        this.rkl = null
+      }
+
     },
     //查询
     handleQuery() {
@@ -453,4 +457,11 @@ export default {
   background: #fff;
   padding: 10px 10px;
 }
+
+.tv_rkl {
+  color: #515a6e;
+  display: flex;
+  font-size: 13px;
+  margin-top: 5px;
+}
 </style>
\ No newline at end of file

From 7ac8c415e6718e4174a783874a7b6437cea54ebf Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 14:42:40 +0800
Subject: [PATCH 06/12] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?]=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/study/comp/jhbd/Bj.vue | 2 +-
 src/views/business/study/comp/sqbd/Bj.vue | 2 +-
 src/views/business/study/comp/tbbd/Bj.vue | 4 ++--
 src/views/business/study/comp/ytbd/Bj.vue | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue
index b832387..2439121 100644
--- a/src/views/business/study/comp/jhbd/Bj.vue
+++ b/src/views/business/study/comp/jhbd/Bj.vue
@@ -64,7 +64,7 @@
             </el-row>
           </el-form>
         </div>
-        <div class="content" v-if="showIndex == 2">
+        <div class="content" v-if="showIndex == 2&&templateData.templateId">
           <TemplateTable ref="templateTable" emitName="onPlanCallback" @onPlanCallback="onPlanCallback"
             :sn="form.templateSn" :templateData="templateData" fillType="actFill" />
         </div>
diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue
index a8c9d2e..0124d95 100644
--- a/src/views/business/study/comp/sqbd/Bj.vue
+++ b/src/views/business/study/comp/sqbd/Bj.vue
@@ -74,7 +74,7 @@
             </el-row>
           </el-form>
         </div>
-        <div class="content" v-if="showIndex == 2">
+        <div class="content" v-if="showIndex == 2&&templateData.templateId">
           <TemplateTable ref="templateTable" emitName="onApplyCallback" @onApplyCallback="onApplyCallback"
             :sn="form.templateSn" :templateData="templateData" fillType="actFill" />
         </div>
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index b73cf4b..ec78c8b 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -78,7 +78,7 @@
             </el-row>
           </el-form>
         </div>
-        <div class="content" v-if="showIndex == 2">
+        <div class="content" v-if="showIndex == 2&&templateData.templateId">
           <TemplateTable emitName="onFillCallback" @onFillCallback="onFillCallback" ref="templateTable"
             :sn="templateData.templateSn" :templateData="templateData" fillType="actFill" />
         </div>
@@ -757,7 +757,7 @@ export default {
           this.$modal.loading()
           studyFormFill_bcOnly(this.form).then(response => {
             this.form = response.data
-            this.templateData.bdmc = this.form.bdmc
+            this.templateData = deepClone(this.form)
             this.showIndex = 2
             const obj = Object.assign({}, this.$route, { title: this.form.bdmc })
             this.$tab.updatePage(obj);
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index b0e5bf6..4d2eb9f 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -65,7 +65,7 @@
             </el-row>
           </el-form>
         </div>
-        <div class="content" v-if="showIndex == 2">
+        <div class="content" v-if="showIndex == 2&&templateData.templateId">
           <TemplateTable ref="templateTable" emitName="onPreCallback" @onPreCallback="onPreCallback"
             :sn="form.templateSn" :templateData="templateData" fillType="preFill" />
         </div>

From 83d62ae84ce1a4453aae7e1bb5122c33ae6a83d1 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Wed, 18 Mar 2026 15:38:39 +0800
Subject: [PATCH 07/12] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=20=E6=AF=92=E7=90=86=E6=A8=A1=E6=9D=BF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/dl/DL021.vue     | 24 +++++++++++++++++++---
 .../business/comps/template/comps/dl/DL023.vue     | 22 +++++++++++++++++---
 2 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/views/business/comps/template/comps/dl/DL021.vue b/src/views/business/comps/template/comps/dl/DL021.vue
index 005054e..d91040f 100644
--- a/src/views/business/comps/template/comps/dl/DL021.vue
+++ b/src/views/business/comps/template/comps/dl/DL021.vue
@@ -187,6 +187,17 @@ export default {
       const { selectInfo, key, rowIndex } = e
       const { row } = selectInfo
       console.log('选择显微镜预留===',row)
+
+	  if (key == 'xwj') {
+        this.$refs.swypyjInfoRef.updateFormData('wxjmc', row.mc)
+        this.$refs.swypyjInfoRef.updateFormData('wxjxh', row.xh)
+        this.$refs.swypyjInfoRef.updateFormData('wxjjzrq', row.jzrq)
+      }
+
+
+
+	  
+	  
       // if (key === 'yqbh' && this.$refs.yqsyTableRef) {
       //   const params = {
       //     yqmc: row.mc,
@@ -273,10 +284,17 @@ export default {
 			return content;
 		},
 		getResource() {
-			//使用的试剂、仪器
-			// stepRef不存在，直接返回空数组
+			let content = this.getFilledFormData();
+			let tmpYq = []
+			tmpYq.push({
+				mc: content.wxjmc,
+				xh: content.wxjxh,
+				bh: content.xwj,
+				jzrq: content.wxjjzrq,
+			})
+
 			this.resourceTmp = []
-			this.yqResourceTmp = []
+			this.yqResourceTmp = tmpYq
 			return this.resourceTmp;
 		},
 		//保存
diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue
index ada231e..0b1ca39 100644
--- a/src/views/business/comps/template/comps/dl/DL023.vue
+++ b/src/views/business/comps/template/comps/dl/DL023.vue
@@ -187,6 +187,8 @@ export default {
 							subType: 'button',
 							subKey: 'zskssj',
 							buttonName: 'template.dl.dl023.ksButton',
+							disabled:true,
+							subDisabled:false
 						},
 						zsjssj: {
 							label: 'template.dl.dl023.zsjssj',
@@ -196,6 +198,8 @@ export default {
 							subType: 'button',
 							subKey: 'zsjssj',
 							buttonName: 'template.dl.dl023.jsButton',
+							disabled:true,
+							subDisabled:false
 						},
 					}
 				}
@@ -318,10 +322,22 @@ export default {
 			return content;
 		},
 		getResource() {
-			//使用的试剂、仪器
-			// stepRef不存在，直接返回空数组
+			let content = this.getFilledFormData();
+			let tmpYq = []
+			let table = content.stepTableFormData
+			if (table && table.length > 0) {
+				for (let i = 0; i < table.length; i++) {
+					let item = table[i]
+					tmpYq.push({
+						mc: item.yqmc,
+						xh: item.yqxh,
+						bh: item.yqbh,
+						jzrq: item.xcrq,
+					})
+				}
+			}
+			this.yqResourceTmp = tmpYq
 			this.resourceTmp = []
-			this.yqResourceTmp = []
 			return this.resourceTmp;
 		},
 		//保存

From 24df8e4e308c189871ac626ceb73e7024ef2559a Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 15:54:22 +0800
Subject: [PATCH 08/12] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?]DL011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/dl/DL011.vue     | 158 ++++++++++-----------
 .../comps/template/mixins/templateMixin.js         |   2 +-
 2 files changed, 78 insertions(+), 82 deletions(-)

diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue
index 3e116c6..c927052 100644
--- a/src/views/business/comps/template/comps/dl/DL011.vue
+++ b/src/views/business/comps/template/comps/dl/DL011.vue
@@ -8,24 +8,11 @@
       </div>
       <div class="detail-content">
         <div class="content">
-          <BaseInfoFormPackage
-            fieldItemLabel="template.common.baseInfo"
-            label="template.common.baseInfo"
-            :ref="refConf.base"
-            :formConfig="baseInfoFormConfig"
-            :formData="formData"
-          />
+          <BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+            :ref="refConf.base" :formConfig="baseInfoFormConfig" :formData="formData" />
 
-          <TableList
-            label="template.common.reagentInfo"
-            :columns="sysjColumns"
-            :dataSource="resourceSj"
-          />
-          <TableList
-            label="template.common.instrumentInfo"
-            :columns="yqColumns"
-            :dataSource="yqResource"
-          />
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
+          <TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <!-- 细胞信息 -->
           <LineLabel label="template.dl.dl011.xbxx" />
@@ -35,13 +22,8 @@
                 $t('template.dl.dl011.bqdy')
               }}</el-button>
             </div>
-            <BaseInfoFormPackage
-              fieldItemLabel=""
-              label=""
-              :ref="refConf.xbxx"
-              :formConfig="xbxxConfig"
-              :formData="formData"
-            />
+            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.xbxx" :formConfig="xbxxConfig"
+              @onRegentSubmit="(data) => onTableRegentSubmit(data)" :formData="formData" />
           </div>
 
           <LineLabel label="template.dl.dl011.fxbz" />
@@ -50,23 +32,13 @@
           <!-- 预留区域 - 培养信息 -->
           <LineLabel label="template.dl.dl011.pyxx" />
           <div class="template-form-item">
-            <BaseInfoFormPackage
-              fieldItemLabel=""
-              label=""
-              :ref="refConf.pyxx"
-              :formConfig="pyxxConfig"
-              :formData="formData"
-              @clickButton="handlePyxxClickButton"
-            />
+            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.pyxx" :formConfig="pyxxConfig"
+              :formData="formData" @onRegentSubmit="(data) => onTableRegentSubmit(data)"
+              @clickButton="handlePyxxClickButton" />
           </div>
 
-          <BaseInfoFormPackage
-            fieldItemLabel="template.dl.dl007.bz"
-            label="template.dl.dl007.bz"
-            :ref="refConf.remark"
-            :formConfig="remarkConfig"
-            :formData="formData"
-          />
+          <BaseInfoFormPackage fieldItemLabel="template.dl.dl007.bz" label="template.dl.dl007.bz" :ref="refConf.remark"
+            :formConfig="remarkConfig" :formData="formData" />
         </div>
       </div>
     </div>
@@ -82,6 +54,7 @@ import TableList from '@/components/Template/Table'
 import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
 import moment from 'moment'
+import { uniqeYqOne, uniqeResource } from "@/utils/calUnitTools";
 
 const refConf = {
   base: 'baseInfoRef',
@@ -297,6 +270,17 @@ export default {
     }
   },
   methods: {
+    onTableRegentSubmit(data) {
+      if (data.key === 'xbdcbh') {
+        this.$refs.xbxxRef.updateFormData('xbdcbh_tj', data.selectInfo.row.tj)
+        this.$refs.xbxxRef.updateFormData('xbdcbh_dw', data.selectInfo.row.tjdw)
+      }
+      if (data.key === 'pyxbh') {
+        this.$refs.pyxxRef.updateFormData('pyxbh_mc', data.selectInfo.row.mc)
+        this.$refs.pyxxRef.updateFormData('pyxbh_xh', data.selectInfo.row.xh)
+        this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', data.selectInfo.row.jzrq)
+      }
+    },
     // 处理培养信息中按钮点击事件
     handlePyxxClickButton(_item, signData) {
       this.$refs.pyxxRef.updateFormData(
@@ -322,49 +306,60 @@ export default {
       return await this.validFormFields(refNames)
     },
     getResource() {
+      const content = this.getFilledFormData()
+      let tmpResource = []
+      let tmpYq = []
+      //生成细胞
+      tmpResource.push({
+        mc: content.xbmc,
+        bh: content.fshxbbh + content.fshxbbhCodeSn,
+        ph: '',
+        ndz: '',
+        nd: '',
+        nddw: '',
+        ly: 'ELN配制',
+        sxrq: null,
+        kc: content.fshxbsjtj,
+        kcdw: content.fshxbsjtjUnit,
+        syl: null,
+        type: null, //生成的时候传null
+        elnType: this.product,  //生成的时候传 his.product
+        syldw: content.fshxbsjtjUnit,
+        yxzq: null,
+        yxzqdw: null,
+      })
+      //使用细胞
+      tmpResource.push({
+        mc: null,
+        bh: content.xbdcbh,
+        ph: '',
+        ndz: '',
+        nd: '',
+        nddw: '',
+        ly: '',
+        sxrq: null,
+        kc: null,
+        kcdw: null,
+        syl: content.xbdcbh_tj,
+        type: 9, //使用的时候传对应的值
+        elnType: null, //传null
+        syldw: content.xbdcbh_dw,
+        yxzq: null,
+        yxzqdw: null,
+      })
+      //使用仪器
+      tmpYq.push({
+        mc: content.pyxbh_mc,
+        xh: content.pyxbh_xh,
+        bh: content.pyxbh,
+        jzrq: content.pyxbh_jzrq,
+      })
+      //使用的试剂、仪器
       const stepResource = this.$refs.stepRef.getStepResource()
-      // 使用的试剂、仪器（来自复苏步骤）
-      this.resourceTmp = stepResource.sjResource || []
-      this.yqResourceTmp = [...(stepResource.yqResource || [])]
-
-      // 获取细胞信息
-      const xbxxData = this.$refs.xbxxRef?.getFilledFormData() || {}
-
-      // 如果选择了细胞冻存编号，添加到细胞细菌信息中
-      if (xbxxData.xbdcbh) {
-        const xbInfo = xbxxData.selectInfo_xbdcbh || {}
-        // 细胞信息格式：不包含 type 字段（参考 StepFormPackage 中 xb 类型的处理）
-        this.xbxjTmp = [
-          {
-            value: xbxxData.xbdcbh,
-            bh: xbInfo.bh || xbxxData.xbdcbh,
-            mc: xbInfo.mc || '',
-            xh: xbInfo.xh || '',
-            jzrq: xbInfo.jzrq || ''
-          }
-        ]
-      } else {
-        this.xbxjTmp = []
-      }
-
-      // 获取培养信息
-      const pyxxData = this.$refs.pyxxRef?.getFilledFormData() || {}
-
-      // 如果选择了培养箱编号，添加到仪器信息中
-      if (pyxxData.pyxbh) {
-        const pyxInfo = pyxxData.selectInfo_pyxbh || {}
-        // 仪器信息格式：包含 type 字段（参考 StepFormPackage 中 yq 类型的处理）
-        this.yqResourceTmp.push({
-          type: 'yq',
-          value: pyxxData.pyxbh,
-          bh: pyxInfo.bh || pyxxData.pyxbh,
-          mc: pyxInfo.mc || '',
-          xh: pyxInfo.xh || '',
-          jzrq: pyxInfo.jzrq || ''
-        })
-      }
-
-      return this.resourceTmp
+      this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
+      this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
+      debugger
+      return this.resourceTmp;
     },
     onRegentSubmit(e) {
       // 预留方法，如果需要处理试剂提交事件可以在这里添加
@@ -391,6 +386,7 @@ export default {
 .print-btn {
   margin-bottom: 20px;
 }
+
 .config-header-end {
   display: flex;
   justify-content: flex-end;
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index c05e190..0906ef1 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -93,7 +93,7 @@ export default {
 						id
 					} = v
 					if (v.resource) {
-						//type 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品
+						//type 类型：1：试剂；3：给药制剂；5：麻精药；7：供试品 9：细胞；11：细菌
 						//试验试剂信息 试剂
 						// this.resource = _.filter(JSON.parse(v.resource), function (o) {
 						// 	return o.type == 1 || o.elnType == 1

From 218d935a25bbd570ee4dae6798c151ba54a1d97f Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 16:00:14 +0800
Subject: [PATCH 09/12] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?]=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/dl/DL011.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/business/comps/template/comps/dl/DL011.vue b/src/views/business/comps/template/comps/dl/DL011.vue
index c927052..e41c302 100644
--- a/src/views/business/comps/template/comps/dl/DL011.vue
+++ b/src/views/business/comps/template/comps/dl/DL011.vue
@@ -340,7 +340,7 @@ export default {
         sxrq: null,
         kc: null,
         kcdw: null,
-        syl: content.xbdcbh_tj,
+        syl: null,
         type: 9, //使用的时候传对应的值
         elnType: null, //传null
         syldw: content.xbdcbh_dw,
@@ -358,7 +358,6 @@ export default {
       const stepResource = this.$refs.stepRef.getStepResource()
       this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
       this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
-      debugger
       return this.resourceTmp;
     },
     onRegentSubmit(e) {

From 88e9dd9b9ca9cff431fe0ecff3b65c7e5b5631bf Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 16:15:40 +0800
Subject: [PATCH 10/12] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?]DL012=E7=89=A9=E8=B5=84=E7=94=9F=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../business/comps/template/comps/dl/DL012.vue     | 123 ++++++++++++++-------
 1 file changed, 83 insertions(+), 40 deletions(-)

diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue
index 373c7fa..78708c6 100644
--- a/src/views/business/comps/template/comps/dl/DL012.vue
+++ b/src/views/business/comps/template/comps/dl/DL012.vue
@@ -8,35 +8,17 @@
       </div>
       <div class="detail-content">
         <div class="content">
-          <BaseInfoFormPackage
-            fieldItemLabel="template.common.baseInfo"
-            label="template.common.baseInfo"
-            :ref="refConf.base"
-            :formConfig="baseInfoFormConfig"
-            :formData="formData"
-          />
+          <BaseInfoFormPackage fieldItemLabel="template.common.baseInfo" label="template.common.baseInfo"
+            :ref="refConf.base" :formConfig="baseInfoFormConfig" :formData="formData" />
 
-          <TableList
-            label="template.common.reagentInfo"
-            :columns="sysjColumns"
-            :dataSource="resourceSj"
-          />
-          <TableList
-            label="template.common.instrumentInfo"
-            :columns="yqColumns"
-            :dataSource="yqResource"
-          />
+          <TableList label="template.common.reagentInfo" :columns="sysjColumns" :dataSource="resourceSj" />
+          <TableList label="template.common.instrumentInfo" :columns="yqColumns" :dataSource="yqResource" />
 
           <!-- 细胞信息 -->
           <LineLabel label="template.dl.dl012.xbxx" />
           <div class="template-form-item">
-            <BaseInfoFormPackage
-              fieldItemLabel=""
-              label=""
-              :ref="refConf.xbxx"
-              :formConfig="xbxxConfig"
-              :formData="formData"
-            />
+            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.xbxx" :formConfig="xbxxConfig"
+              @onRegentSubmit="(data) => onTableRegentSubmit(data)" :formData="formData" />
           </div>
 
           <LineLabel label="template.dl.dl012.zbbz" />
@@ -45,23 +27,13 @@
           <!-- 培养信息 -->
           <LineLabel label="template.dl.dl012.pyxx" />
           <div class="template-form-item">
-            <BaseInfoFormPackage
-              fieldItemLabel=""
-              label=""
-              :ref="refConf.pyxx"
-              :formConfig="pyxxConfig"
-              @clickButton="handleClickButton"
-              :formData="formData"
-            />
+            <BaseInfoFormPackage fieldItemLabel="" label="" :ref="refConf.pyxx" :formConfig="pyxxConfig"
+              @clickButton="handleClickButton" @onRegentSubmit="(data) => onTableRegentSubmit(data)"
+              :formData="formData" />
           </div>
 
-          <BaseInfoFormPackage
-            fieldItemLabel="template.dl.dl007.bz"
-            label="template.dl.dl007.bz"
-            :ref="refConf.remark"
-            :formConfig="remarkConfig"
-            :formData="formData"
-          />
+          <BaseInfoFormPackage fieldItemLabel="template.dl.dl007.bz" label="template.dl.dl007.bz" :ref="refConf.remark"
+            :formConfig="remarkConfig" :formData="formData" />
         </div>
       </div>
     </div>
@@ -77,6 +49,7 @@ import TableList from '@/components/Template/Table'
 import Step from '@/components/Template/Step'
 import templateMixin from '../../mixins/templateMixin'
 import moment from 'moment'
+import { uniqeYqOne, uniqeResource } from "@/utils/calUnitTools";
 
 const refConf = {
   base: 'baseInfoRef',
@@ -339,6 +312,17 @@ export default {
     }
   },
   methods: {
+    onTableRegentSubmit(data) {
+      if (data.key === 'xbzbqbh') {
+        this.$refs.xbxxRef.updateFormData('xbzbqbh_tj', data.selectInfo.row.tj)
+        this.$refs.xbxxRef.updateFormData('xbzbqbh_dw', data.selectInfo.row.tjdw)
+      }
+      if (data.key === 'pyxbh') {
+        this.$refs.pyxxRef.updateFormData('pyxbh_mc', data.selectInfo.row.mc)
+        this.$refs.pyxxRef.updateFormData('pyxbh_xh', data.selectInfo.row.xh)
+        this.$refs.pyxxRef.updateFormData('pyxbh_jzrq', data.selectInfo.row.jzrq)
+      }
+    },
     handleClickButton(e, signData) {
       console.log(e)
       const { subKey } = e || {}
@@ -366,7 +350,7 @@ export default {
     async validFields() {
       return await this.validFormFields(refNames)
     },
-    getResource() {
+    _getResource() {
       const stepResource = this.$refs.stepRef.getStepResource()
       // 使用的试剂、仪器（来自制备步骤）
       this.resourceTmp = stepResource.sjResource || []
@@ -411,6 +395,64 @@ export default {
 
       return this.resourceTmp
     },
+    getResource() {
+      const content = this.getFilledFormData()
+      let tmpResource = []
+      let tmpYq = []
+      //生成细胞
+      for (var i = 0; i < parseInt(content.zbxbs); i++) {
+        tmpResource.push({
+          mc: content.xbmc,
+          bh: content['zbhxbbh_'+(i+1)] +content['zbhxbbhCodeSn_'+(i+1)],
+          ph: '',
+          ndz: '',
+          nd: '',
+          nddw: '',
+          ly: 'ELN配制',
+          sxrq: null,
+          kc: content.zbhxbsjtj,
+          kcdw: content.zbhxbsjtjUnit,
+          syl: null,
+          type: null, //生成的时候传null
+          elnType: this.product,  //生成的时候传 his.product
+          syldw: content.zbhxbsjtjUnit,
+          yxzq: null,
+          yxzqdw: null,
+        })
+      }
+      //使用细胞
+      tmpResource.push({
+        mc: null,
+        bh: content.xbzbqbh,
+        ph: '',
+        ndz: '',
+        nd: '',
+        nddw: '',
+        ly: '',
+        sxrq: null,
+        kc: null,
+        kcdw: null,
+        syl: null,
+        type: 9, //使用的时候传对应的值
+        elnType: null, //传null
+        syldw: content.xbzbqbh_dw,
+        yxzq: null,
+        yxzqdw: null,
+      })
+      //使用仪器
+      tmpYq.push({
+        mc: content.pyxbh_mc,
+        xh: content.pyxbh_xh,
+        bh: content.pyxbh,
+        jzrq: content.pyxbh_jzrq,
+      })
+      //使用的试剂、仪器
+      const stepResource = this.$refs.stepRef.getStepResource()
+      this.resourceTmp = uniqeResource(tmpResource, stepResource.sjResource || [])
+      this.yqResourceTmp = uniqeYqOne(tmpYq, stepResource.yqResource || [])
+      debugger
+      return this.resourceTmp;
+    },
     onRegentSubmit(e) {
       // 预留方法，如果需要处理试剂提交事件可以在这里添加
     },
@@ -430,6 +472,7 @@ export default {
 .print-btn {
   margin-bottom: 20px;
 }
+
 .config-header-end {
   display: flex;
   justify-content: flex-end;

From cc249d3d11906182f5777542c0e7225e849b7530 Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Wed, 18 Mar 2026 16:23:53 +0800
Subject: [PATCH 11/12] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?]DL012?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/dl/DL012.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/business/comps/template/comps/dl/DL012.vue b/src/views/business/comps/template/comps/dl/DL012.vue
index 78708c6..ef9bf15 100644
--- a/src/views/business/comps/template/comps/dl/DL012.vue
+++ b/src/views/business/comps/template/comps/dl/DL012.vue
@@ -399,6 +399,7 @@ export default {
       const content = this.getFilledFormData()
       let tmpResource = []
       let tmpYq = []
+      debugger
       //生成细胞
       for (var i = 0; i < parseInt(content.zbxbs); i++) {
         tmpResource.push({

From 09ab9271bc88413521eb487dd8d5d9815a8df290 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Wed, 18 Mar 2026 16:24:07 +0800
Subject: [PATCH 12/12] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=20=E6=AF=92=E7=90=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/comps/template/comps/dl/DL023.vue      | 11 +++--------
 src/views/business/comps/template/mixins/templateMixin.js | 11 +++++++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/views/business/comps/template/comps/dl/DL023.vue b/src/views/business/comps/template/comps/dl/DL023.vue
index 0b1ca39..4b716bc 100644
--- a/src/views/business/comps/template/comps/dl/DL023.vue
+++ b/src/views/business/comps/template/comps/dl/DL023.vue
@@ -47,9 +47,6 @@ import moment from 'moment'
 
 export default {
 	name: "dl023",
-	dicts: [
-		'business_dl_xbmc',"business_sydd"
-	],
 	components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable, TableOpertaionDelete },
 	mixins: [templateMixin],
 	props: {
@@ -166,9 +163,10 @@ export default {
 							label: "template.dl.dl023.uvazsjl",
 							type: "input",
 							fillType: "actFill",
-							subType: "sj",
+							subType: "select",
 							subKey: "subUvazsjl",
 							subFillType: "actFill",
+							subOptions: this.getDictOptions('business_dl_uav'),
 							maxlength: 20,
 						},
 						zszsj: {
@@ -225,10 +223,7 @@ export default {
 		onSelect(e) {
 			const { key, value } = e
 			if (key === "dwzshxbx") {//动物种属或细胞系
-				this.otherOptions = value === '动物种属' ? this.getDictOptions('business_dl_xbmc') : [
-					{ label: "细胞系1", value: "细胞系1" },
-					{ label: "细胞系2", value: "细胞系2" },
-				]
+				this.otherOptions = value === '动物种属' ? this.getDictOptions('business_dl_dwzs') : this.getDictOptions('business_dl_xbx')
 			}
 
 		},
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index 0906ef1..120f71d 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -61,10 +61,13 @@ export default {
 		'business_cjbw', // 制片部位
 		'business_qywz', // 取样位置
 
-		'business_lba_ptjhbzqx_zkpx', // lba005
-		'business_lba_ptjhfxyp', // lba007
-		'business_ada_kyktzkyp', // ada005
-		'business_ada_kyktffxyp', // ada007
+		'business_lba_ptjhbzqx_zkpx', // LBA-编号-配体结合分析标准曲线LBA005-质控平行
+		'business_lba_bqpx', //LBA-编号-配体结合分析标准曲线LBA005-标曲平行
+		'business_lba_ptjhfxyp', // LBA-编号-配体结合分析方法学样品制备表LBA007
+		'business_ada_kyktzkyp', // ADA-编号-抗药抗体质控样品配制记录表ADA005
+		'business_ada_kyktffxyp', // ADA-编号-抗药抗体方法学样品制备表ADA007
+		'business_dl_uav', // 毒理-紫外照射操作记录表-UVA-DL023
+		'business_pcr_fxffypzbb', //PCR-编号-分析方法学样品制备表
 	],
 	props: {
 		templateData: {