diff --git a/src/components/dialogTwo/index.vue b/src/components/dialogTwo/index.vue
index ceeea5f..8eaa028 100644
--- a/src/components/dialogTwo/index.vue
+++ b/src/components/dialogTwo/index.vue
@@ -186,6 +186,9 @@ const obj = {
'controlCash2/cashPaid': '凭证调入',
'controlCash2/cashOut': '凭证调出',
'controlCash3/index': '支票出售',
+ 'tallerCash': '柜员现金轧账',
+ 'tellerCertificate': '柜员凭证轧账',
+ 'branchDayEnd': '网点日终轧帐',
'spacial': '提交'
}
const nameMap = {
@@ -350,7 +353,6 @@ export default {
}
},
created() {
- console.log('神马情况！')
if(!this.needAuth) {
this.flow = 3
}
diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue
index d318ab9..39f4705 100644
--- a/src/pages/counter/list/index.vue
+++ b/src/pages/counter/list/index.vue
@@ -913,7 +913,6 @@ export default {
}
}
})
-
// 重要空白凭证箱
getOperation({
parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,2'
diff --git a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
index d3c06e1..90ebc9c 100644
--- a/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
+++ b/src/pages/manage/list/ImportantCash/controlCash2/cashOut.vue
@@ -188,6 +188,7 @@ export default {
if(!this.form.startNumber) {
this.$message({
message: '请先输入起始号码',
+ center: true,
type: 'warning'
});
this.$refs.startNumber.focus()
diff --git a/src/pages/manage/list/acceptanceDraft/invoice.vue b/src/pages/manage/list/acceptanceDraft/invoice.vue
index 207f235..d91fe01 100644
--- a/src/pages/manage/list/acceptanceDraft/invoice.vue
+++ b/src/pages/manage/list/acceptanceDraft/invoice.vue
@@ -8,25 +8,19 @@
<el-form ref="form" :model="form" label-width="140px" :rules="rules">
<el-col :span="10" :offset="1">
<el-form-item label="出票人账号" prop="accountNumber">
- <el-input :value="form.accountNumber" @input="val => checkHanzi(val, form, 'accountNumber')" ref="accountNumber"></el-input>
+ <el-input @blur="getBlur" :value="form.accountNumber" @input="val => checkHanzi(val, form, 'accountNumber')" ref="accountNumber"></el-input>
</el-form-item>
- <el-form-item label="出票人名称" prop="accountName">
- <el-input :value="form.accountName" @input="val => checkName(val, form, 'accountName')" ref="accountName"></el-input>
+ <el-form-item label="出票人行名" prop="accountTradeName">
+ <el-input :value="form.accountTradeName" disabled @input="val => checkHanzi(val, form, 'accountTradeName')"></el-input>
</el-form-item>
+
<el-form-item label="收款人账号" prop="collectionNumber">
<el-input :value="form.collectionNumber" @input="val => checkHanzi(val, form, 'collectionNumber')" ref="collectionNumber"></el-input>
</el-form-item>
- <el-form-item label="收款人名称" prop="collectionName">
- <el-input :value="form.collectionName" @input="val => checkName(val, form, 'collectionName')" ref="collectionName"></el-input>
- </el-form-item>
-
- <el-form-item label="币种" prop="currencyType">
- <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
- <el-option value="CNY人民币">CNY人民币</el-option>
- </el-select>
+ <el-form-item label="收款人行名" prop="collectionTradeName">
+ <el-input :value="form.collectionTradeName" disabled @input="val => checkHanzi(val, form, 'collectionTradeName')" ref="collectionTradeName"></el-input>
</el-form-item>
-
- <el-form-item label="汇票号码" prop="moneyOrderNumber">
+ <el-form-item label="票据号码" prop="moneyOrderNumber">
<el-input :value="form.moneyOrderNumber" @input="val => checkHanzi(val, form, 'moneyOrderNumber')" ref="moneyOrderNumber"></el-input>
</el-form-item>
<el-form-item label="到期日期" prop="expireDate">
@@ -37,28 +31,37 @@
ref="expireDate">
</el-date-picker>
</el-form-item>
- <el-form-item label="汇划费金额" prop="moneyOrderMoney">
+ <el-form-item label="申请人证件类型" prop="ApplicantDocuments">
+ <el-select v-model="form.ApplicantDocuments" placeholder="请选择" ref="ApplicantDocuments">
+ <el-option value="身份证">身份证</el-option>
+ <el-option value="港澳台居民回乡证">港澳台居民回乡证</el-option>
+ <el-option value="护照">护照</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="币种" prop="currencyType">
+ <el-select v-model="form.currencyType" placeholder="请选择" ref="currencyType">
+ <el-option value="CNY人民币">CNY人民币</el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="汇票费金额" prop="moneyOrderMoney">
<el-input :value="form.moneyOrderMoney" @input="val => ismoney(val, form, 'moneyOrderMoney')" ref="moneyOrderMoney"></el-input>
</el-form-item>
</el-col>
<el-col :span="10" :offset="1">
- <el-form-item label="出票人行名" prop="accountTradeName">
- <el-input :value="form.accountTradeName" @input="val => checkHanzi(val, form, 'accountTradeName')"></el-input>
+ <el-form-item label="出票人名称" prop="accountName">
+ <el-input :value="form.accountName" @input="val => checkName(val, form, 'accountName')" ref="accountName"></el-input>
</el-form-item>
<el-form-item label="出票行地址" prop="tradeAddress">
<el-input v-model="form.tradeAddress" ref="tradeAddress"></el-input>
</el-form-item>
- <el-form-item label="收款人行名" prop="collectionTradeName">
- <el-input :value="form.collectionTradeName" @input="val => checkHanzi(val, form, 'collectionTradeName')" ref="collectionTradeName"></el-input>
+ <el-form-item label="收款人名称" prop="collectionName">
+ <el-input :value="form.collectionName" @input="val => checkName(val, form, 'collectionName')" ref="collectionName"></el-input>
</el-form-item>
<el-form-item label="票据类型" prop="billType">
<el-select v-model="form.billType" placeholder="请选择" ref="billType">
<el-option value="银行承兑汇票">银行承兑汇票</el-option>
</el-select>
</el-form-item>
- <el-form-item label="金额" prop="money">
- <el-input :value="form.money" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
- </el-form-item>
<el-form-item label="出票日期" prop="drawBillDate">
<el-date-picker
v-model="form.drawBillDate"
@@ -73,6 +76,12 @@
<el-option value="否">否</el-option>
</el-select>
</el-form-item>
+ <el-form-item label="证件号码" prop="certificateNumber">
+ <el-input :value="form.certificateNumber" @input="val => checkHanzi(val, form, 'certificateNumber')" ref="certificateNumber"></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>
+ </el-form-item>
<el-form-item label="手续费金额" prop="serviceCharge">
<el-input :value="form.serviceCharge" @input="val => ismoney(val, form, 'serviceCharge')" ref="serviceCharge"></el-input>
</el-form-item>
@@ -139,6 +148,10 @@ export default {
moneyOrderNumber: '', // 汇票号码
expireDate: '', // 到期日期
money: '', // 金额
+ ApplicantDocuments: '', // 申请人证件类型
+ certificateNumber: '', // 证件号码
+ drawBillDate: '', // 出票日期
+ isTransfer: '否', // 是否转让
// 非必填项
accountName: '', // 出票人名称
collectionName: '', // 收款人名称
@@ -148,16 +161,34 @@ export default {
tradeAddress: '', // 出票行地址
collectionTradeName: '', // 收款人行名
billType: '', // 票据类型
- drawBillDate: '', // 出票日期
- isTransfer: '否', // 是否转让
+
serviceCharge: '' // 手续费金额
},
rules: {
+
+ currencyType: [
+ {
+ required: true,
+ message: '请选择币种',
+ trigger: 'blur'
+ }
+ ],
+ ApplicantDocuments: [
+ {
+ required: true,
+ message: '请选择申请人证件类型',
+ trigger: 'blur'
+ }
+ ],
accountNumber: [
{
required: true,
message: '请输入出票人账号',
trigger: 'blur'
+ },
+ {
+ pattern: /^[0-9]*$/,
+ message: '请输入数字'
}
],
collectionNumber: [
@@ -165,6 +196,10 @@ export default {
required: true,
message: '请输入收款人账号',
trigger: 'blur'
+ },
+ {
+ pattern: /^[0-9]*$/,
+ message: '请输入数字'
}
],
moneyOrderNumber: [
@@ -174,6 +209,13 @@ export default {
trigger: 'blur'
}
],
+ moneyOrderMoney: [
+ {
+ required: true,
+ message: '请输入汇票费金额',
+ trigger: 'blur'
+ }
+ ],
expireDate: [
{
required: true,
@@ -187,7 +229,28 @@ export default {
message: '请输入金额',
trigger: 'blur'
}
- ]
+ ],
+ certificateNumber: [
+ {
+ required: true,
+ message: '请输入证件号码',
+ trigger: 'blur'
+ }
+ ],
+ isTransfer: [
+ {
+ required: true,
+ message: '请选择是否转让',
+ trigger: 'blur'
+ }
+ ],
+ drawBillDate: [
+ {
+ required: true,
+ message: '请选择出票日期',
+ trigger: 'blur'
+ }
+ ],
},
myTable2: {
// accountName: '', // 出票人名称
@@ -299,6 +362,10 @@ export default {
},
}
},
+ created() {
+ this.form.moneyOrderMoney = '6.00'
+ this.form.serviceCharge = '5.00'
+ },
mounted() {
const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,30,374'
autoPlay2(parentId, this.form, this.myTable2, this.myTable)
@@ -313,6 +380,12 @@ export default {
autoPlay(parentId, this.form, this.myTable2, this.myTable)
}, this.$refs));
},
+ getBlur() {
+ if(this.form.accountNumber) {
+ this.form.accountTradeName = '小白1'
+ this.form.collectionTradeName = '小白2'
+ }
+ },
ismoney: ismoney,
checkHanzi: checkHanzi,
checkName: checkName
diff --git a/src/pages/manage/list/cityWide/cityWideIn.vue b/src/pages/manage/list/cityWide/cityWideIn.vue
index efb28b4..243a826 100644
--- a/src/pages/manage/list/cityWide/cityWideIn.vue
+++ b/src/pages/manage/list/cityWide/cityWideIn.vue
@@ -9,33 +9,8 @@
<el-form ref="form" :model="form" label-width="150px" :rules="rules">
<el-col :span="10" :offset="1">
<el-form-item label="本行收款账号" prop="shroffAccountNumber">
- <el-input :value="form.shroffAccountNumber" @input="val => checkHanzi(val, form, 'shroffAccountNumber')" ref="shroffAccountNumber"></el-input>
+ <el-input @blur="getBlur" :value="form.shroffAccountNumber" @input="val => checkHanzi(val, form, 'shroffAccountNumber')" ref="shroffAccountNumber"></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>
- </el-form-item>
- <el-form-item label="提入日期" prop="insertDate">
- <el-date-picker
- v-model="form.insertDate"
- type="date"
- placeholder="选择日期"
- ref="insertDate">
- </el-date-picker>
- </el-form-item>
- <el-form-item label="他行收款户名" prop="otherAccountUsername">
- <el-input :value="form.otherAccountUsername" @input="val => checkName(val, form, 'otherAccountUsername')" ref="otherAccountUsername"></el-input>
- </el-form-item>
- <el-form-item label="交换行号" prop="exchangeNumber">
- <el-input :value="form.exchangeNumber" @input="val => checkHanzi(val, form, 'exchangeNumber')" ref="exchangeNumber"></el-input>
- </el-form-item>
- <el-form-item label="报单号" prop="customsNumber">
- <el-input :value="form.customsNumber" @input="val => checkHanzi(val, form, 'customsNumber')" ref="customsNumber"></el-input>
- </el-form-item>
- <el-form-item label="收款户名" prop="accountUsername">
- <el-input :value="form.accountUsername" @input="val => checkName(val, form, 'accountUsername')" ref="accountUsername"></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="10" :offset="1">
<el-form-item label="币种" prop="currency">
<el-select v-model="form.currency" placeholder="请选择" ref="currency">
<el-option value="CNY人民币">CNY人民币</el-option>
@@ -44,19 +19,52 @@
<el-form-item label="提出场次" prop="proposeTime">
<el-input :value="form.proposeTime" @input="val => inputListen(val, form, 'proposeTime')" ref="proposeTime"></el-input>
</el-form-item>
+ <el-form-item label="他行收款账号" prop="otherAccountNumber">
+ <el-input :value="form.otherAccountNumber" @input="val => checkHanzi(val, form, 'otherAccountNumber')" ref="otherAccountNumber"></el-input>
+ </el-form-item>
<el-form-item label="票据类型" prop="billType">
<el-select v-model="form.billType" placeholder="请选择" ref="billType">
<el-option label="银行本票" value="银行本票"> </el-option>
+ <el-option label="银行支票" value="银行支票"> </el-option>
+ <el-option label="银行汇票" value="银行汇票"> </el-option>
+ <el-option label="银行承兑汇票" value="银行承兑汇票"> </el-option>
+ <el-option label="商业承兑汇票" value="商业承兑汇票"> </el-option>
+ <el-option label="其他" value="其他"> </el-option>
</el-select>
</el-form-item>
- <el-form-item label="他行收款账号" prop="otherAccountNumber">
- <el-input :value="form.otherAccountNumber" @input="val => checkHanzi(val, form, 'otherAccountNumber')" ref="otherAccountNumber"></el-input>
+ <el-form-item label="交换行号" prop="exchangeNumber">
+ <el-input :value="form.exchangeNumber" disabled @input="val => checkHanzi(val, form, 'exchangeNumber')" ref="exchangeNumber"></el-input>
</el-form-item>
- <el-form-item label="凭证号码" prop="voucherNumber">
+ <el-form-item label="报单号" prop="customsNumber">
+ <el-input :value="form.customsNumber" maxlength="15" @input="val => checkHanzi(val, form, 'customsNumber')" ref="customsNumber"></el-input>
+ </el-form-item>
+
+ </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-form-item>
+ <el-form-item label="金额" prop="money">
+ <el-input :value="form.money" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
+ </el-form-item>
+ <el-form-item label="提入日期" prop="insertDate">
+ <!-- <el-date-picker
+ v-model="form.insertDate"
+ type="date"
+ placeholder="选择日期"
+ ref="insertDate">
+ </el-date-picker> -->
+ <el-input :value="form.insertDate" disabled @input="val => checkName(val, form, 'insertDate')" ref="insertDate"></el-input>
+ </el-form-item>
+ <el-form-item label="他行收款户名" prop="otherAccountUsername">
+ <el-input :value="form.otherAccountUsername" @input="val => checkName(val, form, 'otherAccountUsername')" ref="otherAccountUsername"></el-input>
+ </el-form-item>
+
+ <el-form-item label="票据号码" prop="voucherNumber">
<el-input :value="form.voucherNumber" @input="val => checkHanzi(val, form, 'voucherNumber')" ref="voucherNumber"></el-input>
</el-form-item>
<el-form-item label="交换行名" prop="exchangeName">
- <el-input :value="form.exchangeName" @input="val => checkHanzi(val, form, 'exchangeName')" ref="exchangeName"></el-input>
+ <el-input :value="form.exchangeName" disabled @input="val => checkHanzi(val, form, 'exchangeName')" ref="exchangeName"></el-input>
</el-form-item>
<el-form-item label="摘要" prop="abstract">
<el-input v-model="form.abstract" ref="abstract"></el-input>
@@ -112,7 +120,7 @@ export default {
voucherNumber: '', // 凭证号码
// 非必填项
currency: 'CNY人民币', // 币种
- proposeTime: '', // 提出场次
+ proposeTime: 1, // 提出场次
insertDate: '', // 提入日期
otherAccountUsername: '', // 他行收款户名
exchangeNumber: '', // 交换行号
@@ -121,6 +129,27 @@ export default {
exchangeName: '' // 交换行名
},
rules: {
+ customsNumber: [
+ {
+ required: true,
+ message: '请输入报单号',
+ trigger: 'blur'
+ }
+ ],
+ exchangeNumber: [
+ {
+ required: true,
+ message: '请输入交换行号',
+ trigger: 'blur'
+ }
+ ],
+ currency: [
+ {
+ required: true,
+ message: '请选择币种',
+ trigger: 'blur'
+ }
+ ],
shroffAccountNumber: [
{
required: true,
@@ -136,11 +165,11 @@ export default {
}
],
accountUsername: [
- {
- required: true,
- message: '请输入收款户名',
- trigger: 'blur'
- }
+ // {
+ // required: true,
+ // message: '请输入收款户名',
+ // trigger: 'blur'
+ // }
],
billType: [
{
@@ -260,7 +289,19 @@ export default {
}
},
created() {
-
+ const tmpFunc = () => {
+ const date = new Date()
+ var y = date.getFullYear();
+ var m = date.getMonth() + 1;
+ m = m < 10 ? '0' + m : m;
+ var d = date.getDate();
+ d = d < 10 ? ('0' + d) : d;
+ return y + '-' + m + '-' + d;
+
+ }
+ 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'
@@ -275,6 +316,20 @@ export default {
autoPlay(parentId, this.form, this.myTable2, this.myTable)
}, this.$refs));
},
+ getFocus() {
+ if(!this.form.shroffAccountNumber) {
+ this.$message({
+ message: '请先输入本行收款账号',
+ center: true,
+ type: 'warning'
+ });
+ this.$refs.shroffAccountNumber.focus()
+
+ }
+ },
+ getBlur() {
+ this.form.accountUsername = '小白'
+ },
ismoney: ismoney,
inputListen: inputListen,
checkHanzi: checkHanzi,
@@ -296,4 +351,7 @@ export default {
overflow-x: hidden;
}
}
+ /deep/.el-row {
+ padding-bottom: 30px;
+ }
</style>
diff --git a/src/pages/manage/list/cityWide/cityWideOut.vue b/src/pages/manage/list/cityWide/cityWideOut.vue
index 3eb9b43..abfe5ca 100644
--- a/src/pages/manage/list/cityWide/cityWideOut.vue
+++ b/src/pages/manage/list/cityWide/cityWideOut.vue
@@ -9,21 +9,28 @@
<el-form ref="form" :model="form" label-width="150px" :rules="rules">
<el-col :span="10" :offset="1">
<el-form-item label="本行收款账号" prop="shroffAccountNumber">
- <el-input :value="form.shroffAccountNumber" @input="val => checkHanzi(val, form, 'shroffAccountNumber')" ref="shroffAccountNumber"></el-input>
+ <el-input @blur="getBlur" :value="form.shroffAccountNumber" @input="val => checkHanzi(val, form, 'shroffAccountNumber')" ref="shroffAccountNumber"></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>
+ <el-form-item label="币种" prop="currency">
+ <el-select v-model="form.currency" placeholder="请选择" ref="currency">
+ <el-option value="CNY人民币">CNY人民币</el-option>
+ </el-select>
</el-form-item>
- <el-form-item label="提出日期" prop="proposeDate">
- <el-date-picker
- v-model="form.proposeDate"
- type="date"
- placeholder="选择日期"
- ref="proposeDate">
- </el-date-picker>
+ <el-form-item label="提出场次" prop="proposeTime">
+ <el-input :value="form.proposeTime" @input="val => inputListen(val, form, 'proposeTime')" ref="proposeTime"></el-input>
</el-form-item>
- <el-form-item label="他行收款户名" prop="otherAccountUsername">
- <el-input :value="form.otherAccountUsername" @input="val => checkName(val, form, 'otherAccountUsername')" ref="otherAccountUsername"></el-input>
+ <el-form-item label="他行收款账号" prop="otherAccountNumber">
+ <el-input :value="form.otherAccountNumber" @input="val => checkHanzi(val, form, 'otherAccountNumber')" ref="otherAccountNumber"></el-input>
+ </el-form-item>
+ <el-form-item label="票据类型" prop="billType">
+ <el-select v-model="form.billType" placeholder="请选择" ref="billType">
+ <el-option label="银行本票" value="银行本票"> </el-option>
+ <el-option label="银行支票" value="银行支票"> </el-option>
+ <el-option label="银行汇票" value="银行汇票"> </el-option>
+ <el-option label="银行承兑汇票" value="银行承兑汇票"> </el-option>
+ <el-option label="商业承兑汇票" value="商业承兑汇票"> </el-option>
+ <el-option label="其他" value="其他"> </el-option>
+ </el-select>
</el-form-item>
<el-form-item label="出票日期" prop="drawBillDate">
<el-date-picker
@@ -33,26 +40,27 @@
ref="drawBillDate">
</el-date-picker>
</el-form-item>
- <el-form-item label="本行收款户名" prop="shroffAccountUsername">
- <el-input :value="form.shroffAccountUsername" @input="val => checkName(val, form, 'shroffAccountUsername')" ref="shroffAccountUsername"></el-input>
- </el-form-item>
+
</el-col>
<el-col :span="10" :offset="1">
- <el-form-item label="币种" prop="currency">
- <el-select v-model="form.currency" placeholder="请选择" ref="currency">
- <el-option value="CNY人民币">CNY人民币</el-option>
- </el-select>
+ <el-form-item label="本行收款户名" prop="shroffAccountUsername">
+ <el-input @focus="getFocus" :value="form.shroffAccountUsername" @input="val => checkName(val, form, 'shroffAccountUsername')" ref="shroffAccountUsername"></el-input>
</el-form-item>
- <el-form-item label="提出场次" prop="proposeTime">
- <el-input :value="form.proposeTime" @input="val => inputListen(val, form, 'proposeTime')" ref="proposeTime"></el-input>
+ <el-form-item label="金额" prop="money">
+ <el-input :value="form.money" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
</el-form-item>
- <el-form-item label="票据类型" prop="billType">
- <el-select v-model="form.billType" placeholder="请选择" ref="billType">
- <el-option label="银行本票" value="银行本票"> </el-option>
- </el-select>
+ <el-form-item label="提出日期" prop="proposeDate">
+ <!-- <el-date-picker
+ v-model="form.proposeDate"
+ type="date"
+ placeholder="选择日期"
+ ref="proposeDate">
+ </el-date-picker> -->
+ <el-input :value="form.proposeDate" disabled ref="proposeDate"></el-input>
</el-form-item>
- <el-form-item label="他行收款账号" prop="otherAccountNumber">
- <el-input :value="form.otherAccountNumber" @input="val => checkHanzi(val, form, 'otherAccountNumber')" ref="otherAccountNumber"></el-input>
+
+ <el-form-item label="他行收款户名" prop="otherAccountUsername">
+ <el-input :value="form.otherAccountUsername" @input="val => checkName(val, form, 'otherAccountUsername')" ref="otherAccountUsername"></el-input>
</el-form-item>
<el-form-item label="凭证号码" prop="voucherNumber">
<el-input :value="form.voucherNumber" @input="val => checkHanzi(val, form, 'voucherNumber')" ref="voucherNumber"></el-input>
@@ -112,34 +120,56 @@ export default {
voucherNumber: '', // 凭证号码
// 非必填项
currency: 'CNY人民币', // 币种
- proposeTime: '', // 提出场次
+ proposeTime: 1, // 提出场次
proposeDate: '', // 提出日期
otherAccountUsername: '', // 其他收款户名
drawBillDate: '', // 出票日期
abstract: '', // 摘要
},
rules: {
+ drawBillDate: [
+ {
+ required: true,
+ message: '请输入出票日期',
+ trigger: 'blur'
+ }
+ ],
shroffAccountNumber: [
{
required: true,
message: '请输入本行收款账号',
trigger: 'blur'
+ },
+ {
+ pattern: /^[0-9]*$/,
+ message: '请输入数字'
}
+ // {
+ // type: number,
+ // message: '请输入数字',
+ // }
],
- money: [
+ currency: [
{
required: true,
- message: '请输入金额',
+ message: '请选择币种',
trigger: 'blur'
}
],
- shroffAccountUsername: [
+ money: [
{
required: true,
- message: '请输入本行收款户名',
+ message: '请输入金额',
trigger: 'blur'
}
],
+ shroffAccountUsername: [
+ // {
+ // required: true,
+ // message: '请输入本行收款户名',
+ // trigger: 'blur'
+ // }
+ ],
billType: [
{
required: true,
@@ -244,12 +274,21 @@ export default {
}
},
created() {
-
+ const tmpFunc = () => {
+ const date = new Date()
+ var y = date.getFullYear();
+ var m = date.getMonth() + 1;
+ m = m < 10 ? '0' + m : m;
+ var d = date.getDate();
+ d = d < 10 ? ('0' + d) : d;
+ return y + '-' + m + '-' + d;
+ }
+ this.form.proposeDate = tmpFunc()
},
mounted() {
const parentId = '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,29,345,346'
autoPlay2(parentId, this.form, this.myTable2, this.myTable)
- this.$refs.shroffAccountNumber.focus()
+ this.$refs.shroffAccountNumber.focus()
},
methods: {
submitForm() {
@@ -259,6 +298,23 @@ export default {
autoPlay(parentId, this.form, this.myTable2, this.myTable)
}, this.$refs));
},
+ getFocus() {
+ // console.log('test')
+ if(!this.form.shroffAccountNumber) {
+ this.$message({
+ message: '请先输入本行收款账号',
+ center: true,
+ type: 'warning'
+ });
+ this.$refs.shroffAccountNumber.focus()
+
+ }
+ },
+ getBlur() {
+ if(this.form.shroffAccountNumber) {
+ this.form.shroffAccountUsername = '小白'
+ }
+ },
ismoney: ismoney,
inputListen: inputListen,
checkHanzi: checkHanzi,
diff --git a/src/pages/manage/list/dayEnd/branchDayEnd.vue b/src/pages/manage/list/dayEnd/branchDayEnd.vue
index 1c95801..e5309ee 100644
--- a/src/pages/manage/list/dayEnd/branchDayEnd.vue
+++ b/src/pages/manage/list/dayEnd/branchDayEnd.vue
@@ -10,13 +10,14 @@
<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-input placeholder="请输入密码" type="password" :value="form.password" @input="val => checkHanzi(val, form, 'password')" ref="password"></el-input>
+ <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>
</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>
@@ -24,17 +25,25 @@
import { myValidate, checkHanzi } from '@/utils/utilFunction.js'
import { mapState, mapMutations, mapGetters } from 'vuex'
import MyTitle from '@/components/myTitle'
+import MyDialog from '@/components/dialogTwo'
export default {
name: 'index',
components:{
- MyTitle
+ MyTitle,
+ MyDialog
},
data() {
return {
+ visible: false,
+ moduleName: 'branchDayEnd',
form:{
username: '',
password: ''
},
+ formName: {
+ username: '主管柜员号',
+ password: '登录密码'
+ },
rules: {
username: [
{
@@ -54,7 +63,16 @@ export default {
}
},
created() {
-
+ // const tmpFunc = () => {
+ // const date = new Date()
+ // var y = date.getFullYear();
+ // var m = date.getMonth() + 1;
+ // m = m < 10 ? '0' + m : m;
+ // var d = date.getDate();
+ // d = d < 10 ? ('0' + d) : d;
+ // return y + '-' + m + '-' + d;
+ // }
+ // this.form.data = tmpFunc()
},
mounted() {
this.$refs.username.focus()
@@ -65,9 +83,31 @@ export default {
}),
submitIt() {
this.$refs.form.validate(myValidate(() => {
- this.setTipsOperate('验证成功')
+ 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.$message({
+ // message: '提交成功',
+ // type: 'success'
+ // });
+ // this.setNeedsModule(moduleName)
+ // this.setDataFlow({ ...this.form })
+ }).catch((error)=>{
+ })
+ },
checkHanzi: checkHanzi
}
};
@@ -82,4 +122,8 @@ export default {
/deep/.el-input input {
width: 420px;
}
+ .body {
+ padding-top: 50px;
+ padding-left: 50px;
+ }
</style>
diff --git a/src/pages/manage/list/dayEnd/tellerCash.vue b/src/pages/manage/list/dayEnd/tellerCash.vue
index e3831df..748ea32 100644
--- a/src/pages/manage/list/dayEnd/tellerCash.vue
+++ b/src/pages/manage/list/dayEnd/tellerCash.vue
@@ -8,12 +8,13 @@
<el-form ref="form" :model="form" label-width="120px" :rules="rules">
<el-col :span="10" :offset="1">
<el-form-item label="日期" prop="date">
- <el-date-picker type="date" placeholder="选择日期" v-model.trim="form.date" style="width: 100%;" ref="date"></el-date-picker>
+ <!-- <el-date-picker type="date" placeholder="选择日期" v-model.trim="form.date" style="width: 100%;" ref="date"></el-date-picker> -->
+ <el-input :value="form.date" disabled ref="date"></el-input>
</el-form-item>
</el-col>
<el-col :span="10" :offset="1">
<el-form-item label="柜员号" prop="counterNumber">
- <el-input :value="form.counterNumber" @input="(val) => checkHanzi(val, form, 'counterNumber')" ref="counterNumber"></el-input>
+ <el-input :value="form.counterNumber" @input="(val) => inputListen(val, form, 'counterNumber')" ref="counterNumber"></el-input>
</el-form-item>
</el-col>
<!-- <el-col :span="20" :offset="2">
@@ -53,6 +54,7 @@
</el-form>
</el-row>
<el-button @click="submitForm" 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>
</div>
@@ -60,22 +62,30 @@
<script>
import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
-import { myValidate, checkHanzi } from '@/utils/utilFunction.js'
+import { myValidate, checkHanzi, inputListen } from '@/utils/utilFunction.js'
import { mapState, mapMutations, mapGetters } from 'vuex'
import MyTitle from '@/components/myTitle'
+import MyDialog from '@/components/dialogTwo'
export default {
name: 'index',
components:{
- MyTitle
+ MyTitle,
+ MyDialog
},
data() {
return {
headerCellStyle: headerCellStyle,
+ moduleName: 'tallerCash',
text:'柜员现金轧账',/* 顶部文字 */
+ visible: false,
form:{
date: '',
counterNumber: ''
},
+ formName: {
+ date: '日期',
+ counterNumber: '柜员号'
+ },
rules: {
date: [
{
@@ -95,23 +105,8 @@ export default {
tableData: [
{
currency: '人民币',
- moneySum: 30000000000,
- cashSum: 30000000000
- },
- {
- currency: '人民币',
- moneySum: 30000000000,
- cashSum: 30000000000.123
- },
- {
- currency: '人民币',
- moneySum: 30000000000,
- cashSum: 30000000000.123
- },
- {
- currency: '人民币',
- moneySum: 30000000000,
- cashSum: 30000000000.123
+ moneySum: 30000000,
+ cashSum: 30000000
}
],
visible:false,
@@ -128,7 +123,16 @@ export default {
}
},
created() {
-
+ const tmpFunc = () => {
+ const date = new Date()
+ var y = date.getFullYear();
+ var m = date.getMonth() + 1;
+ m = m < 10 ? '0' + m : m;
+ var d = date.getDate();
+ d = d < 10 ? ('0' + d) : d;
+ return y + '-' + m + '-' + d;
+ }
+ this.form.date = tmpFunc()
},
methods: {
...mapMutations({
@@ -136,11 +140,40 @@ export default {
}),
submitForm() {
this.$refs.form.validate(myValidate(() => {
- this.setTipsOperate('验证成功')
+ this.visible = true
}, this.$refs));
},
+ submitForm2() {
+ let projectId = sessionStorage.getItem('projectId')
+ let startTime = sessionStorage.getItem('startTime')
+ 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,541,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,541,545","type": "3"})
+ let params= {
+ parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,32,541',
+ lcJudgmentRuleReq:formList,
+ projectId:+projectId,
+ startTime:startTime,
+ }
+
+ addOperation(params).then((data)=>{
+ // this.$message({
+ // message: '提交成功',
+ // type: 'success'
+ // });
+ // this.setNeedsModule(moduleName)
+ // this.setDataFlow({ ...this.form })
+ }).catch((error)=>{
+ })
+ },
tableRowClassName: tableRowClassName,
- checkHanzi: checkHanzi
+ checkHanzi: checkHanzi,
+ inputListen
+ },
+ watch: {
+ // 'form.date'(newVal) {
+
+ // }
}
};
</script>
diff --git a/src/pages/manage/list/dayEnd/tellerCertificate.vue b/src/pages/manage/list/dayEnd/tellerCertificate.vue
index 547151d..0c937c1 100644
--- a/src/pages/manage/list/dayEnd/tellerCertificate.vue
+++ b/src/pages/manage/list/dayEnd/tellerCertificate.vue
@@ -9,7 +9,8 @@
<el-form ref="form" :model="form" label-width="120px">
<el-col :span="10" :offset="1">
<el-form-item label="日期" required>
- <el-date-picker type="date" placeholder="选择日期" v-model="form.date" style="width: 100%;"></el-date-picker>
+ <!-- <el-date-picker type="date" placeholder="选择日期" v-model="form.date" style="width: 100%;"></el-date-picker> -->
+ <el-input :value="form.date" disabled ref="date"></el-input>
</el-form-item>
</el-col>
<el-col :span="10" :offset="1">
@@ -64,6 +65,7 @@
</el-form>
</el-row>
<el-button @click="submitForm" 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>
</div>
@@ -74,18 +76,26 @@ import { tableRowClassName, headerCellStyle } from '@/assets/js/myConfig'
import { myValidate, checkHanzi } from '@/utils/utilFunction.js'
import { mapState, mapMutations, mapGetters } from 'vuex'
import MyTitle from '@/components/myTitle'
+import MyDialog from '@/components/dialogTwo'
export default {
name: 'index',
components:{
- MyTitle
+ MyTitle,
+ MyDialog
},
data() {
return {
headerCellStyle: headerCellStyle,
+ moduleName: 'tellerCertificate',
+ visible: false,
form:{
date: '',
counterNumber: ''
},
+ formName:{
+ date: '日期',
+ counterNumber: '柜员号'
+ },
rules: {
date: [
{
@@ -104,18 +114,47 @@ export default {
},
tableData: [
{
- certificateName: '身份证',
- stockNum: 100,
- startNumber: '01',
- endNumber: '02',
- cashBoxNum: 0
+ certificateName: '银行卡',
+ stockNum: 19,
+ startNumber: '003001',
+ endNumber: '003019',
+ cashBoxNum: ''
+ },
+ {
+ certificateName: '定期存单',
+ stockNum: 20,
+ startNumber: '003501',
+ endNumber: '003520',
+ cashBoxNum: ''
+ },
+ {
+ certificateName: '现金支票',
+ stockNum: 20,
+ startNumber: '003601',
+ endNumber: '003620',
+ cashBoxNum: ''
+ },
+ {
+ certificateName: '转账支票',
+ stockNum: 20,
+ startNumber: '003701',
+ endNumber: '003720',
+ cashBoxNum: ''
}
- ],
- visible:false,
+ ]
}
},
created() {
-
+ const tmpFunc = () => {
+ const date = new Date()
+ var y = date.getFullYear();
+ var m = date.getMonth() + 1;
+ m = m < 10 ? '0' + m : m;
+ var d = date.getDate();
+ d = d < 10 ? ('0' + d) : d;
+ return y + '-' + m + '-' + d;
+ }
+ this.form.date = tmpFunc()
},
methods: {
...mapMutations({
@@ -126,9 +165,33 @@ export default {
},
submitForm() {
this.$refs.form.validate(myValidate(() => {
- this.setTipsOperate('验证成功')
+ this.visible = true
}, this.$refs));
},
+ submitForm2() {
+ let projectId = sessionStorage.getItem('projectId')
+ let startTime = sessionStorage.getItem('startTime')
+ 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":'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= {
+ parentId: '285,' + this.$store.state.system.businessSelect[this.$store.state.system.businessKey].id + ',287,5,32,542',
+ lcJudgmentRuleReq:formList,
+ projectId:+projectId,
+ startTime:startTime,
+ }
+ addOperation(params).then((data)=>{
+ // this.$message({
+ // message: '提交成功',
+ // type: 'success'
+ // });
+ // this.setNeedsModule(moduleName)
+ // this.setDataFlow({ ...this.form })
+ }).catch((error)=>{
+ })
+ },
tableRowClassName: tableRowClassName,
checkHanzi: checkHanzi
}
diff --git a/src/store/modules/system.js b/src/store/modules/system.js
index 4b7a76a..604345c 100644
--- a/src/store/modules/system.js
+++ b/src/store/modules/system.js
@@ -2432,21 +2432,19 @@ export default {
},
initState(state) {
state.businessSelect = JSON.parse(JSON.stringify(myInitState))
- // state.businessSelect.splice(0, state.businessSelect.length, ...myInitState)
- // function deepClone(obj){
- // let objClone = Array.isArray(obj) ? [] : {}; // 先判断是不是数组
- // if (obj && typeof obj === 'object') { // 确定是引用类型
- // for(let key in obj){
- // if (obj[key] && typeof obj[key] === 'object'){ // 判断是否有深层嵌套
- // objClone[key] = deepClone(obj[key]);
- // }else{
- // objClone[key] = obj[key]
- // }
- // }
- // }
- // return objClone;
+ // function deepClone(obj) {
+ // let objClone = Array.isArray(obj)? []: {}
+ // if(obj && typeof obj === 'object') {
+ // for(let key in obj) {
+ // if(obj[key] && typeof obj[key] === object) {
+ // objClone[key] = deepClone(obj[key])
+ // }else {
+ // objClone[key] = obj[key]
+ // }
+ // }
+ // }
+ // return objClone
// }
- console.log(state.businessSelect)
state.businessKey = ''
},
setShowBusiness(state, isShow) {