diff --git a/src/api/business/mjy/mjy.js b/src/api/business/mjy/mjy.js
index 348fdcf..fb11103 100644
--- a/src/api/business/mjy/mjy.js
+++ b/src/api/business/mjy/mjy.js
@@ -191,6 +191,15 @@ export function gh(data) {
   })
 }
 
+//入库
+export function rk(data) {
+  return request({
+    url: '/system/business/mjy/rk',
+    method: 'post',
+    data: data
+  })
+}
+
 //台账列表
 export function tzList(query) {
   return request({
diff --git a/src/lang/zh/business/resource/gyzj.js b/src/lang/zh/business/resource/gyzj.js
index ee817a4..b6876be 100644
--- a/src/lang/zh/business/resource/gyzj.js
+++ b/src/lang/zh/business/resource/gyzj.js
@@ -24,7 +24,7 @@ export default {
     yslqr2:'钥匙2领取人',
   kgy1: '库管员',
   kgy2: '库管员2',
-
+rkmz:'入库毛重',
   plff: '批量发放',
   plczyj: '批量处置药剂',
   plczrq: '批量处置容器',
@@ -90,7 +90,7 @@ export default {
   ghr2Id: '归还人2',
   jsr1Id: '库管员',
   jsr2Id: '库管员2',
-  tz: '台账',
+  tz: '给药制剂台账',
   gdsqrId: '归档申请人',
   lqsj: '领取时间',
   jcgj: '稽查轨迹',
diff --git a/src/lang/zh/business/resource/mjy.js b/src/lang/zh/business/resource/mjy.js
index 6b1a7d4..68adcc9 100644
--- a/src/lang/zh/business/resource/mjy.js
+++ b/src/lang/zh/business/resource/mjy.js
@@ -1,109 +1,112 @@
 export default {
-    mc:'名称',
-    bh:'编号',
-    jyzt:'借阅状态',
-    zjzt:'制剂状态',
-    jlzt:'记录状态',
-    sxrq:'失效日期',
-    nd:'浓度',
-    nddw:'浓度单位',
-    kcl:'库存量',
-    kc:'库存',
-    kcdw:'库存单位',
-    zcg:'暂存柜',
-    cctj:'存储条件',
-    ccwz:'存储位置',
-    cksj:'出库时间',
-    rksj:'入库时间',
-    ckjz:'出库净重',
-    rkjz:'入库净重',
-    syl:'使用量',
-    lqr1:'领取人',
-    lqr2:'领取人2',
-    yslqr1:'钥匙1领取人',
-    yslqr2:'钥匙2领取人',
-    kgy1:'库管员',
-    kgy2:'库管员2',
+  mc: '名称',
+  bh: '编号',
+  jyzt: '借阅状态',
+  zjzt: '制剂状态',
+  jlzt: '记录状态',
+  sxrq: '失效日期',
+  nd: '浓度',
+  nddw: '浓度单位',
+  kcl: '库存量',
+  kc: '库存',
+  kcdw: '库存单位',
+  zcg: '暂存柜',
+  cctj: '存储条件',
+  ccwz: '存储位置',
+  cksj: '出库时间',
+  rksj: '入库时间',
+  ckjz: '出库净重',
+  rkjz: '入库净重',
+  syl: '使用量',
+  lqr1: '领取人',
+  lqr2: '领取人2',
+  yslqr1: '钥匙1领取人',
+  yslqr2: '钥匙2领取人',
+  kgy1: '库管员',
+  kgy2: '库管员2',
 
-    plff:'批量发放',
-    plczyj:'批量处置药剂',
-    plczrq:'批量处置容器',
-    ysff:'钥匙发放',
-    plsd:'批量锁定',
-    plgd:'批量归档',
-    lock:'锁定',
-    unlock:'解锁',
-    detail:'详情',
-    guidang:'归档',
-    jiedang:'解档',
-    jieyue:'借阅',
-    guihuan:'归还',
-    fafang:'发放',
-    ysff:'钥匙发放',
-    czrq:'处置容器',
-    czyj:'处置药剂',
-    yuanyin:'原因',
-    xgkc:'修改库存',
-    shxgkc:'审核修改库存',
-    shbj:'审核编辑',
-    clr:'处理人',
-    czfs:'处置方式',
-    fhr:'复核人',
-    xgbz:'修改备注',
-    jdr:'监督人',
-    xgr:'修改人',
-    czl:'处置量',
-    ffr:'发放人',
-    ffr1:'发放人1',
-    ffr2:'发放人2',
-    zytj:'转移条件',
-    md:'目的',
-    ckmz:'出库毛重',
-    ckl:'出库量',
-    ckldw:'出库单位',
-    ffzytj:'发放转移条件',
-    ghzytj:'归还转移条件',
-    ckmz:'出库毛重',
-    ckmzdw:'出库毛重单位',
-    ys1lrq:'钥匙1领取人',
-    ys2lrq:'钥匙2领取人',
-    sssy:'所属试验',
-    ssbd:'所属表单',
-    bdssr:'表单所属人',
-    syr:'使用人',
-    lqghr:'领取/归还人',
-    ffjsr:'发放/接收人',
-    czlx:'操作类型',
-    czl:'操作量',
-    bzyy:'备注/原因',
-    ccsj:'操作时间',
-    cksj:'出库时间',
-    rksj:'入库时间',
-    jiaqian:'加签',
-    mjygl:'麻精药管理',
-    ffhsjl:'发放回收记录',
-
-    bdxx:'表单信息',
-    jbxx:'基本信息',
-    rkwz:'入库位置',
-    rktj:'入库条件',
-    zytj:'转移条件',
-    rkmz:'入库毛重',
-    jsl:'减少量',
-    syl:'使用量',
-    ghr1Id:'归还人',
-    ghr2Id:'归还人2',
-    jsr1Id:'库管员',
-    jsr2Id:'库管员2',
-    tz:'麻精药台账',
-    lqsj:'领取时间',
-    jcgj:'稽查轨迹',
-    ffbz:'发放备注',
-    ghbz:'归还备注',
-    cjsj:'创建时间',
-    rkl:'入库毛重',
-    jysj:'借阅时间',
-    mjyxq:'麻精药详情',
-    ffjlxq:'发放回收记录详情',
-    
-}
\ No newline at end of file
+  plff: '批量发放',
+  plczyj: '批量处置药剂',
+  plczrq: '批量处置容器',
+  ysff: '钥匙发放',
+  plsd: '批量锁定',
+  plgd: '批量归档',
+  lock: '锁定',
+  unlock: '解锁',
+  detail: '详情',
+  guidang: '归档',
+  jiedang: '解档',
+  jieyue: '借阅',
+  guihuan: '归还',
+  fafang: '发放',
+  ysff: '钥匙发放',
+  czrq: '处置容器',
+  czyj: '处置药剂',
+  yuanyin: '原因',
+  xgkc: '修改库存',
+  shxgkc: '审核修改库存',
+  shbj: '审核编辑',
+  clr: '处理人',
+  czfs: '处置方式',
+  fhr: '复核人',
+  xgbz: '修改备注',
+  jdr: '监督人',
+  xgr: '修改人',
+  czl: '处置量',
+  ffr: '发放人',
+  ffr1: '发放人1',
+  ffr2: '发放人2',
+  zytj: '转移条件',
+  md: '目的',
+  ckmz: '出库毛重',
+  ckl: '出库量',
+  ckldw: '出库单位',
+  ffzytj: '发放转移条件',
+  ghzytj: '归还转移条件',
+  ckmz: '出库毛重',
+  ckmzdw: '出库毛重单位',
+  ys1lrq: '钥匙1领取人',
+  ys2lrq: '钥匙2领取人',
+  sssy: '所属试验',
+  ssbd: '所属表单',
+  bdssr: '表单所属人',
+  syr: '使用人',
+  lqghr: '领取/归还人',
+  ffjsr: '发放/接收人',
+  czlx: '操作类型',
+  czl: '操作量',
+  bzyy: '备注/原因',
+  ccsj: '操作时间',
+  cksj: '出库时间',
+  rksj: '入库时间',
+  jiaqian: '加签',
+  mjygl: '麻精药管理',
+  ffhsjl: '发放回收记录',
+  ruku: '入库',
+  bdxx: '表单信息',
+  jbxx: '基本信息',
+  rkwz: '入库位置',
+  rktj: '入库条件',
+  zytj: '转移条件',
+  rkmz: '入库毛重',
+  jsl: '减少量',
+  syl: '使用量',
+  ghr1Id: '归还人',
+  ghr2Id: '归还人2',
+  jsr1Id: '库管员',
+  jsr2Id: '库管员2',
+  tz: '麻精药台账',
+  lqsj: '领取时间',
+  jcgj: '稽查轨迹',
+  ffbz: '发放备注',
+  ghbz: '归还备注',
+  cjsj: '创建时间',
+  rkl: '入库毛重',
+  jysj: '借阅时间',
+  mjyxq: '麻精药详情',
+  ffjlxq: '发放回收记录详情',
+  sswjj:'所属文件夹',
+  ssbd:'所属表单',
+  qmr1Id:'签名人1',
+  qmr2Id:'签名人2',
+}
diff --git a/src/lang/zh/business/resource/resource.js b/src/lang/zh/business/resource/resource.js
index 14d00f6..53e2a99 100644
--- a/src/lang/zh/business/resource/resource.js
+++ b/src/lang/zh/business/resource/resource.js
@@ -1,6 +1,7 @@
 export default {
   zjzt: {
     rk: '入库',
+    wrk: '未入库',
     yff: '已发放',
     ysd: '已锁定',
     dgd: '待归档',
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
index 18554b3..37b2f37 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue
@@ -8,7 +8,6 @@
       </div>
       <div class="right-top">
         <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.ffjlxq')
@@ -61,9 +60,7 @@
           </div>
           <div class="right">
             <div class="right-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>
+            <el-input type="text" :value="form.ffrq" maxlength="50" disabled />
           </div>
         </div>
         <div class="pal">
@@ -107,7 +104,14 @@
             <el-input type="text" :value="form.rkl" maxlength="50" disabled> <template slot="append">{{ form.rkldw
                 }}</template>
             </el-input>
-
+          </div>
+        </div>
+         <div class="pal">
+          <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>
+            </el-input>
           </div>
         </div>
         <div class="pal">
@@ -189,9 +193,6 @@ export default {
   created() {
   },
   methods: {
-    exportExcel() {
-      alert('todo')
-    },
     cancel() {
       this.open = false
       this.$emit('callback')
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index c075da0..5848569 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -92,6 +92,13 @@
               </el-input>
             </el-form-item>
           </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')">
+                <template slot="append">{{ form.ckldw }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -190,6 +197,11 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
+        rkmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
         rkl: [{
           required: true,
           message: ' ',
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Js.vue b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
index 1fcee18..2472922 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Js.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
@@ -24,7 +24,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.signerform.signer')">
+            <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
index 144258f..3c4354f 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
@@ -13,7 +13,7 @@
         </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>
+      }}<img src="@/assets/images/detail-title.png" /></div>
       <div class="detail-content">
         <div class="content-left">
           <div class="content-title">
@@ -96,22 +96,42 @@
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
-              <el-table-column :label="$t('page.business.resource.gyzj.syr')" align="center" prop="qmrMc"
-                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.gyzj.syr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.qmrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.qmrMcEn }}
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('page.business.resource.gyzj.lqghr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                  {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+
+                  </div>
+                  <div v-else>
+                    {{ scope.row.lqrMcEn }}{{ scope.row.ghrMcEn }}
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.gyzj.ffjsr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                  {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.ffrMcEn }}{{ scope.row.jsrMcEn }}
+                  </div>
                 </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.czlx')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="100" />
               <el-table-column :label="$t('page.business.resource.gyzj.czl')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
diff --git a/src/views/business/resource/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
index 59540bb..54547d6 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
@@ -8,7 +8,6 @@
       </div>
       <div class="right-top">
         <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.ffjlxq')
@@ -195,9 +194,7 @@ export default {
   created() {
   },
   methods: {
-    exportExcel() {
-      alert('todo')
-    },
+   
     cancel() {
       this.open = false
       this.$emit('callback')
diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue
index 6132007..9d0abd7 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue
@@ -96,21 +96,41 @@
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
-              <el-table-column :label="$t('page.business.resource.mjy.syr')" align="center" prop="qmrMc"
-                :show-overflow-tooltip="true" />
+              <el-table-column :label="$t('page.business.resource.mjy.syr')" align="center"
+                :show-overflow-tooltip="true">
+                <template slot-scope="scope">
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.qmrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.qmrMcEn }}
+                  </div>
+                </template>
+              </el-table-column>
               <el-table-column :label="$t('page.business.resource.mjy.lqghr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                  {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.lqrMc }}{{ scope.row.ghrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.lqrMcEn }}{{ scope.row.ghrMcEn }}
+                  </div>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.mjy.ffjsr')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                  {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                  <div v-if="$i18n.locale === 'zh_CN'">
+                    {{ scope.row.ffrMc }}{{ scope.row.jsrMc }}
+                  </div>
+                  <div v-else>
+                    {{ scope.row.ffrMcEn }}{{ scope.row.jsrMcEn }}
+                  </div>
                 </template>
               </el-table-column>
-               <el-table-column :label="$t('page.business.resource.mjy.czlx')" align="center" :prop="$i18n.locale === 'zh_CN'?'qmyy':'qmyyEn'" width="100" />
+              <el-table-column :label="$t('page.business.resource.mjy.czlx')" align="center"
+                :prop="$i18n.locale === 'zh_CN' ? 'qmyy' : 'qmyyEn'" width="100" />
               <el-table-column :label="$t('page.business.resource.mjy.czl')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
@@ -135,8 +155,7 @@
           </div>
           <jcgjList ref="jcgjList" @handleQuery="getJjcgjList" />
 
-          <pagination v-show="jcgjTotal > 0" :total="jcgjTotal"
-            @pagination="getJjcgjList" />
+          <pagination v-show="jcgjTotal > 0" :total="jcgjTotal" @pagination="getJjcgjList" />
         </div>
       </div>
     </div>
diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue
index 484447e..8ec4cb2 100644
--- a/src/views/business/resource/mjy/comps/mjyList.vue
+++ b/src/views/business/resource/mjy/comps/mjyList.vue
@@ -116,6 +116,7 @@
           <el-table-column :label="$t('page.business.resource.mjy.zjzt')" align="center" width="100px" fixed="right">
             <template slot-scope="scope">
               <span v-if="scope.row.zjzt == 1">{{ $t('page.business.resource.resource.zjzt.rk') }}</span>
+              <span v-if="scope.row.zjzt == 2">{{ $t('page.business.resource.resource.zjzt.wrk') }}</span>
               <span v-if="scope.row.zjzt == 3">{{ $t('page.business.resource.resource.zjzt.yff') }}</span>
               <span v-if="scope.row.zjzt == 5">{{ $t('page.business.resource.resource.zjzt.ysd') }}</span>
               <span v-if="scope.row.zjzt == 7">{{ $t('page.business.resource.resource.zjzt.dgd') }}</span>
@@ -184,6 +185,11 @@
                 <el-button type="text" @click="handleGh(scope.row)" v-hasPermi="['business:resource:mjy:gh']">{{
                   $t('page.business.resource.mjy.guihuan') }}</el-button>
               </template>
+               <template v-if="scope.row.zjzt == 2">
+                <!-- 入库 -->
+                <el-button type="text" @click="handleRk(scope.row)" v-hasPermi="['business:resource:mjy:rk']">{{
+                  $t('page.business.resource.mjy.ruku') }}</el-button>
+              </template>
               <template v-if="scope.row.zjzt == 9">
                 <!-- 解档 -->
                 <el-button type="text" @click="handleJd(scope.row)" v-hasPermi="['business:resource:mjy:jd']">{{
@@ -219,6 +225,8 @@
       <Jy key="Jy" ref="Jy" @callback="handleQuery" />
       <!-- 归还 -->
       <Gh key="Gh" ref="Gh" @callback="handleQuery" />
+      <!-- 入库 -->
+      <Rk key="Rk" ref="Rk" @callback="handleQuery" />
       <!-- 发放 -->
       <Ff key="Ff" ref="Ff" @callback="handleQuery" />
       <!-- 处置药剂 -->
@@ -246,6 +254,7 @@ import Xgkc from "./mjy/Xgkc";
 import Shxgkc from "./mjy/Shxgkc";
 import Jy from "./mjy/Jy";
 import Gh from "./mjy/Gh";
+import Rk from "./mjy/Rk";
 import Ff from "./mjy/Ff";
 import Czrq from "./mjy/Czrq";
 import Czyj from "./mjy/Czyj";
@@ -254,7 +263,7 @@ import moment from "moment";
 
 export default {
   name: "MjyList",
-  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Czyj, Czrq, Ff, Ysff },
+  components: { Rk,Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Czyj, Czrq, Ff, Ysff },
   data() {
     return {
       daterange: [],
@@ -339,6 +348,10 @@ export default {
     handleGh(row) {
       this.$refs.Gh.show(row)
     },
+     //入库
+    handleRk(row) {
+      this.$refs.Rk.show(row)
+    },
     //是否可勾选
     checkSelectable(row) {
       return true;