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

fix

Browse Source
20240205 V3.0.0
yujialong 10 months ago
parent b60282b643
commit 74f9ae8920
4 changed files with 250 additions and 234 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. 2
      src/components/case/index.vue
  2. 2
      src/pages/lobbyManager/list/index.vue
  3. 149
      src/pages/manage/list/dayEnd/tellerCertificate.vue
  4. 3
      src/store/modules/system.js

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

@ -11,7 +11,7 @@
<el-select v-model.trim="projectId" <el-select v-model.trim="projectId"
placeholder="请选择" placeholder="请选择"
class="select" class="select"
:disabled="projectPermissions != 0" disabled
@change="selectProject"> @change="selectProject">
<el-option v-for="item in topicList" <el-option v-for="item in topicList"
:key="item.projectId" :key="item.projectId"

2
src/pages/lobbyManager/list/index.vue
Unescape View File

@ -521,7 +521,7 @@ export default {
} }
}) })
const params= { const params= {
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',286, 553', parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',286,553',
lcJudgmentRuleReq:formList, lcJudgmentRuleReq:formList,
projectId:+projectId, projectId:+projectId,
startTime:startTime, startTime:startTime,

149
src/pages/manage/list/dayEnd/tellerCertificate.vue
Unescape View File

@ -1,66 +1,72 @@
<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" :rules="rules"> style="margin: 0">
<el-col :span="10" :offset="1"> <el-form ref="form"
<el-form-item label="日期" required> :model="form"
label-width="120px"
:rules="rules">
<el-col :span="10"
:offset="1">
<el-form-item label="日期"
required>
<!-- <el-date-picker type="date" placeholder="选择日期" v-model.trim="form.date" style="width: 100%;"></el-date-picker> --> <!-- <el-date-picker type="date" placeholder="选择日期" v-model.trim="form.date" style="width: 100%;"></el-date-picker> -->
<el-input :value="form.date" disabled ref="date"></el-input> <el-input :value="form.date"
disabled
ref="date"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" :offset="1"> <el-col :span="10"
<el-form-item label="柜员号" prop="counterNumber"> :offset="1">
<el-input disabled :value="form.counterNumber" @input="(val) => checkHanzi(val, form, 'counterNumber')"></el-input> <el-form-item label="柜员号"
prop="counterNumber">
<el-input disabled
:value="form.counterNumber"
@input="(val) => checkHanzi(val, form, 'counterNumber')"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
<!-- <el-col :span="20" :offset="2"> <!-- <el-col :span="20" :offset="2">
</el-col> --> </el-col> -->
<el-table <el-table ref="filterTable"
ref="filterTable"
:data="tableData" :data="tableData"
max-height="550" max-height="550"
:header-cell-style="headerCellStyle" :header-cell-style="headerCellStyle"
style="width: 95%" style="width: 95%"
:rules="rules"> :rules="rules">
<el-table-column <el-table-column prop="certificateName"
prop="certificateName"
label="凭证类型" label="凭证类型"
align="center" align="center">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="stockNum"
prop="stockNum"
label="库存数量" label="库存数量"
align="center" align="center">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="startNumber"
prop="startNumber"
label="起始号码" label="起始号码"
align="center" align="center">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="endNumber"
prop="endNumber"
label="终止号码" label="终止号码"
align="center" align="center">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="钱箱数量"
label="钱箱数量"
align="center" align="center"
width="230" width="230"
prop="boxNumber" prop="boxNumber">
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-form-item :label="scope.row.certificateName + '数量'" required> <el-form-item :label="scope.row.certificateName + '数量'"
<el-input type='text' @input="val => inputListen(val, scope.row)" min="0" :value="scope.row.cashBoxNum" class='numrule'></el-input> required>
<el-input type='text'
@input="val => inputListen(val, scope.row)"
min="0"
:value="scope.row.cashBoxNum"
class='numrule'></el-input>
</el-form-item> </el-form-item>
</template> </template>
</el-table-column> </el-table-column>
@ -68,8 +74,17 @@
</el-form> </el-form>
</el-row> </el-row>
<el-button @click="submitForm" type="primary" class="submitBtn" style="margin-top: 20px;" v-throttle>提交</el-button> <el-button @click="submitForm"
<my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" /> type="primary"
class="submitBtn"
style="margin-top: 20px;"
v-throttle>提交</el-button>
<my-dialog :moduleName="moduleName"
v-if="visible"
:visible.sync="visible"
:showForm="form"
:formName="formName"
@submitIt="submitForm2" />
</div> </div>
</div> </div>
@ -85,21 +100,21 @@ import { Message } from 'element-ui';
import { addOperation } from '@/api/http'; import { addOperation } from '@/api/http';
export default { export default {
name: 'index', name: 'index',
components:{ components: {
MyTitle, MyTitle,
MyDialog MyDialog
}, },
data() { data () {
return { return {
headerCellStyle: headerCellStyle, headerCellStyle: headerCellStyle,
moduleName: 'tellerCertificate', moduleName: 'tellerCertificate',
visible: false, visible: false,
form:{ form: {
date: '', date: '',
counterNumber: '002288', counterNumber: '002288',
}, },
formName:{ formName: {
date: '日期', date: '日期',
counterNumber: '柜员号' counterNumber: '柜员号'
}, },
@ -163,7 +178,7 @@ export default {
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();
@ -179,14 +194,14 @@ export default {
...mapMutations({ ...mapMutations({
setTipsOperate: 'system/setTipsOperate' setTipsOperate: 'system/setTipsOperate'
}), }),
inputListen(val, row) { inputListen (val, row) {
row.cashBoxNum = Number(val.replace(/\D+/, '')) row.cashBoxNum = Number(val.replace(/\D+/, ''))
}, },
submitForm() { submitForm () {
if (this.submited) return this.$message.error('已提交！') if (this.submited) return this.$message.error('已提交！')
this.$refs.form.validate(myValidate(() => { this.$refs.form.validate(myValidate(() => {
for(const item of this.tableData) { for (const item of this.tableData) {
if(item.cashBoxNum === '') { if (item.cashBoxNum === '') {
Message.warning({ Message.warning({
center: true, center: true,
message: '请输入' + item.certificateName + '数量' message: '请输入' + item.certificateName + '数量'
@ -196,7 +211,7 @@ export default {
} }
const obj1 = {} const obj1 = {}
const obj2 = {} const obj2 = {}
for(const item of this.tableData) { for (const item of this.tableData) {
console.log(item) console.log(item)
const { cashBoxNum, name2, certificateName } = item; const { cashBoxNum, name2, certificateName } = item;
obj1[name2] = cashBoxNum + '张' obj1[name2] = cashBoxNum + '张'
@ -205,26 +220,29 @@ export default {
} }
this.form = { ...this.form, ...obj1 } this.form = { ...this.form, ...obj1 }
this.formName = { ...this.formName, ...obj2 } this.formName = { ...this.formName, ...obj2 }
console.log(obj1)
console.log(obj2)
this.visible = true this.visible = true
}, this.$refs)); }, this.$refs));
}, },
submitForm2() { submitForm2 () {
let projectId = sessionStorage.getItem('projectId') let projectId = sessionStorage.getItem('projectId')
let startTime = sessionStorage.getItem('startTime') let startTime = sessionStorage.getItem('startTime')
const formList = [] const formList = []
formList.push({"answerId":'544',"emptyOne": 99, "emptyTwo": this.form.date, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,32,542,544","type": "3"}) formList.push({ "answerId": '544', "emptyOne": 99, "emptyTwo": this.form.date, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,32,542,544", "type": "3" })
formList.push({"answerId":'545',"emptyOne": 100, "emptyTwo": this.form.counterNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id +",287,5,32,542,545","type": "3"}) formList.push({ "answerId": '545', "emptyOne": 100, "emptyTwo": this.form.counterNumber, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,32,542,545", "type": "3" })
let params= { formList.push({ "answerId": '572', "emptyOne": 106, "emptyTwo": this.tableData[0].cashBoxNum, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,32,542,572", "type": "3" })
formList.push({ "answerId": '573', "emptyOne": 107, "emptyTwo": this.tableData[1].cashBoxNum, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,32,542,573", "type": "3" })
formList.push({ "answerId": '574', "emptyOne": 108, "emptyTwo": this.tableData[2].cashBoxNum, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,32,542,574", "type": "3" })
formList.push({ "answerId": '575', "emptyOne": 109, "emptyTwo": this.tableData[3].cashBoxNum, "operationIds": "285," + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ",287,5,32,542,575", "type": "3" })
let params = {
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,32,542', parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,32,542',
lcJudgmentRuleReq:formList, lcJudgmentRuleReq: formList,
projectId:+projectId, projectId: +projectId,
startTime:startTime, startTime: startTime,
} }
addOperation(params).then((data)=>{ addOperation(params).then((data) => {
this.submited = 1 this.submited = 1
// this.$message({ // this.$message({
// message: '提交成功', // message: '提交成功',
@ -232,7 +250,7 @@ export default {
// }); // });
// this.setNeedsModule(moduleName) // this.setNeedsModule(moduleName)
// this.setDataFlow({ ...this.form }) // this.setDataFlow({ ...this.form })
}).catch((error)=>{ }).catch((error) => {
}) })
}, },
tableRowClassName: tableRowClassName, tableRowClassName: tableRowClassName,
@ -242,20 +260,19 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import '@/assets/css/tablebg.scss'; @import '@/assets/css/tablebg.scss';
.myPadding { .myPadding {
padding: 24px 0 24px 24px; padding: 24px 0 24px 24px;
} }
/deep/.numrule input { /deep/.numrule input {
appearance: textField!important; appearance: textField !important;
-webkit-appearance: textField!important; -webkit-appearance: textField !important;
width: 100px; width: 100px;
} }
/deep/.el-input input { /deep/.el-input input {
text-align: center; text-align: center;
} }
</style> </style>

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

@ -2514,7 +2514,7 @@ export default {
} }
}, },
'业务三十二': { // 银行承兑汇票签发 '业务三十二': { // 银行承兑汇票签发
id: 5771, id: 577,
name: '银行承兑汇票签发', name: '银行承兑汇票签发',
data: [ 13, 587 ], // data: [ 13, 587 ], //
needs: [ ], needs: [ ],
@ -3074,7 +3074,6 @@ export default {
} }
} }
} }
console.log('arr=',arr)
return arr return arr
}, },

Write Preview
Loading…
Cancel
Save