fix

src/components/case/index.vue

@@ -417,6 +417,7 @@ export default {
   },
   methods: {
     ...mapMutations({
+      setPopId: 'system/setPopId',
       setBusinessKey: 'system/setBusinessKey',
       initState: 'system/initState',
       setShowBusiness: 'system/setShowBusiness',
@@ -654,8 +655,9 @@ export default {
       sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
       sessionStorage.setItem('accountPasswordAll', '')
       sessionStorage.setItem('projectId', this.projectId)
-      sessionStorage.setItem('submited', 0)
+      sessionStorage.removeItem('submited', 0)
-      sessionStorage.setItem('firstLoad2', true)
+      sessionStorage.removeItem('firstLoad2')
+      this.setBusinessKey('')
       getProjectDetail(params).then((data) => {
         if (data.status == 200) {
           const { systemId, projectId } = data.data.projectManage
@@ -906,6 +908,7 @@ export default {
       sessionStorage.setItem('ruleReqs', JSON.stringify(formList))
       sessionStorage.setItem('accountVoucher', JSON.stringify(formList))
       sessionStorage.setItem('accountPasswordAll', '')
+      this.setPopId('')
       this.setBusinessKey('')
       let params = {
         "projectId": projectId,

src/pages/counter/list/index.vue

@@ -1894,6 +1894,7 @@ export default {
       }
 
       if (this.popText === '身份证扫描仪' || this.popText === '刷卡器' || this.popText === '密码器') {
+        debugger
         if (this.$store.state.system.id == '33' && this.popText === '身份证扫描仪') {
 
           this.nbm = 33

src/pages/manage/list/dayEnd/branchDayEnd.vue

@@ -4,19 +4,44 @@
 
     <!-- 存款 -->
     <div class="body">
-            <el-row :gutter="20" style="margin: 0">
+      <el-row :gutter="20"
-                <el-form ref="form" :model="form" label-width="120px" label-position="right" :rules="rules">
+              style="margin: 0">
-                    <el-form-item label="主管柜员号" prop="username" style="width: 40vw;">
+        <el-form ref="form"
-                        <el-input placeholder="请输入账号" :value="form.username" @input="val => checkHanzi(val, form, 'username')" ref="username"></el-input>
+                 :model="form"
+                 label-width="120px"
+                 label-position="right"
+                 :rules="rules">
+          <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"  style="width: 40vw;">
+          <el-form-item label="登录密码"
-                        <el-input placeholder="请输入密码" type="password"  :value="form.password" @input="val => checkHanzi(val, form, 'password')" ref="password"></el-input>
+                        prop="password"
+                        style="width: 40vw;">
+            <el-input placeholder="请输入密码"
+                      type="password"
+                      :value="form.password"
+                      @input="val => checkHanzi(val, form, 'password')"
+                      autocomplete=“new-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" />
+      <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>
+    <el-button @click="submitIt()"
+               type="primary"
+               class="submitBtn"
+               v-throttle>提交</el-button>
 
   </div>
 </template>
@@ -38,8 +63,8 @@ export default {
       visible: false,
       moduleName: 'branchDayEnd',
       form: {
-                username: '',
+        username: '180623',
-                password: ''
+        password: '621229'
       },
       formName: {
         username: '主管柜员号',
@@ -119,7 +144,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    
 .myPadding {
     padding: 24px 0 24px 24px;
 }

src/store/modules/system.js

@@ -778,7 +778,7 @@ const myInitState =  {
     '业务十四': {  // 公司现金支票转账
         id: 503,
         name: '公司支票转账',
-        data: [ 442, 412 ],
+        data: [ 442, 412,431 ],
         needs: [ 426 ],
         isStamp: {
             '私章转讫章': [ 412 ],
@@ -1935,7 +1935,7 @@ export default {
             '业务十三': {  // 公司现金支票取款
                 id: 502,
                 name: '公司现金支票取款',
-                data: [ 442, 411 ],
+                data: [ 442, 411, 411 ],
                 needs: [ 425, 15 ],
                 isStamp: {
                     '付讫章': [ 425 ],
@@ -1975,7 +1975,7 @@ export default {
             '业务十四': {  // 公司现金支票转账
                 id: 503,
                 name: '公司支票转账',
-                data: [ 442, 412 ],
+                data: [ 442, 412,431 ],
                 needs: [ 426 ],
                 isStamp: {
                     '私章转讫章': [ 412 ],
@@ -2780,7 +2780,7 @@ export default {
                         cb([422, 424])
                     }
                     else if(id === 411) {
-                        state.businessSelect[state.businessKey].data.push(472, 473)
+                        state.businessSelect[state.businessKey].data.push(473, 472)
                         judgeDelete = false
                         stampSuccess = '456'
                         cb([472, 473])

src/styles/layout/index.scss

@@ -1,5 +1,5 @@
-@import "lib/var";
+@import 'lib/var';
-@import "var";
+@import 'var';
 html,
 body,
 #app,
@@ -9,18 +9,20 @@ body,
 }
 
 body {
-    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
     font-size: 14px;
     background: rgba(0, 0, 0, 0.02);
+    overflow: auto !important;
 }
 #app .body {
-
     .el-input .el-input__inner {
-        border: 2px solid #EDEDED;
+        border: 2px solid #ededed;
         //height: 68px!important;
         font-size: 18px;
     }
-    .el-date-editor.el-input, .el-date-editor.el-input__inner,.el-select{
+    .el-date-editor.el-input,
+    .el-date-editor.el-input__inner,
+    .el-select {
         width: 100%;
     }
     .el-form-item__label {