diff --git a/src/pages/counter/list/index.vue b/src/pages/counter/list/index.vue index a411e7f..df1f3aa 100644 --- a/src/pages/counter/list/index.vue +++ b/src/pages/counter/list/index.vue @@ -713,7 +713,7 @@ export default { } } } - this.toggleGoods() + // this.toggleGoods() if(this.popText == '密码器'){ if (this.nbm == 8){ let formList = [] @@ -735,6 +735,7 @@ export default { }else{ if (this.receptionList.length >0){ let formList = [] + this.toggleGoods() this.$message.success(`${this.popText}操作成功!`) if (this.nbm == 0){ //用户 }else if (this.nbm == 1){ //传票箱 @@ -917,6 +918,7 @@ export default { this.$message.error('请从物品栏中拖拽所需资料'); } } + }, toPart(){ this.$router.push('/index') @@ -1932,6 +1934,7 @@ export default { @media screen and (min-width: 1200px) and (max-width: 1919px) { .goods-dia { height: 15vh; + width: 100%; .justify-center { max-height: 13vh; } diff --git a/src/pages/manage/list/acceptanceDraft/invoice.vue b/src/pages/manage/list/acceptanceDraft/invoice.vue new file mode 100644 index 0000000..57df30d --- /dev/null +++ b/src/pages/manage/list/acceptanceDraft/invoice.vue @@ -0,0 +1,193 @@ +// 个人客户 + + + + + diff --git a/src/pages/manage/list/business/deposit.vue b/src/pages/manage/list/business/deposit.vue index af04cb8..68c1326 100644 --- a/src/pages/manage/list/business/deposit.vue +++ b/src/pages/manage/list/business/deposit.vue @@ -21,11 +21,11 @@ - + - + @@ -33,7 +33,7 @@ - + @@ -72,7 +72,8 @@ diff --git a/src/pages/manage/list/business/openAccount.vue b/src/pages/manage/list/business/openAccount.vue index 61bfec3..08ca9ad 100644 --- a/src/pages/manage/list/business/openAccount.vue +++ b/src/pages/manage/list/business/openAccount.vue @@ -51,7 +51,7 @@ - + @@ -113,7 +113,8 @@ diff --git a/src/pages/manage/list/business/withdrawal.vue b/src/pages/manage/list/business/withdrawal.vue index c57e9e8..b6589de 100644 --- a/src/pages/manage/list/business/withdrawal.vue +++ b/src/pages/manage/list/business/withdrawal.vue @@ -35,7 +35,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -89,7 +89,8 @@ diff --git a/src/pages/manage/list/cityWide/cityWideIn.vue b/src/pages/manage/list/cityWide/cityWideIn.vue new file mode 100644 index 0000000..3619e98 --- /dev/null +++ b/src/pages/manage/list/cityWide/cityWideIn.vue @@ -0,0 +1,243 @@ +// 存款 + + + + + diff --git a/src/pages/manage/list/cityWide/cityWideOut.vue b/src/pages/manage/list/cityWide/cityWideOut.vue new file mode 100644 index 0000000..0e9f5ad --- /dev/null +++ b/src/pages/manage/list/cityWide/cityWideOut.vue @@ -0,0 +1,239 @@ +// 存款 + + + + + diff --git a/src/pages/manage/list/client/consumerClient.vue b/src/pages/manage/list/client/consumerClient.vue index 43c7209..c9f47e0 100644 --- a/src/pages/manage/list/client/consumerClient.vue +++ b/src/pages/manage/list/client/consumerClient.vue @@ -156,7 +156,7 @@ export default { // const requiredField = { // idNumber:'证件号码', - userName:'用户名字', + userName:'客户姓名', sex:'性别', birthday:'出生日期', phone:'联系电话' diff --git a/src/pages/manage/list/personal/accountService/changePassword.vue b/src/pages/manage/list/personal/accountService/changePassword.vue index f7ecd26..97758de 100644 --- a/src/pages/manage/list/personal/accountService/changePassword.vue +++ b/src/pages/manage/list/personal/accountService/changePassword.vue @@ -21,7 +21,7 @@ - + @@ -42,7 +42,7 @@ diff --git a/src/pages/manage/list/personal/callDeposits/openAccount.vue b/src/pages/manage/list/personal/callDeposits/openAccount.vue index d395afc..a0f9742 100644 --- a/src/pages/manage/list/personal/callDeposits/openAccount.vue +++ b/src/pages/manage/list/personal/callDeposits/openAccount.vue @@ -28,7 +28,7 @@ - + @@ -37,7 +37,7 @@

请刷身份证

- + @@ -69,7 +69,8 @@ diff --git a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue index 13a68cb..6abf0f2 100644 --- a/src/pages/manage/list/personal/currentAccount/accountCancellation.vue +++ b/src/pages/manage/list/personal/currentAccount/accountCancellation.vue @@ -21,7 +21,7 @@
- + @@ -37,7 +37,7 @@ diff --git a/src/pages/manage/list/personal/currentAccount/openAccount.vue b/src/pages/manage/list/personal/currentAccount/openAccount.vue index da11d00..d4fa97c 100644 --- a/src/pages/manage/list/personal/currentAccount/openAccount.vue +++ b/src/pages/manage/list/personal/currentAccount/openAccount.vue @@ -14,7 +14,7 @@ - + @@ -175,7 +175,7 @@ diff --git a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue index d43c36b..74360dd 100644 --- a/src/pages/manage/list/personal/currentAccount/transferAccounts.vue +++ b/src/pages/manage/list/personal/currentAccount/transferAccounts.vue @@ -15,14 +15,14 @@ - + - + @@ -35,8 +35,8 @@

请输入密码

- - + +
@@ -51,7 +51,8 @@ diff --git a/src/pages/manage/list/personal/currentAccount/withdrawal.vue b/src/pages/manage/list/personal/currentAccount/withdrawal.vue index 9a16f5a..3c6684b 100644 --- a/src/pages/manage/list/personal/currentAccount/withdrawal.vue +++ b/src/pages/manage/list/personal/currentAccount/withdrawal.vue @@ -15,7 +15,7 @@ - +
@@ -24,7 +24,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -52,6 +52,8 @@
diff --git a/src/pages/manage/list/personal/timeDeposit/deposit.vue b/src/pages/manage/list/personal/timeDeposit/deposit.vue index 6aa8c64..80521ba 100644 --- a/src/pages/manage/list/personal/timeDeposit/deposit.vue +++ b/src/pages/manage/list/personal/timeDeposit/deposit.vue @@ -15,9 +15,9 @@
- + - + @@ -32,7 +32,7 @@
- + @@ -75,8 +75,8 @@ diff --git a/src/pages/manage/list/personal/timeDeposit/openAccount.vue b/src/pages/manage/list/personal/timeDeposit/openAccount.vue index d6b6ba8..2897263 100644 --- a/src/pages/manage/list/personal/timeDeposit/openAccount.vue +++ b/src/pages/manage/list/personal/timeDeposit/openAccount.vue @@ -34,7 +34,7 @@

请刷身份证

- + @@ -60,6 +60,7 @@ diff --git a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue index efb5772..62ff4ae 100644 --- a/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue +++ b/src/pages/manage/list/personal/usefulPhrases/accountClosed.vue @@ -22,7 +22,7 @@ - + @@ -41,7 +41,7 @@

请刷身份证

- + @@ -50,7 +50,7 @@ - + @@ -60,7 +60,7 @@ - +
@@ -84,7 +84,8 @@ diff --git a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue index d4126ab..45a8930 100644 --- a/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue +++ b/src/pages/manage/list/personal/usefulPhrases/continueDeposit.vue @@ -18,11 +18,11 @@ - + - + @@ -50,8 +50,8 @@ diff --git a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue index 82e5819..92bfe80 100644 --- a/src/pages/manage/list/personal/usefulPhrases/openAccount.vue +++ b/src/pages/manage/list/personal/usefulPhrases/openAccount.vue @@ -41,7 +41,7 @@

请刷身份证

- + @@ -55,7 +55,7 @@ - + @@ -74,8 +74,8 @@ diff --git a/src/pages/manage/list/servicesAccount/passwordChange.vue b/src/pages/manage/list/servicesAccount/passwordChange.vue index df0c1f8..280c311 100644 --- a/src/pages/manage/list/servicesAccount/passwordChange.vue +++ b/src/pages/manage/list/servicesAccount/passwordChange.vue @@ -14,11 +14,11 @@ - + - +
@@ -33,7 +33,7 @@ - + @@ -70,7 +70,8 @@ + \ No newline at end of file diff --git a/src/pages/manage/list/servicesAccount/relieveLost.vue b/src/pages/manage/list/servicesAccount/relieveLost.vue index e69de29..b08831e 100644 --- a/src/pages/manage/list/servicesAccount/relieveLost.vue +++ b/src/pages/manage/list/servicesAccount/relieveLost.vue @@ -0,0 +1,144 @@ + + + \ No newline at end of file diff --git a/src/pages/manage/navbar/index.vue b/src/pages/manage/navbar/index.vue index b824080..67446c5 100644 --- a/src/pages/manage/navbar/index.vue +++ b/src/pages/manage/navbar/index.vue @@ -135,11 +135,27 @@ export default { icon: 'menu-icon icon-index', index: '/index/list4', title: '同城交互', + children:[ + { + index:"/counter/list/manage/cityWide-out", + title:'同城提出' + }, + { + index:"/counter/list/manage/cityWide-in", + title:'同城提入' + } + ] }, { icon: 'menu-icon icon-index', index: '/index/list5', title: '银行承兑汇票', + children:[ + { + index:"/counter/list/manage/acceptanceDraft-invoice", + title:'商业承兑汇票开票' + } + ] }, { icon: 'menu-icon icon-index', diff --git a/src/router/modules/counter.js b/src/router/modules/counter.js index 1d726eb..c6743d6 100644 --- a/src/router/modules/counter.js +++ b/src/router/modules/counter.js @@ -116,8 +116,26 @@ export default { }, // 同城交互 + { + name: `${pre}cityWideOut`, + path: `cityWide-out`, + component: () => import('@/pages/manage/list/cityWide/cityWideOut.vue'), + meta: { title: '同城提出' }, + }, + { + name: `${pre}cityWideIn`, + path: `cityWide-in`, + component: () => import('@/pages/manage/list/cityWide/cityWideIn.vue'), + meta: { title: '同城提入' }, + }, // 银行承兑汇票 + { + name: `${pre}acceptanceDraftInvoice`, + path: `acceptanceDraft-invoice`, + component: () => import('@/pages/manage/list/acceptanceDraft/invoice.vue'), + meta: { title: '商业承兑汇票开票' }, + }, // 重空现金 { diff --git a/src/utils/utilFunction.js b/src/utils/utilFunction.js index 04d9837..df7b917 100644 --- a/src/utils/utilFunction.js +++ b/src/utils/utilFunction.js @@ -25,9 +25,22 @@ const checkRequired = function(form, obj) { // 监听数字 const inputListen = function(val, row, prop) { + if(val === '') { + row[prop] = val; + return; + } row[prop] = Number(val.replace(/\D+/, '')) } +const ismoney = function(val, row, prop) { + + // const reg = /([1-9]\d{0,9}|0)(\.\d{1,2})?$/ // 不用保留 + const reg2 = /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/; // 保留小数点后两位 + if (reg2.test(Number(val)) || val==='') { + row[prop] = val + } +} + /* 刷卡器逻辑 */ @@ -36,5 +49,6 @@ const inputListen = function(val, row, prop) { phoneListen, mailBoxListen, checkRequired, - inputListen + inputListen, + ismoney } \ No newline at end of file diff --git a/src/utils/verify.js b/src/utils/verify.js index 8e757a5..3f7ac8f 100644 --- a/src/utils/verify.js +++ b/src/utils/verify.js @@ -14,17 +14,21 @@ const vermob = [ } ] const vername = [ - { - required: true, - message: '请输入姓名', - trigger: 'blur' - }, { // pattern: /^[\u4e00-\u9fa5]{2,4}$/, - pattern: /^(?:[\u4e00-\u9fa5]+)(?:●[\u4e00-\u9fa5]+)*$|^[a-zA-Z0-9]+\s?[\.·\-()a-zA-Z]*[a-zA-Z]+$/, + // pattern: /^(?:[\u4e00-\u9fa5]+)(?:●[\u4e00-\u9fa5]+)*$|^[a-zA-Z0-9]+\s?[\.·\-()a-zA-Z]*[a-zA-Z]+$/, + pattern: /(^[A-Z][a-z]*(\s[A-Z][a-z]*)*$)|(^[\u4e00-\u9fa5]{2,4}$)/, message: '请输入正确的姓名' } -] +] +const verrate = [ + { + // pattern: /\d{1,2}(\.\d{1,2})?/, + // pattern: /^(([1-9]\\d{0,9})|0)(\\.\\d{1,2})?%$/, + pattern: /^(\d|[1-9]\d|100)(.\d{1,3})?%$|^(\d|[1-9]\d|100)(.\d{1,3})?$/, + message: '请输入正确的年利率' + } +] export { veridc, @@ -33,5 +37,6 @@ const vername = [ verdou, vermail, vermob, - vername + vername, + verrate }