diff --git a/src/lang/zh/business/resource/gyzj.js b/src/lang/zh/business/resource/gyzj.js
index c5c7e8b..ee817a4 100644
--- a/src/lang/zh/business/resource/gyzj.js
+++ b/src/lang/zh/business/resource/gyzj.js
@@ -20,6 +20,8 @@ export default {
   syl: '使用量',
   lqr1: '领取人',
   lqr2: '领取人2',
+    yslqr1:'钥匙1领取人',
+    yslqr2:'钥匙2领取人',
   kgy1: '库管员',
   kgy2: '库管员2',
 
diff --git a/src/lang/zh/business/resource/mjy.js b/src/lang/zh/business/resource/mjy.js
index 8357ef8..c164be2 100644
--- a/src/lang/zh/business/resource/mjy.js
+++ b/src/lang/zh/business/resource/mjy.js
@@ -20,6 +20,8 @@ export default {
     syl:'使用量',
     lqr1:'领取人',
     lqr2:'领取人2',
+    yslqr1:'钥匙1领取人',
+    yslqr2:'钥匙2领取人',
     kgy1:'库管员',
     kgy2:'库管员2',
 
diff --git a/src/views/business/comps/select/BusinessSelect.vue b/src/views/business/comps/select/BusinessSelect.vue
index 754fd24..6d7dd71 100644
--- a/src/views/business/comps/select/BusinessSelect.vue
+++ b/src/views/business/comps/select/BusinessSelect.vue
@@ -8,7 +8,7 @@
 <!-- 处置方式：business_czfs -->
 <template>
   <div>
-    <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
+    <el-select  style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
       <el-option v-for="item in list"  :key="item.dictCode" :label="item.dictLabel" :value="item.dictLabel" />
     </el-select>
   </div>
diff --git a/src/views/business/comps/select/SelectZcg.vue b/src/views/business/comps/select/SelectZcg.vue
index 0c3428d..2be7bea 100644
--- a/src/views/business/comps/select/SelectZcg.vue
+++ b/src/views/business/comps/select/SelectZcg.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-select style="width:100%" v-model="selected" :placeholder="$t('form.placeholderSelect')"  :disabled="readonly" :multiple="multiple" @change="handleChange" :filterable="filterable">
-      <el-option v-for="item in list"  :key="item.id" :label="item.name" :value="item.id" />
+      <el-option v-for="item in list"  :key="item.id" :label="item.mc" :value="item.id" />
     </el-select>
   </div>
 </template>
@@ -22,7 +22,7 @@ export default {
     },
     multiple: {
       type: Boolean,
-      default: true
+      default: false
     },
     filterable: {
       type: Boolean,
@@ -31,10 +31,6 @@ export default {
     placeholder: {
       type: String,
       default: ''
-    },
-    storeId: {
-      type: [Number, String ],
-      default: getStoreId()
     }
   },
   watch: {
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
index 06aff9f..14d98f0 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Gd.vue
@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jd.vue b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
index 783a251..bb3549a 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jd.vue
@@ -70,7 +70,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jq.vue b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
index 9e93fc2..584f680 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jq.vue
@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Js.vue b/src/views/business/resource/gyzj/comps/ffjl/Js.vue
index 7e94c85..f06d099 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Js.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Js.vue
@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
index 1f1019e..4c19f09 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Jy.vue
@@ -87,7 +87,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
index aa8a426..b571d1a 100644
--- a/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/gyzj/comps/ffjl/Sd.vue
@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
index 9eada42..3acb77a 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Bj.vue
@@ -24,7 +24,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.nddw')" prop="nddw">
-              <el-input type="text" v-model="form.nddw" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.nddw" dictType="business_nddw"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -38,12 +38,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.cctj')" prop="cctj">
-              <el-input type="text" v-model="form.cctj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.ccwz')" prop="ccwz">
-              <el-input type="text" v-model="form.ccwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -91,10 +91,11 @@
 import { bj } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Bj",
-  components: { SelectList },
+  components: { SelectList,BusinessSelect },
   data() {
     return {
       open: false,
@@ -145,7 +146,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
index 6dea830..c5995f7 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Czrq.vue
@@ -183,7 +183,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
index 50d2365..7a328fd 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Czyj.vue
@@ -202,7 +202,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
index d4c5a78..a82f3fe 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ff.vue
@@ -155,8 +155,9 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.ffr1')" prop="ffr1Id">
-              <SelectDeptUser v-model="form.ffr1Id" key="ffr1Id" />
+            <el-form-item :label="$t('page.business.resource.gyzj.ffr1')">
+               <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+                disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -274,7 +275,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gd.vue b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
index 4b2a9b5..2dfb9e9 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gd.vue
@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
index 98df106..df6ddef 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Gh.vue
@@ -116,7 +116,8 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.jsr1Id')">
-              <el-input type="text" v-model="nickName" maxlength="50" disabled />
+              <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+                disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -217,7 +218,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jd.vue b/src/views/business/resource/gyzj/comps/gyzj/Jd.vue
index c5066f3..9c6ad21 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Jd.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jd.vue
@@ -81,7 +81,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Js.vue b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
index 529032a..918f3e9 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Js.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Js.vue
@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
index e87cf98..2b853d2 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Jy.vue
@@ -101,7 +101,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sd.vue b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
index db57a55..9dbd5b6 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Sd.vue
@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
index 4b673d0..e2ce1d0 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shbj.vue
@@ -164,7 +164,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
index 0b1a3eb..be0b8d0 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Shxgkc.vue
@@ -120,7 +120,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
index 0e83ddd..f72e28c 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Sqgh.vue
@@ -191,7 +191,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue b/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue
index 4718b99..7d1fb31 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Xgkc.vue
@@ -18,13 +18,13 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.gyzj.kc')" prop="kcbj">
+            <el-form-item :label="$t('page.business.resource.gyzj.kc')" prop="kc">
               <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.resource.gyzj.kcdw')" prop="kcdwbj">
-              <el-input type="text" v-model="form.kcdw" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.gyzj.kcdw')" prop="kcdw">
+              <BusinessSelect v-model="form.kcdw" dictType="business_nddw"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -72,10 +72,11 @@
 import { xgkc } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Xgkc",
-  components: { SelectList },
+  components: { SelectList,BusinessSelect },
   data() {
     return {
       open: false,
@@ -101,7 +102,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue b/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue
index 9abbbea..ff85430 100644
--- a/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue
+++ b/src/views/business/resource/gyzj/comps/gyzj/Ysff.vue
@@ -3,7 +3,7 @@
     <!-- 钥匙发放弹窗 -->
     <el-dialog :title="$t('page.business.resource.gyzj.ysff')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <div>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
@@ -48,7 +48,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.gyzj.zcg')" prop="zcgId">
-              <el-input type="text" v-model="form.zcgId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <SelectZcg v-model="form.zcgId"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -61,33 +61,34 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="text" v-model="form.remark" maxlength="20" :placeholder="$t('form.placeholderInput')">
+                <el-input type="textarea" v-model="form.remark" :rows="5" 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.resource.gyzj.lqr1')" prop="lqr1Id">
+            <el-form-item :label="$t('page.business.resource.gyzj.yslqr1')" prop="lqr1Id">
               <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="lqr1mm">
-              <el-input type="text" v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
+            <el-form-item :label="$t('page.business.resource.gyzj.yslqr1')+$t('form.password')" prop="lqr1mm">
+              <el-input type="password" v-model="form.lqr1mm" maxlength="20" :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.resource.gyzj.lqr2')" prop="lqr2Id">
+            <el-form-item :label="$t('page.business.resource.gyzj.yslqr2')" prop="lqr2Id">
               <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="lqr2mm">
-              <el-input type="text" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
+            <el-form-item :label="$t('page.business.resource.gyzj.yslqr2')+$t('form.password')" prop="lqr2mm">
+              <el-input type="password" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -101,7 +102,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="ffrmm">
-              <el-input type="text" v-model="form.ffrmm" maxlength="20" :placeholder="$t('form.placeholderInput')">
+              <el-input type="password" v-model="form.ffrmm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -119,10 +120,11 @@
 import { ysff } from "@/api/business/gyzj/gyzj"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import SelectZcg from '@/views/business/comps/select/SelectZcg';
 
 export default {
   name: "Ysff",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser,SelectZcg },
   data() {
     return {
       ids: [],
@@ -170,7 +172,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/ffjl/Gd.vue b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
index 0b33d5b..7570e5a 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Gd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Gd.vue
@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jd.vue b/src/views/business/resource/mjy/comps/ffjl/Jd.vue
index f25b7ad..af176a2 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jd.vue
@@ -70,7 +70,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jq.vue b/src/views/business/resource/mjy/comps/ffjl/Jq.vue
index 4e1d9c3..325f43b 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jq.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jq.vue
@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/ffjl/Js.vue b/src/views/business/resource/mjy/comps/ffjl/Js.vue
index b8cac81..91f1e04 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Js.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Js.vue
@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/ffjl/Jy.vue b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
index e26fbb8..934d3c1 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Jy.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Jy.vue
@@ -87,7 +87,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/ffjl/Sd.vue b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
index 8f5dee2..6461c0b 100644
--- a/src/views/business/resource/mjy/comps/ffjl/Sd.vue
+++ b/src/views/business/resource/mjy/comps/ffjl/Sd.vue
@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Bj.vue b/src/views/business/resource/mjy/comps/mjy/Bj.vue
index 4b7ecd9..d73f87d 100644
--- a/src/views/business/resource/mjy/comps/mjy/Bj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Bj.vue
@@ -24,7 +24,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.nddw')" prop="nddw">
-              <el-input type="text" v-model="form.nddw" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.nddw" dictType="business_nddw"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -38,12 +38,12 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.cctj')" prop="cctj">
-              <el-input type="text" v-model="form.cctj" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.cctj" dictType="business_cctj"></BusinessSelect>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.ccwz')" prop="ccwz">
-              <el-input type="text" v-model="form.ccwz" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <BusinessSelect v-model="form.ccwz" dictType="business_ccwz"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -64,7 +64,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20"
+              <el-input type="password" v-model="form.qmrmm" autocomplete="off"  maxlength="20"
                 :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
@@ -91,10 +91,11 @@
 import { bj } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectList from "./SelectList";
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 
 export default {
   name: "Bj",
-  components: { SelectList },
+  components: { SelectList, BusinessSelect },
   data() {
     return {
       open: false,
@@ -145,7 +146,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Czrq.vue b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
index 3e387ac..2939e34 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czrq.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czrq.vue
@@ -71,7 +71,6 @@
               <el-input type="text" v-model="nickName" maxlength="50" disabled />
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.clr') + $t('form.password')" prop="clrmm">
               <el-input type="password" v-model="form.clrmm" maxlength="20"
@@ -183,7 +182,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Czyj.vue b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
index 071c973..c16be9e 100644
--- a/src/views/business/resource/mjy/comps/mjy/Czyj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Czyj.vue
@@ -204,7 +204,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Ff.vue b/src/views/business/resource/mjy/comps/mjy/Ff.vue
index edab7ca..ea96c23 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ff.vue
@@ -171,8 +171,9 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.ffr1')" prop="ffr1Id">
-              <SelectDeptUser v-model="form.ffr1Id" key="ffr1Id" />
+            <el-form-item :label="$t('page.business.resource.mjy.ffr1')">
+                <el-input type="text" v-model="nickName" maxlength="50" :placeholder="$t('form.placeholderInput')"
+                disabled />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -303,7 +304,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Gd.vue b/src/views/business/resource/mjy/comps/mjy/Gd.vue
index b19cea7..b186962 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gd.vue
@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue
index 8db9bd7..109bfee 100644
--- a/src/views/business/resource/mjy/comps/mjy/Gh.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue
@@ -290,7 +290,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Jd.vue b/src/views/business/resource/mjy/comps/mjy/Jd.vue
index 1db5e5b..de5ae62 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jd.vue
@@ -81,7 +81,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Js.vue b/src/views/business/resource/mjy/comps/mjy/Js.vue
index f0a1c2e..39f3d35 100644
--- a/src/views/business/resource/mjy/comps/mjy/Js.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Js.vue
@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Jy.vue b/src/views/business/resource/mjy/comps/mjy/Jy.vue
index 2be38fe..e70aa98 100644
--- a/src/views/business/resource/mjy/comps/mjy/Jy.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Jy.vue
@@ -101,7 +101,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Sd.vue b/src/views/business/resource/mjy/comps/mjy/Sd.vue
index a152753..570217a 100644
--- a/src/views/business/resource/mjy/comps/mjy/Sd.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Sd.vue
@@ -79,7 +79,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Shbj.vue b/src/views/business/resource/mjy/comps/mjy/Shbj.vue
index 8a538d7..e434a39 100644
--- a/src/views/business/resource/mjy/comps/mjy/Shbj.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Shbj.vue
@@ -164,7 +164,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
index b162a66..174e4b2 100644
--- a/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Shxgkc.vue
@@ -120,7 +120,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
index 2980169..ee5eb28 100644
--- a/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Xgkc.vue
@@ -17,13 +17,13 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item :label="$t('page.business.resource.mjy.kc')" prop="kcbj">
+            <el-form-item :label="$t('page.business.resource.mjy.kc')" prop="kc">
               <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.resource.mjy.kcdw')" prop="kcdwbj">
-              <el-input type="text" v-model="form.kcdw" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+            <el-form-item :label="$t('page.business.resource.mjy.kcdw')" prop="kcdw">
+              <BusinessSelect v-model="form.kcdw" dictType="business_nddw"></BusinessSelect>
             </el-form-item>
           </el-col>
         </el-row>
@@ -44,7 +44,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.password')" prop="qmrmm">
-              <el-input type="password" v-model="form.qmrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.qmrmm"  maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -69,11 +69,12 @@
 <script>
 import { xgkc } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
+import BusinessSelect from '@/views/business/comps/select/BusinessSelect';
 import SelectList from "./SelectList";
 
 export default {
   name: "Xgkc",
-  components: { SelectList },
+  components: { SelectList,BusinessSelect },
   data() {
     return {
       open: false,
@@ -99,7 +100,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/mjy/comps/mjy/Ysff.vue b/src/views/business/resource/mjy/comps/mjy/Ysff.vue
index 6ec2ef0..4bf6862 100644
--- a/src/views/business/resource/mjy/comps/mjy/Ysff.vue
+++ b/src/views/business/resource/mjy/comps/mjy/Ysff.vue
@@ -3,7 +3,7 @@
     <!-- 钥匙发放弹窗 -->
     <el-dialog :title="$t('page.business.resource.mjy.ysff')" :visible.sync="open" width="1200px" append-to-body
       :close-on-click-modal="false">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <div>
           <el-row style="margin:10px 0px;">
             <el-col :span="24">
@@ -42,7 +42,7 @@
         <el-row>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.mjy.zcg')" prop="zcgId">
-              <el-input type="text" v-model="form.zcgId" maxlength="50" :placeholder="$t('form.placeholderInput')" />
+              <SelectZcg v-model="form.zcgId"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -55,33 +55,34 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('form.remark')" prop="remark">
-              <el-input type="text" v-model="form.remark" maxlength="20" :placeholder="$t('form.placeholderInput')">
+               <el-input type="textarea" v-model="form.remark" :rows="5" 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.resource.mjy.lqr1')" prop="lqr1Id">
+            <el-form-item :label="$t('page.business.resource.mjy.yslqr1')" prop="lqr1Id">
               <SelectDeptUser v-model="form.lqr1Id" key="lqr1Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="lqr1mm">
-              <el-input type="text" v-model="form.lqr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
+            <el-form-item :label="$t('page.business.resource.mjy.yslqr1')+$t('form.password')" prop="lqr1mm">
+              <el-input type="password" v-model="form.lqr1mm" maxlength="20" :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.resource.mjy.lqr2')" prop="lqr2Id">
+            <el-form-item :label="$t('page.business.resource.mjy.yslqr2')" prop="lqr2Id">
               <SelectDeptUser v-model="form.lqr2Id" key="lqr2Id" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item :label="$t('form.password')" prop="lqr2mm">
-              <el-input type="text" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
+            <el-form-item :label="$t('page.business.resource.mjy.yslqr2')+$t('form.password')" prop="lqr2mm">
+              <el-input type="password" v-model="form.lqr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -95,7 +96,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('form.password')" prop="ffrmm">
-              <el-input type="text" v-model="form.ffrmm" maxlength="20" :placeholder="$t('form.placeholderInput')">
+              <el-input type="password" v-model="form.ffrmm" maxlength="20"  :placeholder="$t('form.placeholderInput')">
               </el-input>
             </el-form-item>
           </el-col>
@@ -113,10 +114,11 @@
 import { ysff } from "@/api/business/mjy/mjy"
 import { mapGetters } from 'vuex'
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import SelectZcg from '@/views/business/comps/select/SelectZcg';
 
 export default {
   name: "Ysff",
-  components: { SelectDeptUser },
+  components: { SelectDeptUser,SelectZcg},
   data() {
     return {
       ids: [],
@@ -164,7 +166,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Bj.vue b/src/views/business/resource/sj/comps/Bj.vue
index 0046ee1..44ea0b1 100644
--- a/src/views/business/resource/sj/comps/Bj.vue
+++ b/src/views/business/resource/sj/comps/Bj.vue
@@ -120,7 +120,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Cz.vue b/src/views/business/resource/sj/comps/Cz.vue
index d630432..afa9cd8 100644
--- a/src/views/business/resource/sj/comps/Cz.vue
+++ b/src/views/business/resource/sj/comps/Cz.vue
@@ -113,7 +113,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/CzBatch.vue b/src/views/business/resource/sj/comps/CzBatch.vue
index ea58b9a..6d92af1 100644
--- a/src/views/business/resource/sj/comps/CzBatch.vue
+++ b/src/views/business/resource/sj/comps/CzBatch.vue
@@ -103,7 +103,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Ff.vue b/src/views/business/resource/sj/comps/Ff.vue
index 27474bb..453eeda 100644
--- a/src/views/business/resource/sj/comps/Ff.vue
+++ b/src/views/business/resource/sj/comps/Ff.vue
@@ -97,7 +97,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Gd.vue b/src/views/business/resource/sj/comps/Gd.vue
index d4d2c76..a46d2e0 100644
--- a/src/views/business/resource/sj/comps/Gd.vue
+++ b/src/views/business/resource/sj/comps/Gd.vue
@@ -70,7 +70,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Gh.vue b/src/views/business/resource/sj/comps/Gh.vue
index 7d096d2..5efbf2c 100644
--- a/src/views/business/resource/sj/comps/Gh.vue
+++ b/src/views/business/resource/sj/comps/Gh.vue
@@ -97,7 +97,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Jd.vue b/src/views/business/resource/sj/comps/Jd.vue
index 316f89a..04d9129 100644
--- a/src/views/business/resource/sj/comps/Jd.vue
+++ b/src/views/business/resource/sj/comps/Jd.vue
@@ -70,7 +70,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Js.vue b/src/views/business/resource/sj/comps/Js.vue
index 7e05d38..be4c24d 100644
--- a/src/views/business/resource/sj/comps/Js.vue
+++ b/src/views/business/resource/sj/comps/Js.vue
@@ -65,7 +65,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Jy.vue b/src/views/business/resource/sj/comps/Jy.vue
index b3dac93..1d4f209 100644
--- a/src/views/business/resource/sj/comps/Jy.vue
+++ b/src/views/business/resource/sj/comps/Jy.vue
@@ -81,7 +81,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Sd.vue b/src/views/business/resource/sj/comps/Sd.vue
index 8f0cb2a..05372db 100644
--- a/src/views/business/resource/sj/comps/Sd.vue
+++ b/src/views/business/resource/sj/comps/Sd.vue
@@ -70,7 +70,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Xgkc.vue b/src/views/business/resource/sj/comps/Xgkc.vue
index 8b2077f..410a8e0 100644
--- a/src/views/business/resource/sj/comps/Xgkc.vue
+++ b/src/views/business/resource/sj/comps/Xgkc.vue
@@ -86,7 +86,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/sj/comps/Ysff.vue b/src/views/business/resource/sj/comps/Ysff.vue
index cada57a..7f97726 100644
--- a/src/views/business/resource/sj/comps/Ysff.vue
+++ b/src/views/business/resource/sj/comps/Ysff.vue
@@ -97,7 +97,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/yq/list.vue b/src/views/business/resource/yq/list.vue
index 5578447..06f5d7a 100644
--- a/src/views/business/resource/yq/list.vue
+++ b/src/views/business/resource/yq/list.vue
@@ -222,7 +222,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/zcg/comps/Ysff.vue b/src/views/business/resource/zcg/comps/Ysff.vue
index ed15d7c..32379c7 100644
--- a/src/views/business/resource/zcg/comps/Ysff.vue
+++ b/src/views/business/resource/zcg/comps/Ysff.vue
@@ -128,7 +128,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/resource/zcg/comps/Ysgh.vue b/src/views/business/resource/zcg/comps/Ysgh.vue
index 5ba8316..32b625c 100644
--- a/src/views/business/resource/zcg/comps/Ysgh.vue
+++ b/src/views/business/resource/zcg/comps/Ysgh.vue
@@ -37,7 +37,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.ghr1mm')" prop="ghr1mm">
-              <el-input type="text" v-model="form.ghr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.ghr1mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -49,7 +49,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.ghr2mm')" prop="ghr2mm">
-              <el-input type="text" v-model="form.ghr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.ghr2mm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -62,7 +62,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="$t('page.business.resource.zcg.jsrmm')" prop="jsrmm">
-              <el-input type="text" v-model="form.jsrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
+              <el-input type="password" v-model="form.jsrmm" maxlength="20" :placeholder="$t('form.placeholderInput')" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -130,7 +130,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue
index 48aed50..1fdbe10 100644
--- a/src/views/business/study/comp/jhbd/Bj.vue
+++ b/src/views/business/study/comp/jhbd/Bj.vue
@@ -173,7 +173,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/jhbd/Fh.vue b/src/views/business/study/comp/jhbd/Fh.vue
index ca10620..2673535 100644
--- a/src/views/business/study/comp/jhbd/Fh.vue
+++ b/src/views/business/study/comp/jhbd/Fh.vue
@@ -153,7 +153,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/jhbd/Ghgsr.vue b/src/views/business/study/comp/jhbd/Ghgsr.vue
index 13d0b57..ae33336 100644
--- a/src/views/business/study/comp/jhbd/Ghgsr.vue
+++ b/src/views/business/study/comp/jhbd/Ghgsr.vue
@@ -80,7 +80,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/jhbd/Sy.vue b/src/views/business/study/comp/jhbd/Sy.vue
index b15e44c..a959eee 100644
--- a/src/views/business/study/comp/jhbd/Sy.vue
+++ b/src/views/business/study/comp/jhbd/Sy.vue
@@ -136,7 +136,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/jhbd/Xq.vue b/src/views/business/study/comp/jhbd/Xq.vue
index 3d6571f..1f0e1e6 100644
--- a/src/views/business/study/comp/jhbd/Xq.vue
+++ b/src/views/business/study/comp/jhbd/Xq.vue
@@ -109,7 +109,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue
index 4e2ca5b..667f472 100644
--- a/src/views/business/study/comp/sqbd/Bj.vue
+++ b/src/views/business/study/comp/sqbd/Bj.vue
@@ -180,7 +180,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Fh.vue b/src/views/business/study/comp/sqbd/Fh.vue
index 925cf44..49772bc 100644
--- a/src/views/business/study/comp/sqbd/Fh.vue
+++ b/src/views/business/study/comp/sqbd/Fh.vue
@@ -153,7 +153,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Fz.vue b/src/views/business/study/comp/sqbd/Fz.vue
index a1aa051..979817d 100644
--- a/src/views/business/study/comp/sqbd/Fz.vue
+++ b/src/views/business/study/comp/sqbd/Fz.vue
@@ -75,7 +75,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Ghgsr.vue b/src/views/business/study/comp/sqbd/Ghgsr.vue
index 176d07d..80bd94f 100644
--- a/src/views/business/study/comp/sqbd/Ghgsr.vue
+++ b/src/views/business/study/comp/sqbd/Ghgsr.vue
@@ -80,7 +80,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Jq.vue b/src/views/business/study/comp/sqbd/Jq.vue
index 2eb9fa6..2ec1c9e 100644
--- a/src/views/business/study/comp/sqbd/Jq.vue
+++ b/src/views/business/study/comp/sqbd/Jq.vue
@@ -84,7 +84,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Qrfz.vue b/src/views/business/study/comp/sqbd/Qrfz.vue
index 9ec2258..b71671b 100644
--- a/src/views/business/study/comp/sqbd/Qrfz.vue
+++ b/src/views/business/study/comp/sqbd/Qrfz.vue
@@ -75,7 +75,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Sh.vue b/src/views/business/study/comp/sqbd/Sh.vue
index 975532d..30bbe3e 100644
--- a/src/views/business/study/comp/sqbd/Sh.vue
+++ b/src/views/business/study/comp/sqbd/Sh.vue
@@ -153,7 +153,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Sy.vue b/src/views/business/study/comp/sqbd/Sy.vue
index 514ead8..4bfd5c7 100644
--- a/src/views/business/study/comp/sqbd/Sy.vue
+++ b/src/views/business/study/comp/sqbd/Sy.vue
@@ -136,7 +136,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/sqbd/Xq.vue b/src/views/business/study/comp/sqbd/Xq.vue
index 0a3f287..748bd1a 100644
--- a/src/views/business/study/comp/sqbd/Xq.vue
+++ b/src/views/business/study/comp/sqbd/Xq.vue
@@ -170,7 +170,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/syff/Xq.vue b/src/views/business/study/comp/syff/Xq.vue
index 7c311b2..b5b1b2d 100644
--- a/src/views/business/study/comp/syff/Xq.vue
+++ b/src/views/business/study/comp/syff/Xq.vue
@@ -77,7 +77,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/syff/Xz.vue b/src/views/business/study/comp/syff/Xz.vue
index 2c7f316..67c84b5 100644
--- a/src/views/business/study/comp/syff/Xz.vue
+++ b/src/views/business/study/comp/syff/Xz.vue
@@ -111,7 +111,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/syff/Yd.vue b/src/views/business/study/comp/syff/Yd.vue
index 91ec1b1..c0dfd64 100644
--- a/src/views/business/study/comp/syff/Yd.vue
+++ b/src/views/business/study/comp/syff/Yd.vue
@@ -67,7 +67,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/syj/Bj.vue b/src/views/business/study/comp/syj/Bj.vue
index 859dd05..400929e 100644
--- a/src/views/business/study/comp/syj/Bj.vue
+++ b/src/views/business/study/comp/syj/Bj.vue
@@ -112,7 +112,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/syj/Jl.vue b/src/views/business/study/comp/syj/Jl.vue
index ab52222..d025ac1 100644
--- a/src/views/business/study/comp/syj/Jl.vue
+++ b/src/views/business/study/comp/syj/Jl.vue
@@ -71,7 +71,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/syj/Js.vue b/src/views/business/study/comp/syj/Js.vue
index a5d2426..38b12f1 100644
--- a/src/views/business/study/comp/syj/Js.vue
+++ b/src/views/business/study/comp/syj/Js.vue
@@ -125,7 +125,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/syj/Xz.vue b/src/views/business/study/comp/syj/Xz.vue
index 1bbba17..70161a0 100644
--- a/src/views/business/study/comp/syj/Xz.vue
+++ b/src/views/business/study/comp/syj/Xz.vue
@@ -125,7 +125,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index b7d84df..6481eac 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -148,7 +148,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Fh.vue b/src/views/business/study/comp/tbbd/Fh.vue
index 60bd444..14eeef5 100644
--- a/src/views/business/study/comp/tbbd/Fh.vue
+++ b/src/views/business/study/comp/tbbd/Fh.vue
@@ -155,7 +155,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Fz.vue b/src/views/business/study/comp/tbbd/Fz.vue
index 0e8ecce..d4ecafc 100644
--- a/src/views/business/study/comp/tbbd/Fz.vue
+++ b/src/views/business/study/comp/tbbd/Fz.vue
@@ -75,7 +75,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Gc.vue b/src/views/business/study/comp/tbbd/Gc.vue
index b1fe1b6..3a887f2 100644
--- a/src/views/business/study/comp/tbbd/Gc.vue
+++ b/src/views/business/study/comp/tbbd/Gc.vue
@@ -83,7 +83,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Ghgsr.vue b/src/views/business/study/comp/tbbd/Ghgsr.vue
index 0cf7647..de90ab1 100644
--- a/src/views/business/study/comp/tbbd/Ghgsr.vue
+++ b/src/views/business/study/comp/tbbd/Ghgsr.vue
@@ -80,7 +80,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Jq.vue b/src/views/business/study/comp/tbbd/Jq.vue
index 044b4df..378fd42 100644
--- a/src/views/business/study/comp/tbbd/Jq.vue
+++ b/src/views/business/study/comp/tbbd/Jq.vue
@@ -84,7 +84,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Qrfz.vue b/src/views/business/study/comp/tbbd/Qrfz.vue
index 19d4adc..9b82cc7 100644
--- a/src/views/business/study/comp/tbbd/Qrfz.vue
+++ b/src/views/business/study/comp/tbbd/Qrfz.vue
@@ -75,7 +75,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Sy.vue b/src/views/business/study/comp/tbbd/Sy.vue
index 976125d..4a39e80 100644
--- a/src/views/business/study/comp/tbbd/Sy.vue
+++ b/src/views/business/study/comp/tbbd/Sy.vue
@@ -136,7 +136,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue
index 02cd664..2190e77 100644
--- a/src/views/business/study/comp/tbbd/Xq.vue
+++ b/src/views/business/study/comp/tbbd/Xq.vue
@@ -170,7 +170,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 92ddc44..1950d12 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -181,7 +181,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/src/views/business/study/comp/ytbd/Sh.vue b/src/views/business/study/comp/ytbd/Sh.vue
index 914393e..7a63c69 100644
--- a/src/views/business/study/comp/ytbd/Sh.vue
+++ b/src/views/business/study/comp/ytbd/Sh.vue
@@ -171,7 +171,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName','name'
     ]),
   },
   created() {
diff --git a/vue.config.js b/vue.config.js
index bf3ddf1..c414bd7 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -34,8 +34,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://localhost:8080`,
-          target: `http://39.99.251.173:8080`,
+        target: `http://localhost:8080`,
+         //  target: `http://39.99.251.173:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''