diff --git a/src/lang/en/business/resource/gyzj/gyzj.js b/src/lang/en/business/resource/gyzj/gyzj.js
index 3edb9e8..4b28804 100644
--- a/src/lang/en/business/resource/gyzj/gyzj.js
+++ b/src/lang/en/business/resource/gyzj/gyzj.js
@@ -1,5 +1,5 @@
 export default {
-   mc:'名称',
+    mc:'名称',
     bh:'编号',
     jyzt:'借阅状态',
     zjzt:'制剂状态',
@@ -35,7 +35,7 @@ export default {
     guidang:'归档',
     jiedang:'解档',
     jieyue:'借阅',
-    guihuan:'归还',
+    guihuan:'确认归还',
     fafang:'发放',
     ysff:'钥匙发放',
     czrq:'处置容器',
@@ -56,12 +56,13 @@ export default {
     ffr2:'发放人2',
     zytj:'转移条件',
     md:'目的',
-    ckmz:'出库毛重',
+    ckmz:'出库净重',
     ckl:'出库量',
     ckldw:'出库单位',
-    ffzytj:'转移条件',
-    ckmz:'出库毛重',
-    ckmzdw:'出库毛重单位',
+    ffzytj:'发放转移条件',
+    ghzytj:'归还转移条件',
+    ckmz:'出库净重',
+    ckmzdw:'出库净重单位',
     ys1lrq:'钥匙1领取人',
     ys2lrq:'钥匙2领取人',
     sssy:'所属试验',
@@ -79,7 +80,23 @@ export default {
     jiaqian:'加签',
     gyzjgl:'给药制剂管理',
     ffhsjl:'发放回收记录',
+
+    rkwz:'入库位置',
+    rktj:'入库条件',
+    zytj:'转移条件',
+    rkmz:'入库净重',
+    jsl:'减少量',
+    syl:'使用量',
+    ghr1Id:'归还人1',
+    ghr2Id:'归还人2',
+    jsr1Id:'库管员1',
+    jsr2Id:'库管员2',
+  tz:'台账',
+  lqsj:'领取时间',
     jcgj:'稽查轨迹',
-    tz:'台账'
-  
+    ffbz:'发放备注',
+    ghbz:'归还备注',
+    gdsqr:'发放备注',
+    cjsj:'创建时间',
+    rkl:'入库净重',
 }
\ No newline at end of file
diff --git a/src/lang/en/business/resource/mjy/mjy.js b/src/lang/en/business/resource/mjy/mjy.js
index 826f530..e22134c 100644
--- a/src/lang/en/business/resource/mjy/mjy.js
+++ b/src/lang/en/business/resource/mjy/mjy.js
@@ -1,5 +1,5 @@
 export default {
-   mc:'名称',
+    mc:'名称',
     bh:'编号',
     jyzt:'借阅状态',
     zjzt:'制剂状态',
@@ -59,7 +59,8 @@ export default {
     ckmz:'出库毛重',
     ckl:'出库量',
     ckldw:'出库单位',
-    ffzytj:'转移条件',
+    ffzytj:'发放转移条件',
+    ghzytj:'归还转移条件',
     ckmz:'出库毛重',
     ckmzdw:'出库毛重单位',
     ys1lrq:'钥匙1领取人',
@@ -76,7 +77,26 @@ export default {
     ccsj:'操作时间',
     cksj:'出库时间',
     rksj:'入库时间',
+    jiaqian:'加签',
+    mjygl:'麻精药管理',
+    ffhsjl:'发放回收记录',
 
+    rkwz:'入库位置',
+    rktj:'入库条件',
+    zytj:'转移条件',
+    rkmz:'入库毛重',
+    jsl:'减少量',
+    syl:'使用量',
+    ghr1Id:'归还人1',
+    ghr2Id:'归还人2',
+    jsr1Id:'库管员1',
+    jsr2Id:'库管员2',
+  tz:'台账',
+  lqsj:'领取时间',
     jcgj:'稽查轨迹',
-  tz:'台账'
+    ffbz:'发放备注',
+    ghbz:'归还备注',
+    gdsqr:'发放备注',
+    cjsj:'创建时间',
+    rkl:'入库毛重',
 }
\ No newline at end of file
diff --git a/src/lang/zh/business/resource/gyzj/gyzj.js b/src/lang/zh/business/resource/gyzj/gyzj.js
index f0e19be..4b28804 100644
--- a/src/lang/zh/business/resource/gyzj/gyzj.js
+++ b/src/lang/zh/business/resource/gyzj/gyzj.js
@@ -35,7 +35,7 @@ export default {
     guidang:'归档',
     jiedang:'解档',
     jieyue:'借阅',
-    guihuan:'归还',
+    guihuan:'确认归还',
     fafang:'发放',
     ysff:'钥匙发放',
     czrq:'处置容器',
@@ -56,12 +56,13 @@ export default {
     ffr2:'发放人2',
     zytj:'转移条件',
     md:'目的',
-    ckmz:'出库毛重',
+    ckmz:'出库净重',
     ckl:'出库量',
     ckldw:'出库单位',
-    ffzytj:'转移条件',
-    ckmz:'出库毛重',
-    ckmzdw:'出库毛重单位',
+    ffzytj:'发放转移条件',
+    ghzytj:'归还转移条件',
+    ckmz:'出库净重',
+    ckmzdw:'出库净重单位',
     ys1lrq:'钥匙1领取人',
     ys2lrq:'钥匙2领取人',
     sssy:'所属试验',
@@ -80,8 +81,22 @@ export default {
     gyzjgl:'给药制剂管理',
     ffhsjl:'发放回收记录',
 
+    rkwz:'入库位置',
+    rktj:'入库条件',
+    zytj:'转移条件',
+    rkmz:'入库净重',
+    jsl:'减少量',
+    syl:'使用量',
+    ghr1Id:'归还人1',
+    ghr2Id:'归还人2',
+    jsr1Id:'库管员1',
+    jsr2Id:'库管员2',
+  tz:'台账',
+  lqsj:'领取时间',
     jcgj:'稽查轨迹',
-  tz:'台账'
-  
-  
+    ffbz:'发放备注',
+    ghbz:'归还备注',
+    gdsqr:'发放备注',
+    cjsj:'创建时间',
+    rkl:'入库净重',
 }
\ No newline at end of file
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
index fcd33c7..131874f 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
@@ -7,7 +7,7 @@
         <div class="left-title"></div>
       </div>
       <div class="right-top">
-        <el-button @click="cancel()">{{ $t('page.business.study.study.cancel') }}</el-button>
+        <el-button @click="cancel()">{{ $t('page.business.study.cancel') }}</el-button>
         <el-button @click="exportExcel()">{{ $t('form.export') }}</el-button>
       </div>
     </div>
@@ -29,102 +29,129 @@
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.gyzj.jlzt') }}</div>
-            <el-select v-model="form.jlzt" disabled style="width: 100%;">
-              <el-option :label="$t('page.business.resource.jlzt.wsd')" :value="1" />
-              <el-option :label="$t('page.business.resource.jlzt.ysd')" :value="3" />
-              <el-option :label="$t('page.business.resource.jlzt.dgd')" :value="5" />
-              <el-option :label="$t('page.business.resource.jlzt.gd')" :value="7" />
-              <el-option :label="$t('page.business.resource.jlzt.djd')" :value="9" />
-            </el-select>
+            <div class="left-title">{{ $t('page.business.resource.gyzj.sxrq') }}</div>
+            <el-input type="text" :value="form.sxrq" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.gyzj.jyzt') }}</div>
-            <el-select v-model="form.jyzt" disabled style="width: 100%;">
-              <el-option :label="$t('page.business.resource.jyzt.wjy')" :value="1" />
-              <el-option :label="$t('page.business.resource.jyzt.djy')" :value="3" />
-              <el-option :label="$t('page.business.resource.jyzt.jyz')" :value="5" />
-            </el-select>
+            <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>
+            </el-input>
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.gyzj.zcg') }}</div>
-            <el-input type="text" :value="form.zcgMc" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.gyzj.cctj') }}</div>
+            <el-input type="text" :value="form.cctj" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.ccwz') }}</div>
+            <el-input type="text" :value="form.ccwz" maxlength="50" disabled />
           </div>
-        </div>
-        <div class="content-title">
-          <div class="line"></div>
-          <div class="subtitle"> 发放信息</div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.gyzj.md') }}</div>
-            <el-input type="text" :value="form.mdMc" maxlength="50" disabled />
+            <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>
+            </el-input>
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.gyzj.zytj') }}</div>
-            <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
+            <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>
+            </el-input>
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.gyzj.cksj') }}</div>
-            <el-input type="text" :value="form.ffrq" maxlength="50" disabled />
-          </div>
-          <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.gyzj.ckjz') }}</div>
-            <el-input type="text" :value="form.ckl" maxlength="50" disabled> <template slot="append">{{ form.ckldw
+            <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>
             </el-input>
           </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.md') }}</div>
+            <el-input type="text" :value="form.mdMc" maxlength="50" disabled />
+          </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.gyzj.lqr1') }}</div>
-            <el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.gyzj.ffzytj') }}</div>
+            <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.gyzj.lqr2') }}</div>
-            <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
+            <div class="right-title">{{ $t('page.business.resource.gyzj.lqr1') }}</div>
+            <el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.gyzj.kgy1') }}</div>
-            <el-input type="text" :value="form.kgy1Mc" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.gyzj.lqr2') }}</div>
+            <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.gyzj.kgy2') }}</div>
-            <el-input type="text" :value="form.kgy2Mc" maxlength="50" disabled />
+            <div class="right-title">{{ $t('page.business.resource.gyzj.ghr1Id') }}</div>
+            <el-input type="text" :value="form.ghr1Mc" maxlength="50" disabled />
           </div>
         </div>
-        <div class="content-title">
-          <div class="line"></div>
-          <div class="subtitle"> 归还信息</div>
-        </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.gyzj.rksj') }}</div>
-            <el-input type="text" :value="form.ghrq" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.gyzj.ghr2Id') }}</div>
+            <el-input type="text" :value="form.ghr2Mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.gyzj.rkjz') }}</div>
-            <el-input type="text" :value="form.rkl" maxlength="50" disabled> <template slot="append">{{ form.rkldw
-            }}</template>
-            </el-input>
+            <div class="right-title">{{ $t('page.business.resource.gyzj.ghzytj') }}</div>
+            <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.gyzj.syl') }}</div>
-            <el-input type="text" :value="form.syl" maxlength="50" disabled> <template slot="append">{{ form.syldw
+            <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>
             </el-input>
           </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gyzj.ffbz') }}</div>
+            <el-input type="text" :value="form.ffbz" maxlength="50" disabled />
+          </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.gyzj.zytj') }}</div>
-            <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
+            <div class="right-title">{{ $t('page.business.resource.gyzj.ghbz') }}</div>
+            <el-input type="text" :value="form.ghbz" maxlength="50" disabled />
+          </div>
+        </div>
+
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gyzj.ghbz') }}</div>
+            <el-input type="text" :value="form.ghbz" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.cjsj') }}</div>
+            <el-input type="text" :value="form.createTime" maxlength="50" disabled />
+          </div>
+        </div>
+        <div class="pal">
+          <div class="left">
+            <div class="left-title">{{ $t('page.business.resource.gyzj.jlzt') }}</div>
+            <el-select v-model="form.jlzt" disabled style="width: 100%;">
+              <el-option :label="$t('page.business.resource.jlzt.wsd')" :value="1" />
+              <el-option :label="$t('page.business.resource.jlzt.ysd')" :value="3" />
+              <el-option :label="$t('page.business.resource.jlzt.dgd')" :value="5" />
+              <el-option :label="$t('page.business.resource.jlzt.gd')" :value="7" />
+              <el-option :label="$t('page.business.resource.jlzt.djd')" :value="9" />
+            </el-select>
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.gyzj.jyzt') }}</div>
+            <el-select v-model="form.jyzt" disabled style="width: 100%;">
+              <el-option :label="$t('page.business.resource.jyzt.wjy')" :value="1" />
+              <el-option :label="$t('page.business.resource.jyzt.djy')" :value="3" />
+              <el-option :label="$t('page.business.resource.jyzt.jyz')" :value="5" />
+            </el-select>
           </div>
         </div>
       </div>
@@ -133,10 +160,10 @@
           <div class="line"></div>
           <div class="subtitle"> 稽查轨迹日志</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" />
+          @pagination="getJjcgjList" :limit="queryJcgjParams.pageSize"/>
       </div>
     </div>
   </div>
@@ -158,7 +185,7 @@ export default {
       queryJcgjParams: {
         pageNum: 1,
         ffjlId: null,
-        pageSize: 10,
+        pageSize: 5,
       }
     }
   },
@@ -172,20 +199,16 @@ export default {
       this.open = false
       this.$emit('callback')
     },
-    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)
+        if (this.queryJcgjParams.pageNum == 1) {
+          this.$refs.jcgjList.init(this.jcgjList)
+        } else {
+          this.$refs.jcgjList.add(this.jcgjList)
+        }
         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 2187fc2..36055b5 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
@@ -73,7 +73,7 @@ G<template>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="clrmm">
+            <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>
@@ -86,7 +86,7 @@ G<template>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="fhrmm">
+            <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>
@@ -98,7 +98,7 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="jdrmm">
+            <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>
@@ -252,7 +252,7 @@ export default {
           if (this.isBatch) {
             params.list = this.selectList
             if (this.selectList.length <= 0) {
-              this.$modal.msgError("请选择要操作的麻精药")
+              this.$modal.msgError("请选择要操作的给药制剂")
             } else {
               plczrq(params).then(response => {
                 this.open = false
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
index be80836..349baad 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
@@ -80,7 +80,7 @@ G<template>
         </div>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.clr')">
+            <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled />
             </el-form-item>
           </el-col>
@@ -91,7 +91,7 @@ G<template>
             </el-form-item>
           </el-col>
         </el-row>
-        <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="fhrId"/>
@@ -99,7 +99,7 @@ G<template>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="fhrmm">
+            <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>
@@ -111,11 +111,11 @@ G<template>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="jdrmm">
+            <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>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -275,7 +275,7 @@ export default {
           if (this.isBatch) {
             params.list = this.selectList
             if (this.selectList.length <= 0) {
-              this.$modal.msgError("请选择要操作的麻精药")
+              this.$modal.msgError("请选择要操作的给药制剂")
             } else {
               plczyj(params).then(response => {
                 this.open = false
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
index 35970c7..8b3d7fd 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
@@ -9,22 +9,39 @@ G<template>
             <el-col :span="24">
               <el-table :data="selectList" border>
                 <el-table-column :label="$t('page.business.resource.gyzj.mc')" align="left" prop="mc"
-                  :show-overflow-tooltip="true" width="120px" />
+                  :show-overflow-tooltip="true" width="100px" />
                 <el-table-column :label="$t('page.business.resource.gyzj.bh')" align="left" prop="bh"
-                  :show-overflow-tooltip="true" width="120px" />
+                  :show-overflow-tooltip="true" width="100px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.nd')" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.nd }}{{ scope.row.nddw }}
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('page.business.resource.gyzj.sxrq')" align="center" prop="sxrq"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.cctj')" align="center" prop="cctj"
+                  width="130px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ccwz')" align="center" prop="ccwz"
+                  width="130px" />
+                <el-table-column :label="$t('page.business.resource.gyzj.ckl')" align="center">
+                  <template slot-scope="scope">
+                    {{ scope.row.kc }}{{ scope.row.kcdw }}
+                  </template>
+                </el-table-column>
                 <el-table-column :label="$t('page.business.resource.gyzj.zytj')" align="center" width="250px">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.zytj" maxlength="50"
                       :placeholder="$t('form.placeholderInput')" />
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" width="250px">
+                <!-- <el-table-column :label="$t('page.business.resource.gyzj.ckmz')" align="center" width="250px">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.ckmz" maxlength="50"
-                      :placeholder="$t('form.placeholderInput')"><template slot="append">{{ scope.row.ckmzdw }}</template>
+                      :placeholder="$t('form.placeholderInput')"><template slot="append">{{ scope.row.ckmzdw
+                      }}</template>
                     </el-input>
                   </template>
-                </el-table-column>
+                </el-table-column> -->
                 <el-table-column :label="$t('page.business.resource.gyzj.md')" align="center" width="250px">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.xmId" maxlength="50"
@@ -49,41 +66,71 @@ G<template>
         </div>
         <div v-if="!isBatch">
           <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.gyzj.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.gyzj.mc')">
+                <el-input type="text" v-model="form.mc" maxlength="50" disabled />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.gyzj.bh')">
+                <el-input type="text" v-model="form.bh" maxlength="50" disabled />
               </el-form-item>
             </el-col>
           </el-row>
+
           <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.resource.gyzj.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.gyzj.sxrq')">
+                <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
+              </el-form-item>
+            </el-col>
+            <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>
+                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="zytj">
-                <el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <el-form-item :label="$t('page.business.resource.gyzj.cctj')">
+                <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t('page.business.resource.gyzj.ckmz')" prop="ckmz">
-                <el-input type="number" v-model="form.ckmz" maxlength="20" :placeholder="$t('form.placeholderInput')">
-                  <template slot="append">{{ form.ckmzdw }}</template>
+              <el-form-item :label="$t('page.business.resource.gyzj.ccwz')">
+                <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <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>
                 </el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="zytj">
+                <el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item :label="$t('page.business.resource.gyzj.md')" prop="xmId">
                 <el-input type="text" v-model="form.xmId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
+            <!-- <el-col :span="12">
+              <el-form-item :label="$t('page.business.resource.gyzj.ckmz')" prop="ckmz">
+                <el-input type="number" v-model="form.ckmz" maxlength="20" :placeholder="$t('form.placeholderInput')">
+                  <template slot="append">{{ form.ckmzdw }}</template>
+                </el-input>
+              </el-form-item>
+            </el-col> -->
           </el-row>
           <el-row>
             <el-col :span="24">
@@ -99,11 +146,11 @@ 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-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>
@@ -112,11 +159,11 @@ 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-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>
@@ -125,11 +172,11 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr1')" prop="ffr1Id">
-              <SelectDeptUser  v-model="form.ffr1Id" key="ffr1Id"/>
+              <SelectDeptUser v-model="form.ffr1Id" key="ffr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$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>
@@ -138,18 +185,18 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ffr2')" prop="ffr2Id">
-              <SelectDeptUser  v-model="form.ffr2Id" key="ffr2Id"/>
+              <SelectDeptUser v-model="form.ffr2Id" key="ffr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$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>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
               <el-input type="text" :value="form.qmyy" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -173,7 +220,7 @@ import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "Ff",
-  components: { SelectList,SelectDeptUser },
+  components: { SelectList, SelectDeptUser },
   data() {
     return {
       isBatch: false,
@@ -283,16 +330,13 @@ export default {
       this.form.ids = val.map(item => item.id)
       let tmp = []
       _.forEach(val, function (item) {
-        tmp.push({
-          id: item.id,
-          mc: item.mc,
-          bh: item.bh,
-          ckmzdw: item.kcdw,
-          zytj: null,
-          ckmz: null,
-          xmId: null,
-          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
       this.open = true
@@ -334,6 +378,14 @@ export default {
       this.form.mc = row.mc
       this.form.bh = row.bh
       this.form.ckmzdw = row.kcdw
+
+      this.form.sxrq = row.sxrq
+      this.form.nd = row.nd
+      this.form.nddw = row.nddw
+      this.form.cctj = row.cctj
+      this.form.ccwz = row.ccwz
+      this.form.ckl = row.ckl
+      this.form.ckldw = row.ckldw
       this.open = true
     },
     save() {
@@ -343,7 +395,7 @@ export default {
           if (this.isBatch) {
             params.list = this.selectList
             if (this.selectList.length <= 0) {
-              this.$modal.msgError("请选择要操作的麻精药")
+              this.$modal.msgError("请选择要操作的给药制剂")
             } else {
               plff(params).then(response => {
                 this.open = false
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index e7778c0..61e640b 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -1,17 +1,17 @@
 G<template>
   <div>
     <!-- 归还弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.guihuan')" :visible.sync="open" width="800px" append-to-body
+    <el-dialog :title="$t('page.business.resource.gyzj.guihuan')" :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">
-            <el-form-item :label="$t('page.business.resource.mjy.mc')">
+            <el-form-item :label="$t('page.business.resource.gyzj.mc')">
               <el-input type="text" v-model="form.mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.bh')">
+            <el-form-item :label="$t('page.business.resource.gyzj.bh')">
               <el-input type="text" v-model="form.bh" maxlength="50" disabled />
             </el-form-item>
           </el-col>
@@ -19,40 +19,40 @@ G<template>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.sxrq')">
+            <el-form-item :label="$t('page.business.resource.gyzj.sxrq')">
               <el-input type="text" v-model="form.sxrq" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.nd')">
+            <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>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.cctj')">
+            <el-form-item :label="$t('page.business.resource.gyzj.cctj')">
               <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ccwz')">
+            <el-form-item :label="$t('page.business.resource.gyzj.ccwz')">
               <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ckjz')">
+            <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>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.cksj')">
+            <el-form-item :label="$t('page.business.resource.gyzj.cksj')">
               <el-input type="text" v-model="form.ffrq" maxlength="50" disabled />
             </el-form-item>
           </el-col>
@@ -60,54 +60,56 @@ G<template>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ckmz')">
+            <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>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.md')">
+            <el-form-item :label="$t('page.business.resource.gyzj.md')">
               <el-input type="text" v-model="form.mdIds" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.rkwz')" prop="rkwz">
+            <el-form-item :label="$t('page.business.resource.gyzj.rkwz')" prop="rkwz">
               <el-input type="text" v-model="form.rkwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.rktj')" prop="rktj">
+            <el-form-item :label="$t('page.business.resource.gyzj.rktj')" prop="rktj">
               <el-input type="text" v-model="form.rktj" maxlength="50" :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.zytj')" prop="ghzytj">
+            <el-form-item :label="$t('page.business.resource.gyzj.zytj')" prop="ghzytj">
               <el-input type="text" v-model="form.ghzytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.rkmz')" prop="rkmz">
-              <el-input type="number" v-model="form.rkmz" maxlength="50" :placeholder="$t('form.placeholderInput')">
+            <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')">
                 <template slot="append">{{ form.kcdw }}</template>
               </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsl')" prop="jsl">
-              <el-input type="number" v-model="form.jsl" maxlength="50" :placeholder="$t('form.placeholderInput')">
+          <!-- <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsl')" prop="jsl">
+              <el-input type="number" v-model="form.jsl" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')">
                 <template slot="append">{{ form.kcdw }}</template>
               </el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.syl')" prop="syl">
+            <el-form-item :label="$t('page.business.resource.gyzj.syl')" prop="syl">
               <el-input type="number" v-model="form.syl" maxlength="50" :placeholder="$t('form.placeholderInput')">
                 <template slot="append">{{ form.kcdw }}</template>
               </el-input>
@@ -127,38 +129,41 @@ G<template>
 
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ghr1Id')" prop="ghr1Id">
-              <SelectDeptUser v-model="form.ghr1Id" key="ghr1Id" />
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')" prop="ghr1Id">
+              <el-input type="text" :value="form.ghr1Mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="ghr1mm">
-              <el-input type="password" v-model="form.ghr1mm" maxlength="20"
-                :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')" prop="ghr2Id">
+              <el-input type="text" :value="form.ghr2Mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ghr2Id')" prop="ghr2Id">
-              <SelectDeptUser v-model="form.ghr2Id" key="ghr2Id" />
+          <!-- <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr1Id')+$t('form.password')" prop="ghr1mm">
+              <el-input type="password" v-model="form.ghr1mm" maxlength="20"
+                :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="ghr2mm">
+          </el-col> -->
+          <!-- <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.ghr2Id')+$t('form.password')" prop="ghr2mm">
               <el-input type="password" v-model="form.ghr2mm" maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
-          </el-col>
+          </el-col> -->
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsr1Id')" prop="jsr1Id">
+          <!-- <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')" prop="jsr1Id">
               <SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" />
             </el-form-item>
+          </el-col> -->
+           <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('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>
@@ -166,22 +171,22 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.jsr2Id')" prop="jsr2Id">
+            <el-form-item :label="$t('page.business.resource.gyzj.jsr2Id')" prop="jsr2Id">
               <SelectDeptUser v-model="form.jsr2Id" key="jsr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$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>
           </el-col>
         </el-row>
+
         <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-input type="text" :value="form.qmyy" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -291,19 +296,56 @@ export default {
   created() {
   },
   methods: {
+    // rklChange() {
+    //   if (!isNaN(this.form.rkmz)) {
+    //     this.form.jsl = _.subtract(parseFloat(this.form.ckmz), parseFloat(this.form.rkmz))
+    //   }else{
+    //     this.form.jsl = ''
+    //   }
+    // },
     cancel() {
       this.open = false
     },
     reset() {
-      this.form = {}
+      this.form = {
+        id:null,
+        rkwz:null,
+        rktj:null,
+        ghzytj: null,
+        rkmz: null,
+        jsl:null,
+        syl:null,
+        ghr1Id: null,
+        ghr1mm: null,
+        ghr2Id:null,
+        ghr2mm: null,
+        jsr1Id:null,
+        jsr1mm: null,
+        jsr2Id:null,
+        jsr2mm:null,
+        qmyy:'归还',
+      }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
+      let that=this
       info({ id: row.id }).then(response => {
-        this.form = response.data
-        this.form.qmyy = '归还'
-        this.open = true
+        that.form.id = response.data.id
+        that.form.mc = response.data.mc
+        that.form.bh = response.data.bh
+        that.form.sxrq = response.data.sxrq
+        that.form.nd = response.data.nd
+        that.form.nddw = response.data.nddw
+        that.form.cctj = response.data.cctj
+        that.form.ccwz = response.data.ccwz
+        that.form.ckl = response.data.ckl
+        that.form.ckldw = response.data.ckldw
+        that.form.ffrq = response.data.ffrq
+        that.form.ckmz = response.data.ckmz
+        that.form.ckmzdw = response.data.ckmzdw
+        that.form.mdIds = response.data.mdIds
+        that.open = true
       })
     },
     save() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Js.vue b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
index 7962037..a6e9138 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Js.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
@@ -38,7 +38,7 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
+            <el-form-item :label="$t('form.signerform.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
@@ -96,7 +96,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '解锁麻精药',
+        qmyy: '解锁给药制剂',
         qmrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sd.vue b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
index eceb15d..8afc0cd 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
@@ -118,7 +118,7 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '锁定麻精药',
+        qmyy: '锁定给药制剂',
         qmrmm: null
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
index 686f3fb..f021717 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
@@ -185,7 +185,7 @@ export default {
         qmrmm: null,
         bjrMc: null,
         bjbz: null,
-        qmyy: '同意编辑',
+        qmyy: 10,
         remark: ''
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
index cb8b140..d089106 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
@@ -107,6 +107,11 @@ export default {
           required: true,
           message: ' ',
           trigger: 'blur'
+        }],
+        qmyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
         }]
       }
     }
@@ -132,7 +137,7 @@ export default {
         qmrmm: null,
         kcbjrMc: null,
         kcbjbz: null,
-        qmyy: '同意修改库存',
+        qmyy: 10,
         remark: ''
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
index bc73f4d..296db9d 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
@@ -110,7 +110,7 @@ G<template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.gyzj.czlx')" align="center" prop="qmyy"
                 :show-overflow-tooltip="true" />
-              <el-table-column :label="$t('page.business.resource.gyzj.ffjsr')" align="center"
+              <el-table-column :label="$t('page.business.resource.gyzj.czl')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   {{ scope.row.czl }}{{ scope.row.czldw }}
diff --git a/src/views/business/resource/mjy/comps/mjy/Shbj.vue b/src/views/business/resource/mjy/comps/mjy/Shbj.vue
index 7c41e2f..22d004f 100644
--- a/src/views/business/resource/mjy/comps/mjy/Shbj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Shbj.vue
@@ -185,7 +185,7 @@ export default {
         qmrmm: null,
         bjrMc: null,
         bjbz: null,
-        qmyy: '同意编辑',
+        qmyy: 10,
         remark: ''
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
index 677fbcc..3a692a8 100644
--- a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
@@ -107,6 +107,11 @@ export default {
           required: true,
           message: ' ',
           trigger: 'blur'
+        }],
+        qmyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
         }]
       }
     }
@@ -132,7 +137,7 @@ export default {
         qmrmm: null,
         kcbjrMc: null,
         kcbjbz: null,
-        qmyy: '同意修改库存',
+        qmyy: 10,
         remark: ''
       }
       this.resetForm("form")