From 17a255203ea2751103691903ce3ed31746b9f0ca Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Fri, 26 Dec 2025 16:23:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A[=E8=B5=84=E6=BA=90=E5=BA=93?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86][=E9=BA=BB=E7=B2=BE=E8=8D=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86]=E5=BD=92=E8=BF=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/business/gyzj/gyzj.js                      |  18 +-
 src/lang/en/business/resource/gyzj/gyzj.js         |   3 +-
 src/lang/en/business/resource/mjy/mjy.js           |   2 +
 src/lang/zh/business/resource/gyzj/gyzj.js         |   2 +
 src/lang/zh/business/resource/mjy/mjy.js           |  23 +-
 src/layout/index.vue                               |   2 +-
 src/views/business/resource/gyzj/comps/gyzj/Gh.vue | 285 +++++++++++++++---
 src/views/business/resource/gyzj/comps/gyzj/Xq.vue |   6 +-
 .../business/resource/gyzj/comps/gyzjList.vue      |   9 +-
 src/views/business/resource/mjy/comps/ffjl/Xq.vue  | 155 +++++-----
 src/views/business/resource/mjy/comps/ffjlList.vue |  12 +-
 src/views/business/resource/mjy/comps/mjy/Czrq.vue |   6 +-
 src/views/business/resource/mjy/comps/mjy/Czyj.vue |   6 +-
 src/views/business/resource/mjy/comps/mjy/Ff.vue   | 126 +++++---
 src/views/business/resource/mjy/comps/mjy/Gh.vue   | 321 ++++++++++++++++++---
 src/views/business/resource/mjy/comps/mjy/Xq.vue   |   8 +-
 16 files changed, 753 insertions(+), 231 deletions(-)

diff --git a/src/api/business/gyzj/gyzj.js b/src/api/business/gyzj/gyzj.js
index 6200543..45744b2 100644
--- a/src/api/business/gyzj/gyzj.js
+++ b/src/api/business/gyzj/gyzj.js
@@ -24,7 +24,14 @@ export function info(query) {
     params: query
   })
 }
-
+//归还
+export function gh(data) {
+  return request({
+    url: '/system/business/gyzj/gh',
+    method: 'post',
+    data: data
+  })
+}
 // 编辑
 export function bj(data) {
   return request({
@@ -172,14 +179,7 @@ export function ysff(data) {
   })
 }
 
-//归还
-export function gh(data) {
-  return request({
-    url: '/system/business/gyzj/gh',
-    method: 'post',
-    data: data
-  })
-}
+
 
 //台账列表
 export function tzList(query) {
diff --git a/src/lang/en/business/resource/gyzj/gyzj.js b/src/lang/en/business/resource/gyzj/gyzj.js
index 9706e1e..3edb9e8 100644
--- a/src/lang/en/business/resource/gyzj/gyzj.js
+++ b/src/lang/en/business/resource/gyzj/gyzj.js
@@ -79,6 +79,7 @@ export default {
     jiaqian:'加签',
     gyzjgl:'给药制剂管理',
     ffhsjl:'发放回收记录',
-
+    jcgj:'稽查轨迹',
+    tz:'台账'
   
 }
\ 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 e9edb61..826f530 100644
--- a/src/lang/en/business/resource/mjy/mjy.js
+++ b/src/lang/en/business/resource/mjy/mjy.js
@@ -77,4 +77,6 @@ export default {
     cksj:'出库时间',
     rksj:'入库时间',
 
+    jcgj:'稽查轨迹',
+  tz:'台账'
 }
\ 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 587e823..f0e19be 100644
--- a/src/lang/zh/business/resource/gyzj/gyzj.js
+++ b/src/lang/zh/business/resource/gyzj/gyzj.js
@@ -80,6 +80,8 @@ export default {
     gyzjgl:'给药制剂管理',
     ffhsjl:'发放回收记录',
 
+    jcgj:'稽查轨迹',
+  tz:'台账'
   
   
 }
\ No newline at end of file
diff --git a/src/lang/zh/business/resource/mjy/mjy.js b/src/lang/zh/business/resource/mjy/mjy.js
index 8497f56..e22134c 100644
--- a/src/lang/zh/business/resource/mjy/mjy.js
+++ b/src/lang/zh/business/resource/mjy/mjy.js
@@ -59,7 +59,8 @@ export default {
     ckmz:'出库毛重',
     ckl:'出库量',
     ckldw:'出库单位',
-    ffzytj:'转移条件',
+    ffzytj:'发放转移条件',
+    ghzytj:'归还转移条件',
     ckmz:'出库毛重',
     ckmzdw:'出库毛重单位',
     ys1lrq:'钥匙1领取人',
@@ -80,6 +81,22 @@ export default {
     mjygl:'麻精药管理',
     ffhsjl:'发放回收记录',
 
-  
-  
+    rkwz:'入库位置',
+    rktj:'入库条件',
+    zytj:'转移条件',
+    rkmz:'入库毛重',
+    jsl:'减少量',
+    syl:'使用量',
+    ghr1Id:'归还人1',
+    ghr2Id:'归还人2',
+    jsr1Id:'库管员1',
+    jsr2Id:'库管员2',
+  tz:'台账',
+  lqsj:'领取时间',
+    jcgj:'稽查轨迹',
+    ffbz:'发放备注',
+    ghbz:'归还备注',
+    gdsqr:'发放备注',
+    cjsj:'创建时间',
+    rkl:'入库毛重',
 }
\ No newline at end of file
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 7a2768c..e8b7c38 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -5,7 +5,7 @@
     <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
         <navbar @setLayout="setLayout"/>
-        <!-- <tags-view v-if="needTagsView"/> -->
+        <tags-view v-if="needTagsView"/>
       </div>
       <app-main/>
       <settings ref="settingRef"/>
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index 1b56e50..e7778c0 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -1,30 +1,116 @@
 G<template>
   <div>
     <!-- 归还弹窗 -->
-    <el-dialog :title="$t('page.business.resource.gyzj.guihuan')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.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="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-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-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-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.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-input type="text" v-model="form.bh" 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.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-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.mjy.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-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-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.mjy.cksj')">
+              <el-input type="text" v-model="form.ffrq" 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.ckmz')">
+              <el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
+              }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.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-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-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-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')">
+                <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')">
+                <template slot="append">{{ form.kcdw }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.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>
             </el-form-item>
           </el-col>
         </el-row>
@@ -37,18 +123,65 @@ G<template>
             </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
+          <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>
+          </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>
+          </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-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$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-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.jsr1Id')" prop="jsr1Id">
+              <SelectDeptUser v-model="form.jsr1Id" key="jsr1Id" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="jsr1mm">
+              <el-input type="password" v-model="form.jsr1mm" 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.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-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.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -62,12 +195,13 @@ G<template>
 </template>
 
 <script>
-import { gh } from "@/api/business/gyzj/gyzj"
+import { gh, info } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "Gh",
-  components: {  },
+  components: { SelectDeptUser },
   data() {
     return {
       isBatch: false,
@@ -76,7 +210,72 @@ export default {
       open: false,
       form: {},
       rules: {
-        qmrmm: [{
+        rkwz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rktj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghzytj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rkmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        syl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr2mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -96,31 +295,25 @@ export default {
       this.open = false
     },
     reset() {
-      this.form = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '归还',
-        qmrmm: null
-      }
+      this.form = {}
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
+      info({ id: row.id }).then(response => {
+        this.form = response.data
+        this.form.qmyy = '归还'
+        this.open = true
+      })
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          
-            gh(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+
+          gh(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
index 84b80ca..bc73f4d 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue
@@ -8,7 +8,7 @@ G<template>
           <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>
@@ -90,7 +90,7 @@ G<template>
           </div>
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 给药制剂台账</div>
+            <div class="subtitle"> {{ $t('page.business.resource.gyzj.tz') }}</div>
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
@@ -130,7 +130,7 @@ G<template>
         <div class="content-right">
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 稽查轨迹日志</div>
+            <div class="subtitle"> {{ $t('page.business.resource.gyzj.jcgj') }}</div>
           </div>
           <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />
 
diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue
index 3637027..ccf3fa5 100644
--- a/src/views/business/resource/gyzj/comps/gyzjList.vue
+++ b/src/views/business/resource/gyzj/comps/gyzjList.vue
@@ -60,12 +60,11 @@
               v-hasPermi="['business:resource:gyzj:czyj']">{{
                 $t('page.business.resource.gyzj.plczyj') }}</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <!-- 批量处置容器 -->
+          <!-- <el-col :span="1.5">
             <el-button type="primary" :disabled="multiple" @click="handlePlczrq"
               v-hasPermi="['business:resource:gyzj:czrq']">{{
                 $t('page.business.resource.gyzj.plczrq') }}</el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <!-- 钥匙发放 -->
             <el-button type="primary" :disabled="multiple" @click="handleYsff"
@@ -146,9 +145,9 @@
                 <el-button type="text" @click="handleCzyj(scope.row)" v-hasPermi="['business:resource:gyzj:czyj']">{{
                   $t('page.business.resource.gyzj.czyj') }}</el-button>
                 <!-- 处置容器 -->
-                <el-button v-if="scope.row.rqzt == 1" type="text" @click="handleCzrq(scope.row)"
+                <!-- <el-button v-if="scope.row.rqzt == 1" type="text" @click="handleCzrq(scope.row)"
                   v-hasPermi="['business:resource:gyzj:czrq']">{{
-                    $t('page.business.resource.gyzj.czrq') }}</el-button>
+                    $t('page.business.resource.gyzj.czrq') }}</el-button> -->
                 <!-- 编辑 -->
                 <el-button v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
                   v-hasPermi="['business:resource:gyzj:bj']">{{
diff --git a/src/views/business/resource/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue
index 616593b..1b2aa85 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Xq.vue
+++ b/src/views/business/resource/mjy/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.mjy.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.mjy.sxrq') }}</div>
+            <el-input type="text" :value="form.sxrq" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.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.mjy.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.mjy.zcg') }}</div>
-            <el-input type="text" :value="form.zcgMc" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.mjy.cctj') }}</div>
+            <el-input type="text" :value="form.cctj" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.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.mjy.md') }}</div>
-            <el-input type="text" :value="form.mdMc" maxlength="50" disabled />
+            <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>
+            </el-input>
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.zytj') }}</div>
-            <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
+            <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>
+            </el-input>
           </div>
         </div>
         <div class="pal">
           <div class="left">
-            <div class="left-title">{{ $t('page.business.resource.mjy.cksj') }}</div>
-            <el-input type="text" :value="form.ffrq" maxlength="50" disabled />
-          </div>
-          <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.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.mjy.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.mjy.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.mjy.lqr1') }}</div>
-            <el-input type="text" :value="form.lqr1Mc" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.mjy.ffzytj') }}</div>
+            <el-input type="text" :value="form.ffzytj" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.lqr2') }}</div>
-            <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
+            <div class="right-title">{{ $t('page.business.resource.mjy.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.mjy.kgy1') }}</div>
-            <el-input type="text" :value="form.kgy1Mc" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.mjy.lqr2') }}</div>
+            <el-input type="text" :value="form.lqr2Mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.kgy2') }}</div>
-            <el-input type="text" :value="form.kgy2Mc" maxlength="50" disabled />
+            <div class="right-title">{{ $t('page.business.resource.mjy.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.mjy.rksj') }}</div>
-            <el-input type="text" :value="form.ghrq" maxlength="50" disabled />
+            <div class="left-title">{{ $t('page.business.resource.mjy.ghr2Id') }}</div>
+            <el-input type="text" :value="form.ghr2Mc" maxlength="50" disabled />
           </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.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.mjy.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.mjy.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.mjy.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.mjy.ffbz') }}</div>
+            <el-input type="text" :value="form.ffbz" maxlength="50" disabled />
+          </div>
           <div class="right">
-            <div class="right-title">{{ $t('page.business.resource.mjy.zytj') }}</div>
-            <el-input type="text" :value="form.ghzytj" maxlength="50" disabled />
+            <div class="right-title">{{ $t('page.business.resource.mjy.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.mjy.ghbz') }}</div>
+            <el-input type="text" :value="form.ghbz" maxlength="50" disabled />
+          </div>
+          <div class="right">
+            <div class="right-title">{{ $t('page.business.resource.mjy.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.mjy.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.mjy.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/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue
index 0d4aa45..d372969 100644
--- a/src/views/business/resource/mjy/comps/ffjlList.vue
+++ b/src/views/business/resource/mjy/comps/ffjlList.vue
@@ -97,14 +97,14 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.mjy.cksj')" align="center" prop="ffrq" width="150px" />
           <el-table-column :label="$t('page.business.resource.mjy.rksj')" align="center" prop="ghrq" width="150px" />
-          <el-table-column :label="$t('page.business.resource.mjy.ckjz')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.mjy.ckmz')" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.ckl }} {{ scope.row.ckldw }}
+              {{ scope.row.ckmz }} {{ scope.row.ckmzdw }}
             </template>
           </el-table-column>
-          <el-table-column :label="$t('page.business.resource.mjy.rkjz')" align="center" width="150px">
+          <el-table-column :label="$t('page.business.resource.mjy.rkmz')" align="center" width="150px">
             <template slot-scope="scope">
-              {{ scope.row.rkl }} {{ scope.row.rkldw }}
+              {{ scope.row.rkmz }} {{ scope.row.rkmzdw }}
             </template>
           </el-table-column>
           <el-table-column :label="$t('page.business.resource.mjy.syl')" align="center" width="150px">
@@ -116,9 +116,9 @@
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.mjy.lqr2')" align="center" prop="lqr2Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.kgy1')" align="center" prop="kgy1Mc"
+          <el-table-column :label="$t('page.business.resource.mjy.kgy1')" align="center" prop="jsr1Mc"
             :show-overflow-tooltip="true" />
-          <el-table-column :label="$t('page.business.resource.mjy.kgy2')" align="center" prop="kgy2Mc"
+          <el-table-column :label="$t('page.business.resource.mjy.kgy2')" align="center" prop="jsr2Mc"
             :show-overflow-tooltip="true" />
           <el-table-column :label="$t('page.business.resource.mjy.zcg')" align="center" prop="zcgMc"
             :show-overflow-tooltip="true" />
diff --git a/src/views/business/resource/mjy/comps/mjy/Czrq.vue b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
index eda393e..fd9fdc1 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czrq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/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.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>
@@ -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.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>
@@ -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.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>
diff --git a/src/views/business/resource/mjy/comps/mjy/Czyj.vue b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
index 9a8ad54..6511670 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czyj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
@@ -86,7 +86,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.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>
@@ -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.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>
@@ -111,7 +111,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.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>
diff --git a/src/views/business/resource/mjy/comps/mjy/Ff.vue b/src/views/business/resource/mjy/comps/mjy/Ff.vue
index c3fc32a..8e607aa 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ff.vue
@@ -9,9 +9,25 @@ G<template>
             <el-col :span="24">
               <el-table :data="selectList" border>
                 <el-table-column :label="$t('page.business.resource.mjy.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.mjy.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.mjy.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.mjy.sxrq')" align="center" prop="sxrq"
+                  width="150px" />
+                <el-table-column :label="$t('page.business.resource.mjy.cctj')" align="center" prop="cctj"
+                  width="130px" />
+                <el-table-column :label="$t('page.business.resource.mjy.ccwz')" align="center" prop="ccwz"
+                  width="130px" />
+                <el-table-column :label="$t('page.business.resource.mjy.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.mjy.zytj')" align="center" width="250px">
                   <template slot-scope="scope">
                     <el-input type="text" v-model="scope.row.zytj" maxlength="50"
@@ -21,7 +37,8 @@ G<template>
                 <el-table-column :label="$t('page.business.resource.mjy.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>
@@ -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.mjy.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.mjy.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-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.mjy.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.mjy.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-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.mjy.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.mjy.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.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.mjy.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-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.mjy.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.mjy.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.mjy.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.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-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>
@@ -112,11 +159,11 @@ 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-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>
@@ -125,11 +172,11 @@ G<template>
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.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.mjy.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.mjy.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.mjy.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() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue
index 7e513bb..0baa6d6 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gh.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue
@@ -1,30 +1,118 @@
 G<template>
   <div>
     <!-- 归还弹窗 -->
-    <el-dialog :title="$t('page.business.resource.mjy.guihuan')" :visible.sync="open" width="500px" append-to-body
+    <el-dialog :title="$t('page.business.resource.mjy.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="24">
-              <el-form-item :label="$t('page.business.resource.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" 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.resource.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" 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.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.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-input type="text" v-model="form.bh" 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.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-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.mjy.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-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-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.mjy.cksj')">
+              <el-input type="text" v-model="form.ffrq" 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.ckmz')">
+              <el-input type="text" v-model="form.ckmz" maxlength="50" disabled> <template slot="append">{{ form.ckmzdw
+                  }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.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-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-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-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" @change="rklChange"
+                :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" disabled
+                :placeholder="$t('form.placeholderInput')">
+                <template slot="append">{{ form.kcdw }}</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.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>
             </el-form-item>
           </el-col>
         </el-row>
@@ -37,18 +125,66 @@ G<template>
             </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
+          <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>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.resource.mjy.ghr1Id')+$t('form.password')" prop="ghr1mm">
+              <el-input type="password" v-model="form.ghr1mm" maxlength="20"
                 :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.ghr2Id')" prop="ghr2Id">
+              <SelectDeptUser v-model="form.ghr2Id" key="ghr2Id" />
+            </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-input type="password" v-model="form.ghr2mm" 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.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.mjy.jsr1Id')+$t('form.password')" prop="jsr1mm">
+              <el-input type="password" v-model="form.jsr1mm" 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.jsr2Id')" prop="jsr2Id">
+              <SelectDeptUser v-model="form.jsr2Id" key="jsr2Id" />
+            </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-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.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <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>
@@ -62,12 +198,13 @@ G<template>
 </template>
 
 <script>
-import { gh } from "@/api/business/mjy/mjy"
+import { gh, info } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
+import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
 
 export default {
   name: "Gh",
-  components: {  },
+  components: { SelectDeptUser },
   data() {
     return {
       isBatch: false,
@@ -76,7 +213,72 @@ export default {
       open: false,
       form: {},
       rules: {
-        qmrmm: [{
+        rkwz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rktj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghzytj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        rkmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        syl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ghr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jsr2mm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -92,35 +294,66 @@ 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 = {
-        id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '归还',
-        qmrmm: null
+        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()
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
+      let that=this
+      info({ id: row.id }).then(response => {
+        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() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          
-            gh(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+
+          gh(this.form).then(response => {
+            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 3a5ed8e..09e4880 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue
@@ -8,7 +8,7 @@ G<template>
           <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>
@@ -90,7 +90,7 @@ G<template>
           </div>
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 给药制剂台账</div>
+            <div class="subtitle"> {{ $t('page.business.resource.mjy.tz') }}</div>
           </div>
           <div class="pal">
             <el-table :data="tzList" v-loading="loadingTz">
@@ -110,7 +110,7 @@ G<template>
               </el-table-column>
               <el-table-column :label="$t('page.business.resource.mjy.czlx')" align="center" prop="qmyy"
                 :show-overflow-tooltip="true" />
-              <el-table-column :label="$t('page.business.resource.mjy.ffjsr')" align="center"
+              <el-table-column :label="$t('page.business.resource.mjy.czl')" align="center"
                 :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   {{ scope.row.czl }}{{ scope.row.czldw }}
@@ -130,7 +130,7 @@ G<template>
         <div class="content-right">
           <div class="content-title">
             <div class="line"></div>
-            <div class="subtitle"> 稽查轨迹日志</div>
+            <div class="subtitle"> {{ $t('page.business.resource.mjy.jcgj') }}</div>
           </div>
           <jcgjList ref="jcgjList" @handleQuery="jcgjListHandleQuery" />