diff --git a/src/api/business/mjy/mjy.js b/src/api/business/mjy/mjy.js
index 706ff5d..9b4c2bb 100644
--- a/src/api/business/mjy/mjy.js
+++ b/src/api/business/mjy/mjy.js
@@ -18,6 +18,54 @@ export function mjy_info(query) {
   })
 }
 
+// 编辑
+export function mjy_bj(data) {
+  return request({
+    url: '/system/business/mjy/bj',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核编辑
+export function mjy_shbj(data) {
+  return request({
+    url: '/system/business/mjy/shbj',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改库存
+export function mjy_xgkc(data) {
+  return request({
+    url: '/system/business/mjy/xgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+
+// 审核修改库存
+export function mjy_shxgkc(data) {
+  return request({
+    url: '/system/business/mjy/shxgkc',
+    method: 'post',
+    data: data
+  })
+}
+
+// 解锁
+export function mjy_js(data) {
+  return request({
+    url: '/system/business/mjy/js',
+    method: 'post',
+    data: data
+  })
+}
+
+
 // 锁定
 export function mjy_sd(data) {
   return request({
@@ -29,36 +77,52 @@ export function mjy_sd(data) {
 
 
 //批量锁定
-export function mjy_sdBatch(data) {
+export function mjy_plsd(data) {
   return request({
-    url: '/system/business/mjy/sdBatch',
+    url: '/system/business/mjy/plsd',
     method: 'post',
     data: data
   })
 }
 
+//处置容器
+export function mjy_czrq(data) {
+  return request({
+    url: '/system/business/mjy/czrq',
+    method: 'post',
+    data: data
+  })
+}
 
-// 解锁
-export function mjy_js(data) {
+//批量处置容器
+export function mjy_plczrq(data) {
   return request({
-    url: '/system/business/mjy/js',
+    url: '/system/business/mjy/plczrq',
     method: 'post',
     data: data
   })
 }
 
 
-//批量解锁
-export function mjy_jsBatch(data) {
+//处置药剂
+export function mjy_czyj(data) {
   return request({
-    url: '/system/business/mjy/jsBatch',
+    url: '/system/business/mjy/czyj',
     method: 'post',
     data: data
   })
 }
 
+//批量处置药剂
+export function mjy_plczyj(data) {
+  return request({
+    url: '/system/business/mjy/plczyj',
+    method: 'post',
+    data: data
+  })
+}
 
-// 归档
+//归档
 export function mjy_gd(data) {
   return request({
     url: '/system/business/mjy/gd',
@@ -67,12 +131,11 @@ export function mjy_gd(data) {
   })
 }
 
-
 //批量归档
-export function mjy_gdBatch(data) {
+export function mjy_plgd(data) {
   return request({
-    url: '/system/business/mjy/gdBatch',
+    url: '/system/business/mjy/plgd',
     method: 'post',
     data: data
   })
-}
\ 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 49fa070..2b55946 100644
--- a/src/lang/zh/business/resource/mjy/mjy.js
+++ b/src/lang/zh/business/resource/mjy/mjy.js
@@ -7,7 +7,10 @@ export default {
     zjzt:'制剂状态',
     sxrq:'失效日期',
     nd:'浓度',
+    nddw:'浓度单位',
     kcl:'库存量',
+    kc:'库存',
+    kcdw:'库存单位',
     zcgMc:'暂存柜',
     cctj:'存储条件',
     ccwz:'存储位置',
@@ -30,9 +33,25 @@ export default {
     ysff:'钥匙发放',
     czrq:'处置容器',
     czyj:'处置药剂',
+    yuanyin:'原因',
     xgkc:'修改库存',
     shxgkc:'审核修改库存',
     shbj:'审核编辑',
+    clr:'处理人',
+    czfs:'处置方式',
+    fhr:'复核人',
+    xgbz:'修改备注',
+    jdr:'监督人',
+    xgr:'修改人',
+    czl:'处置量',
+
+    lqr1:'领取人1',
+    lqr2:'领取人2',
+    ffr1:'发放人1',
+    ffr2:'发放人2',
+    zytj:'转移条件',
+    md:'目的',
+    ckmz:'出库毛重',
 
   
 }
\ No newline at end of file
diff --git a/src/views/business/resource/mjy/comps/Bj.vue b/src/views/business/resource/mjy/comps/Bj.vue
index 46c8d6a..0f5ea4c 100644
--- a/src/views/business/resource/mjy/comps/Bj.vue
+++ b/src/views/business/resource/mjy/comps/Bj.vue
@@ -1,54 +1,60 @@
 G<template>
-  <div >
+  <div>
     <!-- 编辑弹窗 -->
-    <el-dialog :title="$t('form.edit')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('form.edit')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.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.zykgl.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>
-        </template>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mcbj">
+              <el-input type="text" v-model="form.mcbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <el-input type="text" v-model="form.bhbj" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.nd')" prop="ndbj">
+              <el-input type="number" v-model="form.ndbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.nddw')" prop="nddwbj">
+              <el-input type="text" v-model="form.nddwbj" 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.zykgl.mjy.sxrq')" prop="sxrqbj">
+              <el-input type="text" v-model="form.sxrqbj" 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.zykgl.mjy.cctj')" prop="cctjbj">
+              <el-input type="text" v-model="form.cctjbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.ccwz')" prop="ccwzbj">
+              <el-input type="text" v-model="form.ccwzbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <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')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -57,8 +63,17 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="bjbz">
+              <el-input type="textarea" v-model="form.bjbz" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,26 +87,58 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mjy_bj } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjyBj",
+  name: "Mjybj",
   components: { SelectList },
   data() {
     return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        mcbj: [{
           required: true,
           message: ' ',
           trigger: 'blur'
-        }]
+        }],
+        bhbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ndbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        nddwbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        sxrqbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        cctjbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ccwzbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       }
     }
   },
@@ -103,52 +150,44 @@ export default {
   created() {
   },
   methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
     cancel() {
       this.open = false
     },
     reset() {
       this.form = {
         id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
+        mcbj: null,
+        bhbj: null,
+        ndbj: null,
+        nddwbj: null,
+        sxrqbj: null,
+        cctjbj: null,
+        ccwzbj: null,
+        qmrmm: null,
+        qmyy: '编辑',
+        bjbz: ''
       }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
       this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
+      this.form.mcbj = row.mc
+      this.form.bhbj = row.bh
+      this.form.ndbj = row.nd
+      this.form.nddwbj = row.nddw
+      this.form.sxrqbj = row.sxrq
+      this.form.cctjbj = row.cctj
+      this.form.ccwzbj = row.ccwz
       this.open = true
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
+          mjy_bj(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }
diff --git a/src/views/business/resource/mjy/comps/Czrq.vue b/src/views/business/resource/mjy/comps/Czrq.vue
index e9efb90..3228892 100644
--- a/src/views/business/resource/mjy/comps/Czrq.vue
+++ b/src/views/business/resource/mjy/comps/Czrq.vue
@@ -1,64 +1,112 @@
 G<template>
-  <div >
+  <div>
     <!-- 处置容器弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.czrq')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.czrq')" :visible.sync="open" width="1200px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
+        <div :style="isBatch?'display:block':'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <el-table :data="selectList" border>
+                <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="left" prop="bh"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.czfs')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('page.business.zykgl.mjy.yuanyin')" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.czyy" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('form.operate')" align="center" width="150px">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" @click="handleSc(scope.row)">{{
+                      $t('form.delete') }}</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch?'display:block':'display:none'">
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
+                <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.zykgl.mjy.bh')" prop="glyj">
+                <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.zykgl.mjy.czfs')" prop="czfs">
+                <el-input type="text" v-model="form.czfs" maxlength="50" :placeholder="$t('form.placeholderInput')" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
+              <el-form-item :label="$t('page.business.zykgl.mjy.yuanyin')" prop="czyy">
+                <el-input type="textarea" v-model="form.czyy" :rows="2" maxlength="500"
+                  :placeholder="$t('form.placeholderInput')">
+                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+
+        </div>
         <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.zykgl.mjy.clr')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="clrmm">
+              <el-input type="password" v-model="form.clrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.fhr')" prop="fhrId">
+              <el-input type="text" v-model="form.fhrId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="fhrmm">
+              <el-input type="password" v-model="form.fhrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.jdr')" prop="jdrId">
+              <el-input type="text" v-model="form.jdrId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="jdrmm">
+              <el-input type="password" v-model="form.jdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" v-model="form.qmyy" maxlength="20" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,13 +120,11 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mjy_czrq, mjy_plczrq } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
 
 export default {
   name: "MjyBj",
-  components: { SelectList },
   data() {
     return {
       isBatch: false,
@@ -87,7 +133,42 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        czyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        czfs: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        clrId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        fhrId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jdrId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        clrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        fhrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jdrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -103,11 +184,34 @@ export default {
   created() {
   },
   methods: {
+    handleSc(row) {
+      const that = this
+      this.$modal.confirm(this.$t('form.confirmDelete')).then(function () {
+        return delDept(row.deptId)
+      }).then(() => {
+        const _index = _.findIndex(that.selectList, function (o) { return o.id === row.id })
+        if (_index > -1) {
+          that.selectList.splice(_index, 1)
+          that.form.ids = that.selectList.map(item => item.id)
+        }
+      }).catch(() => { })
+    },
     showBatch(val) {
       this.reset()
       this.isBatch = true
+      this.selectList = []
       this.form.ids = val.map(item => item.id)
-      this.selectList = val
+      let tmp = []
+      _.forEach(val, function (item) {
+        tmp.push({
+          id: item.id,
+          mc: item.mc,
+          bh: item.bh,
+          czyy: null,
+          czfs: null,
+        })
+      })
+      this.selectList = tmp
       this.open = true
     },
     cancel() {
@@ -116,10 +220,15 @@ export default {
     reset() {
       this.form = {
         id: null,
-        ids: null,
+        ids: [],
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        czyy: null,
+        czfs: null,
+        clrId: null,
+        fhrId: null,
+        jdrId: null,
+        qmyy: '处置容器',
         sdrmm: null
       }
       this.resetForm("form")
@@ -137,13 +246,19 @@ export default {
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          let params = this.form
           if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+            params.list = this.selectList
+            if (this.selectList.length <= 0) {
+              this.$modal.msgError("请选择要操作的麻精药")
+            } else {
+              mjy_plczrq(params).then(response => {
+                this.open = false
+                this.$emit('callback')
+              })
+            }
           } else {
-            mjy_jd(this.form).then(response => {
+            mjy_czrq(params).then(response => {
               this.open = false
               this.$emit('callback')
             })
diff --git a/src/views/business/resource/mjy/comps/Czyj.vue b/src/views/business/resource/mjy/comps/Czyj.vue
index c166c7a..f1673b6 100644
--- a/src/views/business/resource/mjy/comps/Czyj.vue
+++ b/src/views/business/resource/mjy/comps/Czyj.vue
@@ -1,64 +1,125 @@
 G<template>
-  <div >
+  <div>
     <!-- 处置药剂弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.czyj')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.czyj')" :visible.sync="open" width="1200px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
+      <div :style="isBatch?'display:block':'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <el-table :data="selectList" border>
+                <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="left" prop="bh"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.czfs')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('page.business.zykgl.mjy.yuanyin')" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.czyy" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('page.business.zykgl.mjy.czl')" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.czl" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')"> <template slot="append">{{ scope.row.kcdw }}</template>
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('form.operate')" align="center" width="150px">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" @click="handleSc(scope.row)">{{
+                      $t('form.delete') }}</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch?'display:block':'display:none'">
           <el-row>
-            <el-col :span="24">
+            <el-col :span="12">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
-                <el-input type="text" v-model="form.mc" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
+                <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.zykgl.mjy.bh')" prop="glyj">
+                <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.zykgl.mjy.czfs')" prop="czfs">
+                <el-input type="text" v-model="form.czfs" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item :label="$t('page.business.zykgl.mjy.czl')" prop="czl">
+                <el-input type="text" v-model="form.czl" 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="24">
-              <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-                <el-input type="text" v-model="form.bh" maxlength="50" disabled
-                  :placeholder="$t('form.placeholderInput')" />
+              <el-form-item :label="$t('page.business.zykgl.mjy.yuanyin')" prop="czyy">
+                <el-input type="textarea" v-model="form.czyy" :rows="2" maxlength="500"
+                  :placeholder="$t('form.placeholderInput')">
+                </el-input>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+
+        </div>
         <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.zykgl.mjy.clr')">
+              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="clrmm">
+              <el-input type="password" v-model="form.clrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.fhr')" prop="fhrId">
+              <el-input type="text" v-model="form.fhrId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="fhrmm">
+              <el-input type="password" v-model="form.fhrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.signer')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.jdr')" prop="jdrId">
+              <el-input type="text" v-model="form.jdrId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="jdrmm">
+              <el-input type="password" v-model="form.jdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-input type="text" v-model="form.qmyy" maxlength="20" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,13 +133,11 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mjy_czyj, mjy_plczyj } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
-import SelectList from "./SelectList";
 
 export default {
-  name: "MjyBj",
-  components: { SelectList },
+  name: "MjyCzyj",
   data() {
     return {
       isBatch: false,
@@ -87,7 +146,47 @@ export default {
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        czyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        czfs: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        czl: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        clrId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        fhrId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jdrId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        clrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        fhrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        jdrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -103,11 +202,36 @@ export default {
   created() {
   },
   methods: {
+    handleSc(row) {
+      const that = this
+      this.$modal.confirm(this.$t('form.confirmDelete')).then(function () {
+        return delDept(row.deptId)
+      }).then(() => {
+        const _index = _.findIndex(that.selectList, function (o) { return o.id === row.id })
+        if (_index > -1) {
+          that.selectList.splice(_index, 1)
+          that.form.ids = that.selectList.map(item => item.id)
+        }
+      }).catch(() => { })
+    },
     showBatch(val) {
       this.reset()
       this.isBatch = true
+      this.selectList = []
       this.form.ids = val.map(item => item.id)
-      this.selectList = val
+      let tmp = []
+      _.forEach(val, function (item) {
+        tmp.push({
+          id: item.id,
+          mc: item.mc,
+          bh: item.bh,
+          kcdw: item.kcdw,
+          czyy: null,
+          czl: null,
+          czfs: null,
+        })
+      })
+      this.selectList = tmp
       this.open = true
     },
     cancel() {
@@ -119,7 +243,14 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        czyy: null,
+        kcdw: null,
+        czfs: null,
+        clrId: null,
+        fhrId: null,
+        jdrId: null,
+        czl: null,
+        qmyy: '处置药剂',
         sdrmm: null
       }
       this.resetForm("form")
@@ -132,18 +263,25 @@ export default {
       this.form.id = row.id
       this.form.mc = row.mc
       this.form.bh = row.bh
+      this.form.kcdw = row.kcdw
       this.open = true
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          let params = this.form
           if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
+            params.list = this.selectList
+            if (this.selectList.length <= 0) {
+              this.$modal.msgError("请选择要操作的麻精药")
+            } else {
+              mjy_plczyj(params).then(response => {
+                this.open = false
+                this.$emit('callback')
+              })
+            }
           } else {
-            mjy_jd(this.form).then(response => {
+            mjy_czyj(params).then(response => {
               this.open = false
               this.$emit('callback')
             })
diff --git a/src/views/business/resource/mjy/comps/Ff.vue b/src/views/business/resource/mjy/comps/Ff.vue
index f5c8976..36ea0e9 100644
--- a/src/views/business/resource/mjy/comps/Ff.vue
+++ b/src/views/business/resource/mjy/comps/Ff.vue
@@ -1,18 +1,40 @@
 G<template>
-  <div >
+  <div>
     <!-- 发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.fafang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.fafang')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
+        <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <el-table :data="selectList" border>
+                <el-table-column :label="$t('page.business.zykgl.mjy.mc')" align="left" prop="mc"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.bh')" align="left" prop="bh"
+                  :show-overflow-tooltip="true" width="120px" />
+                <el-table-column :label="$t('page.business.zykgl.mjy.czfs')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('page.business.zykgl.mjy.yuanyin')" align="center">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.czyy" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('form.operate')" align="center" width="150px">
+                  <template slot-scope="scope">
+                    <el-button size="mini" type="text" @click="handleSc(scope.row)">{{
+                      $t('form.delete') }}</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch ? 'display:block' : 'display:none'">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -29,12 +51,25 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+        </div>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.zytj')" prop="zytj">
+              <el-input type="text" v-model="form.zytj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.ckmz')" prop="ckmz">
+              <el-input type="number" v-model="form.ckmz" maxlength="20" :placeholder="$t('form.placeholderInput')">
+                <template slot="append">{{ form.kcdw }}</template>
+              </el-input>
+            </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-form-item :label="$t('page.business.zykgl.mjy.md')" prop="xmId">
+              <el-input type="text" v-model="form.xmId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -48,17 +83,62 @@ G<template>
           </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.zykgl.mjy.lqr1')" prop="lqr1Id">
+              <el-input type="text" v-model="form.lqr1Id" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="lqr1mm">
+              <el-input type="password" v-model="form.lqr1mm" 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.zykgl.mjy.lqr2')" prop="lqr2Id">
+              <el-input type="text" v-model="form.lqr2Id" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="lqr2mm">
+              <el-input type="password" v-model="form.lqr2mm" 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.zykgl.mjy.ffr1')" prop="ffr1Id">
+              <el-input type="text" v-model="form.ffr1Id" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.password')" prop="ffr1mm">
+              <el-input type="password" v-model="form.ffr1mm" 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.zykgl.mjy.ffr2')" prop="ffr2Id">
+              <el-input type="text" v-model="form.ffr2Id" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$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-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" 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>
@@ -72,7 +152,7 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mjy_ff, mjy_plff } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -87,11 +167,78 @@ export default {
       open: false,
       form: {},
       rules: {
+        ffr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ffr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ffr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ffr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr2mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr1mm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr2Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        lqr1Id: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        xmId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ckmzdw: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
         sdrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
+        }],
+        ckmz: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        xmId: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        zytj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
         }]
+
+
       }
     }
   },
@@ -103,11 +250,33 @@ export default {
   created() {
   },
   methods: {
+    handleSc(row) {
+      const that = this
+      this.$modal.confirm(this.$t('form.confirmDelete')).then(function () {
+        return delDept(row.deptId)
+      }).then(() => {
+        const _index = _.findIndex(that.selectList, function (o) { return o.id === row.id })
+        if (_index > -1) {
+          that.selectList.splice(_index, 1)
+          that.form.ids = that.selectList.map(item => item.id)
+        }
+      }).catch(() => { })
+    },
     showBatch(val) {
       this.reset()
       this.isBatch = true
       this.form.ids = val.map(item => item.id)
-      this.selectList = val
+      let tmp = []
+      _.forEach(val, function (item) {
+        tmp.push({
+          id: item.id,
+          mc: item.mc,
+          bh: item.bh,
+          czyy: null,
+          czfs: null,
+        })
+      })
+      this.selectList = tmp
       this.open = true
     },
     cancel() {
@@ -119,7 +288,21 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
+        kcdw: null,
+        zytj: null,
+        xmId: null,
+        ckmz: null,
+        ckmzdw: null,
+        lqr1Id: null,
+        lqr2Id: null,
+        lqr1mm: null,
+        lqr2mm: null,
+        ffr1Id: null,
+        ffr1mm: null,
+        ffr2Id: null,
+        ffr2mm: null,
+        xmId: null,
+        qmyy: '领取发放',
         sdrmm: null
       }
       this.resetForm("form")
@@ -132,6 +315,7 @@ export default {
       this.form.id = row.id
       this.form.mc = row.mc
       this.form.bh = row.bh
+      this.form.kcdw = row.kcdw
       this.open = true
     },
     save() {
diff --git a/src/views/business/resource/mjy/comps/Gd.vue b/src/views/business/resource/mjy/comps/Gd.vue
index 319bdb5..548606e 100644
--- a/src/views/business/resource/mjy/comps/Gd.vue
+++ b/src/views/business/resource/mjy/comps/Gd.vue
@@ -1,18 +1,19 @@
 G<template>
-  <div >
+  <div>
     <!-- 归档弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.guidang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.guidang')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.gdts') " type="error" :closable="false">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-alert :title="$t('page.business.zykgl.mjy.gdts')" type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch ? 'display:block' : 'display:none'">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -29,7 +30,7 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -58,7 +59,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,7 +73,7 @@ G<template>
 </template>
 
 <script>
-import { mjy_gd, mjy_gdBatch } from "@/api/business/mjy/mjy"
+import { mjy_gd, mjy_plgd } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -138,7 +139,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
-            mjy_gdBatch(this.form).then(response => {
+            mjy_plgd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
diff --git a/src/views/business/resource/mjy/comps/Gh.vue b/src/views/business/resource/mjy/comps/Gh.vue
index 9990905..2b815f3 100644
--- a/src/views/business/resource/mjy/comps/Gh.vue
+++ b/src/views/business/resource/mjy/comps/Gh.vue
@@ -1,18 +1,19 @@
 G<template>
-  <div >
+  <div>
     <!-- 归还弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.guihuan')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.guihuan')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-alert :title="$t('page.business.zykgl.mjy.jdts')" type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch ? 'display:block' : 'display:none'">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -29,7 +30,7 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -58,7 +59,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/mjy/comps/Jd.vue b/src/views/business/resource/mjy/comps/Jd.vue
index 1a419c2..23072ea 100644
--- a/src/views/business/resource/mjy/comps/Jd.vue
+++ b/src/views/business/resource/mjy/comps/Jd.vue
@@ -3,7 +3,7 @@ G<template>
     <!-- 解档弹窗 -->
     <el-dialog :title="$t('page.business.zykgl.mjy.jiedang')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
+           <div :style="isBatch ? 'display:block' : 'display:none'">
            <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
@@ -11,8 +11,8 @@ G<template>
               <SelectList :value="selectList"/>
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch ? 'display:block' : 'display:none'">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -29,7 +29,7 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -58,7 +58,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/mjy/comps/Js.vue b/src/views/business/resource/mjy/comps/Js.vue
index 51321b3..65c2b0d 100644
--- a/src/views/business/resource/mjy/comps/Js.vue
+++ b/src/views/business/resource/mjy/comps/Js.vue
@@ -47,7 +47,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/mjy/comps/Jy.vue b/src/views/business/resource/mjy/comps/Jy.vue
index ef5352c..855ad27 100644
--- a/src/views/business/resource/mjy/comps/Jy.vue
+++ b/src/views/business/resource/mjy/comps/Jy.vue
@@ -3,7 +3,7 @@ G<template>
     <!-- 借阅弹窗 -->
     <el-dialog :title="$t('page.business.zykgl.mjy.jieyue')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
            <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
           </el-alert>
           <el-row style="margin:10px 0px;">
@@ -11,8 +11,8 @@ G<template>
               <SelectList :value="selectList"/>
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch ? 'display:block' : 'display:none'">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -29,7 +29,7 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -58,7 +58,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
diff --git a/src/views/business/resource/mjy/comps/Sd.vue b/src/views/business/resource/mjy/comps/Sd.vue
index ead4034..1a06415 100644
--- a/src/views/business/resource/mjy/comps/Sd.vue
+++ b/src/views/business/resource/mjy/comps/Sd.vue
@@ -1,18 +1,17 @@
 G<template>
-  <div >
+  <div>
     <!-- 锁定弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.lock')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.lock')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.sdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
+        <div :style="isBatch ? 'display:block' : 'display:none'">
+          <el-row >
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch ? 'display:block' : 'display:none'">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -29,7 +28,7 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -58,7 +57,7 @@ G<template>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,7 +71,7 @@ G<template>
 </template>
 
 <script>
-import { mjy_sd, mjy_sdBatch } from "@/api/business/mjy/mjy"
+import { mjy_sd, mjy_plsd } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
@@ -138,7 +137,7 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.isBatch) {
-            mjy_sdBatch(this.form).then(response => {
+            mjy_plsd(this.form).then(response => {
               this.open = false
               this.$emit('callback')
             })
diff --git a/src/views/business/resource/mjy/comps/Shbj.vue b/src/views/business/resource/mjy/comps/Shbj.vue
index eadbc83..e1aa588 100644
--- a/src/views/business/resource/mjy/comps/Shbj.vue
+++ b/src/views/business/resource/mjy/comps/Shbj.vue
@@ -1,54 +1,75 @@
 G<template>
-  <div >
+  <div>
     <!-- 审核编辑弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.shbj')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.shbj')" :visible.sync="open" width="800px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.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.zykgl.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>
-        </template>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
-              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mcbj">
+              <el-input type="text" v-model="form.mcbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
+              <el-input type="text" v-model="form.bhbj" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.nd')" prop="ndbj">
+              <el-input type="text" v-model="form.ndbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.nddw')" prop="nddwbj">
+              <el-input type="text" v-model="form.nddwbj" 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.zykgl.mjy.sxrq')" prop="sxrqbj">
+              <el-input type="text" v-model="form.sxrqbj" 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.zykgl.mjy.cctj')" prop="cctjbj">
+              <el-input type="text" v-model="form.cctjbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.ccwz')" prop="ccwzbj">
+              <el-input type="text" v-model="form.ccwzbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
+            <el-form-item :label="$t('page.business.zykgl.mjy.xgr')">
+              <el-input type="text" v-model="form.bjrMc" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.zykgl.mjy.xgbz')" prop="bjbz">
+              <el-input type="text" v-model="form.bjbz" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item :label="$t('form.qmyy')" prop="qmyy">
+              <el-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
+                <el-option key="10" label="同意编辑" value="同意编辑" />
+                <el-option key="1" label="拒绝编辑" value="拒绝编辑" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -57,8 +78,17 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,26 +102,63 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mjy_shbj, mjy_info } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjyBj",
+  name: "Mjybj",
   components: { SelectList },
   data() {
     return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        qmyy: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        mcbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        bhbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ndbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        nddwbj: [{
           required: true,
           message: ' ',
           trigger: 'blur'
-        }]
+        }],
+        sxrqbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        cctjbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        ccwzbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
       }
     }
   },
@@ -103,52 +170,52 @@ export default {
   created() {
   },
   methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
     cancel() {
       this.open = false
     },
     reset() {
       this.form = {
         id: null,
-        ids: null,
-        mc: null,
-        bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
+        mcbj: null,
+        bhbj: null,
+        ndbj: null,
+        nddwbj: null,
+        sxrqbj: null,
+        cctjbj: null,
+        ccwzbj: null,
+        qmrmm: null,
+        bjrMc: null,
+        bjbz: null,
+        qmyy: '同意编辑',
+        remark: ''
       }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
+      this.$modal.loading()
+      mjy_info({ id: row.id }).then(response => {
+        this.form.id = response.data.id
+        this.form.mcbj = response.data.mcbj
+        this.form.bhbj = response.data.bhbj
+        this.form.ndbj = response.data.ndbj
+        this.form.nddwbj = response.data.nddwbj
+        this.form.sxrqbj = response.data.sxrqbj
+        this.form.cctjbj = response.data.cctjbj
+        this.form.ccwzbj = response.data.ccwzbj
+        this.form.bjbz = response.data.bjbz
+        this.form.bjrMc = response.data.bjrMc
+        this.open = true
+        this.$modal.closeLoading()
+      })
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
+          mjy_shbj(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }
diff --git a/src/views/business/resource/mjy/comps/Shxgkc.vue b/src/views/business/resource/mjy/comps/Shxgkc.vue
index 371509f..cfbce44 100644
--- a/src/views/business/resource/mjy/comps/Shxgkc.vue
+++ b/src/views/business/resource/mjy/comps/Shxgkc.vue
@@ -1,54 +1,54 @@
 G<template>
-  <div >
+  <div>
     <!-- 审核修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.shxgkc')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.shxgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.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.zykgl.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>
-        </template>
         <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.zykgl.mjy.mc')" prop="mcbj">
+              <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.zykgl.mjy.bh')" prop="glyj">
+              <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.zykgl.mjy.kc')" prop="kcbj">
+              <el-input type="number" v-model="form.kcbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.kcdw')" prop="kcdwbj">
+              <el-input type="text" v-model="form.kcdwbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
+            <el-form-item :label="$t('page.business.zykgl.mjy.xgr')">
+              <el-input type="text" v-model="form.kcbjrMc" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item :label="$t('page.business.zykgl.mjy.xgbz')" prop="kcbjbz">
+              <el-input type="text" v-model="form.kcbjbz" disabled />
             </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-select v-model="form.qmyy" :placeholder="$t('form.placeholderSelect')" >
+                <el-option key="10" label="同意编辑" value="同意编辑库存" />
+                <el-option key="1" label="拒绝编辑" value="拒绝编辑库存" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -57,8 +57,17 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" prop="remark">
+              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,22 +81,29 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mjy_shxgkc, mjy_info } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjyBj",
+  name: "Mjybj",
   components: { SelectList },
   data() {
     return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        kcbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        kcdwbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -103,52 +119,46 @@ export default {
   created() {
   },
   methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
     cancel() {
       this.open = false
     },
     reset() {
       this.form = {
         id: null,
-        ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
+        kcbj: null,
+        kcdwbj: null,
+        qmrmm: null,
+        kcbjrMc: null,
+        kcbjbz: null,
+        qmyy: '同意编辑库存',
+        remark: ''
       }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
-      this.form.id = row.id
-      this.form.mc = row.mc
-      this.form.bh = row.bh
-      this.open = true
+      this.$modal.loading()
+      mjy_info({ id: row.id }).then(response => {
+        this.form.id = response.data.id
+        this.form.mc = response.data.mc
+        this.form.bh = response.data.bh
+        this.form.kcbj = response.data.kcbj
+        this.form.kcdwbj = response.data.kcdwbj
+        this.form.kcbjbz = response.data.kcbjbz
+        this.form.kcbjrMc = response.data.kcbjrMc
+        this.open = true
+        this.$modal.closeLoading()
+      })
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
+          mjy_shxgkc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }
diff --git a/src/views/business/resource/mjy/comps/Xgkc.vue b/src/views/business/resource/mjy/comps/Xgkc.vue
index ee1c6ad..5c19402 100644
--- a/src/views/business/resource/mjy/comps/Xgkc.vue
+++ b/src/views/business/resource/mjy/comps/Xgkc.vue
@@ -1,54 +1,40 @@
 G<template>
-  <div >
+  <div>
     <!-- 修改库存弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.xgkc')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.xgkc')" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
-          <el-row style="margin:10px 0px;">
-            <el-col :span="24">
-              <SelectList :value="selectList"/>
-            </el-col>
-          </el-row>
-        </template>
-        <template v-else>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item :label="$t('page.business.zykgl.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.zykgl.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>
-        </template>
         <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.zykgl.mjy.mc')" prop="mcbj">
+              <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.zykgl.mjy.bh')" prop="glyj">
+              <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('form.remark')" prop="remark">
-              <el-input type="textarea" v-model="form.remark" :rows="2" maxlength="500"
-                :placeholder="$t('form.placeholderInput')">
-              </el-input>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.kc')" prop="kcbj">
+              <el-input type="number" v-model="form.kcbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item :label="$t('page.business.zykgl.mjy.kcdw')" prop="kcdwbj">
+              <el-input type="text" v-model="form.kcdwbj" 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('form.qmyy')" prop="qmyy">
+              <el-input type="text" :value="form.qmyy" maxlength="50" disabled
+                :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item :label="$t('form.signer')">
               <el-input type="text" v-model="nickName" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
@@ -57,8 +43,17 @@ G<template>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('form.password')" prop="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('form.password')" prop="qmrmm">
+              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('form.remark')" >
+              <el-input type="textarea" v-model="form.kcbjbz" :rows="2" maxlength="500"
+                :placeholder="$t('form.placeholderInput')">
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,22 +67,29 @@ G<template>
 </template>
 
 <script>
-import { mjy_jd, mjy_jdBatch } from "@/api/business/mjy/mjy"
+import { mjy_xgkc } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "MjyBj",
+  name: "Mjybj",
   components: { SelectList },
   data() {
     return {
-      isBatch: false,
-      ids: [],
-      selectList: [],
       open: false,
       form: {},
       rules: {
-        sdrmm: [{
+        kcbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        kcdwbj: [{
+          required: true,
+          message: ' ',
+          trigger: 'blur'
+        }],
+        qmrmm: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -103,52 +105,38 @@ export default {
   created() {
   },
   methods: {
-    showBatch(val) {
-      this.reset()
-      this.isBatch = true
-      this.form.ids = val.map(item => item.id)
-      this.selectList = val
-      this.open = true
-    },
     cancel() {
       this.open = false
     },
     reset() {
       this.form = {
         id: null,
-        ids: null,
         mc: null,
         bh: null,
-        qmyy: '申请解档',
-        sdrmm: null
+        kcbj: null,
+        kcdwbj: null,
+        qmrmm: null,
+        qmyy: '修改库存',
+        kcbjbz: ''
       }
       this.resetForm("form")
     },
     show(row) {
       this.reset()
-      this.isBatch = false
-      this.form.ids = []
-      this.selectList = []
       this.form.id = row.id
       this.form.mc = row.mc
       this.form.bh = row.bh
+      this.form.kcbj = row.kc
+      this.form.kcdwbj = row.kcdw
       this.open = true
     },
     save() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.isBatch) {
-            mjy_jdBatch(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          } else {
-            mjy_jd(this.form).then(response => {
-              this.open = false
-              this.$emit('callback')
-            })
-          }
-
+          mjy_xgkc(this.form).then(response => {
+            this.open = false
+            this.$emit('callback')
+          })
         }
       })
     }
diff --git a/src/views/business/resource/mjy/comps/Ysff.vue b/src/views/business/resource/mjy/comps/Ysff.vue
index 6350ec1..aca006f 100644
--- a/src/views/business/resource/mjy/comps/Ysff.vue
+++ b/src/views/business/resource/mjy/comps/Ysff.vue
@@ -1,18 +1,17 @@
 G<template>
-  <div >
+  <div>
     <!-- 钥匙发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.ysff')" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="$t('page.business.zykgl.mjy.ysff')" :visible.sync="open" width="500px" append-to-body
+      :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <template v-if="isBatch">
-           <el-alert :title="$t('page.business.zykgl.mjy.jdts') " type="error" :closable="false">
-          </el-alert>
+        <div :style="isBatch ? 'display:block' : 'display:none'">
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
-              <SelectList :value="selectList"/>
+              <SelectList :value="selectList" />
             </el-col>
           </el-row>
-        </template>
-        <template v-else>
+        </div>
+        <div :style="!isBatch ? 'display:block' : 'display:none'">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -29,7 +28,7 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
-        </template>
+        </div>
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.qmyy')" prop="qmyy">
@@ -47,21 +46,7 @@ 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
-                :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="sdrmm">
-              <el-input type="text" v-model="form.sdrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
-            </el-form-item>
-          </el-col>
-        </el-row>
+       
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="save">{{ $t('form.confirm') }}</el-button>
diff --git a/src/views/business/resource/mjy/list.vue b/src/views/business/resource/mjy/list.vue
index bd85c14..3846657 100644
--- a/src/views/business/resource/mjy/list.vue
+++ b/src/views/business/resource/mjy/list.vue
@@ -139,62 +139,76 @@
           <el-table-column :label="$t('form.operate')" fixed="right" align="center"
             class-name="small-padding fixed-width" width="250px">
             <template slot-scope="scope">
-              <!-- 详情 -->
-              <el-button size="mini" type="text" @click="handleXq(scope.row)"
-                v-hasPermi="['business:resource:mjy:list']">{{
-                  $t('page.business.zykgl.mjy.detail') }}</el-button>
-              <!-- 发放 -->
-              <el-button size="mini" type="text" @click="handleFf(scope.row)"
-                v-hasPermi="['business:resource:mjy:ff']">{{
-                  $t('page.business.zykgl.mjy.fafang') }}</el-button>
-              <!-- 处置药剂 -->
-              <el-button size="mini" type="text" @click="handleCzyj(scope.row)"
-                v-hasPermi="['business:resource:mjy:czyj']">{{
-                  $t('page.business.zykgl.mjy.czyj') }}</el-button>
-              <!-- 处置容器 -->
-              <el-button size="mini" type="text" @click="handleCzrq(scope.row)"
-                v-hasPermi="['business:resource:mjy:czrq']">{{
-                  $t('page.business.zykgl.mjy.czrq') }}</el-button>
-              <!-- 编辑 -->
-              <el-button size="mini" type="text" @click="handleBj(scope.row)"
-                v-hasPermi="['business:resource:mjy:bj']">{{
-                  $t('form.edit') }}</el-button>
-              <!-- 审核编辑 -->
-              <el-button size="mini" type="text" @click="handleShbj(scope.row)"
-                v-hasPermi="['business:resource:mjy:shbj']">{{
-                  $t('page.business.zykgl.mjy.shbj') }}</el-button>
-              <!-- 修改库存 -->
-              <el-button size="mini" type="text" @click="handleXgkc(scope.row)"
-                v-hasPermi="['business:resource:mjy:xgkc']">{{
-                  $t('page.business.zykgl.mjy.xgkc') }}</el-button>
-              <!-- 审核修改库存 -->
-              <el-button size="mini" type="text" @click="handleShxgkc(scope.row)"
-                v-hasPermi="['business:resource:mjy:shxgkc']">{{
-                  $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
-              <!-- 锁定 -->
-              <el-button size="mini" type="text" @click="handleSd(scope.row)"
-                v-hasPermi="['business:resource:mjy:sd']">{{
-                  $t('page.business.zykgl.mjy.lock') }}</el-button>
-              <!-- 解锁 -->
-              <el-button size="mini" type="text" @click="handleJs(scope.row)"
-                v-hasPermi="['business:resource:mjy:js']">{{
-                  $t('page.business.zykgl.mjy.unlock') }}</el-button>
-              <!-- 归档 -->
-              <el-button size="mini" type="text" @click="handleGd(scope.row)"
-                v-hasPermi="['business:resource:mjy:gd']">{{
-                  $t('page.business.zykgl.mjy.guidang') }}</el-button>
-              <!-- 解档 -->
-              <el-button size="mini" type="text" @click="handleJd(scope.row)"
-                v-hasPermi="['business:resource:mjy:jd']">{{
-                  $t('page.business.zykgl.mjy.jiedang') }}</el-button>
-              <!-- 借阅 -->
-              <el-button size="mini" type="text" @click="handleJy(scope.row)"
-                v-hasPermi="['business:resource:mjy:jy']">{{
-                  $t('page.business.zykgl.mjy.jieyue') }}</el-button>
-              <!-- 归还 -->
-              <el-button size="mini" type="text" @click="handleGh(scope.row)"
-                v-hasPermi="['business:resource:mjy:gh']">{{
-                  $t('page.business.zykgl.mjy.guihuan') }}</el-button>
+              <template v-if="scope.row.zjzt == 1 || scope.row.zjzt == 3 || scope.row.zjzt == 5 || scope.row.zjzt == 9">
+                <!-- 详情 -->
+                <el-button size="mini" type="text" @click="handleXq(scope.row)"
+                  v-hasPermi="['business:resource:mjy:list']">{{
+                    $t('page.business.zykgl.mjy.detail') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 1">
+                <!-- 发放 -->
+                <el-button size="mini" type="text" @click="handleFf(scope.row)"
+                  v-hasPermi="['business:resource:mjy:ff']">{{
+                    $t('page.business.zykgl.mjy.fafang') }}</el-button>
+                <!-- 处置药剂 -->
+                <el-button size="mini" type="text" @click="handleCzyj(scope.row)"
+                  v-hasPermi="['business:resource:mjy:czyj']">{{
+                    $t('page.business.zykgl.mjy.czyj') }}</el-button>
+                <!-- 处置容器 -->
+                <el-button size="mini" v-if="scope.row.rqzt == 1" type="text" @click="handleCzrq(scope.row)"
+                  v-hasPermi="['business:resource:mjy:czrq']">{{
+                    $t('page.business.zykgl.mjy.czrq') }}</el-button>
+                <!-- 编辑 -->
+                <el-button size="mini" v-if="scope.row.bjzt == 1" type="text" @click="handleBj(scope.row)"
+                  v-hasPermi="['business:resource:mjy:bj']">{{
+                    $t('form.edit') }}</el-button>
+                <!-- 修改库存 -->
+                <el-button size="mini" v-if="scope.row.kcbjzt == 1" type="text" @click="handleXgkc(scope.row)"
+                  v-hasPermi="['business:resource:mjy:xgkc']">{{
+                    $t('page.business.zykgl.mjy.xgkc') }}</el-button>
+                <!-- 锁定 -->
+                <el-button size="mini" type="text" @click="handleSd(scope.row)"
+                  v-hasPermi="['business:resource:mjy:sd']">{{
+                    $t('page.business.zykgl.mjy.lock') }}</el-button>
+              </template>
+              <template v-if="scope.row.bjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
+                <!-- 审核编辑 -->
+                <el-button size="mini" type="text" @click="handleShbj(scope.row)"
+                  v-hasPermi="['business:resource:mjy:shbj']">{{
+                    $t('page.business.zykgl.mjy.shbj') }}</el-button>
+              </template>
+              <template v-if="scope.row.kcbjzt == 3 && (scope.row.zjzt == 1 || scope.row.zjzt == 3)">
+                <!-- 审核修改库存 -->
+                <el-button size="mini" type="text" @click="handleShxgkc(scope.row)"
+                  v-hasPermi="['business:resource:mjy:shxgkc']">{{
+                    $t('page.business.zykgl.mjy.shxgkc') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 5">
+                <!-- 解锁 -->
+                <el-button size="mini" type="text" @click="handleJs(scope.row)"
+                  v-hasPermi="['business:resource:mjy:js']">{{
+                    $t('page.business.zykgl.mjy.unlock') }}</el-button>
+                <!-- 归档 -->
+                <el-button size="mini" type="text" @click="handleGd(scope.row)"
+                  v-hasPermi="['business:resource:mjy:gd']">{{
+                    $t('page.business.zykgl.mjy.guidang') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 3">
+                <!-- 归还 -->
+                <el-button size="mini" type="text" @click="handleGh(scope.row)"
+                  v-hasPermi="['business:resource:mjy:gh']">{{
+                    $t('page.business.zykgl.mjy.guihuan') }}</el-button>
+              </template>
+              <template v-if="scope.row.zjzt == 9">
+                <!-- 解档 -->
+                <el-button size="mini" type="text" @click="handleJd(scope.row)"
+                  v-hasPermi="['business:resource:mjy:jd']">{{
+                    $t('page.business.zykgl.mjy.jiedang') }}</el-button>
+                <!-- 借阅 -->
+                <el-button size="mini" type="text" @click="handleJy(scope.row)"
+                  v-hasPermi="['business:resource:mjy:jy']">{{
+                    $t('page.business.zykgl.mjy.jieyue') }}</el-button>
+              </template>
             </template>
           </el-table-column>
         </el-table>
@@ -254,7 +268,7 @@ import Ysff from "./comps/Ysff";
 
 export default {
   name: "Mjy",
-  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh,Czyj,Czrq,Ff,Ysff },
+  components: { Sd, Js, Gd, Xq, Jd, Bj, Shbj, Xgkc, Shxgkc, Jy, Gh, Czyj, Czrq, Ff, Ysff },
   data() {
     return {
       showDetail: false,
@@ -283,19 +297,27 @@ export default {
     this.getList()
   },
   methods: {
-     //钥匙发放
+    //导出
+    handleDc() {
+
+    },
+    //钥匙发放
     handleYsff() {
       this.$refs.Ysff.showBatch(this.selectList)
     },
     //批量发放
-    handlePlff(row) {
+    handlePlff() {
       this.$refs.Ff.showBatch(this.selectList)
     },
+    //发放
+    handleFf(row) {
+      this.$refs.Ff.show(row)
+    },
     //处置容器
     handleCzrq(row) {
       this.$refs.Czrq.show(row)
     },
-     //批量处置容器
+    //批量处置容器
     handlePlczrq() {
       this.$refs.Czrq.showBatch(this.selectList)
     },
@@ -303,7 +325,7 @@ export default {
     handleCzyj(row) {
       this.$refs.Czyj.show(row)
     },
-     //批量处置药剂
+    //批量处置药剂
     handlePlczyj() {
       this.$refs.Czyj.showBatch(this.selectList)
     },