diff --git a/src/api/business/mjy/mjy.js b/src/api/business/mjy/mjy.js
index 9b4c2bb..eac305a 100644
--- a/src/api/business/mjy/mjy.js
+++ b/src/api/business/mjy/mjy.js
@@ -139,3 +139,19 @@ export function mjy_plgd(data) {
     data: data
   })
 }
+//发放
+export function mjy_ff(data) {
+  return request({
+    url: '/system/business/mjy/ff',
+    method: 'post',
+    data: data
+  })
+}
+//批量发放
+export function mjy_plff(data) {
+  return request({
+    url: '/system/business/mjy/plff',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/src/views/business/resource/mjy/comps/Bj.vue b/src/views/business/resource/mjy/comps/Bj.vue
index 0f5ea4c..4168397 100644
--- a/src/views/business/resource/mjy/comps/Bj.vue
+++ b/src/views/business/resource/mjy/comps/Bj.vue
@@ -5,45 +5,45 @@ G<template>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <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 :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <el-input type="text" v-model="form.mc" 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
+              <el-input type="text" v-model="form.bh" maxlength="50" disabled
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="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 :label="$t('page.business.zykgl.mjy.nd')" prop="nd">
+              <el-input type="number" v-model="form.nd" 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 :label="$t('page.business.zykgl.mjy.nddw')" prop="nddw">
+              <el-input type="text" v-model="form.nddw" 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 :label="$t('page.business.zykgl.mjy.sxrq')" prop="sxrq">
+              <el-input type="text" v-model="form.sxrq" 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 :label="$t('page.business.zykgl.mjy.cctj')" prop="cctj">
+              <el-input type="text" v-model="form.cctj" 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 :label="$t('page.business.zykgl.mjy.ccwz')" prop="ccwz">
+              <el-input type="text" v-model="form.ccwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -92,44 +92,44 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "Mjybj",
+  name: "MjyBj",
   components: { SelectList },
   data() {
     return {
       open: false,
       form: {},
       rules: {
-        mcbj: [{
+        mc: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        bhbj: [{
+        bh: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        ndbj: [{
+        nd: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        nddwbj: [{
+        nddw: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        sxrqbj: [{
+        sxrq: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        cctjbj: [{
+        cctj: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        ccwzbj: [{
+        ccwz: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -156,13 +156,13 @@ export default {
     reset() {
       this.form = {
         id: null,
-        mcbj: null,
-        bhbj: null,
-        ndbj: null,
-        nddwbj: null,
-        sxrqbj: null,
-        cctjbj: null,
-        ccwzbj: null,
+        mc: null,
+        bh: null,
+        nd: null,
+        nddw: null,
+        sxrq: null,
+        cctj: null,
+        ccwz: null,
         qmrmm: null,
         qmyy: '编辑',
         bjbz: ''
@@ -172,13 +172,13 @@ export default {
     show(row) {
       this.reset()
       this.form.id = row.id
-      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.form.mc = row.mc
+      this.form.bh = row.bh
+      this.form.nd = row.nd
+      this.form.nddw = row.nddw
+      this.form.sxrq= row.sxrq
+      this.form.cctj = row.cctj
+      this.form.ccwz = row.ccwz
       this.open = true
     },
     save() {
diff --git a/src/views/business/resource/mjy/comps/Czrq.vue b/src/views/business/resource/mjy/comps/Czrq.vue
index 3228892..00167c5 100644
--- a/src/views/business/resource/mjy/comps/Czrq.vue
+++ b/src/views/business/resource/mjy/comps/Czrq.vue
@@ -34,7 +34,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch?'display:block':'display:none'">
+        <div v-if="!isBatch">
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
diff --git a/src/views/business/resource/mjy/comps/Czyj.vue b/src/views/business/resource/mjy/comps/Czyj.vue
index a4cb37d..d97271c 100644
--- a/src/views/business/resource/mjy/comps/Czyj.vue
+++ b/src/views/business/resource/mjy/comps/Czyj.vue
@@ -41,7 +41,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch?'display:block':'display:none'">
+        <div v-if="!isBatch">
           <el-row>
             <el-col :span="12">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
diff --git a/src/views/business/resource/mjy/comps/Ff.vue b/src/views/business/resource/mjy/comps/Ff.vue
index 36ea0e9..31fc579 100644
--- a/src/views/business/resource/mjy/comps/Ff.vue
+++ b/src/views/business/resource/mjy/comps/Ff.vue
@@ -1,7 +1,7 @@
 G<template>
   <div>
     <!-- 发放弹窗 -->
-    <el-dialog :title="$t('page.business.zykgl.mjy.fafang')" :visible.sync="open" width="800px" append-to-body
+    <el-dialog :title="$t('page.business.zykgl.mjy.fafang')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <div :style="isBatch ? 'display:block' : 'display:none'">
@@ -12,19 +12,32 @@ G<template>
                   :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">
+                <el-table-column :label="$t('page.business.zykgl.mjy.zytj')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czfs" maxlength="50"
+                    <el-input type="text" v-model="scope.row.zytj" maxlength="50"
                       :placeholder="$t('form.placeholderInput')" />
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('page.business.zykgl.mjy.yuanyin')" align="center">
+                <el-table-column :label="$t('page.business.zykgl.mjy.ckmz')" align="center" width="250px">
                   <template slot-scope="scope">
-                    <el-input type="text" v-model="scope.row.czyy" maxlength="50"
+                    <el-input type="text" v-model="scope.row.ckmz" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')"><template slot="append">{{ scope.row.ckmzdw }}</template>
+                    </el-input>
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('page.business.zykgl.mjy.md')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.xmId" maxlength="50"
+                      :placeholder="$t('form.placeholderInput')" />
+                  </template>
+                </el-table-column>
+                <el-table-column :label="$t('form.remark')" align="center" width="250px">
+                  <template slot-scope="scope">
+                    <el-input type="text" v-model="scope.row.remark" maxlength="50"
                       :placeholder="$t('form.placeholderInput')" />
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('form.operate')" align="center" width="150px">
+                <el-table-column :label="$t('form.operate')" align="center" width="100px" fixed="right">
                   <template slot-scope="scope">
                     <el-button size="mini" type="text" @click="handleSc(scope.row)">{{
                       $t('form.delete') }}</el-button>
@@ -34,7 +47,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch ? 'display:block' : 'display:none'">
+        <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
@@ -51,37 +64,38 @@ G<template>
               </el-form-item>
             </el-col>
           </el-row>
+          <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.ckmzdw }}</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.md')" prop="xmId">
+                <el-input type="text" v-model="form.xmId" 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>
+            </el-col>
+          </el-row>
         </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('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>
-        <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>
+
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.zykgl.mjy.lqr1')" prop="lqr1Id">
@@ -272,8 +286,11 @@ export default {
           id: item.id,
           mc: item.mc,
           bh: item.bh,
-          czyy: null,
-          czfs: null,
+          ckmzdw: item.kcdw,
+          zytj: null,
+          ckmz: null,
+          xmId: null,
+          remark: null,
         })
       })
       this.selectList = tmp
@@ -288,11 +305,10 @@ export default {
         ids: null,
         mc: null,
         bh: null,
-        kcdw: null,
+        ckmzdw: null,
         zytj: null,
         xmId: null,
         ckmz: null,
-        ckmzdw: null,
         lqr1Id: null,
         lqr2Id: null,
         lqr1mm: null,
@@ -303,7 +319,8 @@ export default {
         ffr2mm: null,
         xmId: null,
         qmyy: '领取发放',
-        sdrmm: null
+        sdrmm: null,
+        remark: null
       }
       this.resetForm("form")
     },
@@ -315,24 +332,29 @@ export default {
       this.form.id = row.id
       this.form.mc = row.mc
       this.form.bh = row.bh
-      this.form.kcdw = row.kcdw
+      this.form.ckmzdw = 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_plff(params).then(response => {
+                this.open = false
+                this.$emit('callback')
+              })
+            }
           } else {
-            mjy_jd(this.form).then(response => {
+            mjy_ff(params).then(response => {
               this.open = false
               this.$emit('callback')
             })
           }
-
         }
       })
     }
diff --git a/src/views/business/resource/mjy/comps/Gd.vue b/src/views/business/resource/mjy/comps/Gd.vue
index 548606e..0e3e3e0 100644
--- a/src/views/business/resource/mjy/comps/Gd.vue
+++ b/src/views/business/resource/mjy/comps/Gd.vue
@@ -13,7 +13,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch ? 'display:block' : 'display:none'">
+         <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
diff --git a/src/views/business/resource/mjy/comps/Gh.vue b/src/views/business/resource/mjy/comps/Gh.vue
index 2b815f3..9a71fc2 100644
--- a/src/views/business/resource/mjy/comps/Gh.vue
+++ b/src/views/business/resource/mjy/comps/Gh.vue
@@ -13,7 +13,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch ? 'display:block' : 'display:none'">
+       <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
diff --git a/src/views/business/resource/mjy/comps/Jd.vue b/src/views/business/resource/mjy/comps/Jd.vue
index 23072ea..ee03edc 100644
--- a/src/views/business/resource/mjy/comps/Jd.vue
+++ b/src/views/business/resource/mjy/comps/Jd.vue
@@ -12,7 +12,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch ? 'display:block' : 'display:none'">
+         <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
diff --git a/src/views/business/resource/mjy/comps/Jy.vue b/src/views/business/resource/mjy/comps/Jy.vue
index 855ad27..81153ae 100644
--- a/src/views/business/resource/mjy/comps/Jy.vue
+++ b/src/views/business/resource/mjy/comps/Jy.vue
@@ -12,7 +12,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch ? 'display:block' : 'display:none'">
+          <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
diff --git a/src/views/business/resource/mjy/comps/Sd.vue b/src/views/business/resource/mjy/comps/Sd.vue
index 1a06415..85cfeaf 100644
--- a/src/views/business/resource/mjy/comps/Sd.vue
+++ b/src/views/business/resource/mjy/comps/Sd.vue
@@ -11,7 +11,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch ? 'display:block' : 'display:none'">
+        <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
diff --git a/src/views/business/resource/mjy/comps/Shbj.vue b/src/views/business/resource/mjy/comps/Shbj.vue
index e1aa588..61476eb 100644
--- a/src/views/business/resource/mjy/comps/Shbj.vue
+++ b/src/views/business/resource/mjy/comps/Shbj.vue
@@ -6,45 +6,44 @@ G<template>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>
           <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 :label="$t('page.business.zykgl.mjy.mc')" prop="mc">
+              <el-input type="text" v-model="form.mc" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.zykgl.mjy.bh')" prop="glyj">
-              <el-input type="text" v-model="form.bhbj" maxlength="50" disabled
-                :placeholder="$t('form.placeholderInput')" />
+              <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.nd')" prop="ndbj">
-              <el-input type="text" v-model="form.ndbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.zykgl.mjy.nd')" prop="nd">
+              <el-input type="text" v-model="form.nd" maxlength="50" disabled />
             </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 :label="$t('page.business.zykgl.mjy.nddw')" prop="nddw">
+              <el-input type="text" v-model="form.nddw" 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.sxrq')" prop="sxrqbj">
-              <el-input type="text" v-model="form.sxrqbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.zykgl.mjy.sxrq')" prop="sxrq">
+              <el-input type="text" v-model="form.sxrq" 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.cctj')" prop="cctjbj">
-              <el-input type="text" v-model="form.cctjbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.zykgl.mjy.cctj')" prop="cctj">
+              <el-input type="text" v-model="form.cctj" maxlength="50" disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.zykgl.mjy.ccwz')" prop="ccwzbj">
-              <el-input type="text" v-model="form.ccwzbj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.zykgl.mjy.ccwz')" prop="ccwz">
+              <el-input type="text" v-model="form.ccwz" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,8 +63,8 @@ G<template>
           <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-option  label="同意编辑" value="同意编辑" />
+                <el-option label="拒绝编辑" value="拒绝编辑" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -107,7 +106,7 @@ import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
 
 export default {
-  name: "Mjybj",
+  name: "MjyShbj",
   components: { SelectList },
   data() {
     return {
@@ -119,37 +118,37 @@ export default {
           message: ' ',
           trigger: 'blur'
         }],
-        mcbj: [{
+        mc: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        bhbj: [{
+        bh: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        ndbj: [{
+        nd: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        nddwbj: [{
+        nddw: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        sxrqbj: [{
+        sxrq: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        cctjbj: [{
+        cctj: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        ccwzbj: [{
+        ccwz: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -176,13 +175,13 @@ export default {
     reset() {
       this.form = {
         id: null,
-        mcbj: null,
-        bhbj: null,
-        ndbj: null,
-        nddwbj: null,
-        sxrqbj: null,
-        cctjbj: null,
-        ccwzbj: null,
+        mc: null,
+        bh: null,
+        nd: null,
+        nddw: null,
+        sxrq: null,
+        cctj: null,
+        ccwz: null,
         qmrmm: null,
         bjrMc: null,
         bjbz: null,
@@ -196,13 +195,13 @@ export default {
       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.mc = response.data.mcbj
+        this.form.bh = response.data.bh
+        this.form.nd = response.data.ndbj
+        this.form.nddw = response.data.nddwbj
+        this.form.sxrq = response.data.sxrqbj
+        this.form.cctj = response.data.cctjbj
+        this.form.ccwz = response.data.ccwzbj
         this.form.bjbz = response.data.bjbz
         this.form.bjrMc = response.data.bjrMc
         this.open = true
diff --git a/src/views/business/resource/mjy/comps/Shxgkc.vue b/src/views/business/resource/mjy/comps/Shxgkc.vue
index cfbce44..7c0db66 100644
--- a/src/views/business/resource/mjy/comps/Shxgkc.vue
+++ b/src/views/business/resource/mjy/comps/Shxgkc.vue
@@ -18,12 +18,12 @@ G<template>
         <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-input type="number" v-model="form.kcbj" maxlength="50" disabled />
             </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-input type="text" v-model="form.kcdwbj" maxlength="50" disabled />
             </el-form-item>
           </el-col>
         </el-row>
@@ -43,8 +43,8 @@ G<template>
          <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-option  label="同意修改库存" value="同意修改库存" />
+                <el-option  label="拒绝修改库存" value="拒绝修改库存" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -132,7 +132,7 @@ export default {
         qmrmm: null,
         kcbjrMc: null,
         kcbjbz: null,
-        qmyy: '同意编辑库存',
+        qmyy: '同意修改库存',
         remark: ''
       }
       this.resetForm("form")
diff --git a/src/views/business/resource/mjy/comps/Xgkc.vue b/src/views/business/resource/mjy/comps/Xgkc.vue
index 5c19402..87291ee 100644
--- a/src/views/business/resource/mjy/comps/Xgkc.vue
+++ b/src/views/business/resource/mjy/comps/Xgkc.vue
@@ -18,12 +18,12 @@ G<template>
         <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-input type="number" v-model="form.kc" 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-input type="text" v-model="form.kcdw" maxlength="50" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -79,12 +79,12 @@ export default {
       open: false,
       form: {},
       rules: {
-        kcbj: [{
+        kc: [{
           required: true,
           message: ' ',
           trigger: 'blur'
         }],
-        kcdwbj: [{
+        kcdw: [{
           required: true,
           message: ' ',
           trigger: 'blur'
@@ -113,8 +113,8 @@ export default {
         id: null,
         mc: null,
         bh: null,
-        kcbj: null,
-        kcdwbj: null,
+        kc: null,
+        kcdw: null,
         qmrmm: null,
         qmyy: '修改库存',
         kcbjbz: ''
@@ -126,8 +126,8 @@ export default {
       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.form.kc = row.kc
+      this.form.kcdw = row.kcdw
       this.open = true
     },
     save() {
diff --git a/src/views/business/resource/mjy/comps/Ysff.vue b/src/views/business/resource/mjy/comps/Ysff.vue
index aca006f..54c0d6c 100644
--- a/src/views/business/resource/mjy/comps/Ysff.vue
+++ b/src/views/business/resource/mjy/comps/Ysff.vue
@@ -11,7 +11,7 @@ G<template>
             </el-col>
           </el-row>
         </div>
-        <div :style="!isBatch ? 'display:block' : 'display:none'">
+          <div v-if="!isBatch">
           <el-row>
             <el-col :span="24">
               <el-form-item :label="$t('page.business.zykgl.mjy.mc')" prop="mc">