diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
index 7e819d5..55557a5 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
@@ -27,7 +27,7 @@
+ v-model="queryParam.model">
@@ -57,7 +57,7 @@
@@ -67,7 +67,7 @@
+ v-model="queryParam.pcrNo">
@@ -106,6 +106,8 @@
:pagination="false"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ :operationList="operationList"
+ @operationClick="operationClick"
@change="handleTableChange">
@@ -167,7 +169,7 @@ export default {
title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.vehicleType'),
align: 'center',
width: 180,
- dataIndex: 'vehicleType',
+ dataIndex: 'model',
scopedSlots: { customRender: 'text' }
},
{ // 车型状态
@@ -195,28 +197,28 @@ export default {
title: this.$t('clauseNo'),
align: 'center',
width: 180,
- dataIndex: 'clauseNo',
+ dataIndex: 'termNumber',
scopedSlots: { customRender: 'text' }
},
{ // 条款内容
title: this.$t('clauseContent'),
align: 'center',
width: 180,
- dataIndex: 'clauseContent',
+ dataIndex: 'termContent',
scopedSlots: { customRender: 'text' }
},
{ // 责任部门
title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.responsibleDepartment'),
align: 'center',
width: 180,
- dataIndex: 'responsibleDepartment',
+ dataIndex: 'authDept',
scopedSlots: { customRender: 'text' }
},
{ // 评估人
title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.appraiser'),
align: 'center',
width: 180,
- dataIndex: 'appraiser',
+ dataIndex: 'userId',
scopedSlots: { customRender: 'text' }
},
{ // 问题类型
@@ -230,28 +232,28 @@ export default {
title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationState'),
align: 'center',
width: 180,
- dataIndex: 'rectificationState',
+ dataIndex: 'rectifyStatus',
scopedSlots: { customRender: 'text' }
},
{ // PCR编号
title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.pcrNumber'),
align: 'center',
width: 180,
- dataIndex: 'pcrNumber',
+ dataIndex: 'pcrNo',
scopedSlots: { customRender: 'text' }
},
{ // 整改完成日期
title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCompletionDate'),
align: 'center',
width: 180,
- dataIndex: 'rectificationCompletionDate',
+ dataIndex: 'rectifyCompleteDate',
scopedSlots: { customRender: 'text' }
},
{ // 附件
title: this.$t('attach'),
align: 'center',
width: 180,
- dataIndex: 'attach',
+ dataIndex: 'file',
scopedSlots: { customRender: 'file' }
},
{
@@ -277,7 +279,7 @@ export default {
}
],
url: {
- list: ''
+ list: '/assessment/lawsEvaluationNotMet/page'
}
}
},
@@ -334,7 +336,7 @@ export default {
// 批量关闭
batchClose () {
// 只有待整改状态的可以关闭
- const isHaveClosed = this.selectionRows.includes(i => i.rectificationState === RectificationState.TARGET_IS_CLOSED.value)
+ const isHaveClosed = this.selectionRows.includes(i => i.rectifyStatus === RectificationState.TARGET_IS_CLOSED.value)
if (isHaveClosed) {
// 存在已关闭的数据
this.$message.warning(this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.isHaveClosed'))
@@ -380,6 +382,7 @@ export default {
},
// 查看
handleLook (record) {
+ console.log('----', record)
this.$refs.nonmatchItemLookModal.open(record)
},
// 关闭
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemCloseModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemCloseModal.vue
index 954268a..3538eb7 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemCloseModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemCloseModal.vue
@@ -14,12 +14,12 @@
+ v-decorator.trim="[ 'pcrNo', validatorRules.pcrNo]"/>
@@ -31,7 +31,7 @@
return-id
:multiple="false"
:number="1"
- v-decorator.trim="[ 'attach', validatorRules.attach]"/>
+ v-decorator.trim="[ 'file', validatorRules.file]"/>
@@ -61,21 +61,21 @@ export default {
},
validatorRules: {
// PCR编号
- pcrNumber: {
+ pcrNo: {
rules: [
{ required: false, message: this.$t('pleaseEnter') + this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.pcrNumber') }
],
validateTrigger: 'blur'
},
// 整改完成日期
- rectificationCompletionDate: {
+ rectifyCompleteDate: {
rules: [
{ required: false, message: this.$t('pleaseSelect') + this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCompletionDate') }
],
validateTrigger: 'change'
},
// 附件
- attach: {
+ file: {
rules: [
{ required: false, message: this.$t('pleaseSelect') + this.$t('attach') }
],
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
index 47380de..f2964bc 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/modules/NonmatchItemLookModal.vue
@@ -12,46 +12,56 @@
-
+
- {{ model.theStatusNotMeetRequirements }}
+ {{ model.unsatisfiedRequire }}
+
+
-
+
- {{ model.rectificationPlan }}
+ {{ model.correctionSolution }}
+
+
-
+
- {{ model.rectificationCycle }}
+ {{ model.correctionPeriod }}
+
+
-
+
- {{ model.rectificationCost }}
+ {{ model.correctionCost }}
+
+
-
+
- {{ model.sharedWithOtherProjects }}
+ {{ model.commonality }}
+
+
-
+
- {{ model.costOfThisItemAfterSharing }}
+ {{ model.commonalityCost }}
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
index 4061251..9428391 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
@@ -76,6 +76,8 @@
:pagination="false"
:loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+ :operationList="operationList"
+ @operationClick="operationClick"
@change="handleTableChange">
@@ -149,13 +151,14 @@ export default {
{
text: this.$t('view'),
clickEvent: 'handleLook',
- has: ''
+ has: 'assessment:lawsConformityAssessment:view'
}
],
url: {
- list: '',
+ list: '/assessment/lawsConformityAssessment/page',
exportXlsUrl: ''
- }
+ },
+ needFilterTableBtn: true
}
},
methods: {
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
index 9407f37..b479bd8 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/modules/AssessmentLookModal.vue
@@ -113,7 +113,6 @@ import { previewPdf } from '@/utils/previewPdf'
import { kkFilePreview } from '@/utils/kkFilePreview'
import { downloadFile, getFileAccessHttpUrl } from '@/api/manage'
import { queryDepartTreeList } from '../../../../api/api'
-import JTable from '@/components/jero/JTable'
import { ACCESS_TOKEN } from '@/store/mutation-types'
// 支持预览的文件后缀
@@ -123,7 +122,6 @@ const FILE_TYPE_PDF = 'pdf'
export default {
name: 'AssessmentLookModal',
- components: { JTable },
mixins: [JeroListMixin],
data () {
return {