huoran
/
FE_bankTeaching
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix

Browse Source
20240205
yujialong 1 year ago
parent 128d944307
commit 7cad626d93
5 changed files with 161 additions and 131 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/components/case/index.vue
  2. 1
      src/pages/counter/list/index.vue
  3. 254
      src/pages/manage/list/dayEnd/branchDayEnd.vue
  4. 8
      src/store/modules/system.js
  5. 22
      src/styles/layout/index.scss

7
src/components/case/index.vue
Unescape View File

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

1
src/pages/counter/list/index.vue
Unescape View File

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

254
src/pages/manage/list/dayEnd/branchDayEnd.vue
Unescape View File

@ -1,24 +1,49 @@
<template> <template>
<div class=" wrap2 myPadding"> <div class=" wrap2 myPadding">
<my-title :titleArr="['日终管理', '网点日终轧帐']"/> <my-title :titleArr="['日终管理', '网点日终轧帐']" />
<!-- 存款 --> <!-- 存款 -->
<div class="body"> <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"
</el-form-item> label-width="120px"
<el-form-item label="登录密码" prop="password" style="width: 40vw;"> label-position="right"
<el-input placeholder="请输入密码" type="password" :value="form.password" @input="val => checkHanzi(val, form, 'password')" ref="password"></el-input> :rules="rules">
</el-form-item> <el-form-item label="主管柜员号"
</el-form> prop="username"
</el-row> style="width: 40vw;">
<my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" /> <el-input placeholder="请输入账号"
</div> :value="form.username"
<el-button @click="submitIt()" type="primary" class="submitBtn" v-throttle>提交</el-button> @input="val => checkHanzi(val, form, 'username')"
ref="username"></el-input>
</el-form-item>
<el-form-item label="登录密码"
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" />
</div> </div>
<el-button @click="submitIt()"
type="primary"
class="submitBtn"
v-throttle>提交</el-button>
</div>
</template> </template>
<script> <script>
@ -28,107 +53,106 @@ import MyTitle from '@/components/myTitle'
import MyDialog from '@/components/dialogTwo' import MyDialog from '@/components/dialogTwo'
import { addOperation, getOperation } from '@/api/http'; import { addOperation, getOperation } from '@/api/http';
export default { export default {
name: 'index', name: 'index',
components:{ components: {
MyTitle, MyTitle,
MyDialog MyDialog
}, },
data() { data () {
return { return {
visible: false, visible: false,
moduleName: 'branchDayEnd', moduleName: 'branchDayEnd',
form:{ form: {
username: '', username: '180623',
password: '' password: '621229'
}, },
formName: { formName: {
username: '主管柜员号', username: '主管柜员号',
password: '登录密码' password: '登录密码'
}, },
rules: { rules: {
username: [ username: [
{ {
required: true, required: true,
message: '请输入主管柜员号', message: '请输入主管柜员号',
trigger: 'blur' trigger: 'blur'
} }
], ],
password: [ password: [
{ {
required: true, required: true,
message: '请输入登录密码', message: '请输入登录密码',
trigger: 'blur' trigger: 'blur'
} }
] ]
}, },
submited: 0 submited: 0
} }
}, },
created() { created () {
// const tmpFunc = () => { // const tmpFunc = () => {
// const date = new Date() // const date = new Date()
// var y = date.getFullYear(); // var y = date.getFullYear();
// var m = date.getMonth() + 1; // var m = date.getMonth() + 1;
// m = m < 10 ? '0' + m : m; // m = m < 10 ? '0' + m : m;
// var d = date.getDate(); // var d = date.getDate();
// d = d < 10 ? ('0' + d) : d; // d = d < 10 ? ('0' + d) : d;
// return y + '-' + m + '-' + d; // return y + '-' + m + '-' + d;
// } // }
// this.form.data = tmpFunc() // this.form.data = tmpFunc()
},
mounted () {
this.$refs.username.focus()
},
methods: {
...mapMutations({
setTipsOperate: 'system/setTipsOperate'
}),
submitIt () {
if (this.submited) return this.$message.error('已提交！')
this.$refs.form.validate(myValidate(() => {
this.visible = true;
}, this.$refs));
}, },
mounted() { submitForm2 () {
this.$refs.username.focus() let projectId = sessionStorage.getItem('projectId')
let startTime = sessionStorage.getItem('startTime')
const formList = []
formList.push({ "answerId": '546', "emptyOne": 101, "emptyTwo": this.form.username, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,32,543,546", "type": "3" })
formList.push({ "answerId": '547', "emptyOne": 102, "emptyTwo": this.form.password, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,32,543,547", "type": "3" })
let params = {
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,32,543',
lcJudgmentRuleReq: formList,
projectId: +projectId,
startTime: startTime,
}
addOperation(params).then((data) => {
this.submited = 1
// this.$message({
// message: '提交成功',
// type: 'success'
// });
// this.setNeedsModule(moduleName)
// this.setDataFlow({ ...this.form })
}).catch((error) => {
})
}, },
methods: { checkHanzi: checkHanzi
...mapMutations({ }
setTipsOperate: 'system/setTipsOperate'
}),
submitIt() {
if (this.submited) return this.$message.error('已提交！')
this.$refs.form.validate(myValidate(() => {
this.visible = true;
}, this.$refs));
},
submitForm2() {
let projectId = sessionStorage.getItem('projectId')
let startTime = sessionStorage.getItem('startTime')
const formList = []
formList.push({"answerId":'546',"emptyOne": 101, "emptyTwo": this.form.username, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,32,543,546","type": "3"})
formList.push({"answerId":'547',"emptyOne": 102, "emptyTwo": this.form.password, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,32,543,547","type": "3"})
let params= {
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,32,543',
lcJudgmentRuleReq:formList,
projectId:+projectId,
startTime:startTime,
}
addOperation(params).then((data)=>{
this.submited = 1
// this.$message({
// message: '提交成功',
// type: 'success'
// });
// this.setNeedsModule(moduleName)
// this.setDataFlow({ ...this.form })
}).catch((error)=>{
})
},
checkHanzi: checkHanzi
}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.myPadding {
.myPadding { padding: 24px 0 24px 24px;
padding: 24px 0 24px 24px; }
}
// /deep/.el-input input { // /deep/.el-input input {
// // width: 420px; // // width: 420px;
// } // }
.body { .body {
padding-top: 50px; padding-top: 50px;
padding-left: 50px; padding-left: 50px;
} }
</style> </style>

8
src/store/modules/system.js
Unescape View File

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

22
src/styles/layout/index.scss
Unescape View File

@ -1,5 +1,5 @@
@import "lib/var"; @import 'lib/var';
@import "var"; @import 'var';
html, html,
body, body,
#app, #app,
@ -9,22 +9,24 @@ body,
} }
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; font-size: 14px;
background: rgba(0, 0, 0, 0.02); background: rgba(0, 0, 0, 0.02);
overflow: auto !important;
} }
#app .body{ #app .body {
.el-input .el-input__inner {
.el-input .el-input__inner{ border: 2px solid #ededed;
border: 2px solid #EDEDED;
//height: 68px!important; //height: 68px!important;
font-size: 18px; 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%; width: 100%;
} }
.el-form-item__label{ .el-form-item__label {
//line-height: 68px; //line-height: 68px;
font-size: 18px; font-size: 18px;
} }
} }

Write Preview
Loading…
Cancel
Save