fix：[资源库管理][麻精药管理]归还

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) {

src/lang/en/business/resource/gyzj/gyzj.js

@@ -79,6 +79,7 @@ export default {
     jiaqian:'加签',
     gyzjgl:'给药制剂管理',
     ffhsjl:'发放回收记录',
-
+    jcgj:'稽查轨迹',
+    tz:'台账'
   
 }

src/lang/en/business/resource/mjy/mjy.js

@@ -77,4 +77,6 @@ export default {
     cksj:'出库时间',
     rksj:'入库时间',
 
+    jcgj:'稽查轨迹',
+  tz:'台账'
 }

src/lang/zh/business/resource/gyzj/gyzj.js

@@ -80,6 +80,8 @@ export default {
     gyzjgl:'给药制剂管理',
     ffhsjl:'发放回收记录',
 
+    jcgj:'稽查轨迹',
+  tz:'台账'
   
   
 }

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:'入库毛重',
 }

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"/>

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