From e5f97748bfcaa2ac24050e2811d4dd89c6e74b0b Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 24 Jun 2024 20:47:46 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E8=81=94=E8=B0=83=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93=E5=92=8C?=
 =?UTF-8?q?=E4=B8=8D=E7=AC=A6=E5=90=88=E9=A1=B9=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonmatchItem/NonmatchItemList.vue         | 31 +++++++++--------
 .../modules/NonmatchItemCloseModal.vue        | 12 +++----
 .../modules/NonmatchItemLookModal.vue         | 34 ++++++++++++-------
 .../RegulatoryComplianceAssessmentList.vue    |  9 +++--
 .../modules/AssessmentLookModal.vue           |  2 --
 5 files changed, 51 insertions(+), 37 deletions(-)

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 @@
             <a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.vehicleType')">
               <j-input
                 :placeholder="$t('pleaseEnter') + $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.vehicleType')"
-                v-model="queryParam.vehicleType"></j-input>
+                v-model="queryParam.model"></j-input>
             </a-form-item>
           </a-col>
 
@@ -57,7 +57,7 @@
               <a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationState')">
                 <j-dict-select-tag
                   :placeholder="$t('pleaseSelect') + $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationState')"
-                  v-model="queryParam.rectificationState"
+                  v-model="queryParam.rectifyStatus"
                   dict-code=""></j-dict-select-tag>
               </a-form-item>
             </a-col>
@@ -67,7 +67,7 @@
               <a-form-item :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.pcrNumber')">
                 <j-input
                   :placeholder="$t('pleaseEnter') + $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.pcrNumber')"
-                  v-model="queryParam.pcrNumber"></j-input>
+                  v-model="queryParam.pcrNo"></j-input>
               </a-form-item>
             </a-col>
           </template>
@@ -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 @@
         <!--   PCR编号  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.pcrNumber')">
           <a-input :max-length="50"
-                   v-decorator.trim="[ 'pcrNumber', validatorRules.pcrNumber]"/>
+                   v-decorator.trim="[ 'pcrNo', validatorRules.pcrNo]"/>
         </a-form-item>
         <!--   整改完成日期  -->
         <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" :label="$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCompletionDate')">
           <a-date-picker
-            v-decorator.trim="[ 'rectificationCompletionDate', validatorRules.rectificationCompletionDate]"
+            v-decorator.trim="[ 'rectifyCompleteDate', validatorRules.rectifyCompleteDate]"
             format="YYYY-MM-DD"
             value-format="YYYY-MM-DD"
           >
@@ -31,7 +31,7 @@
             return-id
             :multiple="false"
             :number="1"
-            v-decorator.trim="[ 'attach', validatorRules.attach]"/>
+            v-decorator.trim="[ 'file', validatorRules.file]"/>
         </a-form-item>
       </a-form>
     </a-spin>
@@ -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 @@
     <div class="table-page-search-wrapper">
       <a-row :gutter="24">
         <!--  不满足要求的现状  -->
-        <a-col :sm="8">
+        <a-col :sm="5" :offset="1">
           <label>{{ $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.theStatusNotMeetRequirements') }}</label>
         </a-col>
         <a-col :sm="16">
-          <value>{{ model.theStatusNotMeetRequirements }}</value>
+          <value name="unsatisfiedRequire">{{ model.unsatisfiedRequire }}</value>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
         <!--  整改方案  -->
-        <a-col :sm="8">
+        <a-col :sm="5" :offset="1">
           <label>{{ $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationPlan') }}</label>
         </a-col>
         <a-col :sm="16">
-          <value>{{ model.rectificationPlan }}</value>
+          <value name="correctionSolution">{{ model.correctionSolution }}</value>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
         <!--  整改周期  -->
-        <a-col :sm="8">
+        <a-col :sm="5" :offset="1">
           <label>{{ $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCycle') }}</label>
         </a-col>
         <a-col :sm="16">
-          <value>{{ model.rectificationCycle }}</value>
+          <value name="correctionPeriod">{{ model.correctionPeriod }}</value>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
         <!--  整改费用  -->
-        <a-col :sm="8">
+        <a-col :sm="5" :offset="1">
           <label>{{ $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationCost') }}</label>
         </a-col>
         <a-col :sm="16">
-          <value>{{ model.rectificationCost }}</value>
+          <value name="correctionCost">{{ model.correctionCost }}</value>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
         <!--  与其他项目共用性  -->
-        <a-col :sm="8">
+        <a-col :sm="5" :offset="1">
           <label>{{ $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.sharedWithOtherProjects') }}</label>
         </a-col>
         <a-col :sm="16">
-          <value>{{ model.sharedWithOtherProjects }}</value>
+          <value name="commonality">{{ model.commonality }}</value>
         </a-col>
+      </a-row>
+      <a-row :gutter="24">
         <!--  共用后本项目所需费用  -->
-        <a-col :sm="8">
+        <a-col :sm="5" :offset="1">
           <label>{{ $t('regulatoryComplianceAssessmentDatabase.nonmatchItem.costOfThisItemAfterSharing') }}</label>
         </a-col>
         <a-col :sm="16">
-          <value>{{ model.costOfThisItemAfterSharing }}</value>
+          <value name="commonalityCost">{{ model.commonalityCost }}</value>
         </a-col>
       </a-row>
     </div>
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 {