diff --git a/src/api/business/study/studyFormFill.js b/src/api/business/study/studyFormFill.js
index 3a0daeb..0bfe47d 100644
--- a/src/api/business/study/studyFormFill.js
+++ b/src/api/business/study/studyFormFill.js
@@ -52,10 +52,10 @@ export function studyFormFill_fz(data) {
   })
 }
 
-//审核废止
-export function studyFormFill_shfz(data) {
+//确认废止
+export function studyFormFill_qrfz(data) {
   return request({
-    url: '/system/business/studyFormFill/shfz',
+    url: '/system/business/studyFormFill/qrfz',
     method: 'post',
     data: data
   })
diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js
index e976285..7f43bd9 100644
--- a/src/lang/en/business/study/studyFormFill.js
+++ b/src/lang/en/business/study/studyFormFill.js
@@ -44,5 +44,10 @@ sqfz:'申请废止',
  guancha:'观察',
  jiaqian:'加签',
  qrfz:'确认废止',
-
+ reason:'原因',
+ reject:'拒绝',
+ approve:'通过',
+szqk:'生长情况',
+rybg:'人员变更',
+shenyue:'审阅'
 }
diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js
index e976285..763b107 100644
--- a/src/lang/zh/business/study/studyFormFill.js
+++ b/src/lang/zh/business/study/studyFormFill.js
@@ -44,5 +44,10 @@ sqfz:'申请废止',
  guancha:'观察',
  jiaqian:'加签',
  qrfz:'确认废止',
-
+ reject:'拒绝',
+ reason:'原因',
+ approve:'通过',
+szqk:'生长情况',
+rybg:'人员变更',
+shenyue:'审阅'
 }
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
index 1d1048d..0707c68 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
@@ -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 b3db79d..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">
@@ -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 c1cec39..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">
@@ -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 257a10d..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">
@@ -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 3782ce8..1c5986b 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
@@ -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 ebc76a4..198e6c5 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
@@ -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/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
index 8d8bbda..6c32be1 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
@@ -64,7 +64,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>
@@ -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 f004bfd..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>
@@ -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 a34dc50..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,8 +63,10 @@ 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>
@@ -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 d357a0b..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>
@@ -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 99cd22e..6d877bd 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
@@ -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 dff9449..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>
@@ -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 b2e8811..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>
@@ -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 708922d..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">
@@ -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 1760bbf..6ef8caa 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
@@ -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 4500423..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>
@@ -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 c90a650..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,7 +78,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>
@@ -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 fc93821..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,7 +59,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>
@@ -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 3f9ee4b..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,13 +45,14 @@ 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-form-item :label="$t('form.remark')">
               <el-input type="textarea" v-model="form.kcbjbz" :rows="5" maxlength="500"
                 :placeholder="$t('form.placeholderInput')">
               </el-input>
@@ -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/mjy/comps/ffjl/Gd.vue b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
index bd67d7d..a4d9e06 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
@@ -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 c853422..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">
@@ -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 b287dd1..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">
@@ -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 f2c23b5..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">
@@ -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 ee39016..270bd0f 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
@@ -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 31c1bb1..074e6ae 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
@@ -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/mjy/Bj.vue b/src/views/business/resource/mjy/comps/mjy/Bj.vue
index fb70987..981d647 100644
--- a/src/views/business/resource/mjy/comps/mjy/Bj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Bj.vue
@@ -64,7 +64,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>
@@ -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 924e056..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>
@@ -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 e6af32a..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,8 +63,10 @@ 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>
@@ -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 8b099a8..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>
@@ -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 a24fc66..d1cfb83 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gd.vue
@@ -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 969fc56..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>
@@ -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 c97fc8b..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>
@@ -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 273d03e..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">
@@ -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 37fa1e9..e18a9c0 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jy.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jy.vue
@@ -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 d4d4cbf..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>
@@ -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 c25b2fb..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,7 +78,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>
@@ -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 a90e902..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,7 +59,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>
@@ -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 ceed416..10a7264 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
@@ -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/zcg/comps/Ysff.vue b/src/views/business/resource/zcg/comps/Ysff.vue
index 36ae370..55a8e39 100644
--- a/src/views/business/resource/zcg/comps/Ysff.vue
+++ b/src/views/business/resource/zcg/comps/Ysff.vue
@@ -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/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index f333151..3d85ed2 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -198,7 +198,7 @@ export default {
           this.$modal.closeLoading()
         })
       } else {
-        this.form =  _.merge({}, this.form, row)
+        this.form = _.merge({}, this.form, row)
         this.open = true
       }
     },
@@ -209,6 +209,8 @@ export default {
           studyFormFill_bc(this.form).then(response => {
             this.$emit('close')
             this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
@@ -220,6 +222,8 @@ export default {
       studyFormFill_bc(this.form).then(response => {
         this.$emit('close')
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     tj() {
@@ -237,6 +241,8 @@ export default {
         this.$emit('close')
         this.openSubmit = false
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     }
   }
diff --git a/src/views/business/study/comp/tbbd/Fz.vue b/src/views/business/study/comp/tbbd/Fz.vue
index 3ffba7c..7ad2832 100644
--- a/src/views/business/study/comp/tbbd/Fz.vue
+++ b/src/views/business/study/comp/tbbd/Fz.vue
@@ -104,6 +104,8 @@ export default {
           studyFormFill_fz(this.form).then(response => {
             this.open = false
             this.$emit('callback')
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/study/comp/tbbd/Gc.vue b/src/views/business/study/comp/tbbd/Gc.vue
index dd15a02..786b296 100644
--- a/src/views/business/study/comp/tbbd/Gc.vue
+++ b/src/views/business/study/comp/tbbd/Gc.vue
@@ -1,13 +1,16 @@
 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-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('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -70,6 +73,11 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
+        qmyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       }
     }
   },
@@ -87,7 +95,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyy: '观察',
+        qmyy: null,
         remark: null,
         qmrmm: null
       }
@@ -101,9 +109,13 @@ export default {
     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()
           })
         }
       })
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
index 5e492ec..ce2d70f 100644
--- a/src/views/business/study/comp/tbbd/Jq.vue
+++ b/src/views/business/study/comp/tbbd/Jq.vue
@@ -6,11 +6,11 @@ G<template>
         <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')">
-                <el-option label="开始现场复核" />
-                <el-option label="结束现场复核" />
-                <el-option label="申明协作" />
-                <el-option label="补充说明" />
+              <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>
@@ -110,9 +110,13 @@ export default {
     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()
           })
         }
       })
diff --git a/src/views/business/study/comp/tbbd/Qrfz.vue b/src/views/business/study/comp/tbbd/Qrfz.vue
index 4f764d4..ce4f842 100644
--- a/src/views/business/study/comp/tbbd/Qrfz.vue
+++ b/src/views/business/study/comp/tbbd/Qrfz.vue
@@ -5,15 +5,15 @@ G<template>
       <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
+            <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('form.remark')" prop="remark">
+            <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>
@@ -37,20 +37,20 @@ G<template>
           </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 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_shfz } from "@/api/business/study/studyFormFill"
+import { studyFormFill_qrfz } from "@/api/business/study/studyFormFill"
 import { mapGetters } from 'vuex'
 
 export default {
-  name: "Fz",
+  name: "Qrfz",
   components: {},
   data() {
     return {
@@ -87,7 +87,8 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyy: '确认废止',
+        qmyymc: '废止通过/拒绝',
+        qmyy: null,
         remark: null,
         qmrmm: null
       }
@@ -98,12 +99,24 @@ export default {
       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) {
-          studyFormFill_shfz(this.form).then(response => {
+          this.$modal.loading()
+          studyFormFill_qrfz(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/tbbd/Sh.vue b/src/views/business/study/comp/tbbd/Sh.vue
deleted file mode 100644
index 1955f16..0000000
--- a/src/views/business/study/comp/tbbd/Sh.vue
+++ /dev/null
@@ -1,237 +0,0 @@
-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">
-          {{ 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.studyFormFill.reject') }}</el-button>
-          <el-button type="primary" @click="showApprove">{{ $t('page.business.study.studyFormFill.approve')
-            }}</el-button>
-        </div>
-      </div>
-      <div class="edit-content ">
-        <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
-      </div>
-    </div>
-    <!-- 通过 -->
-    <el-dialog :title="$t('page.business.study.studyFormFill.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">
-            <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>
-
-    <!-- 拒绝 -->
-    <el-dialog :title="$t('page.business.study.studyFormFill.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">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="formReject.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="formReject.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="formReject.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="reject">{{ $t('form.confirm') }}</el-button>
-        <el-button @click="openReject = false">{{ $t('form.cancel') }}</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { studyFormFill_tg, studyFormFill_jj, studyFormFill_info } from "@/api/business/study/studyFormFill"
-import { mapGetters } from 'vuex'
-import TemplateTable from '@/views/business/comps/template/TemplateTable';
-
-export default {
-  name: "Sh",
-  components: { TemplateTable },
-  data() {
-    return {
-      showIndex: 1,
-      form: {},
-      rules: {
-        bdmc: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        templateId: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-
-      },
-      openApprove: false,
-      formApprove: {
-        id: null,
-        qmyy: '审核通过',
-        remark: '',
-        qmrmm: '',
-      },
-      rulesApprove: {
-        qmrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      },
-      openReject: false,
-      formReject: {
-        id: null,
-        qmyy: '审核拒绝',
-        remark: '',
-        qmrmm: '',
-      },
-      rulesReject: {
-        qmrmm: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }],
-        remark: [{
-          required: true,
-          message: ' ',
-          trigger: 'blur'
-        }]
-      }
-    }
-  },
-  computed: {
-    ...mapGetters([
-      'nickName'
-    ]),
-  },
-  created() {
-  },
-  methods: {
-    cancel() {
-      this.$emit('close')
-    },
-    reset() {
-      this.form = {
-        id: null,
-        studyId: null,
-        qmyy: null,
-        remark: null,
-        qmrmm: null
-      }
-      this.resetForm("form")
-    },
-    show(row) {
-      this.reset()
-      this.$modal.loading()
-      studyFormFill_info({ id: row.id }).then(response => {
-        this.form = response.data
-        this.open = true
-        this.$modal.closeLoading()
-      })
-    },
-    showApprove() {
-      this.formApprove.id = this.form.id
-      this.openApprove = true
-    },
-    approve() {
-      this.$refs["formApprove"].validate(valid => {
-        if (valid) {
-          this.$modal.loading()
-          studyFormFill_tg(this.formApprove).then(response => {
-            this.openApprove = false
-            this.$modal.closeLoading()
-            this.$emit('close')
-          })
-        }
-      })
-    },
-    showReject() {
-      this.formReject.id = this.form.id
-      this.openReject = true
-    },
-    reject() {
-      this.$refs["formReject"].validate(valid => {
-        if (valid) {
-          this.$modal.loading()
-          studyFormFill_jj(this.formReject).then(response => {
-            this.openReject = false
-            this.$modal.closeLoading()
-            this.$emit('close')
-          })
-        }
-      })
-    }
-  }
-}
-</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
index 4afbc8e..43e888d 100644
--- a/src/views/business/study/comp/tbbd/Xq.vue
+++ b/src/views/business/study/comp/tbbd/Xq.vue
@@ -53,7 +53,7 @@ G<template>
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormFill.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" />
@@ -198,6 +198,8 @@ export default {
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     getQmxxList() {
@@ -232,10 +234,11 @@ export default {
       this.queryParamsQmxx.formId = row.id
       studyFormFill_info({ id: row.id }).then(response => {
         this.form = response.data
-        this.open = true
         this.getQmxxList()
         this.getJjcgjList()
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     approve() {
@@ -246,6 +249,8 @@ export default {
             this.$emit('close')
             this.openApprove = false
             this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
diff --git a/src/views/business/study/comp/tbbdList.vue b/src/views/business/study/comp/tbbdList.vue
index 764fb27..8adb846 100644
--- a/src/views/business/study/comp/tbbdList.vue
+++ b/src/views/business/study/comp/tbbdList.vue
@@ -150,7 +150,7 @@
     <!-- 详情 -->
     <Xq v-show="showDetail" key="Xq" ref="Xq" @close="xqClose" />
     <!-- 审阅 -->
-    <Sh v-show="showAudit" key="Sh" ref="Sh" @close="shClose" />
+    <Sy v-show="showAudit" key="Sy" ref="Sy" @close="syClose" />
     <!-- 废止 -->
     <Fz key="Fz" ref="Fz" @callback="search" />
     <!-- 确认废止 -->
@@ -159,22 +159,25 @@
     <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 {
-  studyFormFill_list
-} from '@/api/business/study/studyFormFill'
+import { studyFormFill_list } from '@/api/business/study/studyFormFill'
 import Bj from "./tbbd/Bj";
 import Xq from "./tbbd/Xq";
-import Sh from "./tbbd/Sh";
+import Sy from "./tbbd/Sy";
 import Fz from "./tbbd/Fz";
 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 {
@@ -204,7 +207,7 @@ export default {
       deep: true
     }
   },
-  components: { Fz, Bj, Xq, Sh,Qrfz,Jq ,Gc,SelectDeptUser },
+  components: {Ghgsr, Fz, Bj, Xq, Qrfz,Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog },
   data() {
     return {
       leader: null,
@@ -228,14 +231,21 @@ export default {
         tjsjjs: '',
         tjsjks: '',
       },
-
       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})
+    },
     jq(row) {
       this.$refs.Jq.show(row)
     },
@@ -244,7 +254,7 @@ export default {
     },
     gc(row) {
       this.$refs.Gc.show(row)
-    }, 
+    },
     fz(row) {
       this.$refs.Fz.show(row)
     },
@@ -303,7 +313,7 @@ export default {
       this.$emit('showDetail', this.showDetail)
       this.search()
     },
-    shClose() {
+    syClose() {
       this.showAudit = false
       this.$emit('showDetail', this.showAudit)
       this.search()
@@ -313,10 +323,10 @@ export default {
       this.$emit('showDetail', this.showDetail)
       this.$refs.Xq.show(row)
     },
-    sh(row) {
+    sy(row) {
       this.showAudit = true
       this.$emit('showDetail', this.showAudit)
-      this.$refs.Sh.show(row)
+      this.$refs.Sy.show(row)
     },
   }
 }
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 1fc2aa4..0f72c38 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -228,6 +228,8 @@ export default {
           this.form.qmyy = '制作提交预制表单'
           this.open = true
           this.$modal.closeLoading()
+        }).finally(() => {
+          this.$modal.closeLoading()
         })
       } else {
         this.form = _.merge({}, this.form, row)
@@ -241,6 +243,8 @@ export default {
           studyFormPre_bc(this.form).then(response => {
             this.$emit('close')
             this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })
@@ -252,6 +256,8 @@ export default {
       studyFormPre_bc(this.form).then(response => {
         this.$emit('close')
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     async showtj() {
@@ -273,6 +279,8 @@ export default {
         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 e9862c6..efa9430 100644
--- a/src/views/business/study/comp/ytbd/Sh.vue
+++ b/src/views/business/study/comp/ytbd/Sh.vue
@@ -11,15 +11,17 @@ G<template>
         <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 ">
-         <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
+        <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">
@@ -62,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">
@@ -113,7 +116,7 @@ import { mapGetters } from 'vuex'
 
 export default {
   name: "Sh",
-  components: {TemplateTable},
+  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 f1ff91d..4a57f4e 100644
--- a/src/views/business/study/comp/ytbd/Xq.vue
+++ b/src/views/business/study/comp/ytbd/Xq.vue
@@ -10,7 +10,8 @@ G<template>
         </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 ">
@@ -18,14 +19,18 @@ G<template>
           <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="preFill" />
           <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">
@@ -36,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" />
@@ -47,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>
@@ -101,7 +107,7 @@ import TemplateTable from '@/views/business/comps/template/TemplateTable';
 
 export default {
   name: "Xq",
-  components: { JcgjList ,TemplateTable},
+  components: { JcgjList, TemplateTable },
   data() {
     return {
       openApprove: false,
@@ -166,6 +172,8 @@ export default {
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     getQmxxList() {
@@ -204,6 +212,8 @@ export default {
         this.getQmxxList()
         this.getJjcgjList()
         this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
     },
     approve() {
@@ -214,6 +224,8 @@ export default {
             this.$emit('close')
             this.openApprove = false
             this.$modal.closeLoading()
+          }).finally(() => {
+            this.$modal.closeLoading()
           })
         }
       })