From de9a307184df1c4e054c91a7e424734f55e47227 Mon Sep 17 00:00:00 2001
From: "luoJunYong.123" <you@example.com>
Date: Tue, 19 Apr 2022 14:55:20 +0800
Subject: [PATCH] update

---
 src/components/checkPhoto/index.vue            |  2 +-
 src/components/dialogTwo/index.vue             | 13 +++++++++++--
 src/pages/manage/list/cityWide/cityWideIn.vue  |  8 ++++----
 src/pages/manage/list/cityWide/cityWideOut.vue |  7 ++++---
 src/pages/manage/list/dayEnd/branchDayEnd.vue  | 18 +++++++++---------
 src/pages/manage/list/dayEnd/tellerCash.vue    |  1 +
 6 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/components/checkPhoto/index.vue b/src/components/checkPhoto/index.vue
index 0836390..7ab74df 100644
--- a/src/components/checkPhoto/index.vue
+++ b/src/components/checkPhoto/index.vue
@@ -202,7 +202,7 @@ export default {
     methods: {
         closeIt() {
             this.$emit('update:showImg', false)
-        },
+        }
     },
     
     computed: {
diff --git a/src/components/dialogTwo/index.vue b/src/components/dialogTwo/index.vue
index 3257a1e..5a5a428 100644
--- a/src/components/dialogTwo/index.vue
+++ b/src/components/dialogTwo/index.vue
@@ -270,17 +270,26 @@ export default {
             if(!this.showForm[key]) {
                 continue;
             }
+
             if(num%2 === 0) {
                 if(nameMap[key]) {
                     this.leftObj[this.formName[key]] = nameMap[key][this.showForm[key]]
                 }else {
-                    this.leftObj[this.formName[key]] = this.showForm[key]
+                    if(this.formName[key].indexOf('密码') !== -1) {
+                        this.leftObj[this.formName[key]] = '******'
+                    }else {
+                        this.leftObj[this.formName[key]] = this.showForm[key]
+                    }
                 }
             }else {
                 if(nameMap[key]) {
                     this.rightObj[this.formName[key]] = nameMap[key][this.showForm[key]]
                 }else {
-                    this.rightObj[this.formName[key]] = this.showForm[key]
+                    if(this.formName[key].indexOf('密码') !== -1) {
+                        this.rightObj[this.formName[key]] = '******'
+                    }else {
+                        this.rightObj[this.formName[key]] = this.showForm[key]
+                    }
                 }
             }
 
diff --git a/src/pages/manage/list/cityWide/cityWideIn.vue b/src/pages/manage/list/cityWide/cityWideIn.vue
index 191aff0..35c33b1 100644
--- a/src/pages/manage/list/cityWide/cityWideIn.vue
+++ b/src/pages/manage/list/cityWide/cityWideIn.vue
@@ -44,7 +44,7 @@
                     </el-col>
                     <el-col :span="10" :offset="1">
                         <el-form-item label="本行收款户名" prop="accountUsername">
-                            <el-input :value="form.accountUsername" @focus="getFocus"  @input="val => checkName(val, form, 'accountUsername')" ref="accountUsername"></el-input>
+                            <el-input :value="form.accountUsername" disabled @focus="getFocus"  @input="val => checkName(val, form, 'accountUsername')" ref="accountUsername"></el-input>
                         </el-form-item>
                         <el-form-item label="金额" prop="money">
                             <el-input :value="form.money" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
@@ -304,7 +304,6 @@ export default {
         }
         this.form.insertDate = tmpFunc()
         this.form.exchangeNumber = 20082289056288
-        // this.form.exchangeName = '交换行名'
     },
     mounted() {
         const parentId =  '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id   +  ',287,5,29,345,359'
@@ -334,7 +333,7 @@ export default {
             }
         },
         getBlur() {
-            this.form.accountUsername = '小白'
+            this.form.accountUsername = this.dataFlow.userName;
         },
         ismoney: ismoney,
         inputListen: inputListen,
@@ -343,7 +342,8 @@ export default {
     },
     computed: {
         ...mapGetters({
-            getSelectList: 'system/getSelectList'
+            getSelectList: 'system/getSelectList',
+            dataFlow: 'system/dataFlow'
         })
     }
 };
diff --git a/src/pages/manage/list/cityWide/cityWideOut.vue b/src/pages/manage/list/cityWide/cityWideOut.vue
index d9e4f49..5d1ccae 100644
--- a/src/pages/manage/list/cityWide/cityWideOut.vue
+++ b/src/pages/manage/list/cityWide/cityWideOut.vue
@@ -45,7 +45,7 @@
                     </el-col>
                     <el-col :span="10" :offset="1">
                         <el-form-item label="本行收款户名" prop="shroffAccountUsername">
-                            <el-input @focus="getFocus" :value="form.shroffAccountUsername" @input="val => checkName(val, form, 'shroffAccountUsername')" ref="shroffAccountUsername"></el-input>
+                            <el-input @focus="getFocus" disabled :value="form.shroffAccountUsername" @input="val => checkName(val, form, 'shroffAccountUsername')" ref="shroffAccountUsername"></el-input>
                         </el-form-item>
                         <el-form-item label="金额" prop="money">
                             <el-input :value="form.money" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
@@ -363,7 +363,7 @@ export default {
         },
         getBlur() {
             if(this.form.shroffAccountNumber) {
-                this.form.shroffAccountUsername = '小白'
+                this.form.shroffAccountUsername = this.dataFlow.userName
             }
         },
         ismoney: ismoney,
@@ -376,7 +376,8 @@ export default {
         //     billTypeSelect: state => state.select.billTypeSelect
         // }),
         ...mapGetters({
-            getSelectList: 'system/getSelectList'
+            getSelectList: 'system/getSelectList',
+            dataFlow: 'system/dataFlow'
         })
     }
 };
diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue
index aa837c8..9db26fb 100644
--- a/src/pages/manage/list/dayEnd/branchDayEnd.vue
+++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue
@@ -1,23 +1,23 @@
 <template>
-    <div class="wrap wrap2 myPadding">
+    <div class=" wrap2 myPadding">
         <my-title :titleArr="['日终管理', '网点日终轧帐']"/>
         
         <!-- 存款 -->
         <div class="body">
             <el-row :gutter="20" style="margin: 0">
                 <el-form ref="form" :model="form" label-width="120px" label-position="right" :rules="rules">
-                    <el-form-item label="主管柜员号" prop="username">
-                        <el-input placeholder="请输入账号"  :value="form.username" @input="val => checkHanzi(val, form, 'username')" ref="username"></el-input>
+                    <el-form-item label="主管柜员号" prop="username" style="width: 40vw;">
+                        <el-input placeholder="请输入账号" :value="form.username" @input="val => checkHanzi(val, form, 'username')" ref="username"></el-input>
                     </el-form-item>
-                    <el-form-item label="登录密码" prop="password">
+                    <el-form-item label="登录密码" prop="password"  style="width: 40vw;">
                         <el-input placeholder="请输入密码" type="password"  :value="form.password" @input="val => checkHanzi(val, form, 'password')" ref="password"></el-input>
                     </el-form-item>
                 </el-form>
             </el-row>
-            
+            <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
         </div>
         <el-button @click="submitIt()" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+        
     </div>
 </template>
 
@@ -121,9 +121,9 @@ export default {
         padding: 24px 0 24px 24px;
     }
 
-    /deep/.el-input input {
-        width: 420px;
-    }
+    // /deep/.el-input input {
+    //     // width: 420px;
+    // }
     .body {
         padding-top: 50px;
         padding-left: 50px;
diff --git a/src/pages/manage/list/dayEnd/tellerCash.vue b/src/pages/manage/list/dayEnd/tellerCash.vue
index 3a56834..1a5a998 100644
--- a/src/pages/manage/list/dayEnd/tellerCash.vue
+++ b/src/pages/manage/list/dayEnd/tellerCash.vue
@@ -64,6 +64,7 @@
 import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
 import { myValidate, checkHanzi, inputListen } from '@/utils/utilFunction.js'
 import { mapState, mapMutations, mapGetters } from 'vuex'
+import { addOperation, getOperation } from '@/api/http';
 import MyTitle from '@/components/myTitle'
 import MyDialog from '@/components/dialogTwo'
 export default {