diff --git a/src/api/business/home/home.js b/src/api/business/home/home.js
index 24edc22..83e60b2 100644
--- a/src/api/business/home/home.js
+++ b/src/api/business/home/home.js
@@ -14,3 +14,17 @@ export function home_noticeList(query) {
     params: query
   })
 }
+export function home_noticeRead(data) {
+  return request({
+    url: '/system/business/home/noticeRead',
+    method: 'post',
+    data
+  })
+}
+export function home_noticeCount(query) {
+  return request({
+    url: '/system/business/home/noticeCount',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/lang/en/business/home/home.js b/src/lang/en/business/home/home.js
index 4753b35..24335bd 100644
--- a/src/lang/en/business/home/home.js
+++ b/src/lang/en/business/home/home.js
@@ -5,5 +5,6 @@ export default {
   bzxzsy: 'Weekly New Study',
   ywcsy: 'Completed Study',
 
-  xttz: 'Notification'
+  xttz: 'Notification',
+  xx: 'Message'
 }
diff --git a/src/lang/zh/business/home/home.js b/src/lang/zh/business/home/home.js
index ab6d702..9cd14cf 100644
--- a/src/lang/zh/business/home/home.js
+++ b/src/lang/zh/business/home/home.js
@@ -5,5 +5,6 @@ export default {
   bzxzsy: '本周新增试验',
   ywcsy: '已完成试验',
 
-  xttz: '系统通知'
+  xttz: '系统通知',
+  xx: '消息'
 }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c996c4a..fca8e28 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -20,6 +20,8 @@
         </el-tooltip> -->
 
           </template>
+          
+          <div class="notice-count" @click="gotoNotice"><span>{{$t('page.business.home.xx')}}</span><el-badge :value="menuCount.noticeCount" class="item"></el-badge></div>
           <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
             <div class="avatar-wrapper">
               <img src="@/assets/images/profile.jpg" class="user-avatar">
@@ -35,6 +37,7 @@
             </el-dropdown-menu>
           </el-dropdown>
           <lang-select class="set-language" style="margin-left: 10px;"/>
+          
         </div>
       </div>
     </div>
@@ -42,7 +45,7 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
+import { mapGetters,mapState } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
 import Hamburger from '@/components/Hamburger'
@@ -71,8 +74,9 @@ export default {
       'sidebar',
       'avatar',
       'device',
-      'nickName'
+      'nickName',
     ]),
+    ...mapState(["menuCount"]),
     setting: {
       get() {
         return this.$store.state.settings.showSettings
@@ -101,6 +105,9 @@ export default {
           location.href = '/user/work'
         })
       }).catch(() => { })
+    },
+    gotoNotice(){
+      this.$router.push('/user/work')
     }
   }
 }
@@ -165,10 +172,18 @@ export default {
     line-height: 50px;
     padding-right: 20px;
 
+    display: flex;
+    align-items: center;
+
     &:focus {
       outline: none;
     }
 
+    .notice-count{
+      margin-right: 10px;
+      cursor: pointer;
+    }
+
     .right-menu-item {
       display: inline-block;
       padding: 0 8px;
diff --git a/src/permission.js b/src/permission.js
index 511cae5..d006903 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -12,7 +12,7 @@ NProgress.configure({ showSpinner: false })
 const whiteList = ['/login', '/lblh']
 
 const isWhiteList = (path) => {
-  return whiteList.some(pattern => isPathMatch(pattern, path))
+  return whiteList.some((pattern) => isPathMatch(pattern, path))
 }
 
 router.beforeEach((to, from, next) => {
@@ -28,21 +28,41 @@ router.beforeEach((to, from, next) => {
     } else {
       if (store.getters.roles.length === 0) {
         isRelogin.show = true
+
+        //业务菜单角标
+        store
+          .dispatch('GetMenuCount')
+          .then(() => {})
+          .catch((error) => {
+            console.log('GetMenuCount出错：' + (error.msg || ''))
+          })
+
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(() => {
-          isRelogin.show = false
-          store.dispatch('GenerateRoutes').then(accessRoutes => {
-            // 根据roles权限生成可访问的路由表
-            router.addRoutes(accessRoutes) // 动态添加可访问路由表
-            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+        store
+          .dispatch('GetInfo')
+          .then(() => {
+            isRelogin.show = false
+            store.dispatch('GenerateRoutes').then((accessRoutes) => {
+              // 根据roles权限生成可访问的路由表
+              router.addRoutes(accessRoutes) // 动态添加可访问路由表
+              next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
+            })
           })
-        }).catch(err => {
+          .catch((err) => {
             store.dispatch('LogOut').then(() => {
               Message.error(err)
               next({ path: '/' })
             })
           })
       } else {
+        //业务菜单角标
+        store
+          .dispatch('GetMenuCount')
+          .then(() => {})
+          .catch((error) => {
+            console.log('GetMenuCount出错：' + (error.msg || ''))
+          })
+
         next()
       }
     }
diff --git a/src/store/index.js b/src/store/index.js
index 4817bba..de0c050 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -8,6 +8,7 @@ import permission from './modules/permission'
 import settings from './modules/settings'
 import getters from './getters'
 import template from './modules/template'
+import menuCount from './modules/business/menuCount'
 
 Vue.use(Vuex)
 
@@ -19,7 +20,8 @@ const store = new Vuex.Store({
     tagsView,
     permission,
     settings,
-    template
+    template,
+    menuCount
   },
   getters
 })
diff --git a/src/store/modules/business/menuCount.js b/src/store/modules/business/menuCount.js
new file mode 100644
index 0000000..d90d306
--- /dev/null
+++ b/src/store/modules/business/menuCount.js
@@ -0,0 +1,30 @@
+import { home_noticeCount } from '@/api/business/home/home'
+
+const menuCount = {
+  state: {
+    //未读通知数量
+    noticeCount: 0
+  },
+
+  mutations: {
+    SET_MENU_COUNT: (state, d) => {
+      state.noticeCount = d.noticeCount
+    }
+  },
+  actions: {
+    GetMenuCount({ commit, state }) {
+      return new Promise((resolve, reject) => {
+        home_noticeCount()
+          .then((res) => {
+            commit('SET_MENU_COUNT', res.data)
+            resolve(res)
+          })
+          .catch((error) => {
+            reject(error)
+          })
+      })
+    }
+  }
+}
+
+export default menuCount
diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue
index 7dd9b9d..1ac0a7a 100644
--- a/src/views/business/comps/template/TemplateTable.vue
+++ b/src/views/business/comps/template/TemplateTable.vue
@@ -211,6 +211,9 @@ export default {
     getResource() {
       return this.$refs.templateComponent.getResource();
     },
+    getYqResource() {
+      return this.$refs.templateComponent.getYqResource();
+    },
     getFilledFormData() {
       return this.$refs.templateComponent.getFilledFormData();
     },
diff --git a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
index 0b8a31f..faae5ea 100644
--- a/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPBQGZYZBB.vue
@@ -6,12 +6,10 @@
 				"生物样品标曲工作液制备表" }}<img src="@/assets/images/detail-title.png" /></div>
 			<div class="detail-content">
 				<div class="content">
-					<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="yqsColumns"
-						:dataSource="resource" />
+					<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="yqsColumns" :dataSource="yqResource" />
 					<!-- <BaseInfoFormPackage label="存储条件" ref="storageConditionRef" :formConfig="storageFormConfig"
 						:formData="formData" /> -->
 					<LineLabel label="template.common.operationSteps" />
@@ -19,9 +17,9 @@
 						<BaseInfoFormPackage @clickable="handleClickable" ref="stepFormPackageRef"
 							@resetRecord="resetRecord" :formConfig="stepFormConfig" @blur="onHandleBlur"
 							:formData="formData" />
-						<CustomTable fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur" :showAddRow="false"
-							:showOperation="fillType === 'actFill'" ref="stepTableRef" :columns="stepColumns"
-							:formData="formData">
+						<CustomTable fieldItemLabel="template.common.operationSteps" @blur="onHandleTableBlur"
+							:showAddRow="false" :showOperation="fillType === 'actFill'" ref="stepTableRef"
+							:columns="stepColumns" :formData="formData">
 							<template slot="operation" slot-scope="{ row, rowIndex, columns }">
 								<TableOpertaion @startConfig="startConfig" @configComplete="configComplete"
 									@printTag="printTag" @subPackageSubmit="subPackageSubmit" :fillType="fillType"
@@ -31,7 +29,8 @@
 						</CustomTable>
 					</div>
 					<Step ref="stepRef" :formData="formData.stepData"></Step>
-					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 
 				</div>
 			</div>
@@ -542,6 +541,7 @@ export default {
 				const { actVol, actNd } = this.updateSjmbrynd(item, row.nd);
 				item.actSolutionVolume = actVol;
 				item.actSolutionConcentration = actNd;
+				item.actSolutionExpire = row.sxr;
 			}
 
 			// 更新stepTableRef组件的数据
@@ -551,49 +551,55 @@ export default {
 			let content = await this.validFormFields(["baseInfoRef", "stepFormPackageRef", "stepTableRef", "stepRef", "remarkRef"]);
 			//生成resource
 			let tmpResource = []
-			let tableList = content.stepTableFormData
-			if (tableList && tableList.length > 0) {
-				for (let i = 0; i < tableList.length; i++) {
-					let item = tableList[i]
-					//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-			        const { total, unit } = addTj([item.actStartSolutionVolume, item.actDiluentVolumeUnit], [content.headerSelectFields.actStartSolutionVolumeUnit, content.headerSelectFields.actDiluentVolumeUnit])
-					tmpResource.push({
-						mc: null,
-						bh: item.targetSolutionCode + item.subTargetSolutionCode,
-						ph: null,
-						nd: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit,
-						source: 'ELN配制',
-						sxrq: content.expireDate,
-						ndz: item.actSolutionConcentration,
-						nddw: content.headerSelectFields.actSolutionConcentrationUnit,
-						kc: total,
-						kcdw: unit,
-						syl: null,
-						syldw: unit,
-						yxzq: content.effectivePeriod,
-						yxzqdw: content.effectivePeriodUnit,
-					})
-					if (item.fzsj && item.fzsj.fzList && item.fzsj.fzList) {
-						for (let j = 0; j < item.fzsj.fzList.length; j++) {
-							tmpResource.push({
-								mc: null,
-								bh: item.fzsj.mybh +'-'+item.fzsj.fzList[j].subCode,
-								ph: null,
-								nd: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit,
-								source: 'ELN配制',
-								sxrq: content.expireDate,
-								ndz: item.actSolutionConcentration,
-								nddw: content.headerSelectFields.actSolutionConcentrationUnit,
-								kc: item.fzsj.fzList[j].num,
-								kcdw: item.fzsj.dw,
-								syl: null,
-								syldw: item.fzsj.dw,
-								yxzq: content.effectivePeriod,
-								yxzqdw: content.effectivePeriodUnit,
-							})
+			debugger
+			if (this.fillType === "actFill") {
+				//生成
+				let tableList = content.stepTableFormData
+				if (tableList && tableList.length > 0) {
+					for (let i = 0; i < tableList.length; i++) {
+						let item = tableList[i]
+						//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+						const { total, unit } = addTj([item.actStartSolutionVolume, item.actDiluentVolumeUnit], [content.headerSelectFields.actStartSolutionVolumeUnit, content.headerSelectFields.actDiluentVolumeUnit])
+						tmpResource.push({
+							mc: null,
+							bh: item.targetSolutionCode + item.subTargetSolutionCode,
+							ph: null,
+							nd: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit,
+							source: 'ELN配制',
+							sxrq: content.expireDate,
+							ndz: item.actSolutionConcentration,
+							nddw: content.headerSelectFields.actSolutionConcentrationUnit,
+							kc: total,
+							kcdw: unit,
+							syl: null,
+							syldw: unit,
+							yxzq: content.effectivePeriod,
+							yxzqdw: content.effectivePeriodUnit,
+						})
+						if (item.fzsj && item.fzsj.fzList && item.fzsj.fzList) {
+							for (let j = 0; j < item.fzsj.fzList.length; j++) {
+								tmpResource.push({
+									mc: null,
+									bh: item.fzsj.mybh + '-' + item.fzsj.fzList[j].subCode,
+									ph: null,
+									nd: item.actSolutionConcentration + content.headerSelectFields.actSolutionConcentrationUnit,
+									source: 'ELN配制',
+									sxrq: content.expireDate,
+									ndz: item.actSolutionConcentration,
+									nddw: content.headerSelectFields.actSolutionConcentrationUnit,
+									kc: item.fzsj.fzList[j].num,
+									kcdw: item.fzsj.dw,
+									syl: null,
+									syldw: item.fzsj.dw,
+									yxzq: content.effectivePeriod,
+									yxzqdw: content.effectivePeriodUnit,
+								})
+							}
 						}
 					}
 				}
+				//使用
+				
 			}
 			this.resourceTmp = tmpResource
 
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
index 590b264..b3443af 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXCBYPZB.vue
@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqsColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -240,20 +240,6 @@ export default {
 		return {
 			resource: [],
 			resourceData1: [],
-			sysjColumns: [
-				{ label: 'template.common.reagentName', prop: "mc" },//名称
-				{ label: 'template.common.reagentCode', prop: "bh" },//编号
-				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
-				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源 
-				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
-			],
-			yqsColumns: [
-				{ label: 'template.common.instrumentName', prop: "instrumentName" },
-				{ label: 'template.common.instrumentModel', prop: "instrumentModel" },
-				{ label: 'template.common.instrumentCode', prop: "instrumentCode" },
-				{ label: 'template.common.nextTestDate', prop: "nextTestDate" },
-			],
 			formData: {}
 		};
 	},
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
index 74ffb5e..8d2924a 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXFFXZKPZB.vue
@@ -11,7 +11,7 @@
 					<TableList label="template.common.reagentInfo" :columns="sysjColumns"
 						:dataSource="resource" />
 					<TableList label="template.common.instrumentInfo" :columns="yqsColumns"
-						:dataSource="resource" />
+						:dataSource="yqResource" />
 					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef"
 						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
@@ -236,25 +236,8 @@ export default {
 	data() {
 		return {
 			reagentType: "",//本表单特殊字段：选择试剂的类型1选择基质，2表格里面选择试剂
-
 			currentSubKey: "",//当前点击的子项key
 			rowIndex:0,//当前表格点击的行数
-
-			resource: [],
-			sysjColumns: [
-				{ label: 'template.common.reagentName', prop: "mc" },//名称
-				{ label: 'template.common.reagentCode', prop: "bh" },//编号
-				{ label: 'template.common.reagentNo', prop: "ph" },//批号 试剂，供试品才有
-				{ label: 'template.common.concentration', prop: "nd" },//浓度
-				{ label: 'template.common.source', prop: "source" },//来源
-				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
-			],
-			yqsColumns: [
-				{ label: 'template.common.instrumentName', prop: "instrumentName" },
-				{ label: 'template.common.instrumentModel', prop: "instrumentModel" },
-				{ label: 'template.common.instrumentCode', prop: "instrumentCode" },
-				{ label: 'template.common.nextTestDate', prop: "nextTestDate" },
-			],
 			formData: {}
 		};
 	},
diff --git a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
index f217d4c..ef60758 100644
--- a/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPFXRYPZB.vue
@@ -241,8 +241,6 @@ export default {
 	},
 	data() {
 		return {
-			resource: [],
-			yqResource: [],
 			formData: {}
 		};
 	},
diff --git a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
index c2871ad..e684b65 100644
--- a/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
+++ b/src/views/business/comps/template/comps/sp/SWYPNBGZYZBB.vue
@@ -9,9 +9,10 @@
 					<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="yqsColumns" :dataSource="resource" />
-					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition" label="template.common.storageCondition" ref="storageConditionRef" :formConfig="storageFormConfig"
-						:formData="formData" />
+					<TableList label="template.common.instrumentInfo" :columns="yqsColumns" :dataSource="yqResource" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.storageCondition"
+						label="template.common.storageCondition" ref="storageConditionRef"
+						:formConfig="storageFormConfig" :formData="formData" />
 					<LineLabel label="template.common.operationSteps" />
 					<div v-if="fillType === 'preFill'" class="mt-20">
 						<el-button type="primary" @click="handleAddParalle">新增平行配制</el-button>
@@ -86,7 +87,8 @@
 								:prefixKey="'paralle' + paralleIndex"></Step>
 						</div>
 					</div>
-					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark" ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
+					<BaseInfoFormPackage fieldItemLabel="template.common.remark" label="template.common.remark"
+						ref="remarkRef" :formConfig="remarkConig" :formData="formData" />
 
 				</div>
 			</div>
@@ -484,7 +486,7 @@ export default {
 			// 遍历数据，按要求更新起始溶液编号
 			newData.forEach((item, index) => {
 				const { actVol, actNd } = this.updateSjmbrynd(item, row.nd);
-				console.log(actNd,"actNd")
+				console.log(actNd, "actNd")
 				item.actSolutionVolume = actVol;
 				item.actSolutionConcentration = actNd;
 			})
@@ -572,96 +574,98 @@ export default {
 			let content = this.getFilledFormData();
 			//生成resource
 			let tmpResource = []
-			//平行配置
-			if (content.ladderConfigs && content.ladderConfigs.length > 0) {
-				for (let i = 0; i < content.ladderConfigs.length; i++) {
-					let ladderConfigs = content.ladderConfigs[i]
-					let stepTableFormData = ladderConfigs.stepTableFormData
-					for (let j = 0; j < stepTableFormData.length; j++) {
-						//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
-						const { total, unit } = addTj([stepTableFormData[j].actStartSolutionVolume, stepTableFormData[j].actDiluentVolume], [ladderConfigs.headerSelectFields.actStartSolutionVolumeUnit, ladderConfigs.headerSelectFields.actDiluentVolumeUnit])
-						tmpResource.push({
-							mc: null,
-							bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
-							ph: null,
-							nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-							source: 'ELN配制',
-							sxrq: ladderConfigs.expireDate,
-							ndz: stepTableFormData[j].actSolutionConcentration,
-							nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-							kc: total,
-							kcdw: unit,
-							syl: null,
-							syldw: unit,
-							yxzq: ladderConfigs.effectivePeriod,
-							yxzqdw: ladderConfigs.effectivePeriodUnit,
-						})
-						let fzsj = stepTableFormData[j].fzsj
-						if (fzsj && fzsj.fzList) {
-							for (let k = 0; k < fzsj.fzList.length; k++) {
-								tmpResource.push({
-									mc: null,
-									bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
-									ph: null,
-									nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-									source: 'ELN配制',
-									sxrq: ladderConfigs.expireDate,
-									ndz: stepTableFormData[j].actSolutionConcentration,
-									nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
-									kc: fzsj.fzList[k].num,
-									kcdw: fzsj.dw,
-									syl: null,
-									syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
-									yxzq: ladderConfigs.effectivePeriod,
-									yxzqdw: ladderConfigs.effectivePeriodUnit,
-								})
+			if (this.fillType === "actFill") {
+				//平行配置
+				if (content.ladderConfigs && content.ladderConfigs.length > 0) {
+					for (let i = 0; i < content.ladderConfigs.length; i++) {
+						let ladderConfigs = content.ladderConfigs[i]
+						let stepTableFormData = ladderConfigs.stepTableFormData
+						for (let j = 0; j < stepTableFormData.length; j++) {
+							//计算实际目标溶液体积(实际起始溶液体积+实际稀释液体积)
+							const { total, unit } = addTj([stepTableFormData[j].actStartSolutionVolume, stepTableFormData[j].actDiluentVolume], [ladderConfigs.headerSelectFields.actStartSolutionVolumeUnit, ladderConfigs.headerSelectFields.actDiluentVolumeUnit])
+							tmpResource.push({
+								mc: null,
+								bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
+								ph: null,
+								nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								source: 'ELN配制',
+								sxrq: ladderConfigs.expireDate,
+								ndz: stepTableFormData[j].actSolutionConcentration,
+								nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								kc: total,
+								kcdw: unit,
+								syl: null,
+								syldw: unit,
+								yxzq: ladderConfigs.effectivePeriod,
+								yxzqdw: ladderConfigs.effectivePeriodUnit,
+							})
+							let fzsj = stepTableFormData[j].fzsj
+							if (fzsj && fzsj.fzList) {
+								for (let k = 0; k < fzsj.fzList.length; k++) {
+									tmpResource.push({
+										mc: null,
+										bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
+										ph: null,
+										nd: stepTableFormData[j].actSolutionConcentration + ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+										source: 'ELN配制',
+										sxrq: ladderConfigs.expireDate,
+										ndz: stepTableFormData[j].actSolutionConcentration,
+										nddw: ladderConfigs.headerSelectFields.actSolutionConcentrationUnit,
+										kc: fzsj.fzList[k].num,
+										kcdw: fzsj.dw,
+										syl: null,
+										syldw: ladderConfigs.headerSelectFields.actSolutionVolumeUnit,
+										yxzq: ladderConfigs.effectivePeriod,
+										yxzqdw: ladderConfigs.effectivePeriodUnit,
+									})
+								}
 							}
 						}
 					}
 				}
-			}
-			//阶梯配置
-			if (content.paralleConfigs && content.paralleConfigs.length > 0) {
-				for (let i = 0; i < content.paralleConfigs.length; i++) {
-					let paralleConfigs = content.paralleConfigs[i]
-					let stepTableFormData = paralleConfigs.stepTableFormData
-					for (let j = 0; j < stepTableFormData.length; j++) {
-						const { total, unit } = addTj([stepTableFormData[j].actSolutionVolume, stepTableFormData[j].actDiluentVolume], [paralleConfigs.headerSelectFields.actSolutionVolumeUnit, paralleConfigs.headerSelectFields.actDiluentVolumeUnit])
-						tmpResource.push({
-							mc: null,
-							bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
-							ph: null,
-							nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-							source: 'ELN配制',
-							sxrq: stepTableFormData[j].targetSolutionExpirationDate,
-							ndz: stepTableFormData[j].actSolutionConcentration,
-							nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-							kc: total,
-							kcdw: unit,
-							syl: null,
-							syldw: unit,
-							yxzq: stepTableFormData[j].targetSolutionCycle,
-							yxzqdw: stepTableFormData[j].targetSolutionCyclePrecision,
-						})
-						let fzsj = stepTableFormData[j].fzsj
-						if (fzsj && fzsj.fzList) {
-							for (let k = 0; k < fzsj.fzList.length; k++) {
-								tmpResource.push({
-									mc: null,
-									bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
-									ph: null,
-									nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-									source: 'ELN配制',
-									sxrq: paralleConfigs.expireDate,
-									ndz: stepTableFormData[j].actSolutionConcentration,
-									nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
-									kc: fzsj.fzList[k].num,
-									kcdw: fzsj.dw,
-									syl: null,
-									syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
-									yxzq: paralleConfigs.effectivePeriod,
-									yxzqdw: paralleConfigs.effectivePeriodUnit,
-								})
+				//阶梯配置
+				if (content.paralleConfigs && content.paralleConfigs.length > 0) {
+					for (let i = 0; i < content.paralleConfigs.length; i++) {
+						let paralleConfigs = content.paralleConfigs[i]
+						let stepTableFormData = paralleConfigs.stepTableFormData
+						for (let j = 0; j < stepTableFormData.length; j++) {
+							const { total, unit } = addTj([stepTableFormData[j].actSolutionVolume, stepTableFormData[j].actDiluentVolume], [paralleConfigs.headerSelectFields.actSolutionVolumeUnit, paralleConfigs.headerSelectFields.actDiluentVolumeUnit])
+							tmpResource.push({
+								mc: null,
+								bh: stepTableFormData[j].targetSolutionCode + stepTableFormData[j].subTargetSolutionCode,
+								ph: null,
+								nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								source: 'ELN配制',
+								sxrq: stepTableFormData[j].targetSolutionExpirationDate,
+								ndz: stepTableFormData[j].actSolutionConcentration,
+								nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+								kc: total,
+								kcdw: unit,
+								syl: null,
+								syldw: unit,
+								yxzq: stepTableFormData[j].targetSolutionCycle,
+								yxzqdw: stepTableFormData[j].targetSolutionCyclePrecision,
+							})
+							let fzsj = stepTableFormData[j].fzsj
+							if (fzsj && fzsj.fzList) {
+								for (let k = 0; k < fzsj.fzList.length; k++) {
+									tmpResource.push({
+										mc: null,
+										bh: fzsj.mybh + '-' + fzsj.fzList[k].subCode,
+										ph: null,
+										nd: stepTableFormData[j].actSolutionConcentration + paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+										source: 'ELN配制',
+										sxrq: paralleConfigs.expireDate,
+										ndz: stepTableFormData[j].actSolutionConcentration,
+										nddw: paralleConfigs.headerSelectFields.actSolutionConcentrationUnit,
+										kc: fzsj.fzList[k].num,
+										kcdw: fzsj.dw,
+										syl: null,
+										syldw: paralleConfigs.headerSelectFields.actSolutionVolumeUnit,
+										yxzq: paralleConfigs.effectivePeriod,
+										yxzqdw: paralleConfigs.effectivePeriodUnit,
+									})
+								}
 							}
 						}
 					}
diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js
index ab7d5d2..e829441 100644
--- a/src/views/business/comps/template/mixins/templateMixin.js
+++ b/src/views/business/comps/template/mixins/templateMixin.js
@@ -54,6 +54,10 @@ export default {
 						//试验试剂信息
 						this.resource = JSON.parse(v.resource)
 					}
+					if (v.yqResource) {
+						//仪器信息
+						this.yqResource = JSON.parse(v.yqResource)
+					}
 					if (v.bdnr) {
 						this.formData = {
 							...JSON.parse(v.bdnr),
@@ -112,6 +116,8 @@ export default {
 			formData: {},
 			templateDetail: {},
 			resource: [], //试验试剂信息
+			yqResource: [], //仪器信息
+			yqResourceTmp: [], //仪器信息提交用
 			resourceTmp:[],//试验试剂信息提交用
 			sysjColumns: [
 				{ label: 'template.common.reagentName', prop: "mc" },//名称
@@ -122,10 +128,10 @@ export default {
 				{ label: 'template.common.reagentExpireDate', prop: "sxrq" },//失效日期
 			],
 			yqsColumns: [
-				{ label: 'template.common.instrumentName', prop: "instrumentName" },
-				{ label: 'template.common.instrumentModel', prop: "instrumentModel" },
-				{ label: 'template.common.instrumentCode', prop: "instrumentCode" },
-				{ label: 'template.common.nextTestDate', prop: "nextTestDate" },
+				{ label: 'template.common.instrumentName', prop: "mc" },//仪器名称
+				{ label: 'template.common.instrumentModel', prop: "xh" },//仪器型号
+				{ label: 'template.common.instrumentCode', prop: "bh" },//仪器编号
+				{ label: 'template.common.nextTestDate', prop: "jzrq" },//下次测试/校准/检定日期
 			],
 		}
 	},
@@ -190,6 +196,9 @@ export default {
 		getResource() {
 			return this.resourceTmp
 		},
+		getYqResource() {
+			return this.yqResourceTmp
+		},
 		//根据ref数组获取直接formData
 		getFilledFormDataByRefs(refArr = []) {
 			let result = {}
diff --git a/src/views/business/form/drug/comp/sqbd.vue b/src/views/business/form/drug/comp/sqbd.vue
index 5472adf..2c1a33f 100644
--- a/src/views/business/form/drug/comp/sqbd.vue
+++ b/src/views/business/form/drug/comp/sqbd.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="study-tbbd">
-    <div class="tbbd-right">
+    <div class="tbbd-right" v-if="studyInfo.id&&studyInfo.id!=''">
       <sqbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
diff --git a/src/views/business/form/drug/comp/tbbd.vue b/src/views/business/form/drug/comp/tbbd.vue
index f1dec26..992d53a 100644
--- a/src/views/business/form/drug/comp/tbbd.vue
+++ b/src/views/business/form/drug/comp/tbbd.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="study-tbbd">
-    <div class="tbbd-right">
+    <div class="tbbd-right" v-if="studyInfo.id&&studyInfo.id!=''">
       <tbbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
diff --git a/src/views/business/form/drug/comp/wzlb.vue b/src/views/business/form/drug/comp/wzlb.vue
index e462b57..d79627a 100644
--- a/src/views/business/form/drug/comp/wzlb.vue
+++ b/src/views/business/form/drug/comp/wzlb.vue
@@ -37,7 +37,7 @@
           {{ item.name }}
         </div>
       </div>
-       <div class="content-box">
+       <div class="content-box" v-if="studyInfo.id&&studyInfo.id!=''">
         <gyzjList v-if="active === 'gyzjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
         <mjyList v-if="active === 'mjylb'" :study="studyInfo" @showDetail="showDetailCallback"/>
       </div>
diff --git a/src/views/business/form/drug/comp/ytbd.vue b/src/views/business/form/drug/comp/ytbd.vue
index 356b8e7..23100a3 100644
--- a/src/views/business/form/drug/comp/ytbd.vue
+++ b/src/views/business/form/drug/comp/ytbd.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="study-ytbd">
-    <div class="ytbd-right">
+    <div class="ytbd-right" v-if="studyInfo.id&&studyInfo.id!=''">
       <ytbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
diff --git a/src/views/business/form/nonTrial/comp/syff/Xz.vue b/src/views/business/form/nonTrial/comp/syff/Xz.vue
index 4fc3a1f..8e59ce2 100644
--- a/src/views/business/form/nonTrial/comp/syff/Xz.vue
+++ b/src/views/business/form/nonTrial/comp/syff/Xz.vue
@@ -54,7 +54,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/form/nonTrial/comp/syff/Yd.vue b/src/views/business/form/nonTrial/comp/syff/Yd.vue
index c0dfd64..b2fb620 100644
--- a/src/views/business/form/nonTrial/comp/syff/Yd.vue
+++ b/src/views/business/form/nonTrial/comp/syff/Yd.vue
@@ -32,7 +32,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/form/nonTrial/comp/tbbd.vue b/src/views/business/form/nonTrial/comp/tbbd.vue
index 70232e5..5cc5edf 100644
--- a/src/views/business/form/nonTrial/comp/tbbd.vue
+++ b/src/views/business/form/nonTrial/comp/tbbd.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="study-tbbd">
-    <div class="tbbd-right">
+    <div class="tbbd-right" v-if="studyInfo.id&&studyInfo.id!=''">
       <tbbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
diff --git a/src/views/business/form/nonTrial/comp/wzlb.vue b/src/views/business/form/nonTrial/comp/wzlb.vue
index d46229d..7bb40b0 100644
--- a/src/views/business/form/nonTrial/comp/wzlb.vue
+++ b/src/views/business/form/nonTrial/comp/wzlb.vue
@@ -37,7 +37,7 @@
           {{ item.name }}
         </div>
       </div>
-       <div class="content-box">
+       <div class="content-box" v-if="studyInfo.id&&studyInfo.id!=''">
         <gyzjList v-if="active === 'gyzjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
       </div>
     </div>
diff --git a/src/views/business/form/nonTrial/comp/ytbd.vue b/src/views/business/form/nonTrial/comp/ytbd.vue
index e90168f..2b4fa26 100644
--- a/src/views/business/form/nonTrial/comp/ytbd.vue
+++ b/src/views/business/form/nonTrial/comp/ytbd.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="study-ytbd">
-    <div class="ytbd-right">
+    <div class="ytbd-right" v-if="studyInfo.id&&studyInfo.id!=''">
       <ytbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
diff --git a/src/views/business/resource/gsp/comps/ffjl/Gd.vue b/src/views/business/resource/gsp/comps/ffjl/Gd.vue
index 72856f5..c668477 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Gd.vue
@@ -57,7 +57,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jd.vue b/src/views/business/resource/gsp/comps/ffjl/Jd.vue
index 83df232..fee1dc5 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jd.vue
@@ -47,7 +47,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jq.vue b/src/views/business/resource/gsp/comps/ffjl/Jq.vue
index a3f1bff..36d67c5 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jq.vue
@@ -47,7 +47,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/ffjl/Js.vue b/src/views/business/resource/gsp/comps/ffjl/Js.vue
index 0c793ea..ecdc658 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Js.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Js.vue
@@ -47,7 +47,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/ffjl/Jy.vue b/src/views/business/resource/gsp/comps/ffjl/Jy.vue
index e18d1a2..59d1e6f 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Jy.vue
@@ -57,7 +57,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/ffjl/Sd.vue b/src/views/business/resource/gsp/comps/ffjl/Sd.vue
index 2e82d3d..08dee6e 100644
--- a/src/views/business/resource/gsp/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/gsp/comps/ffjl/Sd.vue
@@ -57,7 +57,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/gsp/Bj.vue b/src/views/business/resource/gsp/comps/gsp/Bj.vue
index f719514..4e563d0 100644
--- a/src/views/business/resource/gsp/comps/gsp/Bj.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Bj.vue
@@ -88,7 +88,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/gsp/Cz.vue b/src/views/business/resource/gsp/comps/gsp/Cz.vue
index eeba9d4..62ccc39 100644
--- a/src/views/business/resource/gsp/comps/gsp/Cz.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Cz.vue
@@ -65,7 +65,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
index b5f27bb..9c74484 100644
--- a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
+++ b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue
@@ -55,7 +55,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/gsp/Ff.vue b/src/views/business/resource/gsp/comps/gsp/Ff.vue
index 049200e..3e59af7 100644
--- a/src/views/business/resource/gsp/comps/gsp/Ff.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Ff.vue
@@ -150,7 +150,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.lqr1')+$t('form.password')" prop="lqr1mm">
-              <el-input type="password" v-model="form.lqr1mm" maxlength="20"
+              <el-input type="password" v-model="form.lqr1mm" maxlength="20"  show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -163,7 +163,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gsp.lqr2')+$t('form.password')" >
-              <el-input type="password" v-model="form.lqr2mm" maxlength="20"
+              <el-input type="password" v-model="form.lqr2mm" maxlength="20"  show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -176,7 +176,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr1')+$t('form.password')" prop="ffr1mm">
-              <el-input type="password" v-model="form.ffr1mm" maxlength="20"
+              <el-input type="password" v-model="form.ffr1mm" maxlength="20"  show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -189,7 +189,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr2')+$t('form.password')" prop="ffr2mm">
-              <el-input type="password" v-model="form.ffr2mm" maxlength="20"
+              <el-input type="password" v-model="form.ffr2mm" maxlength="20"  show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/gsp/Gd.vue b/src/views/business/resource/gsp/comps/gsp/Gd.vue
index 0d9b264..ea119fd 100644
--- a/src/views/business/resource/gsp/comps/gsp/Gd.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Gd.vue
@@ -33,7 +33,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"   autocomplete="off" auto-complete="new-password" show-password :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/gsp/Gh.vue b/src/views/business/resource/gsp/comps/gsp/Gh.vue
index ace3131..db20100 100644
--- a/src/views/business/resource/gsp/comps/gsp/Gh.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Gh.vue
@@ -101,7 +101,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ghr1Id') + $t('form.password')" prop="ghr1mm">
-              <el-input type="password" v-model="form.ghr1mm" maxlength="20"
+              <el-input type="password" v-model="form.ghr1mm" maxlength="20"  show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -114,7 +114,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ghr2Id') + $t('form.password')">
-              <el-input type="password" v-model="form.ghr2mm" maxlength="20"
+              <el-input type="password" v-model="form.ghr2mm" maxlength="20"  show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -127,7 +127,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.jsr1Id') + $t('form.password')" prop="jsr1mm">
-              <el-input type="password" v-model="form.jsr1mm" maxlength="20"
+              <el-input type="password" v-model="form.jsr1mm" maxlength="20"  show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -140,7 +140,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.jsr2Id') + $t('form.password')">
-              <el-input type="password" v-model="form.jsr2mm" maxlength="20"
+              <el-input type="password" v-model="form.jsr2mm" maxlength="20"  show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/gsp/Jd.vue b/src/views/business/resource/gsp/comps/gsp/Jd.vue
index 2315622..d708c18 100644
--- a/src/views/business/resource/gsp/comps/gsp/Jd.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Jd.vue
@@ -58,7 +58,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/gsp/Js.vue b/src/views/business/resource/gsp/comps/gsp/Js.vue
index 28bb847..c44492d 100644
--- a/src/views/business/resource/gsp/comps/gsp/Js.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Js.vue
@@ -48,7 +48,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"   autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/gsp/Jy.vue b/src/views/business/resource/gsp/comps/gsp/Jy.vue
index 9cac9ff..9929233 100644
--- a/src/views/business/resource/gsp/comps/gsp/Jy.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Jy.vue
@@ -68,7 +68,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"   autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/gsp/Sd.vue b/src/views/business/resource/gsp/comps/gsp/Sd.vue
index c822ad8..9877279 100644
--- a/src/views/business/resource/gsp/comps/gsp/Sd.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Sd.vue
@@ -32,7 +32,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/gsp/Shbj.vue b/src/views/business/resource/gsp/comps/gsp/Shbj.vue
index d148517..4b63122 100644
--- a/src/views/business/resource/gsp/comps/gsp/Shbj.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Shbj.vue
@@ -71,7 +71,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue
index a718f4e..63630aed 100644
--- a/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue
@@ -61,7 +61,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue
index a82aa8f..05d7f5a 100644
--- a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue
@@ -32,8 +32,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm"   autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -71,7 +71,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
diff --git a/src/views/business/resource/gsp/comps/gsp/Xq.vue b/src/views/business/resource/gsp/comps/gsp/Xq.vue
index 94e267a..262c7e0 100644
--- a/src/views/business/resource/gsp/comps/gsp/Xq.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xq.vue
@@ -121,7 +121,6 @@
               @pagination="getJjcgjList" />
           </div>
         </div>
-        <XqExport ref="XqExport" key="XqExport" />
 
       </div>
     </div>
@@ -131,12 +130,9 @@
 <script>
 import { info, tzList, jcgjList, exportDetail } from "@/api/business/gsp/gsp"
 import JcgjList from "@/views/business/comps/common/JcgjList";
-import html2canvas from 'html2canvas';
-import jsPDF from 'jspdf'
-import XqExport from "./XqExport"
 export default {
   name: "Xq",
-  components: { JcgjList, XqExport },
+  components: { JcgjList, },
   data() {
     return {
       form: {},
@@ -169,38 +165,7 @@ export default {
       }).finally(() => {
         this.$modal.closeLoading()
       })
-      // const canvas = await html2canvas(element, {
-      //   scale: 2, // 提高清晰度
-      //   useCORS: true, // 允许跨域图片
-      //   backgroundColor: '#ffffff'
-      // })
 
-      // const imgData = canvas.toDataURL('image/png')
-      // const pdf = new jsPDF('p', 'mm', 'a4') // A4纸，纵向
-
-      // const imgWidth = 210 // A4纸宽度
-      // const pageHeight = 295 // A4纸高度
-      // const imgHeight = (canvas.height * imgWidth) / canvas.width
-
-      // let heightLeft = imgHeight
-      // let position = 0
-
-      // // 第一页
-      // pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight)
-      // heightLeft -= pageHeight
-
-      // // 多页处理
-      // while (heightLeft > 0) {
-      //   position = heightLeft - imgHeight
-      //   pdf.addPage()
-      //   pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight)
-      //   heightLeft -= pageHeight
-      // }
-
-      // pdf.save('document.pdf')
-    },
-    exportExcel() {
-      alert('todo')
     },
     jcgjListHandleQuery(val) {
       this.$modal.loading()
@@ -242,8 +207,6 @@ export default {
         this.getTzList()
         this.open = true
       })
-      this.$refs.XqExport.show(row)
-
     }
   }
 }
diff --git a/src/views/business/resource/gsp/comps/gsp/XqExport.vue b/src/views/business/resource/gsp/comps/gsp/XqExport.vue
deleted file mode 100644
index dee8c49..0000000
--- a/src/views/business/resource/gsp/comps/gsp/XqExport.vue
+++ /dev/null
@@ -1,252 +0,0 @@
-<template>
-  <!-- 详情 -->
-  <div>
-    <div class="detail-container">
-      <div ref="content">
-        <div class="detail-title"><img src="@/assets/images/detail-title.png">{{ $t('page.business.resource.gsp.gspxq')
-        }}<img src="@/assets/images/detail-title.png" /></div>
-        <div class="detail-content">
-          <div style="width: 100%;">
-            <!-- 基本信息 -->
-            <div class="content-title">
-              <div class="line"></div>
-              <div class="subtitle"> {{ $t('page.business.resource.gsp.mc') }}</div>
-            </div>
-            <div class="pal">
-              <div class="left">
-                <div class="left-title">{{ $t('page.business.resource.gsp.mc') }}</div>
-                <el-input type="text" :value="form.mc" maxlength="50" disabled />
-              </div>
-              <div class="right">
-                <div class="right-title">{{ $t('page.business.resource.gsp.bh') }}</div>
-                <el-input type="text" :value="form.bh" maxlength="50" disabled />
-              </div>
-            </div>
-            <div class="pal">
-              <div class="left">
-                <div class="left-title">{{ $t('page.business.resource.gsp.ph') }}</div>
-                <el-input type="text" :value="form.ph" maxlength="50" disabled />
-              </div>
-              <div class="right">
-                <div class="right-title">{{ $t('page.business.resource.gsp.gg') }}</div>
-                <el-input type="text" :value="form.gg" maxlength="50" disabled> <template slot="append">{{
-                  form.ggdw }}</template> </el-input>
-              </div>
-            </div>
-            <div class="pal">
-              <div class="left">
-                <div class="left-title">{{ $t('page.business.resource.gsp.jsrq') }}</div>
-                <el-input type="text" :value="form.jsrq" maxlength="50" disabled />
-              </div>
-              <div class="right">
-                <div class="right-title">{{ $t('page.business.resource.gsp.kcl') }}</div>
-                <el-input type="text" :value="form.kc" maxlength="50" disabled> <template slot="append">{{
-                  form.kcdw }}</template> </el-input>
-              </div>
-            </div>
-            <div class="pal">
-              <div class="left">
-                <div class="left-title">{{ $t('page.business.resource.gsp.yxq') }}</div>
-                <el-input type="text" :value="form.yxq" maxlength="50" disabled />
-              </div>
-              <div class="right">
-                <div class="right-title">{{ $t('page.business.resource.gsp.zjzt') }}</div>
-                <el-select v-model="form.zjzt" disabled style="width: 100%;">
-                  <el-option key="1" :label="$t('page.business.resource.resource.zjzt.rk')" :value="1" />
-                  <el-option key="3" :label="$t('page.business.resource.resource.zjzt.yff')" :value="3" />
-                  <el-option key="5" :label="$t('page.business.resource.resource.zjzt.ysd')" :value="5" />
-                  <el-option key="7" :label="$t('page.business.resource.resource.zjzt.dgd')" :value="7" />
-                  <el-option key="9" :label="$t('page.business.resource.resource.zjzt.gd')" :value="9" />
-                  <el-option key="11" :label="$t('page.business.resource.resource.zjzt.djd')" :value="11" />
-                </el-select>
-              </div>
-            </div>
-            <!-- 台账 -->
-            <div class="content-title">
-              <div class="line"></div>
-              <div class="subtitle"> {{ $t('page.business.resource.gsp.tz') }}</div>
-            </div>
-            <div class="pal">
-              <el-table :data="tzList" v-loading="loadingTz">
-                <el-table-column :label="$t('page.business.resource.mjy.syr')" align="center" prop="qmrMc"
-                  :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.mjy.lqghr')" align="center"
-                  :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                    {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
-                  </template>
-                </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.ffjsr')" align="center"
-                  :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                    {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
-                  </template>
-                </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.czlx')" align="center" prop="qmyy"
-                  :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.mjy.czl')" align="center"
-                  :show-overflow-tooltip="true">
-                  <template slot-scope="scope">
-                    {{ scope.row.czl }}{{ scope.row.czldw }}
-                  </template>
-                </el-table-column>
-                <el-table-column :label="$t('page.business.resource.mjy.bzyy')" align="center" prop="remark"
-                  :show-overflow-tooltip="true" />
-                <el-table-column :label="$t('page.business.resource.mjy.ccsj')" align="center" prop="createTime"
-                  width="150px" />
-              </el-table>
-            </div>
-            <!-- 稽查轨迹 -->
-            <div class="content-title">
-              <div class="line"></div>
-              <div class="subtitle"> {{ $t('page.business.resource.gsp.jcgj') }}</div>
-            </div>
-            <div>
-              <div v-for="(item, index) in jcgjList" :key="index">
-                <div>
-                  <span>{{ $i18n.locale === 'zh_CN' ? item.jcmc : item.jcmcEn }},</span>
-                  <span class="jcglList-jcnr">
-                    <template v-if="$i18n.locale === 'zh_CN'">
-                      <span v-for="(pitem, pindex) in item.jcnrList" :key="pindex">
-                        {{ pitem.name }}：{{ pitem.value }},
-                      </span>
-                    </template>
-                    <template v-else>
-                      <span v-for="(pitem, pindex) in item.jcnrListEn" :key="pindex">
-                        {{ pitem.name }}：{{ pitem.value }},
-                      </span>
-                    </template>
-                    <span v-if="item.remark && item.remark !== ''">
-                      {{ $t('form.remark') }}：{{ item.remark }},
-                    </span>
-                    <span v-if="item.qmrId && item.qmrId > 0">
-                      {{ $t('form.qmyy') }}：{{ $i18n.locale === 'zh_CN' ? item.jcmc : item.jcmcEn }},
-                    </span>
-                    <span v-if="item.qmrId && item.qmrId > 0">
-                      <!-- {{$t('form.signer')}}：{{ $i18n.locale === 'zh_CN'?item.qmrMc:item.qmrMcEn  }} -->
-                      {{ $t('form.signer') }}：{{ item.qmrMc }},
-                    </span>
-                    <span>{{ $t('form.signTime') }}：{{ item.createTime }}</span>
-                  </span>
-                </div>
-
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { info, tzList, jcgjList } from "@/api/business/gsp/gsp"
-import JcgjList from "@/views/business/comps/common/JcgjList";
-import html2canvas from 'html2canvas';
-import jsPDF from 'jspdf'
-
-export default {
-  name: "XqExport",
-  components: { JcgjList },
-  data() {
-    return {
-      form: {},
-      tzList: [],
-      totalTz: 0,
-      loadingTz: true,
-      open: false,
-      queryParamstZ: {
-        mjyId: null,
-        pageNum: 1,
-        pageSize: 9999999
-      },
-      jcgjTotal: 0,
-      jcgjList: [],
-      queryJcgjParams: {
-        pageNum: 1,
-        mjyId: null,
-        pageSize: 9999999,
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    async exportPDF() {
-      this.$modal.loading()
-      const element = this.$refs.content
-      const canvas = await html2canvas(element, {
-        scale: 2, // 提高清晰度
-        useCORS: true, // 允许跨域图片
-        backgroundColor: '#ffffff'
-      })
-
-      const imgData = canvas.toDataURL('image/png')
-      const pdf = new jsPDF('p', 'mm', 'a4') // A4纸，纵向
-
-      const imgWidth = 210 // A4纸宽度
-      const pageHeight = 295 // A4纸高度
-      const imgHeight = (canvas.height * imgWidth) / canvas.width
-
-      let heightLeft = imgHeight
-      let position = 0
-
-      // 第一页
-      pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight)
-      heightLeft -= pageHeight
-
-      // 多页处理
-      while (heightLeft > 0) {
-        position = heightLeft - imgHeight
-        pdf.addPage()
-        pdf.addImage(imgData, 'PNG', 0, position, imgWidth, imgHeight)
-        heightLeft -= pageHeight
-      }
-
-      pdf.save('document.pdf')
-      this.$modal.closeLoading()
-    },
-    exportExcel() {
-      alert('todo')
-    },
-    jcgjListHandleQuery(val) {
-      this.$modal.loading()
-      jcgjList(_.merge({}, this.queryJcgjParams, val)).then(response => {
-        this.jcgjList = response.rows
-        this.jcgjTotal = response.total
-        this.$modal.closeLoading()
-      })
-    },
-    getJjcgjList() {
-      jcgjList(this.queryJcgjParams).then(response => {
-        this.jcgjList = response.rows
-        this.jcgjTotal = response.total
-        this.$modal.closeLoading()
-      })
-    },
-    cancel() {
-      this.open = false
-      this.$emit('callback')
-    },
-    getTzList() {
-      this.loadingTz = true
-      tzList(this.queryParamstZ).then(response => {
-        this.tzList = response.rows
-        this.totalTz = response.total
-        this.loadingTz = false
-        this.getJjcgjList()
-      })
-    },
-    show(row) {
-      this.$modal.loading()
-      this.queryParamstZ.gspId = row.id
-      this.queryJcgjParams.gspId = row.id
-      info({ id: row.id }).then(response => {
-        this.form = response.data
-        this.getTzList()
-        this.open = true
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue
index f127f51..db76fd5 100644
--- a/src/views/business/resource/gsp/comps/gsp/Xz.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Xz.vue
@@ -98,7 +98,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/gsp/Ysff.vue b/src/views/business/resource/gsp/comps/gsp/Ysff.vue
index 29e3139..a727b87 100644
--- a/src/views/business/resource/gsp/comps/gsp/Ysff.vue
+++ b/src/views/business/resource/gsp/comps/gsp/Ysff.vue
@@ -97,7 +97,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="ffrmm">
-              <el-input type="text" v-model="form.ffrmm"  maxlength="20"
+              <el-input type="password" v-model="form.ffrmm"  show-password  maxlength="20"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
index 7542f49..727636e 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue
@@ -83,7 +83,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password  maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Gd.vue b/src/views/business/resource/gsp/comps/rkjl/Gd.vue
index 7f54d34..1681f05 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Gd.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Gd.vue
@@ -57,7 +57,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20" show-password :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Jd.vue b/src/views/business/resource/gsp/comps/rkjl/Jd.vue
index 5437608..38a8ab6 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Jd.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Jd.vue
@@ -47,7 +47,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Js.vue b/src/views/business/resource/gsp/comps/rkjl/Js.vue
index 46a8ca3..52a8b95 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Js.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Js.vue
@@ -47,7 +47,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Jy.vue b/src/views/business/resource/gsp/comps/rkjl/Jy.vue
index 40171b3..d3bcbc0 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Jy.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Jy.vue
@@ -57,7 +57,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" show-password maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Sd.vue b/src/views/business/resource/gsp/comps/rkjl/Sd.vue
index b95d0f1..2329412 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Sd.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Sd.vue
@@ -57,7 +57,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20" show-password :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/gsp/comps/rkjl/Xz.vue b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
index 09c6829..31676d6 100644
--- a/src/views/business/resource/gsp/comps/rkjl/Xz.vue
+++ b/src/views/business/resource/gsp/comps/rkjl/Xz.vue
@@ -83,7 +83,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" show-password maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
index d5f49c6..0e18daf 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
@@ -40,7 +40,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input   type="password" show-password v-model="form.qmrmm" maxlength="20"
+              <el-input   type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jd.vue b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
index 3be515d..cddb82b 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
@@ -33,7 +33,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input   type="password" show-password v-model="form.qmrmm" maxlength="20"
+              <el-input   type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jq.vue b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
index c95da41..d6da96f 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
@@ -33,7 +33,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input   type="password" show-password v-model="form.qmrmm" maxlength="20"
+              <el-input   type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Js.vue b/src/views/business/resource/gyzj/comps/ffjl/Js.vue
index 4f910c9..6249516 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Js.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Js.vue
@@ -33,7 +33,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input   type="password" show-password v-model="form.qmrmm" maxlength="20"
+              <el-input   type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
index 204bdd5..7f86722 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
@@ -42,7 +42,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input   type="password" show-password v-model="form.qmrmm" maxlength="20"
+              <el-input   type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
index 2a7fc00..cc353f4 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
@@ -40,7 +40,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input   type="password" show-password v-model="form.qmrmm" maxlength="20"
+              <el-input   type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
index a359990..b0a7832 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
@@ -67,7 +67,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input   type="password" show-password v-model="form.qmrmm" maxlength="20"
+              <el-input   type="password"  autocomplete="off" auto-complete="new-password" show-password v-model="form.qmrmm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/sj/comps/Bj.vue b/src/views/business/resource/sj/comps/Bj.vue
index 1c52054..e9c2e3a 100644
--- a/src/views/business/resource/sj/comps/Bj.vue
+++ b/src/views/business/resource/sj/comps/Bj.vue
@@ -70,8 +70,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="text" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -110,7 +110,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
diff --git a/src/views/business/resource/sj/comps/Cz.vue b/src/views/business/resource/sj/comps/Cz.vue
index 934cc8d..120fa8d 100644
--- a/src/views/business/resource/sj/comps/Cz.vue
+++ b/src/views/business/resource/sj/comps/Cz.vue
@@ -65,7 +65,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/sj/comps/CzBatch.vue b/src/views/business/resource/sj/comps/CzBatch.vue
index 1863bf6..8471204 100644
--- a/src/views/business/resource/sj/comps/CzBatch.vue
+++ b/src/views/business/resource/sj/comps/CzBatch.vue
@@ -55,7 +55,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/resource/sj/comps/Gd.vue b/src/views/business/resource/sj/comps/Gd.vue
index cbecbea..1bd36e0 100644
--- a/src/views/business/resource/sj/comps/Gd.vue
+++ b/src/views/business/resource/sj/comps/Gd.vue
@@ -31,7 +31,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/sj/comps/Jd.vue b/src/views/business/resource/sj/comps/Jd.vue
index 949eb07..5bd2549 100644
--- a/src/views/business/resource/sj/comps/Jd.vue
+++ b/src/views/business/resource/sj/comps/Jd.vue
@@ -31,7 +31,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="text" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="text" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/sj/comps/Js.vue b/src/views/business/resource/sj/comps/Js.vue
index 4d85e42..ad44a37 100644
--- a/src/views/business/resource/sj/comps/Js.vue
+++ b/src/views/business/resource/sj/comps/Js.vue
@@ -31,7 +31,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="text" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="text" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/sj/comps/Jy.vue b/src/views/business/resource/sj/comps/Jy.vue
index 1c07930..4655c83 100644
--- a/src/views/business/resource/sj/comps/Jy.vue
+++ b/src/views/business/resource/sj/comps/Jy.vue
@@ -41,7 +41,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="text" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="text" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/sj/comps/Sd.vue b/src/views/business/resource/sj/comps/Sd.vue
index 5eb11dc..7d6e654 100644
--- a/src/views/business/resource/sj/comps/Sd.vue
+++ b/src/views/business/resource/sj/comps/Sd.vue
@@ -31,7 +31,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="text" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="text" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/sj/comps/Xgkc.vue b/src/views/business/resource/sj/comps/Xgkc.vue
index 269016e..99354df 100644
--- a/src/views/business/resource/sj/comps/Xgkc.vue
+++ b/src/views/business/resource/sj/comps/Xgkc.vue
@@ -41,8 +41,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="text" v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -71,7 +71,7 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue
index 1cdd723..cee213a 100644
--- a/src/views/business/resource/yq/list.vue
+++ b/src/views/business/resource/yq/list.vue
@@ -130,7 +130,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.signerPsw')" prop="qmrmm">
-              <el-input v-model="form.qmrmm" show-password :placeholder="$t('form.placeholderInput')" type="password"
+              <el-input v-model="form.qmrmm"  autocomplete="off" auto-complete="new-password" show-password :placeholder="$t('form.placeholderInput')" type="password"
                 maxlength="20" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue
index 4a6935d..b6a657e 100644
--- a/src/views/business/study/comp/jhbd/Bj.vue
+++ b/src/views/business/study/comp/jhbd/Bj.vue
@@ -192,7 +192,7 @@ export default {
     onPlanCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
-      if (data.type == 'fieldChanged') {
+      if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') {
         studyFormPlan_updateBdnr(
           {
             id: this.form.id,
diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue
index 9f44184..d812424 100644
--- a/src/views/business/study/comp/sqbd/Bj.vue
+++ b/src/views/business/study/comp/sqbd/Bj.vue
@@ -192,7 +192,7 @@ export default {
     onApplyCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
-      if (data.type == 'fieldChanged') {
+      if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') {
         studyFormApply_updateBdnr(
           {
             id: this.form.id,
diff --git a/src/views/business/study/comp/syff/Xq.vue b/src/views/business/study/comp/syff/Xq.vue
index 6b24e49..01cc033 100644
--- a/src/views/business/study/comp/syff/Xq.vue
+++ b/src/views/business/study/comp/syff/Xq.vue
@@ -31,7 +31,7 @@
                   class="el-icon-arrow-right el-icon--right"></i></el-button>
             </el-button-group>
           </div>
-          <div ref="contentToPdf">
+          <div ref="contentToPdf"  v-show="showExportBtn" style="width: 100%; margin-top: 30px;">
             <div class="content-title">
               <div class="line"></div>
               <div class="subtitle"> {{ $t('page.business.study.studyMethod.qmhz') }}</div>
diff --git a/src/views/business/study/comp/syff/Xz.vue b/src/views/business/study/comp/syff/Xz.vue
index 4fc3a1f..d29fb4a 100644
--- a/src/views/business/study/comp/syff/Xz.vue
+++ b/src/views/business/study/comp/syff/Xz.vue
@@ -54,7 +54,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -186,6 +186,7 @@ export default {
       if (res.code === 200) {
         this.form.fileUrl = res.data.url
         this.form.fileName = res.data.name
+        this.form.ffmc = res.data.originalFileName
         this.fileList.push({ name: res.data.name, url: res.data.url })
         this.$modal.closeLoading()
       } else {
diff --git a/src/views/business/study/comp/syff/Yd.vue b/src/views/business/study/comp/syff/Yd.vue
index c0dfd64..b2fb620 100644
--- a/src/views/business/study/comp/syff/Yd.vue
+++ b/src/views/business/study/comp/syff/Yd.vue
@@ -32,7 +32,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"  autocomplete="off" auto-complete="new-password" show-password
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue
index 120e394..ac1edb7 100644
--- a/src/views/business/study/comp/syxx.vue
+++ b/src/views/business/study/comp/syxx.vue
@@ -49,7 +49,7 @@
         </div>
       </div>
     </div>
-    <div class="syxx-content">
+    <div class="syxx-content" v-if="studyInfo.id&&studyInfo.id!=''">
       <jhbdList :study="studyInfo" @showDetail="showDetailCallback" />
     </div>
 
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index 2114e84..06606a1 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -169,7 +169,7 @@
               <div style=" display: flex;  flex-wrap: wrap;  gap: 16px;">
                 <div v-for="(item, index) in resource" :key="'r' + index" style=" flex: 0 0 calc(33.333% - 11px);">
                   {{ item.bh }}
-                  <el-input type="text" v-model="item.syl" maxlength="50" style="width:150px;">
+                  <el-input type="number" v-model="item.syl" maxlength="50" style="width:150px;">
                     <template slot="append">
                       <div style="width: 20px;">
                         <BusinessSelect v-model="item.syldw" :showMax="false" dictType="business_tjdw">
@@ -318,6 +318,7 @@ export default {
         remark: '',
         bdnr: '',
         resource: '',
+        yqResource:'',
         qmrmm: '',
         sfcz: false,
         czfs: '',
@@ -329,6 +330,7 @@ export default {
         ccids: '',
       },
       resource: [],
+      yqResource:[],
       bdmbTitle: this.$t('page.business.form.bdmb'),
       rulesApprove: {
         qmrmm: [{
@@ -359,7 +361,7 @@ export default {
     onFillCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
-      if (data.type == 'fieldChanged') {
+      if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') {
         studyFormFill_updateBdnr(
           {
             id: this.form.id,
@@ -484,6 +486,7 @@ export default {
         that.formApprove.id = that.form.id
         that.formApprove.bdnr = JSON.stringify(content)
         that.resource = that.$refs.templateTable.getResource()
+        that.yqResource = that.$refs.templateTable.getYqResource()
         that.openApprove = true
       }
     },
@@ -512,7 +515,10 @@ export default {
           this.$modal.loading()
           studyFormFill_bcOnly(this.form).then(response => {
             this.form = response.data
+            this.templateData = deepClone(this.form)
             this.showIndex = 2
+            const obj = Object.assign({}, this.$route, { title: this.form.bdmc }) 
+            this.$tab.updatePage(obj);
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -612,6 +618,7 @@ export default {
         if (valid) {
           that.$modal.loading()
           that.formApprove.resource = JSON.stringify(that.resource)
+          that.formApprove.yqResource = JSON.stringify(that.yqResource)
           if (that.czlist.length > 0) {
             that.formApprove.czlist = JSON.stringify(that.czlist)
           }
diff --git a/src/views/business/study/comp/wzlb.vue b/src/views/business/study/comp/wzlb.vue
index 3a05ba8..1447008 100644
--- a/src/views/business/study/comp/wzlb.vue
+++ b/src/views/business/study/comp/wzlb.vue
@@ -37,7 +37,7 @@
           {{ item.name }}
         </div>
       </div>
-       <div class="content-box">
+       <div class="content-box" v-if="studyInfo.id&&studyInfo.id!=''">
         <sjList v-if="active === 'sjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
         <gspList v-if="active === 'gsplb'" :study="studyInfo" @showDetail="showDetailCallback" />
         <gyzjList v-if="active === 'gyzjlb'" :study="studyInfo" @showDetail="showDetailCallback" />
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 49267a8..8b22944 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -199,7 +199,7 @@ export default {
     onPreCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
-      if (data.type == 'fieldChanged') {
+      if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') {
         studyFormPre_updateBdnr(
           {
             id: this.form.id,
diff --git a/src/views/business/template/list.vue b/src/views/business/template/list.vue
index db16c51..d66661a 100644
--- a/src/views/business/template/list.vue
+++ b/src/views/business/template/list.vue
@@ -29,9 +29,9 @@
     </el-form>
 
     <el-table v-loading="loading" :data="list">
-      <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('page.system.template.sn')" align="center" prop="showSn" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('page.system.template.name')" align="center" prop="name" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" />
+      <el-table-column :label="$t('page.system.template.sn')" align="center" prop="showSn" />
+      <el-table-column :label="$t('page.system.template.name')" align="center" prop="name" />
       <el-table-column :label="$t('page.system.template.department')" align="center" prop="deptName" />
       <el-table-column :label="$t('page.system.template.status')" prop="status" align="center" width="100">
         <template slot-scope="scope">
diff --git a/src/views/index.vue b/src/views/index.vue
index 513f591..9fcd146 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -56,7 +56,7 @@
       </div>
       <div class="notice-list" v-loading="loading">
         <div class="notice-item" v-for="(item,index) in noticeList" :key="index" @click="gotoPage(item)">
-          <div class="notice-title"><el-badge is-dot class="notice-dot"></el-badge>{{item.title}}</div>
+          <div class="notice-title"><el-badge is-dot class="notice-dot" v-if="item.status===1"></el-badge>{{item.title}}</div>
           <div class="notice-date">{{item.createTime}}</div>
         </div>
 
@@ -74,7 +74,7 @@
 </template>
 
 <script>
-import { home_count,home_noticeList} from "@/api/business/home/home";
+import { home_count,home_noticeList,home_noticeRead} from "@/api/business/home/home";
 export default {
   name: "Index",
   data() {
@@ -118,18 +118,30 @@ export default {
     },
     getNoticeList(){
       this.loading = true;
-      this.searchForm.startDate = this.daterange && this.daterange.length > 0 ? this.daterange[0] : ''
-      this.searchForm.endDate = this.daterange && this.daterange.length > 1 ? this.daterange[1] : ''
       home_noticeList(this.searchForm).then(response => {
         this.noticeList = response.rows;
         this.noticeTotal = response.total;
       }).finally(()=>{
         this.loading = false;
+        this.refreshNoticeCount()
       })
     },
     gotoPage(item){
+      this.read(item)
       this.$tab.openPage(" ",item.url)
-    }
+    },
+    refreshNoticeCount(){
+      this.$store.dispatch('GetMenuCount').then(() => {
+      }).catch(error => {
+        console.log('GetMenuCount出错：' + (error.msg || ''))
+      })
+    },
+    read(item){
+      home_noticeRead({id:item.id}).then(response => {
+      }).finally(()=>{
+        this.refreshNoticeCount()
+      })
+    },
   }
 }
 </script>