update

src/components/dialog/index.vue

@@ -3,6 +3,8 @@
         style="margin-top:0vh"
         :visible="visible"
         width="55%"
+        append-to-body
+        :close-on-click-modal="true" 
         :show-close="false" 
         custom-class="data-dia">
         <div slot="title" class="dia-header">

src/pages/counter/list/index.vue

@@ -71,12 +71,14 @@
             <img class="sth cipher-machine cp" v-lazy="lazyImg[20]" @click="showData('密码器',8)" alt="" />
         </el-tooltip>
 
-        <el-tooltip placement="top" popper-class="sth-popper" offset="50">
+        <!-- <el-tooltip placement="top" popper-class="sth-popper" offset="50">
             <div slot="content">
                 <img v-lazy="this.lazyImg[29]" alt=""  />
             </div>
             <img class="sth employee" v-lazy="lazyImg[21]" @click="setShowBusiness(true)" alt="" />
-        </el-tooltip>
+        </el-tooltip> -->
+
+        <img class="sth employee" v-lazy="lazyImg[21]" alt="" />
 
         <el-tooltip placement="top" popper-class="sth-popper" offset="-50">
             <div slot="content">
@@ -708,7 +710,9 @@ export default {
                 }
             }
             else if(this.$store.state.system.popText == '身份证扫描仪' || this.$store.state.system.popText.includes('身份证扫描') || this.$store.state.system.popText.includes('银行')){
+                
                 if (this.$store.state.system.id == '33'){
+                    
                     this.nbm = 33
                     let param= {
                         parentId: this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',' + '285,287,5,25,33,41'
@@ -937,6 +941,10 @@ export default {
                 this.boxStart2 = []
                 
             }
+        },
+        id(newVal) {
+            console.log('新的id值')
+            console.log(newVal)
         }
     },
     created() {
@@ -1178,7 +1186,7 @@ export default {
             }
             this.changeShowGoods(true)
             if(type !== '系统') {
-                this.$store.commit('system/changePop',{show:true,text:type})
+                this.$store.commit('system/changePop',{show:true,text:type, id: this.id})
             }
         },
         checkData(item) {/* 选中物品 */
@@ -1247,7 +1255,6 @@ export default {
             }
             setTimeout(() => {
                 if(this.myMap) {
-                    console.log(item.id)
                     this.outThingsGoods([ item.id ])
                     this.pushThings({ idArr: [item.id], name: this.myMap})
                     
@@ -1329,12 +1336,16 @@ export default {
                 this.callChangePassword()
             }
             
+            console.log('mxx')
+            console.log(this.id)
+            console.log(this.$store.state.system.id)
             if (this.$store.state.system.id == '33'){
                 this.nbm = 33
                 // this.goodsShelfTotalData = this.auditGoodsShelf
                 if (this.receptionList.length >0){
                     sessionStorage.setItem('nomClientIdentity', JSON.stringify(this.receptionList))
                 }
+                console.log(sessionStorage.getItem('nomClientIdentity'))
             }else if (this.$store.state.system.id == '34'){
                 this.nbm = 34
                 // this.goodsShelfTotalData = this.auditGoodsShelf
@@ -2776,10 +2787,11 @@ export default {
 }
 .data-dia {
     border-radius: 16px;
-    margin-top: 4vh !important;
+    // margin-top: 4vh !important;
     background: #fff;
     position: fixed;
-    top: 7%;
+    // top: 7%;
+    top: 7vh!important;
     left: 50%;
     transform: translate(-50%, 0);
     padding: 0 15px 15px;

src/pages/manage/list/client/consumerClient.vue

@@ -224,10 +224,19 @@ export default {
         NeedBefore
     },
     created() {
-        console.log(this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id)
-        // console.log(moduleName)
         if(this.inMyWork(moduleName)) {
             if(this.needsModule(moduleName) === '') {
+                if(sessionStorage.getItem('nomClientIdentity')) {
+                    this.idNumberJudge = true
+                    const { idType, userName, sex, birthday, nationality, mailbox, idNumber } = this.dataFlow
+                    this.form.idNumber = idNumber
+                    this.form.idType = idType
+                    this.form.userName = userName
+                    this.form.sex = sex
+                    this.form.birthday = birthday
+                    this.form.nationality = nationality
+                    this.form.mailbox = mailbox
+                }
                 this.getFormData()
             }else {
                 this.isNeedBefore = true
@@ -260,8 +269,8 @@ export default {
                         if (list[i].answerId == '40') {this.form.idType = list[i].emptyTwo}
                         // if (list[i].answerId == '41') {sessionStorage.setItem('nomClientIdentity', list[i].emptyTwo)}
                         if (list[i].answerId == '41') {
-                            this.form.idNumber = list[i].emptyTwo
                             this.idNumberJudge = true
+                            this.form.idNumber = list[i].emptyTwo
                         }
                         if (list[i].answerId == '42') {this.form.userName = list[i].emptyTwo}
                         if (list[i].answerId == '43') {this.form.sex = list[i].emptyTwo}
@@ -279,11 +288,16 @@ export default {
         ...mapMutations({
             changeShowGoods: 'system/changeShowGoods',
             setDataFlow: 'system/setDataFlow',
-            setNeedsModule: 'system/setNeedsModule'
+            setNeedsModule: 'system/setNeedsModule',
+            setPopId: 'system/setPopId'
         }),
         popUp(){// 唤起弹窗
-            this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'33'})
+            // this.$store.commit('system/changePop',{show:true,text:'身份证扫描仪',id:'33'})
-            this.changeShowGoods(true)
+            // this.changeShowGoods(true)
+            this.$message.info('请刷身份证');
+            // this.$store.commit('system/changePop',{show: false, text: '', id:'33'})
+            this.setPopId('33')
+            this.$router.push('/counter/list/')
         },
       //提交个人用户信息
       submitForm(){
@@ -291,6 +305,7 @@ export default {
             let consumerClientDragList = JSON.parse(nomClientIdentity);
             let nomClientIdentitys = JSON.parse(nomClientIdentity);
           this.$refs.form.validate(myValidate(() => {
+              this.form.birthday = this.form.birthday.slice(0, 10)
               this.visible = true;
             //   if (nomClientIdentitys && nomClientIdentitys.length > 0){
             //       this.visible = true;
@@ -388,20 +403,14 @@ export default {
             dataFlowId: 'system/dataFlowId',
             inMyWork: 'system/inMyWork',
             needsModule: 'system/needsModule',
+            popId: 'system/popId'
         })
     },
     
     watch: {
         dataFlowId(newVal) {
             this.idNumberJudge = true
-            const { idType, userName, sex, birthday, nationality, mailbox, idNumber } = this.dataFlow
+            
-            this.form.idNumber = idNumber
-            this.form.idType = idType
-            this.form.userName = userName
-            this.form.sex = sex
-            this.form.birthday = birthday
-            this.form.nationality = nationality
-            this.form.mailbox = mailbox
         }
     }
 };

src/pages/manage/list/personal/currentAccount/openAccount.vue

@@ -48,7 +48,9 @@
                         </el-form-item>
                         <el-form-item label="支取方式" prop="drawWay">
                             <el-select v-model="form.drawWay" @focus="getSubjectInfoData('13')" placeholder="请选择" ref="drawWay">
-                                <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.options"  :key="item.itemId"> </el-option>
+                                <!-- <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.options"  :key="item.itemId"> </el-option> -->
+                                <el-option label="密码" value="密码"> </el-option>
+                                <el-option label="印鉴" value="印鉴"> </el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -56,6 +58,7 @@
                         <el-form-item label="凭证类型" prop="voucherType" disabled>
                             <el-select v-model="form.voucherType" @focus="getSubjectInfoData('11')" placeholder="请选择" ref="voucherType" disabled>
                                 <el-option v-for="item in voucherTypeSelectList" :label="item.options" :value="item.options"  :key="item.itemId"> </el-option>
+                                
                             </el-select>
                         </el-form-item>
                         <el-form-item label="凭证号码" required>
@@ -96,7 +99,9 @@
               </el-form-item>
               <el-form-item label="支取方式" required>
                 <el-select v-model="form.drawWaysTwo" @focus="getSubjectInfoData('13')" placeholder="请选择">
-                  <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.options"  :key="item.itemId"> </el-option>
+                  <!-- <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.options"  :key="item.itemId"> </el-option> -->
+                  <el-option label="密码" value="密码"> </el-option>
+                  <el-option label="印鉴" value="印鉴"> </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -143,7 +148,9 @@
               </el-form-item>
               <el-form-item label="支取方式" required>
                 <el-select v-model="form.drawWaysThree" @focus="getSubjectInfoData('13')" placeholder="请选择">
-                  <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.options" :key="item.itemId"> </el-option>
+                  <el-option label="密码" value="密码"> </el-option>
+                  <el-option label="印鉴" value="印鉴"> </el-option>
+                  <!-- <el-option v-for="item in drawWaySelectList" :label="item.options" :value="item.options" :key="item.itemId"> </el-option> -->
                 </el-select>
               </el-form-item>
             </el-col>

src/store/modules/system.js

@@ -673,6 +673,8 @@ import { addOperation } from '@/api/http';
 export default {
     namespaced: true,
     state: {/* 管理柜台状态 */
+        popId: '',
+        id: '',
         showPop: false,// 弹框
         popText:'',
         fullScreen:false,// 银行系统是否全屏
@@ -1490,6 +1492,9 @@ export default {
         // setHeadId(state, id) {
         //     state.businessSelect[state.businessKey].id = id + ','
         // },
+        setPopId(state, id) {
+            state.id = id
+        },
         setNeedsModule(state, name) {
             state.businessSelect[state.businessKey].needsModule[name] = true
         },
@@ -1788,11 +1793,12 @@ export default {
         changeFullscreen:(state,val) => {
             state.fullScreen = val
         },
+        // 更改弹窗
         changePop:(state,val)=>{
             state.showPop = val.show
-            state.popText = val.text
+            state.popText = val.text? val.text: ''
             state.id = val.id
-            if(!val.text.includes('密码') && val.show) {
+            if(!state.popText.includes('密码') && state.showPop && state.popText) {
                 state.showGoods = true;
             }
         },
@@ -1840,6 +1846,9 @@ export default {
         
     },
     getters: {
+        popId(state) {
+            return state.popId
+        },
         businessId(state) {
             return state.businessSelect[state.businessKey].id + ','
         },