diff --git a/src/App.vue b/src/App.vue
index 2f7b353..2bfdb39 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -450,6 +450,13 @@ export default {
     }
   }
 }
+
+/* 单选，隐藏label */
+.hide-label>.el-radio__label {
+  font-size: 0 !important;
+  line-height: 0 !important;
+}
+
 .template-form-item {
     background: #fff;
     padding: 20px;
diff --git a/src/api/business/study/study.js b/src/api/business/study/study.js
index c2775f3..5bac995 100644
--- a/src/api/business/study/study.js
+++ b/src/api/business/study/study.js
@@ -39,3 +39,32 @@ export function study_jcgjList(query) {
     params: query
   })
 }
+
+export function study_gd(data) {
+  return request({
+    url: '/system/business/study/gd',
+    method: 'post',
+    data: data
+  })
+}
+export function study_js(data) {
+  return request({
+    url: '/system/business/study/js',
+    method: 'post',
+    data: data
+  })
+}
+export function study_jd(data) {
+  return request({
+    url: '/system/business/study/jd',
+    method: 'post',
+    data: data
+  })
+}
+export function study_jy(data) {
+  return request({
+    url: '/system/business/study/jy',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/business/study/studyFormFill.js b/src/api/business/study/studyFormFill.js
new file mode 100644
index 0000000..0bfe47d
--- /dev/null
+++ b/src/api/business/study/studyFormFill.js
@@ -0,0 +1,134 @@
+import request from '@/utils/request'
+
+//列表
+export function studyFormFill_list(query) {
+  return request({
+    url: '/system/business/studyFormFill/list',
+    method: 'get',
+    params: query
+  })
+}
+//稽查轨迹
+export function studyFormFill_jcgj(query) {
+  return request({
+    url: '/system/business/studyFormFill/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+//签名信息
+export function studyFormFill_qmxx(query) {
+  return request({
+    url: '/system/business/studyFormFill/qmxxList',
+    method: 'get',
+    params: query
+  })
+}
+
+//详情
+export function studyFormFill_info(query) {
+  return request({
+    url: '/system/business/studyFormFill/info',
+    method: 'get',
+    params: query
+  })
+}
+
+//加签
+export function studyFormFill_jq(data) {
+  return request({
+    url: '/system/business/studyFormFill/jq',
+    method: 'post',
+    data: data
+  })
+}
+
+//废止
+export function studyFormFill_fz(data) {
+  return request({
+    url: '/system/business/studyFormFill/fz',
+    method: 'post',
+    data: data
+  })
+}
+
+//确认废止
+export function studyFormFill_qrfz(data) {
+  return request({
+    url: '/system/business/studyFormFill/qrfz',
+    method: 'post',
+    data: data
+  })
+}
+
+//更换归属人
+export function studyFormFill_ghgsr(data) {
+  return request({
+    url: '/system/business/studyFormFill/ghgsr',
+    method: 'post',
+    data: data
+  })
+}
+
+//保存
+export function studyFormFill_bc(data) {
+  return request({
+    url: '/system/business/studyFormFill/bc',
+    method: 'post',
+    data: data
+  })
+}
+
+//提交
+export function studyFormFill_tj(data) {
+  return request({
+    url: '/system/business/studyFormFill/tj',
+    method: 'post',
+    data: data
+  })
+}
+
+//观察
+export function studyFormFill_gc(data) {
+  return request({
+    url: '/system/business/studyFormFill/gc',
+    method: 'post',
+    data: data
+  })
+}
+
+//复核通过
+export function studyFormFill_fhtg(data) {
+  return request({
+    url: '/system/business/studyFormFill/fhtg',
+    method: 'post',
+    data: data
+  })
+}
+
+//复核拒绝
+export function studyFormFill_fhjj(data) {
+  return request({
+    url: '/system/business/studyFormFill/fhjj',
+    method: 'post',
+    data: data
+  })
+}
+
+//通过
+export function studyFormFill_tg(data) {
+  return request({
+    url: '/system/business/studyFormFill/tg',
+    method: 'post',
+    data: data
+  })
+}
+
+//审阅
+export function studyFormFill_sy(data) {
+  return request({
+    url: '/system/business/studyFormFill/sy',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/api/business/study/studyFormPlan.js b/src/api/business/study/studyFormPlan.js
new file mode 100644
index 0000000..b40c70a
--- /dev/null
+++ b/src/api/business/study/studyFormPlan.js
@@ -0,0 +1,102 @@
+import request from '@/utils/request'
+
+//列表
+export function studyFormPlan_list(query) {
+  return request({
+    url: '/system/business/studyFormPlan/list',
+    method: 'get',
+    params: query
+  })
+}
+//稽查轨迹
+export function studyFormPlan_jcgj(query) {
+  return request({
+    url: '/system/business/studyFormPlan/jcgjList',
+    method: 'get',
+    params: query
+  })
+}
+//签名信息
+export function studyFormPlan_qmxx(query) {
+  return request({
+    url: '/system/business/studyFormPlan/qmxxList',
+    method: 'get',
+    params: query
+  })
+}
+
+//详情
+export function studyFormPlan_info(query) {
+  return request({
+    url: '/system/business/studyFormPlan/info',
+    method: 'get',
+    params: query
+  })
+}
+
+
+
+//更换归属人
+export function studyFormPlan_ghgsr(data) {
+  return request({
+    url: '/system/business/studyFormPlan/ghgsr',
+    method: 'post',
+    data: data
+  })
+}
+
+//保存
+export function studyFormPlan_bc(data) {
+  return request({
+    url: '/system/business/studyFormPlan/bc',
+    method: 'post',
+    data: data
+  })
+}
+
+//提交
+export function studyFormPlan_tj(data) {
+  return request({
+    url: '/system/business/studyFormPlan/tj',
+    method: 'post',
+    data: data
+  })
+}
+
+
+
+//复核通过
+export function studyFormPlan_fhtg(data) {
+  return request({
+    url: '/system/business/studyFormPlan/fhtg',
+    method: 'post',
+    data: data
+  })
+}
+
+//复核拒绝
+export function studyFormPlan_fhjj(data) {
+  return request({
+    url: '/system/business/studyFormPlan/fhjj',
+    method: 'post',
+    data: data
+  })
+}
+
+//通过
+export function studyFormPlan_tg(data) {
+  return request({
+    url: '/system/business/studyFormPlan/tg',
+    method: 'post',
+    data: data
+  })
+}
+
+//审阅
+export function studyFormPlan_sy(data) {
+  return request({
+    url: '/system/business/studyFormPlan/sy',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/lang/en.js b/src/lang/en.js
index 1022c99..b121d6c 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -13,7 +13,12 @@ import template from './en/system/template'
 // 试验管理
 import study from './en/business/study/study'
 import studyEnter from './en/business/study/studyEnter'
+//预填表单
 import studyFormPre from './en/business/study/studyFormPre'
+//填报表单
+import studyFormFill from './en/business/study/studyFormFill'
+//计划表单
+import studyFormPlan from './en/business/study/studyFormPlan'
 
 //表单
 import form from './en/business/form/form'
@@ -53,6 +58,7 @@ export default {
     saveConfirm: 'Confirm',
     confirm: 'Confirm',
     cancel: 'Cancel',
+    close: 'Close',
     operate: 'Action',
     delete: 'Delete',
     detail: 'View',
@@ -63,8 +69,8 @@ export default {
     endDate: 'End Date',
     password: 'Password',
     signer: 'Signer',
-    signerPsw: '签名人密码',
-    qmyy: '签名意义',
+    signerPsw: 'Password',
+    qmyy: 'Purpose',
     signTime: '签名时间',
     remark: 'remark',
 
@@ -112,17 +118,19 @@ export default {
     },
     business: {
       resource: {
-        resource:resource,
-        zcg:zcg,
-        mjy:mjy,
-        yq:yq,
-        sj:sj,
-        gyzj:gyzj,
+        resource: resource,
+        zcg: zcg,
+        mjy: mjy,
+        yq: yq,
+        sj: sj,
+        gyzj: gyzj
       },
       study: {
         study: study,
         studyEnter: studyEnter,
-        studyFormPre:studyFormPre
+        studyFormPre: studyFormPre,
+        studyFormFill: studyFormFill,
+        studyFormPlan: studyFormPlan
       },
       form: form
     }
diff --git a/src/lang/en/business/study/study.js b/src/lang/en/business/study/study.js
index 03d4942..cfe824b 100644
--- a/src/lang/en/business/study/study.js
+++ b/src/lang/en/business/study/study.js
@@ -53,6 +53,7 @@ export default {
   jssy: 'Unlock Study',
   sqjy: 'Apply for Check-out',
   sqgd: 'Apply for Archiving',
+  sqjd: 'Apply for De-archiving',
   jjjd: 'Reject De-archiving',
   tyjd: 'Approve De-archiving',
   jjgd: 'Reject Archiving',
@@ -63,5 +64,7 @@ export default {
   qb: 'All',
   lc: 'Milestone',
   bj: 'Change',
-  ry: 'User'
+  ry: 'User',
+
+  scsy: 'Remove Study'
 }
diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js
new file mode 100644
index 0000000..6bc90ba
--- /dev/null
+++ b/src/lang/en/business/study/studyFormFill.js
@@ -0,0 +1,57 @@
+export default {
+ jcsz:'基础设置',
+ bdtb:'表单填报',
+ xzbd:'新增表单',
+ fh:'复核',
+ jq:'加签',
+ ghgsr:'更换归属人',
+ sy:'审阅',
+ fz:'废止',
+ qrfz:'确认废止',
+ gc:'观察',
+ bdsm:'表单说明',
+ zc:'暂存',
+ next:'下一步',
+ save:'保存',
+ submit:'提交',
+ bdnr:'表单内容',
+ qmxx:'签名信息',
+ qmr:'签名人',
+ qmyy:'签名意义',
+ qmsj:'签名时间',
+ bzyy:'备注原因',
+ jcgj:'稽查轨迹',
+ cjjl:'创建记录',
+ sfbl:'是否为补录',
+ yes:'是',
+ no:'否',
+ tjjl:'提交记录',
+sqfz:'申请废止',
+ dcqbjcgj:'导出(全部稽查轨迹)',
+ dclcjcgj:'导出(流程稽查轨迹)',
+ dcbjjcgj:'导出(编辑稽查轨迹)',
+ dcxgjcgj:'导出(修改稽查轨迹)',
+ dcbhsjgj:'导出(不含数据轨迹)',
+
+ tbz:'填报中',
+ ytj:'已提交',
+ ywc:'已完成',
+ ywcfh:'已完成（经复核）',
+ ywc:'已完成',
+ dfz:'待废止',
+ yfz:'已废止',
+
+ guancha:'观察',
+ jiaqian:'加签',
+ qrfz:'确认废止',
+ reason:'原因',
+ reject:'拒绝',
+ approve:'通过',
+szqk:'生长情况',
+rybg:'人员变更',
+shenyue:'审阅',
+
+fhjj:'复核拒绝',
+fhtg:'复核通过',
+tongguo:'通过',
+}
diff --git a/src/lang/en/business/study/studyFormPlan.js b/src/lang/en/business/study/studyFormPlan.js
new file mode 100644
index 0000000..91b217f
--- /dev/null
+++ b/src/lang/en/business/study/studyFormPlan.js
@@ -0,0 +1,53 @@
+export default {
+  jcsz: '基础设置',
+  bdtb: '表单填报',
+  xzbd: '新增表单',
+  fh: '复核',
+  ghgsr: '更换归属人',
+  sy: '审阅',
+  gc: '观察',
+  bdsm: '表单说明',
+  zc: '暂存',
+  next: '下一步',
+  save: '保存',
+  submit: '提交',
+  bdnr: '表单内容',
+  qmxx: '签名信息',
+  qmr: '签名人',
+  qmyy: '签名意义',
+  qmsj: '签名时间',
+  bzyy: '备注原因',
+  jcgj: '稽查轨迹',
+  cjjl: '创建记录',
+  yes: '是',
+  no: '否',
+  tjjl: '提交记录',
+  dcqbjcgj: '导出(全部稽查轨迹)',
+  dclcjcgj: '导出(流程稽查轨迹)',
+  dcbjjcgj: '导出(编辑稽查轨迹)',
+  dcxgjcgj: '导出(修改稽查轨迹)',
+  dcbhsjgj: '导出(不含数据轨迹)',
+  rybg: '人员变更',
+
+  tbz: '填报中',
+  ytj: '已提交',
+  ywcfh: '已完成（经复核）',
+  ywc: '已完成',
+
+  reject: '拒绝',
+  reason: '原因',
+  approve: '通过',
+  shenyue: '审阅',
+  fhjj: '复核拒绝',
+  fhtg: '复核通过',
+  tongguo: '通过',
+  syxx: '试验信息',
+  symc: '试验名称',
+  sybh: '试验编号',
+  syfzr: '试验负责人',
+  cjsj: '创建时间',
+  sdsy: '锁定试验',
+  syjj: '试验简介',
+  xz: '新增配置计划表',
+  syxkxx: '试验学科信息'
+}
diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js
index 7313be3..db5af8b 100644
--- a/src/lang/en/business/study/studyFormPre.js
+++ b/src/lang/en/business/study/studyFormPre.js
@@ -23,7 +23,6 @@ export default {
  bzyy:'备注原因',
  jcgj:'稽查轨迹',
  cjjl:'创建记录',
- ts:'是否确定用该预填模板进行实际填报？',
- ts:'是否确定用该预填模板进行实际填报？',
+ xjbd:'新建表单',
  ts:'是否确定用该预填模板进行实际填报？',
 }
diff --git a/src/lang/zh.js b/src/lang/zh.js
index df67de4..6e38f1d 100644
--- a/src/lang/zh.js
+++ b/src/lang/zh.js
@@ -13,7 +13,12 @@ import template from './zh/system/template'
 // 试验管理
 import study from './zh/business/study/study'
 import studyEnter from './zh/business/study/studyEnter'
+//预填表单
 import studyFormPre from './zh/business/study/studyFormPre'
+//填报表单
+import studyFormFill from './zh/business/study/studyFormFill'
+//计划表单
+import studyFormPlan from './zh/business/study/studyFormPlan'
 
 //表单
 import form from './zh/business/form/form'
@@ -50,6 +55,7 @@ export default {
     saveConfirm: '确定',
     confirm: '确认',
     cancel: '取消',
+    close: '关闭',
     operate: '操作',
     delete: '删除',
     detail: '详情',
@@ -109,17 +115,19 @@ export default {
     },
     business: {
       resource: {
-        resource:resource,
-        zcg:zcg,
-        mjy:mjy,
-        yq:yq,
-        sj:sj,
-        gyzj:gyzj,
+        resource: resource,
+        zcg: zcg,
+        mjy: mjy,
+        yq: yq,
+        sj: sj,
+        gyzj: gyzj
       },
       study: {
         study: study,
         studyEnter: studyEnter,
-        studyFormPre
+        studyFormPre: studyFormPre,
+        studyFormFill: studyFormFill,
+        studyFormPlan: studyFormPlan
       },
       form: form
     }
diff --git a/src/lang/zh/business/study/study.js b/src/lang/zh/business/study/study.js
index 5d3d739..de8adf6 100644
--- a/src/lang/zh/business/study/study.js
+++ b/src/lang/zh/business/study/study.js
@@ -53,6 +53,7 @@ export default {
   jssy: '解锁试验',
   sqjy: '申请借阅',
   sqgd: '申请归档',
+  sqjd: '申请解档',
   jjjd: '拒绝解档',
   tyjd: '同意解档',
   jjgd: '拒绝归档',
@@ -63,5 +64,7 @@ export default {
   qb: '全部',
   lc: '流程',
   bj: '编辑',
-  ry: '人员'
+  ry: '人员',
+
+  scsy: '删除试验'
 }
diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js
new file mode 100644
index 0000000..4bd4334
--- /dev/null
+++ b/src/lang/zh/business/study/studyFormFill.js
@@ -0,0 +1,57 @@
+export default {
+ jcsz:'基础设置',
+ bdtb:'表单填报',
+ xzbd:'新增表单',
+ fh:'复核',
+ jq:'加签',
+ ghgsr:'更换归属人',
+ sy:'审阅',
+ fz:'废止',
+ qrfz:'确认废止',
+ gc:'观察',
+ bdsm:'表单说明',
+ zc:'暂存',
+ next:'下一步',
+ save:'保存',
+ submit:'提交',
+ bdnr:'表单内容',
+ qmxx:'签名信息',
+ qmr:'签名人',
+ qmyy:'签名意义',
+ qmsj:'签名时间',
+ bzyy:'备注原因',
+ jcgj:'稽查轨迹',
+ cjjl:'创建记录',
+ sfbl:'是否为补录',
+ yes:'是',
+ no:'否',
+ tjjl:'提交记录',
+sqfz:'申请废止',
+ dcqbjcgj:'导出(全部稽查轨迹)',
+ dclcjcgj:'导出(流程稽查轨迹)',
+ dcbjjcgj:'导出(编辑稽查轨迹)',
+ dcxgjcgj:'导出(修改稽查轨迹)',
+ dcbhsjgj:'导出(不含数据轨迹)',
+
+ tbz:'填报中',
+ ytj:'已提交',
+ ywc:'已完成',
+ ywcfh:'已完成（经复核）',
+ ywc:'已完成',
+ dfz:'待废止',
+ yfz:'已废止',
+
+ guancha:'观察',
+ jiaqian:'加签',
+ qrfz:'确认废止',
+ reject:'拒绝',
+ reason:'原因',
+ approve:'通过',
+szqk:'生长情况',
+rybg:'人员变更',
+shenyue:'审阅',
+fhjj:'复核拒绝',
+fhtg:'复核通过',
+tongguo:'通过',
+
+}
diff --git a/src/lang/zh/business/study/studyFormPlan.js b/src/lang/zh/business/study/studyFormPlan.js
new file mode 100644
index 0000000..2e9d5b5
--- /dev/null
+++ b/src/lang/zh/business/study/studyFormPlan.js
@@ -0,0 +1,52 @@
+export default {
+  jcsz: '基础设置',
+  bdtb: '表单填报',
+  xzbd: '新增表单',
+  fh: '复核',
+  ghgsr: '更换归属人',
+  sy: '审阅',
+  gc: '观察',
+  bdsm: '表单说明',
+  zc: '暂存',
+  next: '下一步',
+  save: '保存',
+  submit: '提交',
+  bdnr: '表单内容',
+  qmxx: '签名信息',
+  qmr: '签名人',
+  qmyy: '签名意义',
+  qmsj: '签名时间',
+  bzyy: '备注原因',
+  jcgj: '稽查轨迹',
+  cjjl: '创建记录',
+  yes: '是',
+  no: '否',
+  tjjl: '提交记录',
+  dcqbjcgj: '导出(全部稽查轨迹)',
+  dclcjcgj: '导出(流程稽查轨迹)',
+  dcbjjcgj: '导出(编辑稽查轨迹)',
+  dcxgjcgj: '导出(修改稽查轨迹)',
+  dcbhsjgj: '导出(不含数据轨迹)',
+  rybg: '人员变更',
+  tbz: '填报中',
+  ytj: '已提交',
+  ywcfh: '已完成（经复核）',
+  ywc: '已完成',
+
+  reject: '拒绝',
+  reason: '原因',
+  approve: '通过',
+  shenyue: '审阅',
+  fhjj: '复核拒绝',
+  fhtg: '复核通过',
+  tongguo: '通过',
+  syxx: '试验信息',
+  symc: '试验名称',
+  sybh: '试验编号',
+  syfzr: '试验负责人',
+  cjsj: '创建时间',
+  sdsy: '锁定试验',
+  syjj: '试验简介',
+  xz: '新增配置计划表',
+  syxkxx: '试验学科信息'
+}
diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js
index 7313be3..db5af8b 100644
--- a/src/lang/zh/business/study/studyFormPre.js
+++ b/src/lang/zh/business/study/studyFormPre.js
@@ -23,7 +23,6 @@ export default {
  bzyy:'备注原因',
  jcgj:'稽查轨迹',
  cjjl:'创建记录',
- ts:'是否确定用该预填模板进行实际填报？',
- ts:'是否确定用该预填模板进行实际填报？',
+ xjbd:'新建表单',
  ts:'是否确定用该预填模板进行实际填报？',
 }
diff --git a/src/main.js b/src/main.js
index 379fb46..7eaf4dd 100644
--- a/src/main.js
+++ b/src/main.js
@@ -81,9 +81,6 @@ DictData.install()
 import i18n from './lang'
 
 import _ from 'lodash'
-import moment from "moment";
-// 将 moment 挂载到 Vue 原型上
-Vue.prototype.$moment = moment;
 Vue.use(Element, {
   i18n: (key, value) => i18n.t(key, value),
   size: Cookies.get('size') || 'mini' // set element-ui default size
diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue
index 248aeb2..0239c18 100644
--- a/src/views/business/comps/common/JcgjList.vue
+++ b/src/views/business/comps/common/JcgjList.vue
@@ -84,14 +84,14 @@ export default {
           item.jcnrList = []
         }
         // 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 
-        if (item.jcgjlx == 1) {
+        if (item.jcmcys == 1) {
           item.color = '#409EFF'
         }
-        else if (item.jcgjlx == 3) {
+        else if (item.jcmcys == 3) {
           item.color = '#F56C6C'
-        } else if (item.jcgjlx == 5) {
+        } else if (item.jcmcys == 5) {
           item.color = '#67C23A'
-        } else if (item.jcgjlx == 7) {
+        } else if (item.jcmcys == 7) {
           item.color = '#E6A23C'
         }
         tmp.push(item)
diff --git a/src/views/business/comps/select/SelectTemplateDialog.vue b/src/views/business/comps/select/SelectTemplateDialog.vue
index f3218c0..0fbb971 100644
--- a/src/views/business/comps/select/SelectTemplateDialog.vue
+++ b/src/views/business/comps/select/SelectTemplateDialog.vue
@@ -1,51 +1,39 @@
 <template>
   <div class="select-template">
-    <el-dialog :title="$t('page.system.template.selectTemplate')" :visible.sync="open" width="80%" append-to-body :close-on-click-modal="false"
-      style="padding: 20px 20px;">
+    <el-dialog :title="$t('page.system.template.selectTemplate')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false" style="padding: 20px 20px;">
       <div class="dialog-container">
         <el-form :model="searchForm" ref="searchForm" :inline="true">
-          <el-form-item :label="$t('page.system.template.sn') + '：'" prop="sn">
-            <el-input v-model="searchForm.sn" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px"
-              @keyup.enter.native="search" />
-          </el-form-item>
           <el-form-item :label="$t('page.system.template.name') + '：'" prop="name">
             <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable
               style="width: 150px" @keyup.enter.native="search" />
           </el-form-item>
-
           <el-form-item :label="$t('page.system.template.department') + '：'" prop="deptId">
             <select-dept style="width:200px" v-model="searchForm.deptId" @change="search" />
           </el-form-item>
-          <el-form-item :label="$t('page.system.template.status') + '：'" prop="status">
-            <el-select v-model="searchForm.status" :placeholder="$t('form.placeholderSelect')" clearable
-              style="width: 100px" @change="search">
-              <el-option key="0" :label="$t('page.system.template.statusEnable')" :value="10" />
-              <el-option key="1" :label="$t('page.system.template.statusDisable')" :value="1" />
-            </el-select>
-          </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
             <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
           </el-form-item>
         </el-form>
-        <el-table v-loading="loading" :data="list">
-          <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" />
-          <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" width="150">
+        <el-table v-loading="loading" border :data="list">
+          <!-- 单选列 -->
+          <el-table-column width="80" align="center">
             <template slot-scope="scope">
-              <span v-if="scope.row.status === 10">{{ $t('page.system.template.statusEnable') }}</span>
-              <span v-if="scope.row.status === 1">{{ $t('page.system.template.statusDisable') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="150">
-            <template slot-scope="scope">
-              <el-button type="primary" v-if="scope.row.status === 10" @click="handleSelect(scope.row)">{{ $t('page.system.template.select') }}</el-button>
+              <el-radio v-model="selectedId" :label="scope.row.id" class="hide-label"  @click.native.stop="handleRadioClick(scope.row)"></el-radio>
             </template>
           </el-table-column>
+          <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" width="150px"/>
+          <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" width="150px"/>
         </el-table>
-        <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum"
-          :limit.sync="searchForm.pageSize" @pagination="getList" />
+        <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+          @pagination="getList" />
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="open = false">{{ $t('form.cancel') }}</el-button>
+        <el-button type="primary" :disabled="!(this.selectedId && this.selectedId !== '')" @click="handleSelect">{{
+          $t('form.saveConfirm') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -56,13 +44,14 @@ import { public_templateList } from "@/api/business/public/public";
 import SelectDept from "@/views/business/comps/select/SelectDept";
 export default {
   name: "SelectTemplateDialog",
-  components: {SelectDept},
+  components: { SelectDept },
   props: {
   },
   watch: {
   },
   data() {
     return {
+      selectedId: null,
       loading: false,
       open: false,
       total: 0,
@@ -70,7 +59,7 @@ export default {
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-         sn: '',
+        sn: '',
         name: '',
         deptId: null,
         status: '',
@@ -80,12 +69,17 @@ export default {
   mounted() {
   },
   methods: {
+    handleRadioClick(row) {
+      this.selectedId = row.id
+    },
     show() {
+      this.selectedId=null
       this.search()
     },
     search() {
       this.searchForm.pageNum = 1;
-        this.open = true
+      this.open = true
+      this.selectedId=null
       this.getList();
     },
     reset() {
@@ -106,8 +100,10 @@ export default {
         this.loading = false
       })
     },
-    handleSelect(row) {
-      this.$emit('callback', row);
+    handleSelect() {
+      let that = this
+      let _index = _.findIndex(this.list, function (item) { return item.id = that.selectedId })
+      this.$emit('callback', this.list[_index]);
       this.open = false
     }
   }
@@ -115,5 +111,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss">
-.select-template {}
+.select-template {
+ 
+}
 </style>
\ No newline at end of file
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
index fb93515..0707c68 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
@@ -22,7 +22,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -39,7 +39,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,14 +120,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             plgd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             gd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jd.vue b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
index e792b2a..f52dd82 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
@@ -1,7 +1,8 @@
 G<template>
-  <div >
+  <div>
     <!-- 解档弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.jiedang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -14,7 +15,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -31,7 +32,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -109,14 +111,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             jdBatch(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             jd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jq.vue b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
index f70c674..01721fe 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
@@ -1,7 +1,8 @@
 G<template>
-  <div >
+  <div>
     <!-- 加签弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.jiaqian')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.jiaqian')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -14,7 +15,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -31,7 +32,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -95,10 +97,14 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-            jq(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+          this.$modal.loading()
+          jq(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
     }
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Js.vue b/src/views/business/resource/gyzj/comps/ffjl/Js.vue
index a90bc90..10e2c54 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Js.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Js.vue
@@ -1,7 +1,8 @@
 G<template>
-  <div >
+  <div>
     <!-- 解锁弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.unlock')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -14,7 +15,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -31,7 +32,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -95,10 +97,14 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-            js(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+          this.$modal.loading()
+          js(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
     }
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
index 3fa5d30..1c5986b 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
@@ -24,7 +24,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -128,10 +128,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-
+          this.$modal.loading()
           jy(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
 
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
index e358d05..198e6c5 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
@@ -22,7 +22,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -39,7 +39,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,14 +120,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             plsd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             sd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
index aab88fe..605f234 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
@@ -11,7 +11,8 @@
         <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
       </div>
     </div>
-       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.gyzj.ffjlxq') }}<img src="@/assets/images/detail-title.png" /></div>
+    <div class="detail-title"><img src="@/assets/images/detail-title.png">{{ $t('page.business.resource.gyzj.ffjlxq')
+      }}<img src="@/assets/images/detail-title.png" /></div>
 
     <div class="detail-content">
       <div class="content-left">
@@ -37,7 +38,7 @@
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.gyzj.nd') }}</div>
             <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
         </div>
@@ -55,13 +56,13 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.gyzj.ckl') }}</div>
             <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.gyzj.ckmz') }}</div>
             <el-input type="text" :value="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
         </div>
@@ -69,7 +70,7 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.gyzj.lqsj') }}</div>
             <el-input type="text" :value="form.ffrq" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
           <div class="right">
@@ -111,7 +112,7 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.gyzj.rkmz') }}</div>
             <el-input type="text" :value="form.rkmz" maxlength="50" disabled> <template slot="append">{{ form.rkmzdw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
         </div>
@@ -165,7 +166,7 @@
         <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
         <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
-          @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize"/>
+          @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize" />
       </div>
     </div>
   </div>
@@ -212,6 +213,8 @@ export default {
           this.$refs.jcgjList.add(this.jcgjList)
         }
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     show(row) {
@@ -221,6 +224,9 @@ export default {
         this.form = response.data
         this.open = true
         this.getJjcgjList()
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     }
   }
diff --git a/src/views/business/resource/gyzj/comps/ffjlList.vue b/src/views/business/resource/gyzj/comps/ffjlList.vue
index 9eb9e68..bf85370 100644
--- a/src/views/business/resource/gyzj/comps/ffjlList.vue
+++ b/src/views/business/resource/gyzj/comps/ffjlList.vue
@@ -202,6 +202,7 @@ import Gd from "./ffjl/Gd";
 import Jd from "./ffjl/Jd";
 import Xq from "./ffjl/Xq";
 import Jq from "./ffjl/Jq";
+import moment from "moment";
 
 export default {
   name: "FfjlList",
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
index bc90515..6c32be1 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
@@ -64,14 +64,15 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="bjbz">
-              <el-input type="textarea" v-model="form.bjbz" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.bjbz" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -176,7 +177,7 @@ export default {
       this.form.bh = row.bh
       this.form.nd = row.nd
       this.form.nddw = row.nddw
-      this.form.sxrq= row.sxrq
+      this.form.sxrq = row.sxrq
       this.form.cctj = row.cctj
       this.form.ccwz = row.ccwz
       this.open = true
@@ -184,9 +185,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           bj(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
index 36055b5..24fc228 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
@@ -4,7 +4,7 @@ G<template>
     <el-dialog :title="$t('page.business.resource.gyzj.czrq')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <div :style="isBatch?'display:block':'display:none'">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
@@ -57,7 +57,7 @@ G<template>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.gyzj.yuanyin')" prop="czyy">
-                <el-input type="textarea" v-model="form.czyy" :rows="2" maxlength="500"
+                <el-input type="textarea" v-model="form.czyy" :rows="5" maxlength="500"
                   :placeholder="$t('form.placeholderInput')">
                 </el-input>
               </el-form-item>
@@ -73,33 +73,36 @@ G<template>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.clr')+$t('form.password')" prop="clrmm">
-              <el-input type="password" v-model="form.clrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gyzj.clr') + $t('form.password')" prop="clrmm">
+              <el-input type="password" v-model="form.clrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.fhr')" prop="fhrId">
-              <SelectDeptUser  v-model="form.fhrId" key="jdrId"/>
+              <SelectDeptUser v-model="form.fhrId" key="jdrId" />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.fhr')+$t('form.password')" prop="fhrmm">
-              <el-input type="password" v-model="form.fhrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gyzj.fhr') + $t('form.password')" prop="fhrmm">
+              <el-input type="password" v-model="form.fhrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.jdr')" prop="jdrId">
-              <SelectDeptUser  v-model="form.jdrId" key="jdrId"/>
+              <SelectDeptUser v-model="form.jdrId" key="jdrId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.jdr')+$t('form.password')" prop="jdrmm">
-              <el-input type="password" v-model="form.jdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gyzj.jdr') + $t('form.password')" prop="jdrmm">
+              <el-input type="password" v-model="form.jdrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -254,15 +257,23 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的给药制剂")
             } else {
+              this.$modal.loading()
               plczrq(params).then(response => {
                 this.open = false
                 this.$emit('callback')
+                this.$modal.closeLoading()
+              }).finally(() => {
+                this.$modal.closeLoading()
               })
             }
           } else {
+            this.$modal.loading()
             czrq(params).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
index 349baad..c037fa8 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
@@ -4,7 +4,7 @@ G<template>
     <el-dialog :title="$t('page.business.resource.gyzj.czyj')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <div :style="isBatch?'display:block':'display:none'">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
@@ -27,7 +27,8 @@ G<template>
                 <el-table-column :label="$t('page.business.resource.gyzj.czl')" align="center">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.czl" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw }}</template>
+                      :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw
+                        }}</template>
                     </el-input>
                   </template>
                 </el-table-column>
@@ -62,15 +63,17 @@ G<template>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.czl')" prop="czl">
-                <el-input-number type="text" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')" > <template slot="append">{{ form.kcdw }}</template>
-                  </el-input-number>
+                <el-input-number type="text" v-model="form.czl" maxlength="50"
+                  :placeholder="$t('form.placeholderInput')">
+                  <template slot="append">{{ form.kcdw }}</template>
+                </el-input-number>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.gyzj.yuanyin')" prop="czyy">
-                <el-input type="textarea" v-model="form.czyy" :rows="2" maxlength="500"
+                <el-input type="textarea" v-model="form.czyy" :rows="5" maxlength="500"
                   :placeholder="$t('form.placeholderInput')">
                 </el-input>
               </el-form-item>
@@ -87,7 +90,8 @@ G<template>
 
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="clrmm">
-              <el-input type="password" v-model="form.clrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.clrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -277,15 +281,23 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的给药制剂")
             } else {
+              this.$modal.loading()
               plczyj(params).then(response => {
                 this.open = false
                 this.$emit('callback')
+                this.$modal.closeLoading()
+              }).finally(() => {
+                this.$modal.closeLoading()
               })
             }
           } else {
+            this.$modal.loading()
             czyj(params).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
index 8b3d7fd..976e3f5 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
@@ -87,7 +87,7 @@ G<template>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.nd')">
                 <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                }}</template>
+                    }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -108,7 +108,7 @@ G<template>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.ckl')">
                 <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                }}</template>
+                    }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -135,7 +135,7 @@ G<template>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('form.remark')" prop="remark">
-                <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+                <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                   :placeholder="$t('form.placeholderInput')">
                 </el-input>
               </el-form-item>
@@ -150,7 +150,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.lqr1')+$t('form.password')" prop="lqr1mm">
+            <el-form-item :label="$t('page.business.resource.gyzj.lqr1') + $t('form.password')" prop="lqr1mm">
               <el-input type="password" v-model="form.lqr1mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -163,7 +163,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.lqr2')+$t('form.password')" prop="lqr2mm">
+            <el-form-item :label="$t('page.business.resource.gyzj.lqr2') + $t('form.password')" prop="lqr2mm">
               <el-input type="password" v-model="form.lqr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -176,7 +176,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ffr1')+$t('form.password')" prop="ffr1mm">
+            <el-form-item :label="$t('page.business.resource.gyzj.ffr1') + $t('form.password')" prop="ffr1mm">
               <el-input type="password" v-model="form.ffr1mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -189,7 +189,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ffr2')+$t('form.password')" prop="ffr2mm">
+            <el-form-item :label="$t('page.business.resource.gyzj.ffr2') + $t('form.password')" prop="ffr2mm">
               <el-input type="password" v-model="form.ffr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -330,12 +330,12 @@ export default {
       this.form.ids = val.map(item => item.id)
       let tmp = []
       _.forEach(val, function (item) {
-        let a=item
-        a.ckmzdw=a.kcdw
-        a.zytj=null
-        a.ckmz=null
-        a.xmIds=null
-        a.remark=null
+        let a = item
+        a.ckmzdw = a.kcdw
+        a.zytj = null
+        a.ckmz = null
+        a.xmIds = null
+        a.remark = null
         tmp.push(a)
       })
       this.selectList = tmp
@@ -397,15 +397,23 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的给药制剂")
             } else {
+              this.$modal.loading()
               plff(params).then(response => {
                 this.open = false
                 this.$emit('callback')
+                this.$modal.closeLoading()
+              }).finally(() => {
+                this.$modal.closeLoading()
               })
             }
           } else {
+            this.$modal.loading()
             ff(params).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
         }
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gd.vue b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
index baaf7ae..6d877bd 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
@@ -22,7 +22,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -39,7 +39,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,14 +120,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             plgd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             gd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index e27dab2..e3cf7ee 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -13,7 +13,7 @@ G<template>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.nd')">
               <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -34,7 +34,7 @@ G<template>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ckjz')">
               <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -49,7 +49,7 @@ G<template>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ckmz')">
               <el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -79,8 +79,7 @@ G<template>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.rkmz')" prop="rkmz">
-              <el-input type="number" v-model="form.rkmz" maxlength="50"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="number" v-model="form.rkmz" maxlength="50" :placeholder="$t('form.placeholderInput')">
                 <template slot="append">{{ form.ckldw }}</template>
               </el-input>
             </el-form-item>
@@ -106,7 +105,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -116,12 +115,12 @@ G<template>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')" >
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')">
               <el-input type="text" v-model="form.ghr1Mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')" >
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')">
               <el-input type="text" v-model="form.ghr2Mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
@@ -144,13 +143,13 @@ G<template>
               <SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" />
             </el-form-item>
           </el-col> -->
-           <el-col :span="12">
+          <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')+$t('form.password')" prop="jsr1mm">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id') + $t('form.password')" prop="jsr1mm">
               <el-input type="password" v-model="form.jsr1mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -163,7 +162,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.jsr2Id')+$t('form.password')" prop="jsr2mm">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr2Id') + $t('form.password')" prop="jsr2mm">
               <el-input type="password" v-model="form.jsr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -295,28 +294,28 @@ export default {
     },
     reset() {
       this.form = {
-        id:null,
-        rkwz:null,
-        rktj:null,
+        id: null,
+        rkwz: null,
+        rktj: null,
         ghzytj: null,
         rkmz: null,
-        jsl:null,
-        syl:null,
+        jsl: null,
+        syl: null,
         ghr1Id: null,
         ghr1mm: null,
-        ghr2Id:null,
+        ghr2Id: null,
         ghr2mm: null,
-        jsr1Id:null,
+        jsr1Id: null,
         jsr1mm: null,
-        jsr2Id:null,
-        jsr2mm:null,
-        qmyy:'归还',
+        jsr2Id: null,
+        jsr2mm: null,
+        qmyy: '归还',
       }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      let that=this
+      let that = this
       info({ id: row.id }).then(response => {
         that.form.id = response.data.id
         that.form.mc = response.data.mc
@@ -342,10 +341,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-
+          this.$modal.loading()
           gh(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jd.vue b/src/views/business/resource/gyzj/comps/gyzj/Jd.vue
index c0855bd..f769eb2 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Jd.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jd.vue
@@ -1,14 +1,15 @@
 G<template>
-  <div >
+  <div>
     <!-- 解档弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.jiedang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-           <div :style="isBatch ? 'display:block' : 'display:none'">
-           <el-alert :title="$t('page.business.resource.gyzj.jdts') " type="error" :closable="false">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-alert :title="$t('page.business.resource.gyzj.jdts')" type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
         </div>
@@ -23,7 +24,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -40,7 +41,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -120,14 +122,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             jdBatch(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             jd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Js.vue b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
index 68c4640..9c27a32 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Js.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
@@ -1,7 +1,8 @@
 G<template>
-  <div >
+  <div>
     <!-- 解锁弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.unlock')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -14,7 +15,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -31,7 +32,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -95,10 +97,14 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-            js(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+          this.$modal.loading()
+          js(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
     }
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
index 0e8d026..6ef8caa 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
@@ -33,7 +33,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -154,14 +154,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             jdBatch(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             jd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sd.vue b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
index 15353f3..f01e86c 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
@@ -5,7 +5,7 @@ G<template>
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div :style="isBatch ? 'display:block' : 'display:none'">
-          <el-row >
+          <el-row>
             <el-col :span="24">
               <SelectList :value="selectList" />
             </el-col>
@@ -22,7 +22,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -39,7 +39,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,14 +120,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             plsd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             sd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
index f021717..6ba74ac 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
@@ -62,8 +62,8 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
-                <el-option  label="同意编辑" :value="10" />
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')">
+                <el-option label="同意编辑" :value="10" />
                 <el-option label="拒绝编辑" :value="1" />
               </el-select>
             </el-form-item>
@@ -78,14 +78,15 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -211,9 +212,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           shbj(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
index d089106..df12b4e 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
@@ -1,7 +1,8 @@
 G<template>
   <div>
     <!-- 审核修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.shxgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.shxgkc')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -27,7 +28,7 @@ G<template>
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.resource.gyzj.xgr')">
               <el-input type="text" v-model="form.kcbjrMc" disabled />
@@ -40,11 +41,11 @@ G<template>
           </el-col>
         </el-row>
         <el-row>
-         <el-col :span="12">
+          <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
-                <el-option  label="同意修改库存" :value="10" />
-                <el-option  label="拒绝修改库存" :value="1" />
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')">
+                <el-option label="同意修改库存" :value="10" />
+                <el-option label="拒绝修改库存" :value="1" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -58,14 +59,15 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -160,9 +162,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           shxgkc(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue
index ed7f7bd..fcb85ab 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue
@@ -1,7 +1,8 @@
 G<template>
   <div>
     <!-- 修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.xgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.gyzj.xgkc')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -44,14 +45,15 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" >
-              <el-input type="textarea" v-model="form.kcbjbz" :rows="2" maxlength="500"
+            <el-form-item :label="$t('form.remark')">
+              <el-input type="textarea" v-model="form.kcbjbz" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -133,9 +135,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           xgkc(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
index 017a562..ff6c950 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
@@ -8,11 +8,12 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="right-top">
-        <el-button @click="cancel()">{{$t('form.cancel')}}</el-button>
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
           <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
         </div>
       </div>
-       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.gyzj.gyzjxq') }}<img src="@/assets/images/detail-title.png" /></div>
+      <div class="detail-title"><img src="@/assets/images/detail-title.png">{{ $t('page.business.resource.gyzj.gyzjxq')
+        }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
@@ -133,7 +134,7 @@ G<template>
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.resource.gyzj.jcgj') }}</div>
           </div>
-          <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
+          <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />
@@ -174,26 +175,21 @@ export default {
   created() {
   },
   methods: {
-    exportExcel(){
+    exportExcel() {
       alert('todo')
     },
-    jcgjListHandleQuery(val) {
+    getJjcgjList(val) {
       this.$modal.loading()
       jcgjList(_.merge({}, this.queryJcgjParams, val)).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
         this.$modal.closeLoading()
-      })
-    },
-    getJjcgjList() {
-      jcgjList(this.queryJcgjParams).then(response => {
-        this.jcgjList = response.rows
-        this.jcgjTotal = response.total
-        this.$refs.jcgjList.init(this.jcgjList)
+      }).finally(() => {
         this.$modal.closeLoading()
       })
     },
+
     cancel() {
       this.open = false
       this.$emit('callback')
@@ -211,10 +207,14 @@ export default {
       this.$modal.loading()
       this.queryParamstZ.gyzjId = row.id
       this.queryJcgjParams.gyzjId = row.id
+      this.$modal.loading()
       info({ id: row.id }).then(response => {
         this.form = response.data
         this.getTzList()
         this.open = true
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     }
   }
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue
index 962e91e..4087501 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue
@@ -20,7 +20,8 @@ G<template>
 
                 <el-table-column :label="$t('page.business.resource.gyzj.ffzytj')" align="center" prop="ffzytj"
                   width="150px" />
-                <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" prop="ckmz" width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" prop="ckmz"
+                  width="150px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.ckmzdw')" align="center" prop="ckmzdw"
                   width="150px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.lqr1')" align="center" prop="lqr1Mc"
@@ -54,8 +55,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="text" v-model="form.remark"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.remark" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -63,13 +63,12 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.lqr1')" prop="lqr1Id">
-              <SelectDeptUser  v-model="form.lqr1Id" key="lqr1Id"/>
+              <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="lqr1mm">
-              <el-input type="text" v-model="form.lqr1mm"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -77,13 +76,12 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.lqr2')" prop="lqr2Id">
-              <SelectDeptUser  v-model="form.lqr2Id" key="lqr2Id"/>
+              <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="lqr2mm">
-              <el-input type="text" v-model="form.lqr2mm"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -91,14 +89,13 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr')">
-              <el-input type="text" v-model="nickName" maxlength="50" 
-                :placeholder="$t('form.placeholderInput')" disabled/>
+              <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+                disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="ffrmm">
-              <el-input type="text" v-model="form.ffrmm"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.ffrmm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -119,7 +116,7 @@ import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "Ysff",
-  components: {SelectDeptUser},
+  components: { SelectDeptUser },
   data() {
     return {
       ids: [],
@@ -137,27 +134,27 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        lqr2mm:[{
+        lqr2mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr1mm:[{
+        lqr1mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr1Id:[{
+        lqr1Id: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr2Id:[{
+        lqr2Id: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        ffrmm:[{
+        ffrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -204,9 +201,13 @@ export default {
         if (valid) {
           let params = this.form
           params.list = this.selectList
+          this.$modal.loading()
           ysff(params).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue
index 09df930..e7ca0ab 100644
--- a/src/views/business/resource/gyzj/comps/gyzjList.vue
+++ b/src/views/business/resource/gyzj/comps/gyzjList.vue
@@ -249,6 +249,7 @@ import Ff from "./gyzj/Ff";
 import Czrq from "./gyzj/Czrq";
 import Czyj from "./gyzj/Czyj";
 import Ysff from "./gyzj/Ysff";
+import moment from "moment";
 
 export default {
   name: "GyzjList",
diff --git a/src/views/business/resource/mjy/comps/ffjl/Gd.vue b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
index fb6c34b..a4d9e06 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
@@ -22,7 +22,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -39,7 +39,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,14 +120,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             plgd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             gd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jd.vue b/src/views/business/resource/mjy/comps/ffjl/Jd.vue
index b78adb3..bc9e66d 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jd.vue
@@ -1,7 +1,8 @@
 G<template>
-  <div >
+  <div>
     <!-- 解档弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -14,7 +15,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -31,7 +32,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -109,14 +111,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             jdBatch(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             jd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jq.vue b/src/views/business/resource/mjy/comps/ffjl/Jq.vue
index ccc0ae8..acd169e 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jq.vue
@@ -1,7 +1,8 @@
 G<template>
-  <div >
+  <div>
     <!-- 加签弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.jiaqian')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.jiaqian')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -14,7 +15,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -31,7 +32,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -95,10 +97,14 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-            jq(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+          this.$modal.loading()
+          jq(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
     }
diff --git a/src/views/business/resource/mjy/comps/ffjl/Js.vue b/src/views/business/resource/mjy/comps/ffjl/Js.vue
index 51e507f..dfb9e15 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Js.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Js.vue
@@ -1,7 +1,8 @@
 G<template>
-  <div >
+  <div>
     <!-- 解锁弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.unlock')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -14,7 +15,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -31,7 +32,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -95,10 +97,14 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-            js(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+          this.$modal.loading()
+          js(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
     }
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jy.vue b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
index e1a0366..270bd0f 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
@@ -24,7 +24,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -128,10 +128,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-
+          this.$modal.loading()
           jy(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
 
diff --git a/src/views/business/resource/mjy/comps/ffjl/Sd.vue b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
index 6ea3e19..074e6ae 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
@@ -22,7 +22,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -39,7 +39,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,14 +120,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             plsd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             sd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
index 132a8d0..36635a8 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
@@ -11,7 +11,8 @@
         <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
       </div>
     </div>
-       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.mjy.ffjlxq') }}<img src="@/assets/images/detail-title.png" /></div>
+    <div class="detail-title"><img src="@/assets/images/detail-title.png">{{ $t('page.business.resource.mjy.ffjlxq')
+      }}<img src="@/assets/images/detail-title.png" /></div>
     <div class="detail-content">
       <div class="content-left">
         <div class="content-title">
@@ -36,7 +37,7 @@
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.mjy.nd') }}</div>
             <el-input type="text" :value="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
         </div>
@@ -54,13 +55,13 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.mjy.ckl') }}</div>
             <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
           <div class="right">
             <div class="right-title">{{ $t('page.business.resource.mjy.ckmz') }}</div>
             <el-input type="text" :value="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
         </div>
@@ -68,7 +69,7 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.mjy.lqsj') }}</div>
             <el-input type="text" :value="form.ffrq" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
           <div class="right">
@@ -110,7 +111,7 @@
           <div class="left">
             <div class="left-title">{{ $t('page.business.resource.mjy.rkmz') }}</div>
             <el-input type="text" :value="form.rkmz" maxlength="50" disabled> <template slot="append">{{ form.rkmzdw
-            }}</template>
+                }}</template>
             </el-input>
           </div>
         </div>
@@ -164,7 +165,7 @@
         <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
         <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
-          @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize"/>
+          @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize" />
       </div>
     </div>
   </div>
@@ -211,6 +212,8 @@ export default {
           this.$refs.jcgjList.add(this.jcgjList)
         }
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     show(row) {
diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index 48f2b12..24a25aa 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -202,6 +202,7 @@ import Gd from "./ffjl/Gd";
 import Jd from "./ffjl/Jd";
 import Xq from "./ffjl/Xq";
 import Jq from "./ffjl/Jq";
+import moment from "moment";
 
 export default {
   name: "FfjlList",
diff --git a/src/views/business/resource/mjy/comps/mjy/Bj.vue b/src/views/business/resource/mjy/comps/mjy/Bj.vue
index dcc33f7..981d647 100644
--- a/src/views/business/resource/mjy/comps/mjy/Bj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Bj.vue
@@ -64,14 +64,15 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="bjbz">
-              <el-input type="textarea" v-model="form.bjbz" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.bjbz" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -176,7 +177,7 @@ export default {
       this.form.bh = row.bh
       this.form.nd = row.nd
       this.form.nddw = row.nddw
-      this.form.sxrq= row.sxrq
+      this.form.sxrq = row.sxrq
       this.form.cctj = row.cctj
       this.form.ccwz = row.ccwz
       this.open = true
@@ -184,9 +185,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           bj(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/mjy/comps/mjy/Czrq.vue b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
index fd9fdc1..ba1b30d 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czrq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
@@ -4,7 +4,7 @@ G<template>
     <el-dialog :title="$t('page.business.resource.mjy.czrq')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <div :style="isBatch?'display:block':'display:none'">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
@@ -57,7 +57,7 @@ G<template>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.mjy.yuanyin')" prop="czyy">
-                <el-input type="textarea" v-model="form.czyy" :rows="2" maxlength="500"
+                <el-input type="textarea" v-model="form.czyy" :rows="5" maxlength="500"
                   :placeholder="$t('form.placeholderInput')">
                 </el-input>
               </el-form-item>
@@ -73,33 +73,36 @@ G<template>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.clr')+$t('form.password')" prop="clrmm">
-              <el-input type="password" v-model="form.clrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.clr') + $t('form.password')" prop="clrmm">
+              <el-input type="password" v-model="form.clrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.fhr')" prop="fhrId">
-              <SelectDeptUser  v-model="form.fhrId" key="jdrId"/>
+              <SelectDeptUser v-model="form.fhrId" key="jdrId" />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.fhr')+$t('form.password')" prop="fhrmm">
-              <el-input type="password" v-model="form.fhrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.fhr') + $t('form.password')" prop="fhrmm">
+              <el-input type="password" v-model="form.fhrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.jdr')" prop="jdrId">
-              <SelectDeptUser  v-model="form.jdrId" key="jdrId"/>
+              <SelectDeptUser v-model="form.jdrId" key="jdrId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jdr')+$t('form.password')" prop="jdrmm">
-              <el-input type="password" v-model="form.jdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.jdr') + $t('form.password')" prop="jdrmm">
+              <el-input type="password" v-model="form.jdrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -254,15 +257,23 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的麻精药")
             } else {
+              this.$modal.loading()
               plczrq(params).then(response => {
                 this.open = false
                 this.$emit('callback')
+                this.$modal.closeLoading()
+              }).finally(() => {
+                this.$modal.closeLoading()
               })
             }
           } else {
+            this.$modal.loading()
             czrq(params).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/mjy/Czyj.vue b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
index 6511670..ec31e5d 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czyj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
@@ -4,7 +4,7 @@ G<template>
     <el-dialog :title="$t('page.business.resource.mjy.czyj')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-      <div :style="isBatch?'display:block':'display:none'">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
               <el-table :data="selectList" border>
@@ -27,7 +27,8 @@ G<template>
                 <el-table-column :label="$t('page.business.resource.mjy.czl')" align="center">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.czl" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw }}</template>
+                      :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw
+                        }}</template>
                     </el-input>
                   </template>
                 </el-table-column>
@@ -62,15 +63,17 @@ G<template>
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.czl')" prop="czl">
-                <el-input-number type="text" v-model="form.czl" maxlength="50" :placeholder="$t('form.placeholderInput')" > <template slot="append">{{ form.kcdw }}</template>
-                  </el-input-number>
+                <el-input-number type="text" v-model="form.czl" maxlength="50"
+                  :placeholder="$t('form.placeholderInput')">
+                  <template slot="append">{{ form.kcdw }}</template>
+                </el-input-number>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.resource.mjy.yuanyin')" prop="czyy">
-                <el-input type="textarea" v-model="form.czyy" :rows="2" maxlength="500"
+                <el-input type="textarea" v-model="form.czyy" :rows="5" maxlength="500"
                   :placeholder="$t('form.placeholderInput')">
                 </el-input>
               </el-form-item>
@@ -86,33 +89,36 @@ G<template>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.clr')+$t('form.password')" prop="clrmm">
-              <el-input type="password" v-model="form.clrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.clr') + $t('form.password')" prop="clrmm">
+              <el-input type="password" v-model="form.clrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.fhr')" prop="fhrId">
-              <SelectDeptUser  v-model="form.fhrId" key="fhrId"/>
+              <SelectDeptUser v-model="form.fhrId" key="fhrId" />
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.fhr')+$t('form.password')" prop="fhrmm">
-              <el-input type="password" v-model="form.fhrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.fhr') + $t('form.password')" prop="fhrmm">
+              <el-input type="password" v-model="form.fhrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.jdr')" prop="jdrId">
-              <SelectDeptUser  v-model="form.jdrId" key="jdrId"/>
+              <SelectDeptUser v-model="form.jdrId" key="jdrId" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jdr')+$t('form.password')" prop="jdrmm">
-              <el-input type="password" v-model="form.jdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.jdr') + $t('form.password')" prop="jdrmm">
+              <el-input type="password" v-model="form.jdrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -277,15 +283,23 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的麻精药")
             } else {
+              this.$modal.loading()
               plczyj(params).then(response => {
                 this.open = false
                 this.$emit('callback')
+                this.$modal.closeLoading()
+              }).finally(() => {
+                this.$modal.closeLoading()
               })
             }
           } else {
+            this.$modal.loading()
             czyj(params).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/mjy/Ff.vue b/src/views/business/resource/mjy/comps/mjy/Ff.vue
index 8e607aa..bcc2703 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ff.vue
@@ -87,7 +87,7 @@ G<template>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.nd')">
                 <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                }}</template>
+                    }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -108,7 +108,7 @@ G<template>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.mjy.ckjz')">
                 <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                }}</template>
+                    }}</template>
                 </el-input>
               </el-form-item>
             </el-col>
@@ -135,7 +135,7 @@ G<template>
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('form.remark')" prop="remark">
-                <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+                <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                   :placeholder="$t('form.placeholderInput')">
                 </el-input>
               </el-form-item>
@@ -150,7 +150,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.lqr1')+$t('form.password')" prop="lqr1mm">
+            <el-form-item :label="$t('page.business.resource.mjy.lqr1') + $t('form.password')" prop="lqr1mm">
               <el-input type="password" v-model="form.lqr1mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -163,7 +163,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.lqr2')+$t('form.password')" prop="lqr2mm">
+            <el-form-item :label="$t('page.business.resource.mjy.lqr2') + $t('form.password')" prop="lqr2mm">
               <el-input type="password" v-model="form.lqr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -176,7 +176,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ffr1')+$t('form.password')" prop="ffr1mm">
+            <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"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -189,7 +189,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ffr2')+$t('form.password')" prop="ffr2mm">
+            <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"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -330,12 +330,12 @@ export default {
       this.form.ids = val.map(item => item.id)
       let tmp = []
       _.forEach(val, function (item) {
-        let a=item
-        a.ckmzdw=a.kcdw
-        a.zytj=null
-        a.ckmz=null
-        a.xmIds=null
-        a.remark=null
+        let a = item
+        a.ckmzdw = a.kcdw
+        a.zytj = null
+        a.ckmz = null
+        a.xmIds = null
+        a.remark = null
         tmp.push(a)
       })
       this.selectList = tmp
@@ -397,15 +397,23 @@ export default {
             if (this.selectList.length <= 0) {
               this.$modal.msgError("请选择要操作的麻精药")
             } else {
+              this.$modal.loading()
               plff(params).then(response => {
                 this.open = false
                 this.$emit('callback')
+                this.$modal.closeLoading()
+              }).finally(() => {
+                this.$modal.closeLoading()
               })
             }
           } else {
+            this.$modal.loading()
             ff(params).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
         }
diff --git a/src/views/business/resource/mjy/comps/mjy/Gd.vue b/src/views/business/resource/mjy/comps/mjy/Gd.vue
index 24dca9c..d1cfb83 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gd.vue
@@ -22,7 +22,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -39,7 +39,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,14 +120,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             plgd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             gd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue
index 0baa6d6..c6e563a 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gh.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue
@@ -26,7 +26,7 @@ G<template>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.nd')">
               <el-input type="text" v-model="form.nd" maxlength="50" disabled> <template slot="append">{{ form.nddw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -47,7 +47,7 @@ G<template>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ckjz')">
               <el-input type="text" v-model="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -62,7 +62,7 @@ G<template>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ckmz')">
               <el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
-                  }}</template>
+              }}</template>
               </el-input>
             </el-form-item>
           </el-col>
@@ -119,7 +119,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -134,7 +134,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ghr1Id')+$t('form.password')" prop="ghr1mm">
+            <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"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -147,7 +147,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ghr2Id')+$t('form.password')" prop="ghr2mm">
+            <el-form-item :label="$t('page.business.resource.mjy.ghr2Id') + $t('form.password')" prop="ghr2mm">
               <el-input type="password" v-model="form.ghr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -160,7 +160,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsr1Id')+$t('form.password')" prop="jsr1mm">
+            <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"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -173,7 +173,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsr2Id')+$t('form.password')" prop="jsr2mm">
+            <el-form-item :label="$t('page.business.resource.mjy.jsr2Id') + $t('form.password')" prop="jsr2mm">
               <el-input type="password" v-model="form.jsr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -297,7 +297,7 @@ export default {
     rklChange() {
       if (!isNaN(this.form.rkmz)) {
         this.form.jsl = _.subtract(parseFloat(this.form.ckmz), parseFloat(this.form.rkmz))
-      }else{
+      } else {
         this.form.jsl = ''
       }
     },
@@ -306,28 +306,28 @@ export default {
     },
     reset() {
       this.form = {
-        id:null,
-        rkwz:null,
-        rktj:null,
+        id: null,
+        rkwz: null,
+        rktj: null,
         ghzytj: null,
         rkmz: null,
-        jsl:null,
-        syl:null,
+        jsl: null,
+        syl: null,
         ghr1Id: null,
         ghr1mm: null,
-        ghr2Id:null,
+        ghr2Id: null,
         ghr2mm: null,
-        jsr1Id:null,
+        jsr1Id: null,
         jsr1mm: null,
-        jsr2Id:null,
-        jsr2mm:null,
-        qmyy:'归还',
+        jsr2Id: null,
+        jsr2mm: null,
+        qmyy: '归还',
       }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      let that=this
+      let that = this
       info({ id: row.id }).then(response => {
         that.form.id = response.data.id
         that.form.mc = response.data.mc
@@ -349,10 +349,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-
+          this.$modal.loading()
           gh(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/mjy/comps/mjy/Jd.vue b/src/views/business/resource/mjy/comps/mjy/Jd.vue
index da48a72..f6145e6 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jd.vue
@@ -1,14 +1,15 @@
 G<template>
-  <div >
+  <div>
     <!-- 解档弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-           <div :style="isBatch ? 'display:block' : 'display:none'">
-           <el-alert :title="$t('page.business.resource.mjy.jdts') " type="error" :closable="false">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-alert :title="$t('page.business.resource.mjy.jdts')" type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
         </div>
@@ -23,7 +24,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -40,7 +41,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -120,14 +122,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             jdBatch(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             jd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/mjy/Js.vue b/src/views/business/resource/mjy/comps/mjy/Js.vue
index 67d5b12..f0bac2f 100644
--- a/src/views/business/resource/mjy/comps/mjy/Js.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Js.vue
@@ -1,7 +1,8 @@
 G<template>
-  <div >
+  <div>
     <!-- 解锁弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.unlock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.unlock')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -14,7 +15,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -31,7 +32,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -95,10 +97,14 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-            js(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+          this.$modal.loading()
+          js(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
         }
       })
     }
diff --git a/src/views/business/resource/mjy/comps/mjy/Jy.vue b/src/views/business/resource/mjy/comps/mjy/Jy.vue
index 3e181e5..e18a9c0 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jy.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jy.vue
@@ -33,7 +33,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -154,14 +154,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             jdBatch(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             jd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/mjy/Sd.vue b/src/views/business/resource/mjy/comps/mjy/Sd.vue
index ab9e1f4..29879af 100644
--- a/src/views/business/resource/mjy/comps/mjy/Sd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Sd.vue
@@ -5,7 +5,7 @@ G<template>
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div :style="isBatch ? 'display:block' : 'display:none'">
-          <el-row >
+          <el-row>
             <el-col :span="24">
               <SelectList :value="selectList" />
             </el-col>
@@ -22,7 +22,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -39,7 +39,8 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -119,14 +120,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             plsd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             sd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/resource/mjy/comps/mjy/Shbj.vue b/src/views/business/resource/mjy/comps/mjy/Shbj.vue
index 22d004f..a47ca4a 100644
--- a/src/views/business/resource/mjy/comps/mjy/Shbj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Shbj.vue
@@ -62,8 +62,8 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
-                <el-option  label="同意编辑" :value="10" />
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')">
+                <el-option label="同意编辑" :value="10" />
                 <el-option label="拒绝编辑" :value="1" />
               </el-select>
             </el-form-item>
@@ -78,14 +78,15 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -211,9 +212,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           shbj(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
index 3a692a8..6900821 100644
--- a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
@@ -1,7 +1,8 @@
 G<template>
   <div>
     <!-- 审核修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.shxgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.resource.mjy.shxgkc')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <el-col :span="12">
@@ -27,7 +28,7 @@ G<template>
             </el-form-item>
           </el-col>
         </el-row>
-         <el-row>
+        <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.resource.mjy.xgr')">
               <el-input type="text" v-model="form.kcbjrMc" disabled />
@@ -40,11 +41,11 @@ G<template>
           </el-col>
         </el-row>
         <el-row>
-         <el-col :span="12">
+          <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
-                <el-option  label="同意修改库存" :value="10" />
-                <el-option  label="拒绝修改库存" :value="1" />
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')">
+                <el-option label="同意修改库存" :value="10" />
+                <el-option label="拒绝修改库存" :value="1" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -58,14 +59,15 @@ 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" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -160,9 +162,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           shxgkc(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
index e466414..10a7264 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
@@ -51,7 +51,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" >
-              <el-input type="textarea" v-model="form.kcbjbz" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.kcbjbz" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -133,9 +133,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           xgkc(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+           this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue
index e11bccd..8ea021e 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue
@@ -8,11 +8,12 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="right-top">
-        <el-button @click="cancel()">{{$t('form.cancel')}}</el-button>
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
           <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
         </div>
       </div>
-       <div class="detail-title"><img src="@/assets/images/detail-title.png" >{{ $t('page.business.resource.mjy.mjyxq') }}<img src="@/assets/images/detail-title.png" /></div>
+      <div class="detail-title"><img src="@/assets/images/detail-title.png">{{ $t('page.business.resource.mjy.mjyxq')
+      }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
@@ -133,7 +134,7 @@ G<template>
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.resource.mjy.jcgj') }}</div>
           </div>
-          <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
+          <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />
@@ -174,23 +175,17 @@ export default {
   created() {
   },
   methods: {
-    exportExcel(){
+    exportExcel() {
       alert('todo')
     },
-    jcgjListHandleQuery(val) {
+    getJjcgjList(val) {
       this.$modal.loading()
       jcgjList(_.merge({}, this.queryJcgjParams, val)).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
         this.$modal.closeLoading()
-      })
-    },
-    getJjcgjList() {
-      jcgjList(this.queryJcgjParams).then(response => {
-        this.jcgjList = response.rows
-        this.jcgjTotal = response.total
-        this.$refs.jcgjList.init(this.jcgjList)
+      }).finally(() => {
         this.$modal.closeLoading()
       })
     },
@@ -211,10 +206,14 @@ export default {
       this.$modal.loading()
       this.queryParamstZ.mjyId = row.id
       this.queryJcgjParams.mjyId = row.id
+      this.$modal.loading()
       info({ id: row.id }).then(response => {
         this.form = response.data
         this.getTzList()
         this.open = true
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     }
   }
diff --git a/src/views/business/resource/mjy/comps/mjy/Ysff.vue b/src/views/business/resource/mjy/comps/mjy/Ysff.vue
index 7870fea..d8adc2f 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ysff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ysff.vue
@@ -20,7 +20,8 @@ G<template>
 
                 <el-table-column :label="$t('page.business.resource.mjy.ffzytj')" align="center" prop="ffzytj"
                   width="150px" />
-                <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" prop="ckmz" width="150px" />
+                <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" prop="ckmz"
+                  width="150px" />
                 <el-table-column :label="$t('page.business.resource.mjy.ckmzdw')" align="center" prop="ckmzdw"
                   width="150px" />
                 <el-table-column :label="$t('page.business.resource.mjy.lqr1')" align="center" prop="lqr1Mc"
@@ -54,8 +55,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="text" v-model="form.remark"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.remark" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -63,13 +63,12 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.lqr1')" prop="lqr1Id">
-              <SelectDeptUser  v-model="form.lqr1Id" key="lqr1Id"/>
+              <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="lqr1mm">
-              <el-input type="text" v-model="form.lqr1mm"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -77,13 +76,12 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.lqr2')" prop="lqr2Id">
-              <SelectDeptUser  v-model="form.lqr2Id" key="lqr2Id"/>
+              <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="lqr2mm">
-              <el-input type="text" v-model="form.lqr2mm"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -91,14 +89,13 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ffr')">
-              <el-input type="text" v-model="nickName" maxlength="50" 
-                :placeholder="$t('form.placeholderInput')" disabled/>
+              <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+                disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="ffrmm">
-              <el-input type="text" v-model="form.ffrmm"  maxlength="20"
-                :placeholder="$t('form.placeholderInput')">
+              <el-input type="text" v-model="form.ffrmm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -119,7 +116,7 @@ import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "Ysff",
-  components: {SelectDeptUser},
+  components: { SelectDeptUser },
   data() {
     return {
       ids: [],
@@ -137,27 +134,27 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        lqr2mm:[{
+        lqr2mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr1mm:[{
+        lqr1mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr1Id:[{
+        lqr1Id: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        lqr2Id:[{
+        lqr2Id: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        ffrmm:[{
+        ffrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -204,9 +201,13 @@ export default {
         if (valid) {
           let params = this.form
           params.list = this.selectList
+          this.$modal.loading()
           ysff(params).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index e55a193..484447e 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -250,6 +250,7 @@ import Ff from "./mjy/Ff";
 import Czrq from "./mjy/Czrq";
 import Czyj from "./mjy/Czyj";
 import Ysff from "./mjy/Ysff";
+import moment from "moment";
 
 export default {
   name: "MjyList",
diff --git a/src/views/business/resource/zcg/comps/Ysff.vue b/src/views/business/resource/zcg/comps/Ysff.vue
index e6f0dfb..55a8e39 100644
--- a/src/views/business/resource/zcg/comps/Ysff.vue
+++ b/src/views/business/resource/zcg/comps/Ysff.vue
@@ -28,7 +28,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -37,7 +37,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.lqr1Id')" prop="lqr1Id">
-              <SelectDeptUser  v-model="form.lqr1Id" key="lqr1Id"/>
+              <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -49,7 +49,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.lqr2Id')" prop="lqr2Id">
-              <SelectDeptUser  v-model="form.lqr2Id" key="lqr2Id"/>
+              <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -161,9 +161,13 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          this.$modal.loading()
           zcg_ysff(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/resource/zcg/comps/Ysgh.vue b/src/views/business/resource/zcg/comps/Ysgh.vue
index 1d78a96..fafb5f9 100644
--- a/src/views/business/resource/zcg/comps/Ysgh.vue
+++ b/src/views/business/resource/zcg/comps/Ysgh.vue
@@ -5,11 +5,11 @@ G<template>
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="130px">
         <template v-if="isBatch">
-          <el-alert :title="$t('page.business.resource.zcg.ysghts') " type="error" :closable="false">
+          <el-alert :title="$t('page.business.resource.zcg.ysghts')" type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
         </template>
@@ -32,7 +32,7 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.ghr1Id')" prop="ghr1Id">
-              <SelectDeptUser  v-model="form.ghr1Id" key="ghr1Id"/>
+              <SelectDeptUser v-model="form.ghr1Id" key="ghr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -44,7 +44,7 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.ghr2Id')" prop="ghr2Id">
-              <SelectDeptUser  v-model="form.ghr2Id" key="ghr2Id"/>
+              <SelectDeptUser v-model="form.ghr2Id" key="ghr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -91,7 +91,7 @@ import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "ZcgYsgh",
-  components: { SelectList,SelectDeptUser },
+  components: { SelectList, SelectDeptUser },
   data() {
     return {
       isBatch: false,
@@ -174,14 +174,22 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
+            this.$modal.loading()
             zcg_ysghBatch(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           } else {
+            this.$modal.loading()
             zcg_ysgh(this.form).then(response => {
               this.open = false
               this.$emit('callback')
+              this.$modal.closeLoading()
+            }).finally(() => {
+              this.$modal.closeLoading()
             })
           }
 
diff --git a/src/views/business/study/comp/edit.vue b/src/views/business/study/comp/edit.vue
index 4942198..05ee6ce 100644
--- a/src/views/business/study/comp/edit.vue
+++ b/src/views/business/study/comp/edit.vue
@@ -37,7 +37,7 @@
         </el-row>
       </el-form>
     </div>
-    <Sign ref="signRef" @callback="doSign" />
+    <Sign ref="editSignRef" @callback="doSign" />
   </div>
 </template>
 
@@ -113,7 +113,7 @@ export default {
         if (valid) {
           this.infoDialog.formData.status = status
           if(status === 3){
-            this.$refs.signRef.show(this.$t('page.business.study.study.submit'),'创建试验')
+            this.$refs.editSignRef.show(this.$t('page.business.study.study.submit'),'创建试验')
           }else{
             this.doSave({})
           }
@@ -130,7 +130,7 @@ export default {
         sign:sign
       }).then(() => {
         this.$emit('save')
-        this.$refs.signRef.cancel()
+        this.$refs.editSignRef.cancel()
       }).finally(() => {
         this.$modal.closeLoading()
       })
diff --git a/src/views/business/study/comp/enter.vue b/src/views/business/study/comp/enter.vue
index 2edc3b7..22e5a9f 100644
--- a/src/views/business/study/comp/enter.vue
+++ b/src/views/business/study/comp/enter.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="study-enter">
     <div class="content-list">
-      <div class="search-box" v-show="!showDetailYt">
+      <div class="search-box" v-show="!showDetail">
         <div class="search-item" :class="active === item.key ? 'active' : ''" v-for="(item, index) in tabList"
           :key="index" @click="changeTab(item)">
           {{ item.name }}
@@ -9,8 +9,9 @@
       </div>
 
       <div class="content-box">
-        <ytbd v-if="active === 'ytbd'" :study="study" @showDetail="showDetailCallbackYt" />
-        <tbbd v-if="active === 'tbbd'" :study="study" />
+        <ytbd v-if="active === 'ytbd'" :study="study" @showDetail="showDetailCallback" />
+        <tbbd v-if="active === 'tbbd'" :study="study" @showDetail="showDetailCallback"/>
+        <syxx v-if="active === 'syxx'" :study="study" @showDetail="showDetailCallback"/>
       </div>
     </div>
   </div>
@@ -19,15 +20,16 @@
 <script>
 import ytbd from './ytbd.vue'
 import tbbd from './tbbd.vue'
+import syxx from './syxx.vue'
 export default {
   name: 'StudyEnter',
   props: {},
-  components: { ytbd, tbbd },
+  components: { ytbd, tbbd ,syxx},
   computed: {},
   filters: {},
   data() {
     return {
-      showDetailYt: false,
+      showDetail: false,
       tabList: [
         { key: 'ytbd', name: this.$t('page.business.study.studyEnter.ytbdlb') },
         { key: 'tbbd', name: this.$t('page.business.study.studyEnter.tbbdlb') },
@@ -46,8 +48,8 @@ export default {
     show(row) {
       this.study = row
     },
-    showDetailCallbackYt(val) {
-      this.showDetailYt = val
+    showDetailCallback(val) {
+      this.showDetail = val
     },
     changeTab(item) {
       if (this.active !== item.key) {
diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue
new file mode 100644
index 0000000..3ccbec2
--- /dev/null
+++ b/src/views/business/study/comp/jhbd/Bj.vue
@@ -0,0 +1,234 @@
+G<template>
+  <div>
+    <div class="edit-container">
+      <div class="edit-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="center-top">
+          <div>
+            <div :class="showIndex == 1 ? 'el-step__icon is-text is-finish' : 'el-step__icon is-text is-info'">
+              <div class="el-step__icon-inner">1</div>
+            </div>
+            {{ $t('page.business.study.studyFormPlan.jcsz') }}
+          </div>
+          <div class="line"></div>
+          <div>
+            <div :class="showIndex == 2 ? 'el-step__icon is-text is-finish' : 'el-step__icon is-text is-info'">
+              <div class="el-step__icon-inner">2</div>
+            </div>
+            {{ $t('page.business.study.studyFormPlan.bdtb') }}
+          </div>
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
+          <template v-if="showIndex == 1">
+            <el-button @click="save">{{ $t('page.business.study.studyFormPlan.zc') }}</el-button>
+            <el-button type="primary" @click="next">{{ $t('page.business.study.studyFormPlan.next') }}</el-button>
+          </template>
+          <template v-else>
+            <el-button @click="saveNext">{{ $t('page.business.study.studyFormPlan.save') }}</el-button>
+            <el-button type="primary" @click="openSubmit = true">{{ $t('page.business.study.studyFormPlan.submit')
+            }}</el-button>
+          </template>
+        </div>
+      </div>
+      <div class="edit-content">
+        <div class="content" style="width:60%" v-show="showIndex == 1">
+          <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateId">
+                  <SelectTemplate v-model="form.templateId" :name="form.templateMc" @change="selectTemplateChange" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.form.bdmc')" prop="bdmc">
+                  <el-input type="text" v-model="form.bdmc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.study.studyFormPlan.bdsm')" prop="bdsm">
+                  <el-input type="textarea" v-model="form.bdsm" :rows="5" maxlength="500"
+                    :placeholder="$t('form.placeholderInput')">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <div class="content" v-show="showIndex == 2">
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="prePlan" />
+        </div>
+      </div>
+    </div>
+
+    <el-dialog :title="$t('page.business.study.studyFormPlan.tjjl')" :visible.sync="openSubmit" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px">
+        todo
+      </el-form>
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="tj">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openSubmit = false">{{ $t('form.cancel') }}</el-button>
+      </div> -->
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormPlan_bc, studyFormPlan_tj, studyFormPlan_info } from "@/api/business/study/studyFormPlan"
+import { mapGetters } from 'vuex'
+import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
+
+export default {
+  name: "Bj",
+  components: { SelectTemplate, SelectDeptUser, TemplateTable },
+  data() {
+    return {
+      open: false,
+      showIndex: 1,
+      form: {},
+      openSubmit: false,
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        fzrsh: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        shryId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
+      rules: {
+        bdmc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        templateId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    next() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.showIndex = 2
+        }
+      })
+    },
+    selectTemplateChange(val) {
+      this.form.bdnr = val.content
+      this.form.templateMc = val.name
+    },
+    cancel() {
+      this.$emit('close')
+    },
+    reset() {
+      this.form = {
+        id: null,
+        studyId: null,
+        bdbh: null,
+        bdmc: null,
+        bdsm: null,
+        templateId: null,
+        templateMc: null,
+        bdnr: null,
+        fzrsh: null,
+        shryId: null,
+        shryMc: null,
+      }
+      this.resetForm("form")
+    },
+    selectDeptUserChange(val) {
+      this.form.shryMc = val.name
+    },
+    edit(row) {
+      this.reset()
+      this.showIndex = 1
+      if (row && row.id) {
+        this.$modal.loading()
+        studyFormPlan_info({ id: row.id }).then(response => {
+          this.form = response.data
+          this.form.qmyy = '制作提交预制表单'
+          this.open = true
+          this.$modal.closeLoading()
+        })
+      } else {
+        this.form = _.merge({}, this.form, row)
+        this.open = true
+      }
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormPlan_bc(this.form).then(response => {
+            this.$emit('close')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    },
+    async saveNext() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.form.bdnr = JSON.stringify(content)
+      this.$modal.loading()
+      studyFormPlan_bc(this.form).then(response => {
+        this.$emit('close')
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    tj() {
+      this.$refs["formSubmit"].validate(valid => {
+        if (valid) {
+          this.dotj()
+        }
+      })
+    },
+    async dotj() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.form.bdnr = JSON.stringify(content)
+      this.$modal.loading()
+      studyFormPlan_tj(this.form).then(response => {
+        this.$emit('close')
+        this.openSubmit = false
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/jhbd/Fh.vue b/src/views/business/study/comp/jhbd/Fh.vue
new file mode 100644
index 0000000..4691a9a
--- /dev/null
+++ b/src/views/business/study/comp/jhbd/Fh.vue
@@ -0,0 +1,268 @@
+G<template>
+  <div>
+    <div class="edit-container">
+      <div class="edit-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="center-top">
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
+          <el-button type="danger" @click="showApprove('复核拒绝')">{{ $t('page.business.study.studyFormPlan.fhjj')
+          }}</el-button>
+          <el-button type="primary" @click="showApprove('复核通过')">{{ $t('page.business.study.studyFormPlan.fhtg')
+          }}</el-button>
+          <el-button type="primary" @click="showApprove('通过')">{{ $t('page.business.study.studyFormPlan.tongguo')
+          }}</el-button>
+        </div>
+      </div>
+      <div class="edit-content">
+        <div class="content-left">
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="prePlan" />
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
+          </div>
+          <div class="pal">
+            <el-table :data="qmxxList" v-loading="loadingQmxx">
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmr')" align="center" prop="qmrMc"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmyy')" align="center" prop="qmyy"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmsj')" align="center" prop="createTime"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalQmxx > 0" :total="totalQmxx" :page.sync="queryParamsQmxx.pageNum"
+              :limit.sync="queryParamsQmxx.pageSize" @pagination="getQmxxList" />
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.jcgj') }}</div>
+          </div>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+      </div>
+    </div>
+    <el-dialog :title="$t(openTitle)" :visible.sync="openApprove" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formApprove.qmyy == '复核拒绝'">
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.reason')" prop="reason">
+              <el-input type="textarea" v-model="formApprove.reason" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-else>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')">
+              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="formApprove.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="approve">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openApprove = false">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { studyFormPlan_fhtg, studyFormPlan_fhjj, studyFormPlan_tg, studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import { mapGetters } from 'vuex'
+import JcgjList from "@/views/business/comps/common/JcgjList";
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
+
+export default {
+  name: "Fh",
+  components: { TemplateTable, JcgjList },
+  data() {
+    return {
+      form: {},
+      qmxxList: [],
+      totalQmxx: 0,
+      loadingQmxx: true,
+      queryParamsQmxx: {
+        formId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      jcgjList: [],
+      jcgjTotal: 0,
+      queryParamsJcgj: {
+        pageNum: 1,
+        formId: null,
+        pageSize: 10,
+      },
+      openTitle: '',
+      openApprove: false,
+      formApprove: {},
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        reason: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    getJjcgjList(val) {
+      this.$modal.loading()
+      studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    getQmxxList() {
+      this.loadingQmxx = true
+      studyFormPlan_qmxx(this.queryParamsQmxx).then(response => {
+        this.qmxxList = response.rows
+        this.totalQmxx = response.total
+        this.loadingQmxx = false
+      })
+    },
+    cancel() {
+      this.$emit('close')
+    },
+    reset() {
+      this.form = {}
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.$modal.loading()
+      this.queryParamsJcgj.formId = row.id
+      this.queryParamsQmxx.formId = row.id
+      studyFormPlan_info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.getQmxxList()
+        this.getJjcgjList()
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    showApprove(qmyy) {
+      this.openApprove = true
+      this.resetApprove()
+      this.formApprove.id = this.form.id
+      this.formApprove.qmyy = qmyy
+      if (qmyy == '复核通过') {
+        this.openTitle = 'page.business.study.studyFormPlan.fhtg'
+      } else if (qmyy == '复核拒绝') {
+        this.openTitle = 'page.business.study.studyFormPlan.fhjj'
+      } else if (qmyy == '通过') {
+        this.openTitle = 'page.business.study.studyFormPlan.tongguo'
+      }
+    },
+    resetApprove() {
+      this.resetForm("formApprove")
+      this.formApprove = {
+        id: null,
+        qmyy: '',
+        bdnr: '',
+        remark: '',
+        reason: '',
+        qmrmm: '',
+      }
+    },
+    approve() {
+      this.$refs["formApprove"].validate(valid => {
+        if (valid) {
+          this.doapprove()
+        }
+      })
+    },
+    async doapprove() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.formApprove.bdnr = JSON.stringify(content)
+      this.$modal.loading()
+      if (this.formApprove.qmyy == '复核通过') {
+        studyFormPlan_fhtg(this.formApprove).then(response => {
+          this.openApprove = false
+          this.$modal.closeLoading()
+          this.$emit('close')
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else if (this.formApprove.qmyy == '复核拒绝') {
+        this.formApprove.remark=this.formApprove.reason
+        studyFormPlan_fhjj(this.formApprove).then(response => {
+          this.openApprove = false
+          this.$modal.closeLoading()
+          this.$emit('close')
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else {
+        studyFormPlan_tg(this.formApprove).then(response => {
+          this.openApprove = false
+          this.$modal.closeLoading()
+          this.$emit('close')
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/jhbd/Ghgsr.vue b/src/views/business/study/comp/jhbd/Ghgsr.vue
new file mode 100644
index 0000000..062e30e
--- /dev/null
+++ b/src/views/business/study/comp/jhbd/Ghgsr.vue
@@ -0,0 +1,126 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormPlan.rybg')" :visible.sync="open" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+              <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.reason')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormPlan_ghgsr } from "@/api/business/study/studyFormPlan"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Ghgsr",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: '更换归属人',
+        userId: null,
+        UserMc: null,
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.form.userId = row.userId
+      this.form.userMc = row.userMc
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormPlan_ghgsr(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/jhbd/Sy.vue b/src/views/business/study/comp/jhbd/Sy.vue
new file mode 100644
index 0000000..22f10f4
--- /dev/null
+++ b/src/views/business/study/comp/jhbd/Sy.vue
@@ -0,0 +1,215 @@
+G<template>
+  <div>
+    <div class="edit-container">
+      <div class="edit-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="center-top">
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
+          <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormPlan.shenyue')
+          }}</el-button>
+        </div>
+      </div>
+      <div class="edit-content">
+        <div class="content-left">
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="prePlan" />
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
+          </div>
+          <div class="pal">
+            <el-table :data="qmxxList" v-loading="loadingQmxx">
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmr')" align="center" prop="qmrMc"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmyy')" align="center" prop="qmyy"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmsj')" align="center" prop="createTime"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalQmxx > 0" :total="totalQmxx" :page.sync="queryParamsQmxx.pageNum"
+              :limit.sync="queryParamsQmxx.pageSize" @pagination="getQmxxList" />
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.jcgj') }}</div>
+          </div>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+      </div>
+    </div>
+    <el-dialog :title="$t('page.business.study.studyFormPlan.shenyue')" :visible.sync="openApprove" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="formApprove.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="approve">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openApprove = false">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { studyFormPlan_sy, studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import { mapGetters } from 'vuex'
+import JcgjList from "@/views/business/comps/common/JcgjList";
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
+
+export default {
+  name: "Sy",
+  components: { TemplateTable, JcgjList },
+  data() {
+    return {
+      form: {},
+      qmxxList: [],
+      totalQmxx: 0,
+      loadingQmxx: true,
+      queryParamsQmxx: {
+        formId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      jcgjList: [],
+      jcgjTotal: 0,
+      queryParamsJcgj: {
+        pageNum: 1,
+        formId: null,
+        pageSize: 10,
+      },
+      openApprove: false,
+      formApprove: {},
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    getJjcgjList(val) {
+      this.$modal.loading()
+      studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    getQmxxList() {
+      this.loadingQmxx = true
+      studyFormPlan_qmxx(this.queryParamsQmxx).then(response => {
+        this.qmxxList = response.rows
+        this.totalQmxx = response.total
+        this.loadingQmxx = false
+      })
+    },
+    cancel() {
+      this.$emit('close')
+    },
+    reset() {
+      this.form = {}
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.$modal.loading()
+      this.queryParamsJcgj.formId = row.id
+      this.queryParamsQmxx.formId = row.id
+      studyFormPlan_info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.getQmxxList()
+        this.getJjcgjList()
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    showApprove() {
+      this.resetApprove()
+      this.formApprove.id = this.form.id
+      this.openApprove = true
+    },
+    resetApprove() {
+      this.formApprove = {
+        id: null,
+        qmyy: '已审阅',
+        remark: '',
+        qmrmm: '',
+      }
+      this.resetForm("formApprove")
+    },
+    approve() {
+      this.$refs["formApprove"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormPlan_sy(this.formApprove).then(response => {
+            this.openApprove = false
+            this.$modal.closeLoading()
+            this.$emit('close')
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/jhbd/Xq.vue b/src/views/business/study/comp/jhbd/Xq.vue
new file mode 100644
index 0000000..60bc924
--- /dev/null
+++ b/src/views/business/study/comp/jhbd/Xq.vue
@@ -0,0 +1,260 @@
+G<template>
+  <div>
+    <div class="edit-container">
+      <div class="edit-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="center-top">
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.close') }}</el-button>
+          <el-button type="primary" v-if="form.bdzt === 5 && form.tbzt === 1" @click="openApprove = true">{{
+            $t('page.business.study.studyFormPlan.tb') }}</el-button>
+        </div>
+      </div>
+      <div class="edit-content ">
+        <div class="content">
+          <div>
+            <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormPlan.dcqbjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dclcjcgj">{{ $t('page.business.study.studyFormPlan.dclcjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcbjjcgj">{{ $t('page.business.study.studyFormPlan.dcbjjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcxgjcgj">{{ $t('page.business.study.studyFormPlan.dcxgjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormPlan.dcbhsjgj') }}
+            </el-button>
+          </div>
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="prePlan" />
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
+          </div>
+          <div class="pal">
+            <el-table :data="qmxxList" v-loading="loadingQmxx">
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmr')" align="center" prop="qmrMc"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmyy')" align="center" prop="qmyy"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.qmsj')" align="center" prop="createTime"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPlan.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalQmxx > 0" :total="totalQmxx" :page.sync="queryParamsQmxx.pageNum"
+              :limit.sync="queryParamsQmxx.pageSize" @pagination="getQmxxList" />
+          </div>
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.jcgj') }}</div>
+          </div>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+
+      </div>
+    </div>
+
+    <!-- 填报 -->
+    <el-dialog :title="$t('page.business.study.studyFormPlan.cjjl')" :visible.sync="openApprove" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
+        <el-alert :title="$t('page.business.study.studyFormPlan.ts')" :closable="false" type="success">
+        </el-alert>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="formApprove.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="approve">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openApprove = false">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormPlan_tb, studyFormPlan_info, studyFormPlan_jcgj, studyFormPlan_qmxx } from "@/api/business/study/studyFormPlan"
+import { mapGetters } from 'vuex'
+import JcgjList from "@/views/business/comps/common/JcgjList";
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
+
+export default {
+  name: "Xq",
+  components: { JcgjList, TemplateTable },
+  data() {
+    return {
+      openApprove: false,
+      formApprove: {
+        id: null,
+        qmyy: '创建记录',
+        remark: '',
+        qmrmm: '',
+      },
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
+      qmxxList: [],
+      totalQmxx: 0,
+      loadingQmxx: true,
+      queryParamsQmxx: {
+        formId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      open: false,
+      showIndex: 1,
+      form: {},
+      rules: {
+        bdmc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        templateId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+
+      },
+      jcgjTotal: 0,
+      jcgjList: [],
+      queryParamsJcgj: {
+        pageNum: 1,
+        formId: null,
+        pageSize: 10,
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    dcqbjcgj() {
+      alert('todo')
+    },
+    dclcjcgj() {
+      alert('todo')
+    },
+    dcbjjcgj() {
+      alert('todo')
+    },
+    dcxgjcgj() {
+      alert('todo')
+    },
+    dcbhsjgj() {
+      alert('todo')
+    },
+    getJjcgjList(val) {
+      this.$modal.loading()
+      studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    getQmxxList() {
+      this.loadingQmxx = true
+      studyFormPlan_qmxx(this.queryParamsQmxx).then(response => {
+        this.qmxxList = response.rows
+        this.totalQmxx = response.total
+        this.loadingQmxx = false
+      })
+    },
+    cancel() {
+      this.$emit('close')
+    },
+    reset() {
+      this.form = {
+        id: null,
+        studyId: null,
+        bdbh: null,
+        bdmc: null,
+        bdsm: null,
+        templateId: null,
+        templateMc: null,
+        bdnr: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.$modal.loading()
+      this.formApprove.id = row.id
+      this.queryParamsJcgj.formId = row.id
+      this.queryParamsQmxx.formId = row.id
+      studyFormPlan_info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.getQmxxList()
+        this.getJjcgjList()
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    approve() {
+      this.$refs["formApprove"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormPlan_tb(this.formApprove).then(response => {
+            this.$emit('close')
+            this.openApprove = false
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/jhbdList.vue b/src/views/business/study/comp/jhbdList.vue
new file mode 100644
index 0000000..5f32140
--- /dev/null
+++ b/src/views/business/study/comp/jhbdList.vue
@@ -0,0 +1,280 @@
+<template>
+  <div class="tbbd-list">
+    <div v-show="!showDetail && !showEdit && !showAudit && !showFh">
+      <div class="tbbd-search">
+        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="5">
+              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 160px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 160px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+                <SelectDeptUser v-model="searchForm.userId" style="width: 160px" :name="searchForm.userMc" key="userId"
+                  @change="userChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="5">
+              <el-form-item :label="$t('page.business.form.cjsj')">
+                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
+                  :start-placeholder="$t('page.business.form.startDate')"
+                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
+                  style="width: 200px" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+                <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="tbbd-content">
+        <el-row class="add-box">
+          <el-col>
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyFormPlan:xz']">{{
+              $t('page.business.study.studyFormPlan.xzbd') }}</el-button>
+          </el-col>
+        </el-row>
+
+        <el-table v-loading="loading" :data="list">
+          <el-table-column :label="$t('page.business.form.bh')" prop="bdbh" />
+          <el-table-column :label="$t('page.business.form.bdmc')" prop="bdmc" />
+          <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateMc" />
+          <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
+          <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
+          <el-table-column :label="$t('page.business.form.status')" prop="status" align="center" width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormPlan.tbz') }}</span>
+              <span v-if="scope.row.bdzt === 3">{{ $t('page.business.study.studyFormPlan.ytj') }}</span>
+              <span v-if="scope.row.bdzt === 7">{{ $t('page.business.study.studyFormPlan.ywc') }}</span>
+              <span v-if="scope.row.bdzt === 5">{{ $t('page.business.study.studyFormPlan.ywcfh') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
+            <template slot-scope="scope">
+              <!-- 表单状态：1：填报中；3：已提交；5：已完成（经复核）;7：已完成 -->
+              <!-- 详情 -->
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyFormPlan:xq']">{{
+                $t('form.detail') }}</el-button>
+              <!-- 编辑 -->
+              <el-button type="text" v-if="scope.row.bdzt === 1 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                @click="edit(scope.row)" v-hasPermi="['business:studyFormPlan:bj']">{{
+                  $t('form.edit') }}</el-button>
+              <!-- 复核 -->
+              <el-button type="text" v-if="scope.row.bdzt === 3" @click="fh(scope.row)"
+                v-hasPermi="['business:studyFormPlan:fh']">{{
+                  $t('page.business.study.studyFormPlan.fh') }}</el-button>
+              <!-- 更换归属人 -->
+              <el-button type="text"
+                v-if="scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                @click="ghgsr(scope.row)" v-hasPermi="['business:studyFormPlan:ghgsr']">{{
+                  $t('page.business.study.studyFormPlan.ghgsr') }}</el-button>
+              <!-- 审阅 -->
+              <el-button type="text" v-if="scope.row.bdzt === 5 || scope.row.bdzt === 7" @click="sy(scope.row)"
+                v-hasPermi="['business:studyFormPlan:sy']">{{
+                  $t('page.business.study.studyFormPlan.sy') }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+
+        <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+          @pagination="getList" />
+      </div>
+    </div>
+    <!-- 编辑 -->
+    <Bj v-show="showEdit" key="Bj" ref="Bj" @close="bjClose" />
+    <!-- 详情 -->
+    <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
+    <!-- 审阅 -->
+    <Sy v-show="showAudit" key="Sy" ref="Sy" @close="syClose" />
+    <!-- 复核 -->
+    <Fh v-show="showFh" key="Fh" ref="Fh" @close="fhClose" />
+    <!-- 更换归属人 -->
+    <Ghgsr key="Ghgsr" ref="Ghgsr" @callback="search" />
+    <SelectDeptUserDialog ref="selectDeptUserDialog" @change="ghgsrChange" />
+  </div>
+
+</template>
+
+<script>
+import { studyFormPlan_list } from '@/api/business/study/studyFormPlan'
+import Bj from "./jhbd/Bj";
+import Xq from "./jhbd/Xq";
+import Sy from "./jhbd/Sy";
+import Fh from "./jhbd/Fh";
+import Ghgsr from "./jhbd/Ghgsr";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import SelectDeptUserDialog from '@/views/business/comps/select/SelectDeptUserDialog';
+import { mapGetters } from 'vuex'
+import moment from "moment";
+export default {
+  name: 'YtbdList',
+  props: {
+    study: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
+  watch: {
+    study: {
+      handler(newVal) {
+        this.searchForm.studyId = newVal.studyId
+        this.leader = newVal.leader
+        this.search()
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  components: { Ghgsr, Fh, Bj, Xq, Sy, SelectDeptUser, SelectDeptUserDialog },
+  data() {
+    return {
+      leader: null,
+      showFh: false,
+      showAudit: false,
+      showEdit: false,
+      showDetail: false,
+      daterange: [],
+      searchForm: {
+        pageNum: 1,
+        pageSize: 10,
+        studyId: '',
+        bdbh: '',
+        bdmc: '',
+        userId: '',
+        userMc: '',
+        cjsjjs: '',
+        cjsjks: '',
+      },
+      loading: false,
+      total: 0,
+      list: [],
+      currentRow: null
+    }
+  },
+  created() { },
+  methods: {
+    ghgsr(row) {
+      this.currentRow = row
+      this.$refs.selectDeptUserDialog.show(null, null)
+    },
+    ghgsrChange(val) {
+      this.$refs.Ghgsr.show({ id: this.currentRow.id, userId: val.id, userMc: val.name })
+    },
+    userChange(val) {
+      this.searchForm.userId = val.id
+      this.searchForm.userMc = val.name
+      this.search()
+    },
+    search() {
+      this.searchForm.pageNum = 1
+      this.getList()
+    },
+    reset() {
+      this.resetForm("searchForm")
+      this.handleQuery()
+    },
+    getList() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.searchForm.cjsjks = this.daterange[0]
+        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.searchForm.cjsjks = ''
+        this.searchForm.cjsjjs = ''
+      }
+      this.loading = true
+      studyFormPlan_list(this.searchForm).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    add() {
+      this.showEdit = true
+      this.$emit('showDetail', this.showEdit)
+      this.$refs.Bj.edit({ studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
+    },
+    edit(row) {
+      this.showEdit = true
+      this.$emit('showDetail', this.showEdit)
+      this.$refs.Bj.edit(row)
+    },
+    bjClose() {
+      this.showEdit = false
+      this.$emit('showDetail', this.showEdit)
+      this.search()
+    },
+    xqClose() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
+      this.search()
+    },
+    syClose() {
+      this.showAudit = false
+      this.$emit('showDetail', this.showAudit)
+      this.search()
+    },
+    fhClose() {
+      this.showFh = false
+      this.$emit('showDetail', this.showFh)
+      this.search()
+    },
+    detail(row) {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    sy(row) {
+      this.showAudit = true
+      this.$emit('showDetail', this.showAudit)
+      this.$refs.Sy.show(row)
+    },
+    fh(row) {
+      this.showFh = true
+      this.$emit('showDetail', this.showFh)
+      this.$refs.Fh.show(row)
+    },
+  }
+}
+</script>
+<style lang="scss" scoped>
+.tbbd-list {
+  
+
+  .tbbd-search {
+    background: #fff;
+    padding: 10px;
+
+    .right-btn {
+      text-align: right
+    }
+  }
+
+  .tbbd-content {
+    background: #fff;
+    padding: 10px;
+
+    .add-box {
+      margin-bottom: 10px;
+    }
+  }
+}
+</style>
diff --git a/src/views/business/study/comp/suject.vue b/src/views/business/study/comp/suject.vue
index 7d3141d..3dc3fb9 100644
--- a/src/views/business/study/comp/suject.vue
+++ b/src/views/business/study/comp/suject.vue
@@ -14,10 +14,10 @@
       </div>
     </div>
     <div class="subject-content">
-      <div class="subject-item" v-for="(item,index) in  subjectList" :key="index">
+      <div class="subject-item" :class="selectedSubjectId===item.id?'active':''" v-for="(item,index) in  subjectList" :key="index" @click="changeSelectedSubject(item)">
         <div class="subject-item-name">{{item.deptName}}({{item.leaderName}})</div>
         <div class="subject-item-add">
-          <el-button type="primary" plain @click="yq(item)">{{$t('page.business.study.studyEnter.yq')}}</el-button>
+          <el-button type="primary" plain @click.stop="yq(item)">{{$t('page.business.study.studyEnter.yq')}}</el-button>
         </div>
       </div>
     </div>
@@ -90,6 +90,7 @@ export default {
   data() {
     return {
       subjectList:[],
+      selectedSubjectId:'',
       infoDialog:{
         title:this.$t('page.business.study.studyEnter.xzxk'),
         visible:false,
@@ -110,8 +111,14 @@ export default {
     getList(){
       studySubject_listByStudyId({studyId:this.study.id}).then(response => {
         this.subjectList = response.data;
+        this.selectedSubjectId = this.subjectList.length>0?this.subjectList[0].id:''
+        this.$emit('change',this.selectedSubjectId)
       })
     },
+    changeSelectedSubject(item){
+      this.selectedSubjectId = item.id
+      this.$emit('change',this.selectedSubjectId)
+    },
     editSubject(){
       this.infoDialog.list = []
       this.infoDialog.loading = true
@@ -257,7 +264,8 @@ export default {
       justify-content: space-between;
       background: #f9fafc;
       border-radius: 5px;
-      &:hover{
+      cursor: pointer;
+      &.active{
         border: 1px solid #47a1ff;
       }
       .subject-item-name{
diff --git a/src/views/business/study/comp/syxx.vue b/src/views/business/study/comp/syxx.vue
new file mode 100644
index 0000000..0834993
--- /dev/null
+++ b/src/views/business/study/comp/syxx.vue
@@ -0,0 +1,162 @@
+<template>
+  <div class="study-syxx">
+    <div class="syxx-top" v-show="!showDetail" style="margin-bottom: 10px;">
+      <div class="syxx-operate">
+        <div class="operate-img"></div>
+        <div class="operate-left">{{ $t('page.business.study.studyFormPlan.syxx') }}</div>
+      </div>
+      <el-form ref="form" label-width="90px">
+        <el-row>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.symc')">
+              {{ studyInfo.name }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.sybh')">
+              {{ studyInfo.sn }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.syfzr')">
+              {{ studyInfo.leaderName }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.cjsj')">
+              {{ studyInfo.createTime }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.studyFormPlan.syjj')">
+              {{ studyInfo.remark }}
+            </el-form-item>
+          </el-col>
+          <el-col>
+            <el-button type="primary" @click="sdsy">{{ $t('page.business.study.studyFormPlan.sdsy') }}</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div class="syxx-operate" style="margin-top: 10px;">
+        <div class="operate-img"></div>
+        <div class="operate-left">{{ $t('page.business.study.studyFormPlan.syxkxx') }}</div>
+      </div>
+      <div style="display: flex;">
+        <div style="margin-right: 30px;" v-for="(item, index) in subjectList" :key="index">
+          {{ item.deptName }}（{{ item.leaderName }}）
+        </div>
+      </div>
+    </div>
+    <div class="syxx-content">
+      <jhbdList :study="studyInfo" @showDetail="showDetailCallback" />
+    </div>
+  </div>
+</template>
+
+<script>
+import jhbdList from './jhbdList.vue'
+import { study_info } from "@/api/business/study/study"
+import { studySubject_listByStudyId } from '@/api/business/study/studySubject'
+export default {
+  name: 'StudyTbbd',
+  props: {
+    study: {
+      type: Object,
+      default: () => {
+        return {}
+      }
+    }
+  },
+  watch: {
+    study: {
+      immediate: true,
+      handler(v) {
+        this.id = v.id
+        this.getStudyInfo()
+      }
+    },
+  },
+  components: { jhbdList },
+  data() {
+    return {
+      showDetail: false,
+      id: {},
+      studyInfo:{},
+      subjectList: []
+    }
+  },
+  created() {
+  },
+  methods: {
+    getstudySubject() {
+      studySubject_listByStudyId({ studyId: this.id }).then(response => {
+        this.subjectList = response.data;
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    getStudyInfo() {
+      this.$modal.loading()
+      study_info({ id: this.id }).then(response => {
+        this.studyInfo = response.data
+        this.getstudySubject()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    sdsy() {
+      alert('todo')
+    },
+    showDetailCallback(val) {
+      this.showDetail = val
+      this.$emit('showDetail', val)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.study-syxx {
+
+  .syxx-top {
+    background: #fff;
+    padding: 20px;
+    width: 100%;
+
+    .syxx-operate {
+      margin: 0px 0 10px 0;
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      color: #409eff;
+
+      .operate-img {
+        flex-shrink: 0;
+        height: 15px;
+        background: #409eff;
+        width: 3px;
+      }
+
+      .operate-left {
+        flex-shrink: 0;
+        font-weight: bold;
+        padding-left: 10px;
+      }
+
+      .operate-right {
+        flex-grow: 1;
+        text-align: right;
+
+        .operate-icon {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
+  .syxx-content {
+    
+  }
+}
+</style>
diff --git a/src/views/business/study/comp/tbbd.vue b/src/views/business/study/comp/tbbd.vue
index ab303a7..0ffd96b 100644
--- a/src/views/business/study/comp/tbbd.vue
+++ b/src/views/business/study/comp/tbbd.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="study-ytbd">
-    <div class="ytbd-left">
-      <sbject :study="study" />
+  <div class="study-tbbd">
+    <div class="tbbd-left" v-show="!showDetail">
+      <sbject :study="study" @change="changeSubject" />
     </div>
-    <div class="ytbd-right">
-      <tbbdList :study="study" />
+    <div class="tbbd-right" v-if="studyInfo.studySubjectId!=''">
+      <tbbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
 </template>
@@ -22,30 +22,55 @@ export default {
       }
     }
   },
+  watch:{
+    study: {
+      immediate: true,
+      handler(v) {
+        this.studyInfo = {
+          studyId:v.id,
+          studyLeader:v.leader,
+          studySubjectId:''
+        }
+      }
+    },
+  },
   components: {sbject,tbbdList},
   computed: {},
   filters: {},
   data() {
     return {
+      showDetail:false,
+      studyInfo:{
+        studyId:this.study.id,
+        studyLeader:this.study.leader,
+        studySubjectId:''
+      }
     }
   },
   created() {},
   methods: {
+    changeSubject(val){
+      this.studyInfo.studySubjectId = val
+    },
+    showDetailCallback(val){
+      this.showDetail=val
+      this.$emit('showDetail',val)
+    }
   }
 }
 </script>
 <style lang="scss" scoped>
-.study-ytbd {
+.study-tbbd {
   display: flex;
   flex-direction: row;
-  .ytbd-left {
+  .tbbd-left {
     background: #fff;
     padding: 20px;
     margin-right: 10px;
     flex-shrink: 0;
     width: 350px;
   }
-  .ytbd-right{
+  .tbbd-right{
     flex-grow: 1;
     overflow: hidden;
   }
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
new file mode 100644
index 0000000..3d85ed2
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -0,0 +1,250 @@
+G<template>
+  <div>
+    <div class="edit-container">
+      <div class="edit-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="center-top">
+          <div>
+            <div :class="showIndex == 1 ? 'el-step__icon is-text is-finish' : 'el-step__icon is-text is-info'">
+              <div class="el-step__icon-inner">1</div>
+            </div>
+            {{ $t('page.business.study.studyFormFill.jcsz') }}
+          </div>
+          <div class="line"></div>
+          <div>
+            <div :class="showIndex == 2 ? 'el-step__icon is-text is-finish' : 'el-step__icon is-text is-info'">
+              <div class="el-step__icon-inner">2</div>
+            </div>
+            {{ $t('page.business.study.studyFormFill.bdtb') }}
+          </div>
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
+          <template v-if="showIndex == 1">
+            <el-button @click="save">{{ $t('page.business.study.studyFormFill.zc') }}</el-button>
+            <el-button type="primary" @click="next">{{ $t('page.business.study.studyFormFill.next') }}</el-button>
+          </template>
+          <template v-else>
+            <el-button @click="saveNext">{{ $t('page.business.study.studyFormFill.save') }}</el-button>
+            <el-button type="primary" @click="openSubmit = true">{{ $t('page.business.study.studyFormFill.submit')
+            }}</el-button>
+          </template>
+        </div>
+      </div>
+      <div class="edit-content">
+        <div class="content" style="width:60%" v-show="showIndex == 1">
+          <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateId">
+                  <SelectTemplate v-model="form.templateId" :name="form.templateMc" @change="selectTemplateChange" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.form.bdmc')" prop="bdmc">
+                  <el-input type="text" v-model="form.bdmc" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')" prop="sfbl">
+                  <el-radio-group v-model="form.sfbl">
+                    <el-radio :label="1">{{ $t('page.business.study.studyFormFill.no') }}</el-radio>
+                    <el-radio :label="10">{{ $t('page.business.study.studyFormFill.yes') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item :label="$t('page.business.study.studyFormFill.bdsm')" prop="bdsm">
+                  <el-input type="textarea" v-model="form.bdsm" :rows="5" maxlength="500"
+                    :placeholder="$t('form.placeholderInput')">
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-form>
+        </div>
+        <div class="content" v-show="showIndex == 2">
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+        </div>
+      </div>
+    </div>
+
+    <el-dialog :title="$t('page.business.study.studyFormFill.tjjl')" :visible.sync="openSubmit" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px">
+        todo
+      </el-form>
+      <!-- <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="tj">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openSubmit = false">{{ $t('form.cancel') }}</el-button>
+      </div> -->
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormFill_bc, studyFormFill_tj, studyFormFill_info } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
+
+export default {
+  name: "Bj",
+  components: { SelectTemplate, SelectDeptUser, TemplateTable },
+  data() {
+    return {
+      open: false,
+      showIndex: 1,
+      form: {},
+      openSubmit: false,
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        fzrsh: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        shryId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
+      rules: {
+        bdmc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        templateId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        sfbl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    next() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.showIndex = 2
+        }
+      })
+    },
+    selectTemplateChange(val) {
+      this.form.bdnr = val.content
+      this.form.templateMc = val.name
+    },
+    cancel() {
+      this.$emit('close')
+    },
+    reset() {
+      this.form = {
+        id: null,
+        studyId: null,
+        bdbh: null,
+        bdmc: null,
+        bdsm: null,
+        templateId: null,
+        templateMc: null,
+        bdnr: null,
+        fzrsh: null,
+        shryId: null,
+        sfbl: null,
+        shryMc: null,
+      }
+      this.resetForm("form")
+    },
+    selectDeptUserChange(val) {
+      this.form.shryMc = val.name
+    },
+    edit(row) {
+      this.reset()
+      this.showIndex = 1
+      if (row && row.id) {
+        this.$modal.loading()
+        studyFormFill_info({ id: row.id }).then(response => {
+          this.form = response.data
+          this.form.qmyy = '制作提交预制表单'
+          this.open = true
+          this.$modal.closeLoading()
+        })
+      } else {
+        this.form = _.merge({}, this.form, row)
+        this.open = true
+      }
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormFill_bc(this.form).then(response => {
+            this.$emit('close')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    },
+    async saveNext() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.form.bdnr = JSON.stringify(content)
+      this.$modal.loading()
+      studyFormFill_bc(this.form).then(response => {
+        this.$emit('close')
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    tj() {
+      this.$refs["formSubmit"].validate(valid => {
+        if (valid) {
+          this.dotj()
+        }
+      })
+    },
+    async dotj() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.form.bdnr = JSON.stringify(content)
+      this.$modal.loading()
+      studyFormFill_tj(this.form).then(response => {
+        this.$emit('close')
+        this.openSubmit = false
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbd/Fh.vue b/src/views/business/study/comp/tbbd/Fh.vue
new file mode 100644
index 0000000..bc7c005
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Fh.vue
@@ -0,0 +1,268 @@
+G<template>
+  <div>
+    <div class="edit-container">
+      <div class="edit-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="center-top">
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
+          <el-button type="danger" @click="showApprove('复核拒绝')">{{ $t('page.business.study.studyFormFill.fhjj')
+          }}</el-button>
+          <el-button type="primary" @click="showApprove('复核通过')">{{ $t('page.business.study.studyFormFill.fhtg')
+          }}</el-button>
+          <el-button type="primary" @click="showApprove('通过')">{{ $t('page.business.study.studyFormFill.tongguo')
+          }}</el-button>
+        </div>
+      </div>
+      <div class="edit-content">
+        <div class="content-left">
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
+          </div>
+          <div class="pal">
+            <el-table :data="qmxxList" v-loading="loadingQmxx">
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmr')" align="center" prop="qmrMc"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmyy')" align="center" prop="qmyy"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmsj')" align="center" prop="createTime"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalQmxx > 0" :total="totalQmxx" :page.sync="queryParamsQmxx.pageNum"
+              :limit.sync="queryParamsQmxx.pageSize" @pagination="getQmxxList" />
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormFill.jcgj') }}</div>
+          </div>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+      </div>
+    </div>
+    <el-dialog :title="$t(openTitle)" :visible.sync="openApprove" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-if="formApprove.qmyy == '复核拒绝'">
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.studyFormFill.reason')" prop="reason">
+              <el-input type="textarea" v-model="formApprove.reason" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-else>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')">
+              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="formApprove.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="approve">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openApprove = false">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { studyFormFill_fhtg, studyFormFill_fhjj, studyFormFill_tg, studyFormFill_info, studyFormFill_jcgj, studyFormFill_qmxx } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+import JcgjList from "@/views/business/comps/common/JcgjList";
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
+
+export default {
+  name: "Fh",
+  components: { TemplateTable, JcgjList },
+  data() {
+    return {
+      form: {},
+      qmxxList: [],
+      totalQmxx: 0,
+      loadingQmxx: true,
+      queryParamsQmxx: {
+        formId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      jcgjList: [],
+      jcgjTotal: 0,
+      queryParamsJcgj: {
+        pageNum: 1,
+        formId: null,
+        pageSize: 10,
+      },
+      openTitle: '',
+      openApprove: false,
+      formApprove: {},
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        reason: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    getJjcgjList(val) {
+      this.$modal.loading()
+      studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    getQmxxList() {
+      this.loadingQmxx = true
+      studyFormFill_qmxx(this.queryParamsQmxx).then(response => {
+        this.qmxxList = response.rows
+        this.totalQmxx = response.total
+        this.loadingQmxx = false
+      })
+    },
+    cancel() {
+      this.$emit('close')
+    },
+    reset() {
+      this.form = {}
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.$modal.loading()
+      this.queryParamsJcgj.formId = row.id
+      this.queryParamsQmxx.formId = row.id
+      studyFormFill_info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.getQmxxList()
+        this.getJjcgjList()
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    showApprove(qmyy) {
+      this.openApprove = true
+      this.resetApprove()
+      this.formApprove.id = this.form.id
+      this.formApprove.qmyy = qmyy
+      if (qmyy == '复核通过') {
+        this.openTitle = 'page.business.study.studyFormFill.fhtg'
+      } else if (qmyy == '复核拒绝') {
+        this.openTitle = 'page.business.study.studyFormFill.fhjj'
+      } else if (qmyy == '通过') {
+        this.openTitle = 'page.business.study.studyFormFill.tongguo'
+      }
+    },
+    resetApprove() {
+      this.formApprove = {
+        id: null,
+        qmyy: '',
+        bdnr: '',
+        remark: '',
+        reason: '',
+        qmrmm: '',
+      }
+      this.resetForm("formApprove")
+    },
+    approve() {
+      this.$refs["formApprove"].validate(valid => {
+        if (valid) {
+          this.doapprove()
+        }
+      })
+    },
+    async doapprove() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.formApprove.bdnr = JSON.stringify(content)
+      this.$modal.loading()
+      if (this.formApprove.qmyy == '复核通过') {
+        studyFormFill_fhtg(this.formApprove).then(response => {
+          this.openApprove = false
+          this.$modal.closeLoading()
+          this.$emit('close')
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else if (this.formApprove.qmyy == '复核拒绝') {
+        this.formApprove.remark=this.formApprove.reason
+        studyFormFill_fhjj(this.formApprove).then(response => {
+          this.openApprove = false
+          this.$modal.closeLoading()
+          this.$emit('close')
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      } else {
+        studyFormFill_tg(this.formApprove).then(response => {
+          this.openApprove = false
+          this.$modal.closeLoading()
+          this.$emit('close')
+        }).finally(() => {
+          this.$modal.closeLoading()
+        })
+      }
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbd/Fz.vue b/src/views/business/study/comp/tbbd/Fz.vue
new file mode 100644
index 0000000..7ad2832
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Fz.vue
@@ -0,0 +1,115 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormFill.sqfz')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormFill_fz } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Fz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: '申请废止',
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          studyFormFill_fz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbd/Gc.vue b/src/views/business/study/comp/tbbd/Gc.vue
new file mode 100644
index 0000000..786b296
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Gc.vue
@@ -0,0 +1,125 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormFill.guancha')" :visible.sync="open" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.studyFormFill.szqk')" prop="qmyy">
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" style="width: 100%;">
+                <el-option label="良好" value="良好" />
+                <el-option label="中" value="中" />
+                <el-option label="差" value="差" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormFill_gc } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Fz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: null,
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormFill_gc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbd/Ghgsr.vue b/src/views/business/study/comp/tbbd/Ghgsr.vue
new file mode 100644
index 0000000..e2bd8a5
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Ghgsr.vue
@@ -0,0 +1,126 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormFill.rybg')" :visible.sync="open" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+              <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.studyFormFill.reason')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormFill_ghgsr } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Ghgsr",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: '更换归属人',
+        userId: null,
+        UserMc: null,
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.form.userId = row.userId
+      this.form.userMc = row.userMc
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormFill_ghgsr(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbd/Jq.vue b/src/views/business/study/comp/tbbd/Jq.vue
new file mode 100644
index 0000000..ce2d70f
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Jq.vue
@@ -0,0 +1,126 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormFill.jiaqian')" :visible.sync="open" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" style="width: 100%;">
+                <el-option label="开始现场复核" value="开始现场复核" />
+                <el-option label="结束现场复核" value="结束现场复核" />
+                <el-option label="申明协作" value="申明协作" />
+                <el-option label="补充说明" value="补充说明" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="cancel">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormFill_jq } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Fz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyy: null,
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormFill_jq(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbd/Qrfz.vue b/src/views/business/study/comp/tbbd/Qrfz.vue
new file mode 100644
index 0000000..ce4f842
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Qrfz.vue
@@ -0,0 +1,126 @@
+G<template>
+  <div>
+    <el-dialog :title="$t('page.business.study.studyFormFill.qrfz')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyymc">
+              <el-input type="text" :value="form.qmyymc" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.study.studyFormFill.reason')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <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-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer" style="text-align: center;">
+        <el-button type="danger" @click="reject">{{ $t('page.business.study.studyFormFill.reject') }}</el-button>
+        <el-button type="primary" @click="approve">{{ $t('page.business.study.studyFormFill.approve') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormFill_qrfz } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+
+export default {
+  name: "Qrfz",
+  components: {},
+  data() {
+    return {
+      isBatch: false,
+      ids: [],
+      selectList: [],
+      open: false,
+      form: {},
+      rules: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        remark: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    cancel() {
+      this.open = false
+    },
+    reset() {
+      this.form = {
+        id: null,
+        qmyymc: '废止通过/拒绝',
+        qmyy: null,
+        remark: null,
+        qmrmm: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.form.id = row.id
+      this.open = true
+    },
+    reject() {
+      this.form.qmyy = 1
+      this.save()
+    },
+    approve() {
+      this.form.qmyy = 10
+      this.save()
+    },
+    save() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormFill_qrfz(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbd/Sy.vue b/src/views/business/study/comp/tbbd/Sy.vue
new file mode 100644
index 0000000..4635c51
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Sy.vue
@@ -0,0 +1,215 @@
+G<template>
+  <div>
+    <div class="edit-container">
+      <div class="edit-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="center-top">
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
+          <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormFill.shenyue')
+          }}</el-button>
+        </div>
+      </div>
+      <div class="edit-content">
+        <div class="content-left">
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
+          </div>
+          <div class="pal">
+            <el-table :data="qmxxList" v-loading="loadingQmxx">
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmr')" align="center" prop="qmrMc"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmyy')" align="center" prop="qmyy"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmsj')" align="center" prop="createTime"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalQmxx > 0" :total="totalQmxx" :page.sync="queryParamsQmxx.pageNum"
+              :limit.sync="queryParamsQmxx.pageSize" @pagination="getQmxxList" />
+          </div>
+        </div>
+        <div class="content-right">
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormFill.jcgj') }}</div>
+          </div>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+      </div>
+    </div>
+    <el-dialog :title="$t('page.business.study.studyFormFill.shenyue')" :visible.sync="openApprove" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="formApprove.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="approve">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openApprove = false">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { studyFormFill_sy, studyFormFill_info, studyFormFill_jcgj, studyFormFill_qmxx } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+import JcgjList from "@/views/business/comps/common/JcgjList";
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
+
+export default {
+  name: "Sy",
+  components: { TemplateTable, JcgjList },
+  data() {
+    return {
+      form: {},
+      qmxxList: [],
+      totalQmxx: 0,
+      loadingQmxx: true,
+      queryParamsQmxx: {
+        formId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      jcgjList: [],
+      jcgjTotal: 0,
+      queryParamsJcgj: {
+        pageNum: 1,
+        formId: null,
+        pageSize: 10,
+      },
+      openApprove: false,
+      formApprove: {},
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    getJjcgjList(val) {
+      this.$modal.loading()
+      studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    getQmxxList() {
+      this.loadingQmxx = true
+      studyFormFill_qmxx(this.queryParamsQmxx).then(response => {
+        this.qmxxList = response.rows
+        this.totalQmxx = response.total
+        this.loadingQmxx = false
+      })
+    },
+    cancel() {
+      this.$emit('close')
+    },
+    reset() {
+      this.form = {}
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.$modal.loading()
+      this.queryParamsJcgj.formId = row.id
+      this.queryParamsQmxx.formId = row.id
+      studyFormFill_info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.getQmxxList()
+        this.getJjcgjList()
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    showApprove() {
+      this.resetApprove()
+      this.formApprove.id = this.form.id
+      this.openApprove = true
+    },
+    resetApprove() {
+      this.formApprove = {
+        id: null,
+        qmyy: '已审阅',
+        remark: '',
+        qmrmm: '',
+      }
+      this.resetForm("formApprove")
+    },
+    approve() {
+      this.$refs["formApprove"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormFill_sy(this.formApprove).then(response => {
+            this.openApprove = false
+            this.$modal.closeLoading()
+            this.$emit('close')
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue
new file mode 100644
index 0000000..43e888d
--- /dev/null
+++ b/src/views/business/study/comp/tbbd/Xq.vue
@@ -0,0 +1,260 @@
+G<template>
+  <div>
+    <div class="edit-container">
+      <div class="edit-top">
+        <div class="left-top">
+          <img src="@/assets/images/back.png" @click="cancel()" />
+          <div class="left-title"></div>
+        </div>
+        <div class="center-top">
+        </div>
+        <div class="right-top">
+          <el-button @click="cancel()">{{ $t('form.close') }}</el-button>
+          <el-button type="primary" v-if="form.bdzt === 5 && form.tbzt === 1" @click="openApprove = true">{{
+            $t('page.business.study.studyFormFill.tb') }}</el-button>
+        </div>
+      </div>
+      <div class="edit-content ">
+        <div class="content">
+          <div>
+            <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dclcjcgj">{{ $t('page.business.study.studyFormFill.dclcjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcbjjcgj">{{ $t('page.business.study.studyFormFill.dcbjjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcxgjcgj">{{ $t('page.business.study.studyFormFill.dcxgjcgj') }}
+            </el-button>
+            <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormFill.dcbhsjgj') }}
+            </el-button>
+          </div>
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormFill.qmxx') }}</div>
+          </div>
+          <div class="pal">
+            <el-table :data="qmxxList" v-loading="loadingQmxx">
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmr')" align="center" prop="qmrMc"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmyy')" align="center" prop="qmyy"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.qmsj')" align="center" prop="createTime"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormFill.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
+            </el-table>
+          </div>
+          <div class="pal">
+            <pagination v-show="totalQmxx > 0" :total="totalQmxx" :page.sync="queryParamsQmxx.pageNum"
+              :limit.sync="queryParamsQmxx.pageSize" @pagination="getQmxxList" />
+          </div>
+          <div class="content-title">
+            <div class="line"></div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormFill.jcgj') }}</div>
+          </div>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+
+          <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
+            @pagination="getJjcgjList" />
+        </div>
+
+      </div>
+    </div>
+
+    <!-- 填报 -->
+    <el-dialog :title="$t('page.business.study.studyFormFill.cjjl')" :visible.sync="openApprove" width="500px"
+      append-to-body :close-on-click-modal="false">
+      <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
+        <el-alert :title="$t('page.business.study.studyFormFill.ts')" :closable="false" type="success">
+        </el-alert>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="formApprove.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.signer')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="formApprove.qmrmm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="approve">{{ $t('form.confirm') }}</el-button>
+        <el-button @click="openApprove = false">{{ $t('form.cancel') }}</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { studyFormFill_tb, studyFormFill_info, studyFormFill_jcgj, studyFormFill_qmxx } from "@/api/business/study/studyFormFill"
+import { mapGetters } from 'vuex'
+import JcgjList from "@/views/business/comps/common/JcgjList";
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
+
+export default {
+  name: "Xq",
+  components: { JcgjList, TemplateTable },
+  data() {
+    return {
+      openApprove: false,
+      formApprove: {
+        id: null,
+        qmyy: '创建记录',
+        remark: '',
+        qmrmm: '',
+      },
+      rulesApprove: {
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+      },
+      qmxxList: [],
+      totalQmxx: 0,
+      loadingQmxx: true,
+      queryParamsQmxx: {
+        formId: null,
+        pageNum: 1,
+        pageSize: 10
+      },
+      open: false,
+      showIndex: 1,
+      form: {},
+      rules: {
+        bdmc: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        templateId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }]
+
+      },
+      jcgjTotal: 0,
+      jcgjList: [],
+      queryParamsJcgj: {
+        pageNum: 1,
+        formId: null,
+        pageSize: 10,
+      }
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'nickName'
+    ]),
+  },
+  created() {
+  },
+  methods: {
+    dcqbjcgj() {
+      alert('todo')
+    },
+    dclcjcgj() {
+      alert('todo')
+    },
+    dcbjjcgj() {
+      alert('todo')
+    },
+    dcxgjcgj() {
+      alert('todo')
+    },
+    dcbhsjgj() {
+      alert('todo')
+    },
+    getJjcgjList(val) {
+      this.$modal.loading()
+      studyFormFill_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
+        this.jcgjList = response.rows
+        this.jcgjTotal = response.total
+        this.$refs.jcgjList.init(this.jcgjList)
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    getQmxxList() {
+      this.loadingQmxx = true
+      studyFormFill_qmxx(this.queryParamsQmxx).then(response => {
+        this.qmxxList = response.rows
+        this.totalQmxx = response.total
+        this.loadingQmxx = false
+      })
+    },
+    cancel() {
+      this.$emit('close')
+    },
+    reset() {
+      this.form = {
+        id: null,
+        studyId: null,
+        bdbh: null,
+        bdmc: null,
+        bdsm: null,
+        templateId: null,
+        templateMc: null,
+        bdnr: null
+      }
+      this.resetForm("form")
+    },
+    show(row) {
+      this.reset()
+      this.$modal.loading()
+      this.formApprove.id = row.id
+      this.queryParamsJcgj.formId = row.id
+      this.queryParamsQmxx.formId = row.id
+      studyFormFill_info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.getQmxxList()
+        this.getJjcgjList()
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    approve() {
+      this.$refs["formApprove"].validate(valid => {
+        if (valid) {
+          this.$modal.loading()
+          studyFormFill_tb(this.formApprove).then(response => {
+            this.$emit('close')
+            this.openApprove = false
+            this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
+          })
+        }
+      })
+    }
+  }
+}
+</script>
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index bacea03..a714c7a 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -1,217 +1,367 @@
 <template>
-  <div class="ytbd-list">
-    <div class="ytbd-search">
-      <el-form :model="searchForm" ref="searchForm" :inline="true">
-        <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
-          <el-input v-model="searchForm.name" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-        </el-form-item>
-        <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-          <el-input v-model="searchForm.sn" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-        </el-form-item>
-        <el-form-item :label="$t('page.business.form.gsr')" prop="ownerName">
-          <el-input v-model="searchForm.ownerName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-        </el-form-item>
-         <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-          <el-input v-model="searchForm.templateName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="search" />
-        </el-form-item>
+  <div>
+    <div class="tbbd-list" v-show="!showDetail && !showEdit && !showAudit && !showFh">
+      <div class="tbbd-search">
+        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+                <SelectDeptUser v-model="searchForm.userId" style="width: 200px" :name="searchForm.userMc" key="userId"
+                  @change="userChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item>
+                <div style="margin-left: 100px;">
+                  <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+                  <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+                </div>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.cjsj')">
+                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
+                  :start-placeholder="$t('page.business.form.startDate')"
+                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
+                  style="width: 200px" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.tjsj')">
+                <el-date-picker v-model="daterangetj" clearable type="daterange" range-separator="-"
+                  :start-placeholder="$t('page.business.form.startDate')"
+                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
+                  style="width: 200px" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.study.studyFormFill.sfbl')">
+                <el-select v-model="searchForm.sfbl" :placeholder="$t('form.placeholderSelect')" clearable
+                  @change="search">
+                  <el-option :label="$t('page.business.study.studyFormFill.yes')" :value="10" />
+                  <el-option :label="$t('page.business.study.studyFormFill.no')" :value="1" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="tbbd-content">
+        <el-row class="add-box">
+          <el-col>
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyFormFill:xz']">{{
+              $t('page.business.study.studyFormFill.xzbd') }}</el-button>
+          </el-col>
+        </el-row>
 
-        <el-form-item :label="$t('page.business.form.cjsj')">
-          <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.form.startDate')"
-            :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
-        </el-form-item>
+        <el-table v-loading="loading" :data="list">
+          <el-table-column :label="$t('page.business.form.bh')" prop="bdbh" />
+          <el-table-column :label="$t('page.business.form.bdmc')" prop="bdmc" />
+          <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateMc" />
+          <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
+          <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="userMc" width="100" />
+          <el-table-column :label="$t('page.business.form.status')" prop="status" align="center" width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormFill.tbz') }}</span>
+              <span v-if="scope.row.bdzt === 3">{{ $t('page.business.study.studyFormFill.ytj') }}</span>
+              <span v-if="scope.row.bdzt === 5">{{ $t('page.business.study.studyFormFill.ywc') }}</span>
+              <span v-if="scope.row.bdzt === 7">{{ $t('page.business.study.studyFormFill.ywcfh') }}</span>
+              <span v-if="scope.row.bdzt === 9">{{ $t('page.business.study.studyFormFill.dfz') }}</span>
+              <span v-if="scope.row.bdzt === 11">{{ $t('page.business.study.studyFormFill.yfz') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.study.studyFormFill.sfbl')" align="center" prop="status"
+            width="100">
+            <template slot-scope="scope">
+              <span v-if="scope.row.bdzt === 10">{{ $t('page.business.study.studyFormFill.yes') }}</span>
+              <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormFill.no') }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="tjsj" width="140" />
+          <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
+            <template slot-scope="scope">
+              <!-- 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 -->
+              <!-- 详情 -->
+              <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyFormFill:xq']">{{
+                $t('form.detail') }}</el-button>
+              <!-- 编辑 -->
+              <el-button type="text" v-if="scope.row.bdzt === 1 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
+                  $t('form.edit') }}</el-button>
+              <!-- 复核 -->
+              <el-button type="text" v-if="scope.row.bdzt === 3" @click="fh(scope.row)"
+                v-hasPermi="['business:studyFormFill:fh']">{{
+                  $t('page.business.study.studyFormFill.fh') }}</el-button>
+              <!-- 加签 -->
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="jq(scope.row)"
+                v-hasPermi="['business:studyFormFill:jq']">{{
+                  $t('page.business.study.studyFormFill.jq') }}</el-button>
+              <!-- 更换归属人 -->
+              <el-button type="text"
+                v-if="scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                @click="ghgsr(scope.row)" v-hasPermi="['business:studyFormFill:ghgsr']">{{
+                  $t('page.business.study.studyFormFill.ghgsr') }}</el-button>
+              <!-- 审阅 -->
+              <el-button type="text" v-if="scope.row.bdzt === 5 || scope.row.bdzt === 7" @click="sy(scope.row)"
+                v-hasPermi="['business:studyFormFill:sy']">{{
+                  $t('page.business.study.studyFormFill.sy') }}</el-button>
+              <!-- 废止 -->
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="fz(scope.row)"
+                v-hasPermi="['business:studyFormFill:fz']">{{
+                  $t('page.business.study.studyFormFill.fz') }}</el-button>
+              <!-- 确认废止 -->
+              <el-button type="text" v-if="scope.row.bdzt === 9" @click="qrfz(scope.row)"
+                v-hasPermi="['business:studyFormFill:qrfz']">{{
+                  $t('page.business.study.studyFormFill.qrfz') }}</el-button>
+              <!-- 观察 -->
+              <el-button type="text" v-if="scope.row.bdzt === 1" @click="gc(scope.row)"
+                v-hasPermi="['business:studyFormFill:gc']">{{
+                  $t('page.business.study.studyFormFill.gc') }}</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
 
-        <el-form-item :label="$t('page.business.form.tjsj')">
-          <el-date-picker v-model="daterangeTj" clearable type="daterange" range-separator="-" :start-placeholder="$t('page.business.form.startDate')"
-            :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search" style="width: 220px" />
-        </el-form-item>
-
-        <el-form-item :label="$t('page.business.form.sfwbl')">
-          <el-select v-model="searchForm.sfwbl" clearable :placeholder="$t('form.placeholderSelect')" @change="search">
-            <el-option :label="$t('page.business.form.yes')" :value="10"></el-option>
-            <el-option :label="$t('page.business.form.no')" :value="1"></el-option>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-          <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-        </el-form-item>
-        
-        <!-- <div>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-          </el-form-item>
-        </div> -->
-      </el-form>
-    </div>
-    <div class="ytbd-content">
-      <el-row class="add-box">
-        <el-col>
-          <el-button type="primary" icon="el-icon-plus" @click="edit(null)" v-hasPermi="['business:study:add']">{{ $t('page.business.form.xzytbd') }}</el-button>
-        </el-col>
-      </el-row>
-
-      <el-table v-loading="loading" :data="list">
-        <el-table-column :label="$t('page.business.form.bh')" prop="sn" />
-        <el-table-column :label="$t('page.business.form.bdmc')" prop="name" />
-        <el-table-column :label="$t('page.business.form.xtmbmc')" prop="templateName" />
-        <el-table-column :label="$t('page.business.form.cjsj')" align="center" prop="createTime" width="140" />
-        <el-table-column :label="$t('page.business.form.gsr')" align="center" prop="ownerName" width="100" />
-        <el-table-column :label="$t('page.business.form.sfwbl')" prop="sfwbl" width="100">
-          <template slot-scope="scope">
-            <span v-if="scope.row.sfwbl===1">{{$t('page.business.form.no')}}</span>
-            <span v-if="scope.row.sfwbl===10">{{$t('page.business.form.yes')}}</span>
-          </template>
-        </el-table-column>
-
-
-        <el-table-column :label="$t('page.business.form.status')" prop="status" width="100">
-          <template slot-scope="scope">
-            <span v-if="scope.row.status===1">{{$t('page.business.form.statusBdTbz')}}</span>
-            <span v-if="scope.row.status===3">{{$t('page.business.form.statusBdYtj')}}</span>
-            <span v-if="scope.row.status===5">{{$t('page.business.form.statusBdYwc')}}</span>
-            <span v-if="scope.row.status===7">{{$t('page.business.form.statusBdYwcJfh')}}</span>
-            <span v-if="scope.row.status===9">{{$t('page.business.form.statusBdDfz')}}</span>
-            <span v-if="scope.row.status===10">{{$t('page.business.form.statusBdYfz')}}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column :label="$t('page.business.form.tjsj')" align="center" prop="submitTime" width="140" />
-
-        
-        <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="300">
-          <template slot-scope="scope">
-            <!-- 详情 -->
-            <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:study:detail']">{{$t('page.business.form.detail')}}</el-button>
-            <!-- 编辑 -->
-            <el-button type="text" @click="edit(scope.row)" v-hasPermi="['business:study:edit']" v-if="scope.row.status===1 || scope.row.status===5 || scope.row.status===7">{{$t('page.business.form.edit')}}</el-button>
-            <!-- 加签 -->
-            <el-button type="text" @click="jq(scope.row)" v-if="scope.row.status===1">{{$t('page.business.form.jq')}}</el-button>
-            <!-- 更换归属人 -->
-            <el-button type="text" @click="changeOwner(scope.row)" v-if="scope.row.status!==9 && scope.row.status!==10">{{$t('page.business.form.ghgsr')}}</el-button>
-            <!-- 废止 -->
-            <el-button type="text" @click="fz(scope.row)" v-if="scope.row.status===1">{{$t('page.business.form.fz')}}</el-button>
-            <!-- 复核 -->
-            <el-button type="text" @click="fh(scope.row)" v-if="scope.row.status===3">{{$t('page.business.form.fh')}}</el-button>
-            <!-- 审阅 -->
-            <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:study:audit']" v-if="scope.row.status===5 || scope.row.status===7">{{$t('page.business.form.sy')}}</el-button>
-            <!-- 观察 -->
-            <el-button type="text" @click="gc(scope.row)" v-hasPermi="['business:study:audit']" v-if="scope.row.status===1">{{$t('page.business.form.gc')}}</el-button>
-            <!-- 确认废止 -->
-            <el-button type="text" @click="qrfz(scope.row)" v-hasPermi="['business:study:audit']" v-if="scope.row.status===9">{{$t('page.business.form.qrfz')}}</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <pagination
-        v-show="total>0"
-        :total="total"
-        :page.sync="searchForm.pageNum"
-        :limit.sync="searchForm.pageSize"
-        @pagination="getList"
-      />
+        <pagination v-show="total > 0" :total="total" :page.sync="searchForm.pageNum" :limit.sync="searchForm.pageSize"
+          @pagination="getList" />
+      </div>
     </div>
+    <!-- 编辑 -->
+    <Bj v-show="showEdit" key="Bj" ref="Bj" @close="bjClose" />
+    <!-- 详情 -->
+    <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
+    <!-- 审阅 -->
+    <Sy v-show="showAudit" key="Sy" ref="Sy" @close="syClose" />
+    <!-- 复核 -->
+    <Fh v-show="showFh" key="Fh" ref="Fh" @close="fhClose" />
+    <!-- 废止 -->
+    <Fz key="Fz" ref="Fz" @callback="search" />
+    <!-- 确认废止 -->
+    <Qrfz key="Qrfz" ref="Qrfz" @callback="search" />
+    <!-- 加签 -->
+    <Jq key="Jq" ref="Jq" @callback="search" />
+    <!-- 观察 -->
+    <Gc key="Gc" ref="Gc" @callback="search" />
+    <!-- 更换归属人 -->
+    <Ghgsr key="Ghgsr" ref="Ghgsr" @callback="search" />
+    <SelectDeptUserDialog ref="selectDeptUserDialog" @change="ghgsrChange" />
   </div>
+
 </template>
 
 <script>
-import {
-  study_list,
-  study_info,
-  study_save,
-  study_delete
-} from '@/api/business/study/study'
+import { studyFormFill_list } from '@/api/business/study/studyFormFill'
+import Bj from "./tbbd/Bj";
+import Xq from "./tbbd/Xq";
+import Sy from "./tbbd/Sy";
+import Fz from "./tbbd/Fz";
+import Fh from "./tbbd/Fh";
+import Qrfz from "./tbbd/Qrfz";
+import Jq from "./tbbd/Jq";
+import Ghgsr from "./tbbd/Ghgsr";
+import Gc from "./tbbd/Gc";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import SelectDeptUserDialog from '@/views/business/comps/select/SelectDeptUserDialog';
+import { mapGetters } from 'vuex'
+import moment from "moment";
 export default {
-  name: 'TbbdList',
+  name: 'YtbdList',
   props: {
-    study:{
-      type:Object,
-      default:()=>{
+    study: {
+      type: Object,
+      default: () => {
         return {}
       }
     }
   },
-  components: {},
-  computed: {},
-  filters: {},
+  computed: {
+    ...mapGetters([
+      'id'
+    ]),
+  },
+  watch: {
+    study: {
+      handler(newVal) {
+        this.searchForm.studyId = newVal.studyId
+        this.searchForm.studySubjectId = newVal.studySubjectId
+        this.leader = newVal.leader
+        this.search()
+      },
+      immediate: true,
+      deep: true
+    }
+  },
+  components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog },
   data() {
     return {
-      daterange:[],
-      daterangeTj:[],
+      leader: null,
+      showFh: false,
+      showAudit: false,
+      showEdit: false,
+      showDetail: false,
+      daterangetj: [],
+      daterange: [],
       searchForm: {
         pageNum: 1,
         pageSize: 10,
-        sn:'',
-        name:'',
-        ownerName:'',
-        templateName:'',
-        startDate:'',
-        endDate:'',
-        tjStartDate:'',
-        tjEndDate:'',
+        studyId: '',
+        studySubjectId: '',
+        bdbh: '',
+        bdmc: '',
+        userId: '',
+        userMc: '',
+        templateMc: '',
+        cjsjjs: '',
+        cjsjks: '',
+        tjsjjs: '',
+        tjsjks: '',
       },
-
       loading: false,
       total: 0,
       list: [],
+      currentRow: null
     }
   },
-  created() {},
+  created() { },
   methods: {
-    search(){
-
+    ghgsr(row) {
+      this.currentRow = row
+      this.$refs.selectDeptUserDialog.show(null, null)
     },
-    reset(){
-
+    ghgsrChange(val) {
+      this.$refs.Ghgsr.show({ id: this.currentRow.id, userId: val.id, userMc: val.name })
     },
-    getList(){
-
+    jq(row) {
+      this.$refs.Jq.show(row)
     },
-    edit(row){
-
+    qrfz(row) {
+      this.$refs.Qrfz.show(row)
     },
-    detail(row){
-
+    gc(row) {
+      this.$refs.Gc.show(row)
     },
-    audit(row){
-
+    fz(row) {
+      this.$refs.Fz.show(row)
     },
-    jq(row){
-
+    userChange(val) {
+      this.searchForm.userId = val.id
+      this.searchForm.userMc = val.name
+      this.search()
     },
-    changeOwner(row){
-
+    search() {
+      this.searchForm.pageNum = 1
+      this.getList()
     },
-    fz(row){
-
+    reset() {
+      this.resetForm("searchForm")
+      this.handleQuery()
     },
-    fh(row){
-
+    getList() {
+      if (this.daterange != null && this.daterange.length > 0) {
+        this.searchForm.cjsjks = this.daterange[0]
+        this.searchForm.cjsjjs = moment().add(this.daterange[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.searchForm.cjsjks = ''
+        this.searchForm.cjsjjs = ''
+      }
+      if (this.daterangetj != null && this.daterangetj.length > 0) {
+        this.searchForm.tjsjks = this.daterangetj[0]
+        this.searchForm.tjsjjs = moment().add(this.daterangetj[1], 'days').format('YYYY-MM-DD');
+      } else {
+        this.searchForm.tjsjks = ''
+        this.searchForm.tjsjjs = ''
+      }
+      this.loading = true
+      studyFormFill_list(this.searchForm).then(response => {
+        this.list = response.rows
+        this.total = response.total
+        this.loading = false
+      })
     },
-    gc(row){
-
+    add() {
+      this.showEdit = true
+      this.$emit('showDetail', this.showEdit)
+      this.$refs.Bj.edit({ studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
     },
-    qrfz(row){
-
+    edit(row) {
+      this.showEdit = true
+      this.$emit('showDetail', this.showEdit)
+      this.$refs.Bj.edit(row)
+    },
+    bjClose() {
+      this.showEdit = false
+      this.$emit('showDetail', this.showEdit)
+      this.search()
+    },
+    xqClose() {
+      this.showDetail = false
+      this.$emit('showDetail', this.showDetail)
+      this.search()
+    },
+    syClose() {
+      this.showAudit = false
+      this.$emit('showDetail', this.showAudit)
+      this.search()
+    },
+    fhClose() {
+      this.showFh = false
+      this.$emit('showDetail', this.showFh)
+      this.search()
+    },
+    detail(row) {
+      this.showDetail = true
+      this.$emit('showDetail', this.showDetail)
+      this.$refs.Xq.show(row)
+    },
+    sy(row) {
+      this.showAudit = true
+      this.$emit('showDetail', this.showAudit)
+      this.$refs.Sy.show(row)
+    },
+    fh(row) {
+      this.showFh = true
+      this.$emit('showDetail', this.showFh)
+      this.$refs.Fh.show(row)
     },
   }
 }
 </script>
 <style lang="scss" scoped>
-.ytbd-list {
-  .ytbd-search{
+.tbbd-list {
+  .tbbd-search {
     background: #fff;
     padding: 20px;
     margin-bottom: 10px;
-    .right-btn{
-      text-align:right
+
+    .right-btn {
+      text-align: right
     }
   }
-  .ytbd-content{
+
+  .tbbd-content {
     padding: 20px;
     background: #fff;
-    .add-box{
+
+    .add-box {
       margin-bottom: 10px;
     }
   }
diff --git a/src/views/business/study/comp/ytbd.vue b/src/views/business/study/comp/ytbd.vue
index 18d8db4..b864e4c 100644
--- a/src/views/business/study/comp/ytbd.vue
+++ b/src/views/business/study/comp/ytbd.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="study-ytbd">
     <div class="ytbd-left" v-show="!showDetail">
-      <sbject :study="study" />
+      <sbject :study="study" @change="changeSubject" />
     </div>
-    <div class="ytbd-right" >
-      <ytbdList :study="study" @showDetail="showDetailCallback"/>
+    <div class="ytbd-right" v-if="studyInfo.studySubjectId!=''">
+      <ytbdList :study="studyInfo" @showDetail="showDetailCallback"/>
     </div>
   </div>
 </template>
@@ -22,16 +22,36 @@ export default {
       }
     }
   },
+  watch:{
+    study: {
+      immediate: true,
+      handler(v) {
+        this.studyInfo = {
+          studyId:v.id,
+          studyLeader:v.leader,
+          studySubjectId:''
+        }
+      }
+    },
+  },
   components: {sbject,ytbdList},
   computed: {},
   filters: {},
   data() {
     return {
-      showDetail:false
+      showDetail:false,
+      studyInfo:{
+        studyId:this.study.id,
+        studyLeader:this.study.leader,
+        studySubjectId:''
+      }
     }
   },
   created() {},
   methods: {
+    changeSubject(val){
+      this.studyInfo.studySubjectId = val
+    },
     showDetailCallback(val){
       this.showDetail=val
       this.$emit('showDetail',val)
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index b3e8d38..0f72c38 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -29,7 +29,7 @@ G<template>
           </template>
           <template v-else>
             <el-button @click="saveNext">{{ $t('page.business.study.studyFormPre.save') }}</el-button>
-            <el-button type="primary" @click="openSubmit = true">{{ $t('page.business.study.studyFormPre.submit')
+            <el-button type="primary" @click="showtj">{{ $t('page.business.study.studyFormPre.submit')
             }}</el-button>
           </template>
         </div>
@@ -63,11 +63,10 @@ G<template>
           </el-form>
         </div>
         <div class="content" v-show="showIndex == 2">
-          <TemplateTable ref="templateTable" sn="SP001" fillType="preFill" />
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
         </div>
       </div>
     </div>
-
     <el-dialog :title="$t('page.business.study.studyFormPre.tjysb')" :visible.sync="openSubmit" width="500px"
       append-to-body :close-on-click-modal="false">
       <el-form ref="formSubmit" :model="form" :rules="rulesApprove" label-width="120px">
@@ -80,7 +79,7 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('page.business.study.studyFormPre.shryId')" prop="fzrsh">
+            <el-form-item :label="$t('page.business.study.studyFormPre.fzrsh')" prop="fzrsh">
               <el-radio-group v-model="form.fzrsh">
                 <el-radio :label="10">是</el-radio>
                 <el-radio :label="1">否</el-radio>
@@ -99,7 +98,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.getReason" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="form.getReason" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -229,9 +228,11 @@ export default {
           this.form.qmyy = '制作提交预制表单'
           this.open = true
           this.$modal.closeLoading()
+        }).finally(() => {
+          this.$modal.closeLoading()
         })
       } else {
-        this.form = row
+        this.form = _.merge({}, this.form, row)
         this.open = true
       }
     },
@@ -242,19 +243,27 @@ export default {
           studyFormPre_bc(this.form).then(response => {
             this.$emit('close')
             this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
     },
     async saveNext() {
       let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr=JSON.stringify(content)
+      this.form.bdnr = JSON.stringify(content)
       this.$modal.loading()
       studyFormPre_bc(this.form).then(response => {
         this.$emit('close')
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
+    async showtj() {
+      await this.$refs.templateTable.getFormData()
+      this.openSubmit = true
+    },
     tj() {
       this.$refs["formSubmit"].validate(valid => {
         if (valid) {
@@ -264,12 +273,14 @@ export default {
     },
     async dotj() {
       let content = await this.$refs.templateTable.getFormData()
-      this.form.bdnr=JSON.stringify(content)
+      this.form.bdnr = JSON.stringify(content)
       this.$modal.loading()
       studyFormPre_tj(this.form).then(response => {
         this.$emit('close')
         this.openSubmit = false
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     }
   }
diff --git a/src/views/business/study/comp/ytbd/Sh.vue b/src/views/business/study/comp/ytbd/Sh.vue
index 0fdfd67..efa9430 100644
--- a/src/views/business/study/comp/ytbd/Sh.vue
+++ b/src/views/business/study/comp/ytbd/Sh.vue
@@ -7,20 +7,21 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="center-top">
-          {{ form.bdmc }}
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
           <el-button type="danger" @click="showReject">{{ $t('page.business.study.studyFormPre.reject') }}</el-button>
-          <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormPre.approve') }}</el-button>
+          <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormPre.approve')
+            }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
-        表单详情todo
+        <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
       </div>
     </div>
     <!-- 通过 -->
-    <el-dialog :title="$t('page.business.study.studyFormPre.shtg')" :visible.sync="openApprove" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormPre.shtg')" :visible.sync="openApprove" width="500px"
+      append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -33,7 +34,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="formApprove.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -63,7 +64,8 @@ G<template>
     </el-dialog>
 
     <!-- 拒绝 -->
-    <el-dialog :title="$t('page.business.study.studyFormPre.shjj')" :visible.sync="openReject" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormPre.shjj')" :visible.sync="openReject" width="500px"
+      append-to-body :close-on-click-modal="false">
       <el-form ref="formReject" :model="formReject" :rules="rulesReject" label-width="120px">
         <el-row>
           <el-col :span="24">
@@ -76,7 +78,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="formReject.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="formReject.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -109,11 +111,12 @@ G<template>
 
 <script>
 import { studyFormPre_tg, studyFormPre_jj, studyFormPre_info } from "@/api/business/study/studyFormPre"
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
 import { mapGetters } from 'vuex'
 
 export default {
   name: "Sh",
-  components: {},
+  components: { TemplateTable },
   data() {
     return {
       showIndex: 1,
@@ -194,6 +197,8 @@ export default {
         this.form = response.data
         this.open = true
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     showApprove() {
@@ -208,6 +213,8 @@ export default {
             this.openApprove = false
             this.$modal.closeLoading()
             this.$emit('close')
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
@@ -224,6 +231,8 @@ export default {
             this.openReject = false
             this.$modal.closeLoading()
             this.$emit('close')
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue
index be28d3d..4a57f4e 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -7,30 +7,30 @@ G<template>
           <div class="left-title"></div>
         </div>
         <div class="center-top">
-          {{ form.bdmc }}
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
-          <el-button type="primary" v-if="form.bdzt === 5&&form.tbzt === 1" @click="openApprove = true">{{ $t('page.business.study.studyFormPre.tb') }}</el-button>
+          <el-button type="primary" v-if="form.bdzt === 5 && form.tbzt === 1" @click="openApprove = true">{{
+            $t('page.business.study.studyFormPre.tb') }}</el-button>
         </div>
       </div>
       <div class="edit-content ">
         <div class="content-left">
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> {{  $t('page.business.study.studyFormPre.bdnr') }}</div>
-          </div>
-          todo
-          <div class="content-title">
-            <div class="line"></div>
-            <div class="subtitle"> {{  $t('page.business.study.studyFormPre.qmxx') }}</div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormPre.qmxx') }}</div>
           </div>
           <div class="pal">
             <el-table :data="qmxxList" v-loading="loadingQmxx">
-              <el-table-column :label="$t('page.business.study.studyFormPre.qmr')" align="center" prop="qmrMc" width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormPre.qmyy')" align="center" prop="qmyy" width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormPre.qmsj')" align="center" prop="createTime" width="150px" />
-              <el-table-column :label="$t('page.business.study.studyFormPre.bzyy')" align="center" prop="remark" :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.qmr')" align="center" prop="qmrMc"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.qmyy')" align="center" prop="qmyy"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.qmsj')" align="center" prop="createTime"
+                width="150px" />
+              <el-table-column :label="$t('page.business.study.studyFormPre.bzyy')" align="center" prop="remark"
+                :show-overflow-tooltip="true" />
             </el-table>
           </div>
           <div class="pal">
@@ -41,9 +41,9 @@ G<template>
         <div class="content-right">
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> {{  $t('page.business.study.studyFormPre.jcgj') }}</div>
+            <div class="subtitle"> {{ $t('page.business.study.studyFormPre.jcgj') }}</div>
           </div>
-          <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />
@@ -52,7 +52,8 @@ G<template>
     </div>
 
     <!-- 填报 -->
-    <el-dialog :title="$t('page.business.study.studyFormPre.cjjl')" :visible.sync="openApprove" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.study.studyFormPre.cjjl')" :visible.sync="openApprove" width="500px"
+      append-to-body :close-on-click-modal="false">
       <el-form ref="formApprove" :model="formApprove" :rules="rulesApprove" label-width="120px">
         <el-alert :title="$t('page.business.study.studyFormPre.ts')" :closable="false" type="success">
         </el-alert>
@@ -67,7 +68,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="formApprove.remark" :rows="2" maxlength="500"
+              <el-input type="textarea" v-model="formApprove.remark" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
@@ -102,10 +103,11 @@ G<template>
 import { studyFormPre_tb, studyFormPre_info, studyFormPre_jcgj, studyFormPre_qmxx } from "@/api/business/study/studyFormPre"
 import { mapGetters } from 'vuex'
 import JcgjList from "@/views/business/comps/common/JcgjList";
+import TemplateTable from '@/views/business/comps/template/TemplateTable';
 
 export default {
   name: "Xq",
-  components: { JcgjList },
+  components: { JcgjList, TemplateTable },
   data() {
     return {
       openApprove: false,
@@ -170,6 +172,8 @@ export default {
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     getQmxxList() {
@@ -208,6 +212,8 @@ export default {
         this.getQmxxList()
         this.getJjcgjList()
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     approve() {
@@ -218,6 +224,8 @@ export default {
             this.$emit('close')
             this.openApprove = false
             this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue
index 7140777..361e55b 100644
--- a/src/views/business/study/comp/ytbdList.vue
+++ b/src/views/business/study/comp/ytbdList.vue
@@ -2,42 +2,57 @@
   <div>
     <div class="ytbd-list" v-show="!showDetail && !showEdit && !showAudit">
       <div class="ytbd-search">
-        <el-form :model="searchForm" ref="searchForm" :inline="true">
-          <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
-            <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
-          </el-form-item>
-          <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
-            <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
-          </el-form-item>
-          <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
-            <el-input v-model="searchForm.userId" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
-          </el-form-item>
-          <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
-            <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
-              style="width: 150px" @keyup.enter.native="search" />
-          </el-form-item>
-
-          <el-form-item :label="$t('page.business.form.cjsj')">
-            <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
-              :start-placeholder="$t('page.business.form.startDate')"
-              :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
-              style="width: 220px" />
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
-            <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
-          </el-form-item>
+        <el-form :model="searchForm" ref="searchForm" :inline="true" label-width="100px">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.bdmc')" prop="name">
+                <el-input v-model="searchForm.bdmc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.bdbh')" prop="sn">
+                <el-input v-model="searchForm.bdbh" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.gsr')" prop="userId">
+                <SelectDeptUser v-model="searchForm.userId" :name="searchForm.userMc" key="userId"
+                  @change="userChange" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item>
+                <el-button type="primary" icon="el-icon-search" @click="search">{{ $t('form.search') }}</el-button>
+                <el-button icon="el-icon-refresh" @click="reset">{{ $t('form.reset') }}</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.xtmbmc')" prop="templateName">
+                <el-input v-model="searchForm.templateMc" :placeholder="$t('form.placeholderInput')" clearable
+                  style="width: 200px" @keyup.enter.native="search" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item :label="$t('page.business.form.cjsj')">
+                <el-date-picker v-model="daterange" clearable type="daterange" range-separator="-"
+                  :start-placeholder="$t('page.business.form.startDate')"
+                  :end-placeholder="$t('page.business.form.endDate')" value-format="yyyy-MM-dd" @change="search"
+                  style="width: 200px" />
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
       </div>
       <div class="ytbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:study:add']">{{
-              $t('page.business.form.xzytbd') }}</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="showAdd()"
+              v-hasPermi="['business:studyFormPre:xz']">{{
+                $t('page.business.form.xzytbd') }}</el-button>
           </el-col>
         </el-row>
 
@@ -60,26 +75,28 @@
           <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="200">
             <template slot-scope="scope">
               <!-- 详情 -->
-              <el-button type="text" @click="detail(scope.row)">{{
+              <el-button type="text" v-hasPermi="['business:studyFormPre:xq']" @click="detail(scope.row)">{{
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
-              <el-button type="text" @click="edit(scope.row)" v-if="scope.row.bdzt === 1">{{
-                $t('form.edit') }}</el-button>
+              <el-button type="text" v-hasPermi="['business:studyFormPre:bj']" @click="edit(scope.row)"
+                v-if="scope.row.bdzt === 1">{{
+                  $t('form.edit') }}</el-button>
               <template v-if="scope.row.fzrsh == 10">
                 <template v-if="scope.row.fzrshzt == 5">
                   <!-- 负责人审核 -->
-                  <el-button type="text" @click="audit(scope.row)" v-if="scope.row.bdzt === 3 && id == leader">{{
-                    $t('page.business.form.audit') }}</el-button>
+                  <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
+                    v-if="scope.row.bdzt === 3 && id == leader">{{
+                      $t('page.business.form.audit') }}</el-button>
                 </template>
                 <template>
                   <!-- 有权限审核 -->
-                  <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:audit']"
+                  <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
                     v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
                 </template>
               </template>
               <template v-else>
                 <!-- 有权限审核 -->
-                <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:audit']"
+                <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
                   v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
               </template>
             </template>
@@ -96,6 +113,19 @@
     <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
     <!-- 审核 -->
     <Sh v-show="showAudit" key="Sh" ref="Sh" @close="shClose" />
+    <el-dialog :title="$t('page.business.study.studyFormPre.xjbd')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
+      <el-form ref="form" label-width="120px">
+        <el-row>
+          <el-col :span="24" style="text-align: center; margin-top: 50px;">
+            <el-button type="primary" style="width: 80%; height: 40px;" @click="add" plain icon="el-icon-circle-plus">创建新表单</el-button>
+          </el-col>
+          <el-col :span="24" style="text-align: center; margin: 50px 0px;">
+            <el-button type="primary" style="width: 80%;height: 40px;"  @click="copy" plain icon="el-icon-document-copy">复制已有表单</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-dialog>
   </div>
 
 </template>
@@ -107,6 +137,8 @@ import {
 import Bj from "./ytbd/Bj";
 import Xq from "./ytbd/Xq";
 import Sh from "./ytbd/Sh";
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import moment from "moment";
 import { mapGetters } from 'vuex'
 export default {
   name: 'YtbdList',
@@ -126,7 +158,8 @@ export default {
   watch: {
     study: {
       handler(newVal) {
-        this.searchForm.studyId = newVal.id
+        this.searchForm.studyId = newVal.studyId
+        this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
         this.search()
       },
@@ -134,9 +167,10 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh },
+  components: { Bj, Xq, Sh, SelectDeptUser },
   data() {
     return {
+      open: false,
       leader: null,
       showAudit: false,
       showEdit: false,
@@ -146,9 +180,11 @@ export default {
         pageNum: 1,
         pageSize: 10,
         studyId: '',
+        studySubjectId: '',
         bdbh: '',
         bdmc: '',
         userId: '',
+        userMc: '',
         templateMc: '',
         startDate: '',
         endDate: '',
@@ -161,12 +197,24 @@ export default {
   },
   created() { },
   methods: {
+    copy(){
+      alert('todo')
+    },
+    showAdd() {
+      this.open = true
+    },
+    userChange(val) {
+      this.searchForm.userId = val.id
+      this.searchForm.userMc = val.name
+      this.search()
+    },
     search() {
       this.searchForm.pageNum = 1
       this.getList()
     },
     reset() {
-
+      this.resetForm("searchForm")
+      this.handleQuery()
     },
     getList() {
       if (this.daterange != null && this.daterange.length > 0) {
@@ -184,9 +232,10 @@ export default {
       })
     },
     add() {
+      this.open = false
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studyId: this.searchForm.studyId })
+      this.$refs.Bj.edit({ studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
     },
     edit(row) {
       this.showEdit = true
diff --git a/src/views/business/study/list.vue b/src/views/business/study/list.vue
index aadfaac..1040668 100644
--- a/src/views/business/study/list.vue
+++ b/src/views/business/study/list.vue
@@ -90,11 +90,11 @@
               <!-- 归档 -->
               <el-button type="text" @click="gd(scope.row)" v-hasPermi="['business:study:gd']" v-if="scope.row.status===5">{{$t('page.business.study.study.gd')}}</el-button>
               <!-- 解锁 -->
-              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:js']" v-if="scope.row.status===5">{{$t('page.business.study.study.js')}}</el-button>
+              <el-button type="text" @click="js(scope.row)" v-hasPermi="['business:study:js']" v-if="scope.row.status===5">{{$t('page.business.study.study.js')}}</el-button>
               <!-- 解档 -->
               <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jd']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.study.jd')}}</el-button>
               <!-- 借阅 -->
-              <el-button type="text" @click="jd(scope.row)" v-hasPermi="['business:study:jy']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.study.jy')}}</el-button>
+              <el-button type="text" @click="jy(scope.row)" v-hasPermi="['business:study:jy']" v-if="scope.row.status===9 && scope.row.borrowStatus===1">{{$t('page.business.study.study.jy')}}</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -142,15 +142,16 @@
     <Edit ref="edit" v-show="showType==='edit'" @cancel="showType='list'" @save="save" />
     <Enter ref="enter" v-show="showType==='enter'" @cancel="showType='list'" />
     <Detail ref="detail" v-show="showType==='detail'" @cancel="showType='list'" />
-    
+    <Sign ref="signRef" @callback="doSign" />
   </div>
 </template>
 
 <script>
-import { study_list,study_info,study_save,study_delete} from "@/api/business/study/study";
+import { study_list,study_delete,study_gd,study_js,study_jd,study_jy} from "@/api/business/study/study";
 import Edit from './comp/edit.vue'
 import Enter from './comp/enter.vue'
 import Detail from './comp/detail.vue'
+import Sign from './comp/sign.vue'
 export default {
   name: "Study",
   props:{
@@ -158,7 +159,8 @@ export default {
   components:{
     Edit,
     Enter,
-    Detail
+    Detail,
+    Sign
   },
   computed: {
   },
@@ -182,7 +184,10 @@ export default {
       total: 0,
       list: [],
       //线上类型list,edit。。。。
-      showType:'list'
+      showType:'list',
+
+      operate:'',
+      operateRow:{},
     };
   },
   created() {
@@ -226,17 +231,6 @@ export default {
       this.showType = 'list'
       this.getList()
     },
-    del(row) {
-      this.$modal.confirm(this.$t('form.confirmDelete')).then(function() {
-        this.$modal.loading()
-        study_delete({ id: row.id}).then(() => {
-          this.getList()
-        })
-        .finally(() => {
-          this.$modal.closeLoading()
-        })
-      }).catch(() => {})
-    },
     enter(row){
       this.showType = 'enter'
       this.$refs.enter.show(row)
@@ -244,7 +238,126 @@ export default {
     detail(row){
       this.showType = 'detail'
       this.$refs.detail.show(row)
-    }
+    },
+
+    del(row) {
+      this.operate = 'del'
+      this.operateRow = row
+      this.$refs.signRef.show(this.$t('page.business.study.study.scsy'),this.$t('page.business.study.study.scsy'))
+    },
+    doDel(signInfo) {
+      this.$modal.loading()
+      let postData = {
+        study:this.operateRow,
+        sign:signInfo
+      }
+      study_delete(postData).then(() => {
+        this.$refs.signRef.cancel()
+        this.getList()
+      })
+      .finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+
+    gd(row) {
+      this.operate = 'gd'
+      this.operateRow = row
+      this.$refs.signRef.show(this.$t('page.business.study.study.sqgd'),this.$t('page.business.study.study.sqgd'))
+    },
+    doGd(signInfo) {
+      this.$modal.loading()
+      let postData = {
+        study:this.operateRow,
+        sign:signInfo
+      }
+      study_gd(postData).then(() => {
+        this.$refs.signRef.cancel()
+        this.getList()
+      })
+      .finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+
+    gs(row) {
+      this.operate = 'gs'
+      this.operateRow = row
+      this.$refs.signRef.show(this.$t('page.business.study.study.jssy'),this.$t('page.business.study.study.jssy'))
+    },
+    doJs(signInfo) {
+      this.$modal.loading()
+      let postData = {
+        study:this.operateRow,
+        sign:signInfo
+      }
+      study_js(postData).then(() => {
+        this.$refs.signRef.cancel()
+        this.getList()
+      })
+      .finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+
+    jd(row) {
+      this.operate = 'jd'
+      this.operateRow = row
+      this.$refs.signRef.show(this.$t('page.business.study.study.sqjd'),this.$t('page.business.study.study.sqjd'))
+    },
+    doJd(signInfo) {
+      this.$modal.loading()
+      let postData = {
+        study:this.operateRow,
+        sign:signInfo
+      }
+      study_jd(postData).then(() => {
+        this.$refs.signRef.cancel()
+        this.getList()
+      })
+      .finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+
+    jy(row) {
+      this.operate = 'jy'
+      this.operateRow = row
+      this.$refs.signRef.show(this.$t('page.business.study.study.sqjy'),this.$t('page.business.study.study.sqjy'))
+    },
+    doJy(signInfo) {
+      this.$modal.loading()
+      let postData = {
+        study:this.operateRow,
+        sign:signInfo
+      }
+      study_jy(postData).then(() => {
+        this.$refs.signRef.cancel()
+        this.getList()
+      })
+      .finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+
+
+    doSign(val){
+      if(this.operate==='del'){
+        this.doDel(val)
+      }
+      if(this.operate==='gd'){
+        this.doGd(val)
+      }
+      if(this.operate==='js'){
+        this.doJs(val)
+      }
+      if(this.operate==='jd'){
+        this.doJd(val)
+      }
+      if(this.operate==='jy'){
+        this.doJy(val)
+      }
+    },
   }
 };
 </script>
diff --git a/src/views/business/template/list.vue b/src/views/business/template/list.vue
index 4bb36bc..626b22b 100644
--- a/src/views/business/template/list.vue
+++ b/src/views/business/template/list.vue
@@ -33,17 +33,28 @@
       <el-table-column :label="$t('page.system.template.sn')" align="center" prop="sn" />
       <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" width="150">
+      <el-table-column :label="$t('page.system.template.status')" prop="status" align="center" width="100">
         <template slot-scope="scope">
           <span v-if="scope.row.status === 10">{{ $t('page.system.template.statusEnable') }}</span>
           <span v-if="scope.row.status === 1">{{ $t('page.system.template.statusDisable') }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="150">
+      <el-table-column label="是否需要预填" prop="needPre" align="center" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.needPre === 10">是</span>
+          <span v-if="scope.row.needPre === 1">否</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="模板类型" prop="type" align="center" width="100">
+        <template slot-scope="scope">
+          <span v-if="scope.row.type === 10">敏感模板</span>
+          <span v-if="scope.row.type === 1">普通模板</span>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('form.operate')" fixed="right" align="center" width="100">
         <template slot-scope="scope">
-          <el-button type="text" @click="edit(scope.row)">{{ $t('page.system.template.detail') }}</el-button>
           <el-button type="text" @click="edit(scope.row)">{{ $t('page.system.template.bj') }}</el-button>
-          <el-button type="text" @click="bdpz(scope.row)">{{ $t('page.system.template.bdpz') }}</el-button>
+          <el-button type="text" @click="bdpz(scope.row)">{{ $t('page.system.template.detail') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -53,7 +64,7 @@
 
     <el-dialog :close-on-click-modal="false" :close-on-press-escape="false" :title="infoDialog.title" :visible.sync="infoDialog.visible" width="600px"
       append-to-body>
-      <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="100px">
+      <el-form ref="infoDialogForm" :model="infoDialog.formData" :rules="infoDialog.rules" label-width="120px">
         <el-row>
           <el-col :span="24">
             <el-form-item label="编号：" prop="sn">
@@ -66,10 +77,35 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <el-form-item label="部门/学科：" prop="name">
+            <el-form-item label="部门/学科：" prop="deptId">
               <select-dept v-model="infoDialog.formData.deptId" />
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="状态：" prop="status">
+              <el-select v-model="infoDialog.formData.status" :placeholder="$t('form.placeholderSelect')" style="width:100%">
+                <el-option label="启用" :value="10" />
+                <el-option label="禁用" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否需要预填：" prop="needPre">
+              <el-select v-model="infoDialog.formData.needPre" :placeholder="$t('form.placeholderSelect')" style="width:100%">
+                <el-option label="是" :value="10" />
+                <el-option label="否" :value="1" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="类型：" prop="type">
+              <el-select v-model="infoDialog.formData.type" :placeholder="$t('form.placeholderSelect')" style="width:100%">
+                <el-option label="普通模板" :value="1" />
+                <el-option label="敏感模板" :value="10" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -92,7 +128,10 @@ const EmptyDialogData = {
   id: '',
   name: '',
   sn: '',
-  deptId: ''
+  deptId: '',
+  status:10,
+  needPre: 10,
+  type: 1,
 }
 export default {
   name: "Template",
@@ -125,6 +164,27 @@ export default {
         title: '',
         visible: false,
         formData: {},
+
+        rules: {
+          sn: [
+            { required: true, message:'请输入', trigger: "blur" }
+          ],
+          name: [
+            { required: true, message:'请输入', trigger: "blur" }
+          ],
+          deptId: [
+            { required: true, message:'请选择', trigger: "change" }
+          ],
+          status: [
+            { required: true, message:'请选择', trigger: "change" }
+          ],
+          needPre: [
+            { required: true, message:'请选择', trigger: "change" }
+          ],
+          type: [
+            { required: true, message:'请选择', trigger: "change" }
+          ],
+        },
       },
       tableDialog: {
         title: '',
diff --git a/vue.config.js b/vue.config.js
index d3ce99c..054942f 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
-        target: `http://39.99.251.173:8080`,
+         target: `http://localhost:8080`,
+        //target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''