From d71919cbb7dca4e61b056b936fd7c48bc26fc4ce Mon Sep 17 00:00:00 2001
From: fengachen <373943794@qq.com>
Date: Wed, 23 Mar 2022 17:31:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=8F=98=E6=9B=B4=E3=80=91=20?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=81=E4=B9=A6=E5=A2=9E=E5=8A=A0=E8=AF=81?=
=?UTF-8?q?=E4=B9=A6=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CertificateManagement.vue | 17 ++++-
.../VinCertificateModal.vue | 71 ++++++++++++++-----
2 files changed, 66 insertions(+), 22 deletions(-)
diff --git a/src/views/standardsAssociation/CertificateManagement.vue b/src/views/standardsAssociation/CertificateManagement.vue
index 53df3b5..cfb209f 100644
--- a/src/views/standardsAssociation/CertificateManagement.vue
+++ b/src/views/standardsAssociation/CertificateManagement.vue
@@ -210,6 +210,7 @@ export default {
key: 'rowIndex',
width: 60,
align: 'center',
+ fixed: 'left',
customRender: function(t, r, index) {
return parseInt(index) + 1
}
@@ -217,11 +218,14 @@ export default {
{
title: '单位全称',
align: 'center',
- dataIndex: 'companyName'
+ width: 160,
+ dataIndex: 'companyName',
+ fixed:'left'
},
{
title: '证书类型',
align: 'center',
+ width: 260,
dataIndex: 'certificateType',
customRender: function(text) {
if (text === 1) {
@@ -235,16 +239,19 @@ export default {
title: '证书代码',
align: 'center',
dataIndex: 'code',
+ width: 140,
scopedSlots: { customRender: 'codeState' }
},
{
title: '发证时间',
align: 'center',
- dataIndex: 'certificationDate'
+ dataIndex: 'certificationDate',
+ width: 170
},
{
title: '生效日期',
align: 'center',
+ width: 170,
dataIndex: 'effectDate',
customRender: function(text) {
return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
@@ -254,6 +261,7 @@ export default {
title: '失效日期',
align: 'center',
dataIndex: 'invalidDate',
+ width: 160,
customRender: function(text) {
return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
}
@@ -262,6 +270,7 @@ export default {
title: '备案通知书',
align: 'center',
dataIndex: 'noticeOfFiling',
+ width: 120,
customRender: function(text) {
if (text === 1) {
return '是'
@@ -275,12 +284,14 @@ export default {
{
title: '状态',
align: 'center',
+ width: 140,
dataIndex: 'certificateStatus',
scopedSlots: { customRender: 'customRenderStatus' }
},
{
title: '证书形式',
align: 'center',
+ width: 120,
dataIndex: 'certificateModality',
customRender: function(text) {
if (text === 1) {
@@ -298,7 +309,7 @@ export default {
title: '操作',
dataIndex: 'action',
align: 'center',
- // fixed:"right",
+ fixed:'right',
width: 147,
scopedSlots: { customRender: 'action' }
}
diff --git a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
index 03f670e..20fb209 100644
--- a/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
+++ b/src/views/standardsAssociation/memberManagementModule/VinCertificateModal.vue
@@ -72,6 +72,20 @@
+
+
+
+
+
+
+
+
+
@@ -813,8 +827,8 @@
-
-
+
+
+
+
+
+
+
+
+
缴费信息
@@ -2823,8 +2849,8 @@ import { getLastPaymentByMemberId, getCertificateByMemberId } from '@/api/standa
import JDictSelectTag from '@/components/standardsAssociation/JDictSelectTag'
import JMultiSelectTag from '@/components/standardsAssociation/JMultiSelectTag'
import PreViewImgModal from './PreViewImgModal'
-import { USER_INFO } from '@/store/mutation-types'
-import Vue from 'vue'
+// import { USER_INFO } from '@/store/mutation-types'
+// import Vue from 'vue'
export default {
name: 'VinCertificateModal',
@@ -3133,7 +3159,7 @@ export default {
validatorRules: {
defaultRules: {
rules: [{ required: true, message: '请选择' },
- { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'onBlur' }
+ { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'blur' }
]
},
unBindId: {
@@ -3143,30 +3169,37 @@ export default {
companyName: {
rules: [
{ required: true, message: '请输入单位全称!' },
- { min: 1, max: 50, message: '单位全称长度不超过50个字符', validateTrigger: 'onBlur' }
+ { min: 1, max: 50, message: '单位全称长度不超过50个字符', validateTrigger: 'blur' }
]
},
mobile: {
rules: [
{ required: true, message: '请输入手机!' },
{ min: 1, max: 50, message: '手机号码不超过50个字符' },
- { pattern: /^1[34578]\d{9}$/, message: '请输入正确的手机号', validateTrigger: 'onBlur' }
+ { pattern: /^1[345678]\d{9}$/, message: '请输入正确的手机号', validateTrigger: 'blur' }
]
},
+ certificateImg: {
+ rules: [
+ { required: true, message: '请上传证书文件!' },
+
+ ],
+ validateTrigger: 'change'
+ },
code: {
rules: [
{ required: true, message: '请输入证书代码!' },
- { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'onBlur' }
+ { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'blur' }
]
},
clientCode: {
rules: [
- { min: 0, max: 50, message: '长度不超过50个字符', validateTrigger: 'onBlur' }
+ { min: 0, max: 50, message: '长度不超过50个字符', validateTrigger: 'blur' }
]
},
auditOpinion: {
rules: [
- { min: 0, max: 500, message: '处理结果备注最多500个字符', validateTrigger: 'onBlur' }
+ { min: 0, max: 500, message: '处理结果备注最多500个字符', validateTrigger: 'blur' }
]
},
effectDate: {
@@ -3188,7 +3221,7 @@ export default {
address: {
rules: [
{ required: true, message: '请输入通讯地址!' },
- { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'onBlur' }
+ { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'blur' }
]
},
postcode: {
@@ -3197,7 +3230,7 @@ export default {
required: true, message: '请输入邮编!'
},
{ min: 1, max: 50, message: '长度不超过50个字符' },
- { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮编', validateTrigger: 'onBlur' }
+ { pattern: /^[0-9]\d{5}$/, message: '请输入正确的邮编', validateTrigger: 'blur' }
]
},
paymentMethod: {
@@ -3213,7 +3246,7 @@ export default {
{
pattern: /^[1-9](\d{1,10})?(\.\d{1,2})$|^0\.([1-9](\d{0,1})|\d[1-9])$|^[1-9]\d{0,10}$|^0$/,
message: '请输入合法的金额数字,最多2位小数,11位正数',
- validateTrigger: 'onBlur'
+ validateTrigger: 'blur'
}
],
validateTrigger: 'blur'
@@ -3232,7 +3265,7 @@ export default {
liaisonMan: {
rules: [
{ required: true, message: '请输入联系人!' },
- { min: 1, max: 50, message: '联系人不超过50个字符', validateTrigger: 'onBlur' }
+ { min: 1, max: 50, message: '联系人不超过50个字符', validateTrigger: 'blur' }
]
},
invoiceRequirements: {
@@ -3245,20 +3278,20 @@ export default {
{
required: true, message: '请输入关联付款发票名称!'
},
- { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'onBlur' }
+ { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'blur' }
],
validateTrigger: 'blur'
},
taxNumber: {
rules: [
{ required: true, message: '请输入社会统一代码/税号!' },
- { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'onBlur' },
+ { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'blur' },
{
// pattern: /^[A-Z0-9]{15}$|^[A-Z0-9]{17}$|^[A-Z0-9]{18}$|^[A-Z0-9]{20}$/,
pattern: /^([0-9A-HJ-NPQRTUWXY]{2}\d{6}[0-9A-HJ-NPQRTUWXY]{10}|[1-9]\d{14})$/,
// message: '15位、17位、18位、20位数字和大写英文字母',
message: '请输入15位、18位的社会统一代码/税号',
- validateTrigger: 'onBlur'
+ validateTrigger: 'blur'
}
],
validateTrigger: 'blur'
@@ -3270,7 +3303,7 @@ export default {
{
pattern: /^((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(17[0135678])|(18[0-9])|(19[8|9])|(16[6]))\d{8}$|^([0-9]{3,4}-)[0-9]{7,8}$/,
message: '请输入正确格式的电话号码',
- validateTrigger: 'onBlur'
+ validateTrigger: 'blur'
}
],
validateTrigger: 'blur'
@@ -4397,7 +4430,7 @@ export default {
})
},
- handleTableChange(pagination, filters, sorter) {
+ handleTableChange(pagination) {
this.ipagination = pagination
this.paymentSearchQuery()
},