@@ -135,7 +131,7 @@ export default {
return {
visible: false,
confirmLoading: false,
- pageType: 1,
+ width: 1350,
form: this.$form.createForm(this),
// 角色码
isMember: Vue.ls.get(USER_INFO).roleCode,
@@ -175,7 +171,7 @@ export default {
dataIndex: 'effectDate',
customRender: function(text) {
if (text == null) {
- return '------------'
+ return '--'
} else {
return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
}
@@ -187,7 +183,7 @@ export default {
dataIndex: 'invalidDate',
customRender: function(text) {
if (text == null) {
- return '------------'
+ return '--'
} else {
return !text ? '' : (text.length > 10 ? text.substr(0, 10) : text)
}
@@ -196,15 +192,14 @@ export default {
{
title: '快递公司',
align: 'center',
- dataIndex: 'sendMethod',
- customRender: function(text) {
- if (text === 1) {
- return 'EMS'
- } else if (text === 2) {
- return '顺丰'
- }
- }
- }],
+ dataIndex: 'sendMethod_dictText'
+ },
+ {
+ title: '快递单号',
+ align: 'center',
+ dataIndex: 'postNo'
+ }
+ ],
// VIN证书历史数据源
vinCertificateHistoryDataSource: [],
// 页面分页信息
@@ -221,18 +216,6 @@ export default {
}
}
},
- computed: {
- width() {
- if (this.pageType === 14) {
- return 400
- }
- if (this.pageType !== 4) {
- return 1350
- } else {
- return 650
- }
- }
- },
methods: {
check(val) {
this.form.resetFields()
@@ -240,7 +223,7 @@ export default {
this.paymentSearchQuery()
this.visible = true
this.$nextTick(() => {
- this.form.setFieldsValue(pick(this.model, 'certificateImg', 'certificateValidDate', 'companyName', 'certificationDate', 'certificateType', 'certificateStatus', 'code',))
+ this.form.setFieldsValue(pick(this.model, 'companyName', 'certificateType', 'code', 'certificateValidDate', 'certificateImg'))
})
},
handleCancel() {
@@ -249,7 +232,6 @@ export default {
// 获取证书历史数据源
paymentSearchQuery() {
const params = `certificateId=${this.model.id}&pageNo=${this.ipagination.current}&pageSize=${this.ipagination.pageSize}`
- // const params = 'certificateId=' + this.vinCertificate.id + '&pageNo=' + this.ipagination.current + '&pageSize=' + this.ipagination.pageSize
getAction('/vinCertificateHistory/vinCertificateHistory/list?' + params).then((res) => {
this.vinCertificateHistoryDataSource = res.result.records
this.ipagination.total = res.result.total
@@ -331,19 +313,4 @@ export default {
background: #8a8c8e;
}
-.transalte-y-10 {
- transform: translateY(10px);
-}
-
-.apply-notice {
- color: #f5222d;
-}
-
-.apply-code-notice {
- color: #f5222d;
- position: absolute;
- bottom: 4px;
- left: 25%
-}
-
\ No newline at end of file
diff --git a/src/views/standardsAssociation/model/RenewChargeModel.vue b/src/views/standardsAssociation/model/RenewChargeModel.vue
index 6af200e..25a14f0 100644
--- a/src/views/standardsAssociation/model/RenewChargeModel.vue
+++ b/src/views/standardsAssociation/model/RenewChargeModel.vue
@@ -72,7 +72,7 @@
@@ -84,7 +84,7 @@
@@ -94,7 +94,7 @@
@@ -292,7 +292,7 @@ export default {
confirmLoading: false,
// 验证单位名称与发票抬头是否一致
validateCompanyNameFlag:false,
- pageType: 7,
+ width: 1350,
// 记录续费证书选择
selectType: 1,
// 当前选中的发票类型
@@ -315,15 +315,6 @@ export default {
// 所有获取的相关信息
model: {},
validatorRules: {
- defaultRules: {
- rules: [{ required: true, message: '请选择' },
- { min: 1, max: 50, message: '长度不超过50个字符', validateTrigger: 'blur' }
- ]
- },
- unBindId: {
- rules: [{ required: true, message: '请选择要解绑的证书' }
- ]
- },
companyName: {
rules: [
{ required: true, message: '请输入单位全称!' },
@@ -463,11 +454,7 @@ export default {
depositBank: { rules: [{ required: true, message: '请输入开户银行' }], validateTrigger: 'blur' },
bankAccount: { rules: [{ required: true, message: '请输入银行账户' }], validateTrigger: 'blur' },
linkBankNumber: { rules: [{ required: true, message: '请输入联行号' }], validateTrigger: 'blur' },
- reasonsRenewal: {
- rules: [{
- required: true, message: '请至少选择一个换证原因!'
- }]
- },
+
sendMethod: { rules: [{ required: false, message: '请选择快递公司' }], validateTrigger: 'change' },
postNo: { rules: [{ required: false, message: '请输入邮寄单号' }], validateTrigger: 'blur' }
},
@@ -521,24 +508,6 @@ export default {
validateCompanyName() {
this.validateCompanyNameFlag = this.form.getFieldValue('headerName') === this.model.companyName
},
- /*
- * 续费选择换证
- * */
- selectcertificateType(val) {
- this.selectType = val
- // 记录原始的证书形式
- const originType = this.model.certificateType
- // 记录原始的证书代码
- this.form.resetFields('reasonsRenewal')
- const originCode = this.model.code
- if (val !== originType.toString()) {
- this.selectTypeDisabled = false
- this.model.code = ''
- } else {
- this.selectTypeDisabled = true
- this.model.code = originCode
- }
- },
// 提交- 证书续费
renewChargeCertificate() {
this.handleRenewChargeCertificateOk()
@@ -660,18 +629,6 @@ export default {
this.visible = false
this.currentSelectInvoiceType = ''
}
- },
- computed: {
- width() {
- if (this.pageType === 14) {
- return 400
- }
- if (this.pageType !== 4) {
- return 1350
- } else {
- return 650
- }
- }
}
}