From ac7456ea932d76539f849da9a6aa926a1cba0bb5 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 4 Mar 2024 11:18:12 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E8=A1=A8=E6=A0=BC=E4=B8=AD=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E9=A1=B9=E8=A1=A8=E5=A4=B4=E5=A2=9E=E5=8A=A0*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/less/common.less                   |  5 +++++
 .../customComparison/CustomComparisonList.vue |  2 +-
 .../modules/ContactSelectApproverBaseInfo.vue |  8 +++++++-
 .../modules/EngineerInitBaseInfo.vue          |  8 +++++++-
 .../modules/LeaderApproveSentBaseInfo.vue     |  8 +++++++-
 .../modules/MainDrafterCollectBaseInfo.vue    |  8 +++++++-
 ...MainDrafterCollectUploadMinuteBaseInfo.vue | 14 ++++----------
 .../modules/ScorerMarkBaseInfo.vue            | 19 ++++++++++++++++---
 8 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index d29de219..96038d03 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -947,3 +947,8 @@
     }
   }
 }
+
+// 表格表头的必填标识
+.table-header-required {
+  color: #FF0000;
+}
\ No newline at end of file
diff --git a/src/views/documentTool/customComparison/CustomComparisonList.vue b/src/views/documentTool/customComparison/CustomComparisonList.vue
index bd1d8abf..bc07c8ec 100644
--- a/src/views/documentTool/customComparison/CustomComparisonList.vue
+++ b/src/views/documentTool/customComparison/CustomComparisonList.vue
@@ -220,4 +220,4 @@ export default {
 /deep/ .table-page-search-wrapper .ant-form-inline .ant-form-item > .ant-form-item-label {
   min-width: 80px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
index 36ad00e4..c52c121d 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/ContactSelectApproverBaseInfo.vue
@@ -25,6 +25,11 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
+        <template slot="customTitleApprovalUser">
+          <span class="table-header-required">*</span>
+          {{ $t('workCenter.revisionPlanActivelyReport.approver') }}
+        </template>
+
         <!--   原企标编号/企标名称  -->
         <template v-slot:toDetailOld="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
@@ -202,10 +207,11 @@ export default {
           scopedSlots: { customRender: 'text' }
         },
         { // 审批人
-          title: this.$t('workCenter.revisionPlanActivelyReport.approver'),
+          // title: this.$t('workCenter.revisionPlanActivelyReport.approver'),
           align: 'center',
           width: 300,
           dataIndex: 'approvalUser',
+          slots: { title: 'customTitleApprovalUser' },
           customRender: (value, row, index) => {
             return <user-selection v-model={row.approvalUser}
               filedName={row.id} onNameChange={this.userNameChange}
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
index 791ef9e8..fbbf79a4 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/EngineerInitBaseInfo.vue
@@ -37,6 +37,11 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
+        <template slot="customTitleContactPerson">
+          <span class="table-header-required">*</span>
+          {{ $t('workCenter.revisionPlanActivelyReport.contactPerson') }}
+        </template>
+
         <!--   原企标编号/企标名称  -->
         <template v-slot:toDetailOld="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
@@ -244,10 +249,11 @@ export default {
           scopedSlots: { customRender: 'text' }
         },
         { // 联络人
-          title: this.$t('workCenter.revisionPlanActivelyReport.contactPerson'),
+          // title: this.$t('workCenter.revisionPlanActivelyReport.contactPerson'),
           align: 'center',
           width: 300,
           dataIndex: 'contactUser',
+          slots: { title: 'customTitleContactPerson' },
           customRender: (value, row, index) => {
             if (this.isRejectedTodo && row.id) {
               // 是被驳回的待办
diff --git a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
index 5ba52819..ee1758af 100644
--- a/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
+++ b/src/views/workCenter/annualRevisionPlanStandardizationInit/modules/LeaderApproveSentBaseInfo.vue
@@ -21,6 +21,11 @@
         :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
         @change="handleTableChange">
 
+        <template slot="customTitleDrafter">
+          <span class="table-header-required">*</span>
+          {{ $t('workCenter.revisionPlanActivelyReport.drafter') }}
+        </template>
+
         <!--   原企标编号/企标名称  -->
         <template v-slot:toDetailOld="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
@@ -193,10 +198,11 @@ export default {
           scopedSlots: { customRender: 'text' }
         },
         { // 主起草人
-          title: this.$t('workCenter.revisionPlanActivelyReport.drafter'),
+          // title: this.$t('workCenter.revisionPlanActivelyReport.drafter'),
           align: 'center',
           width: 300,
           dataIndex: 'drafter',
+          slots: { title: 'customTitleDrafter' },
           customRender: (value, row, index) => {
             return <user-selection v-model={row.prcMainDraftUser}
               filedName={row.id} onNameChange={this.userNameChange}
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
index 6d5f2d68..37499f1e 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectBaseInfo.vue
@@ -35,6 +35,11 @@
         :loading="loading"
         @change="handleTableChange">
 
+        <template slot="customTitleHandlingSuggestion">
+          <span class="table-header-required">*</span>
+          {{ $t('workCenter.enStandardRevision.handlingSuggestion') }}
+        </template>
+
       </j-table>
     </div>
     <comment-modal ref="commentModal" @ok="modalFormOk"></comment-modal>
@@ -116,10 +121,11 @@ export default {
           scopedSlots: { customRender: 'text' }
         },
         { // 处理意见
-          title: this.$t('workCenter.enStandardRevision.handlingSuggestion'),
+          // title: this.$t('workCenter.enStandardRevision.handlingSuggestion'),
           align: 'center',
           width: 180,
           dataIndex: 'handleAdvice',
+          slots: { title: 'customTitleHandlingSuggestion' },
           customRender: (text, row, index) => {
             const obj = {
               children: <a-select v-model={row.handleAdvice}
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
index 9a24c25e..b0f43d5c 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/MainDrafterCollectUploadMinuteBaseInfo.vue
@@ -383,16 +383,10 @@ export default {
       await this.$refs.ruleForm.validate(valid => {
         if (valid) {
           if (this.formInline.inspectFlag === '1' && this.dataSource && this.dataSource.length > 0) {
-            if (this.dataSource.map(item => item.rectificationDepartment).every(item => !!item)) {
-              // 每一个的整改部门都填了
-              // 有数据可以抛出
-              data = Object.assign({}, this.formInline)
-              data.inspectContents = this.dataSource || []
-              data.onEditFile = this.onEditFile
-            } else {
-              this.$message.warning(this.$t('pleaseCompleteTableInfo'))
-              data = false
-            }
+            // 有数据可以抛出
+            data = Object.assign({}, this.formInline)
+            data.inspectContents = this.dataSource || []
+            data.onEditFile = this.onEditFile
           } else if (this.formInline.inspectFlag === '0') {
             // 有数据可以抛出
             data = Object.assign({}, this.formInline)
diff --git a/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue b/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue
index ba621e63..8c98a845 100644
--- a/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue
+++ b/src/views/workCenter/enterpriseStandardRevision/modules/ScorerMarkBaseInfo.vue
@@ -23,6 +23,17 @@
       rowKey="id"
       :pagination="false"
     >
+      <!-- 评分 -->
+      <template slot="customTitleGrade">
+        <span class="table-header-required">*</span>
+        {{ $t('enterpriseStandardLibrary.reviewMeeting.grade') }}
+      </template>
+      <!-- 扣分理由 -->
+      <template slot="customTitleGroundsForDemerit">
+        <span class="table-header-required">*</span>
+        {{ $t('enterpriseStandardLibrary.reviewMeeting.groundsForDemerit') }}
+      </template>
+
       <template slot="text" slot-scope="text">
         <a-tooltip overlay-class-name="tooltip-style">
           <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
@@ -246,11 +257,12 @@ export default {
             return obj
           }
         },
-        {
-          title: this.$t('enterpriseStandardLibrary.reviewMeeting.grade'),
+        { // 评分
+          // title: this.$t('enterpriseStandardLibrary.reviewMeeting.grade'),
           align: 'center',
           width: 150,
           dataIndex: 'evaluateScore',
+          slots: { title: 'customTitleGrade' },
           customRender: (text, row, index) => {
             const obj = {
               children: <a-input-number v-model={this.dataSource[index].evaluateScore}
@@ -278,10 +290,11 @@ export default {
           }
         },
         { // 扣分理由
-          title: this.$t('enterpriseStandardLibrary.reviewMeeting.groundsForDemerit'),
+          // title: this.$t('enterpriseStandardLibrary.reviewMeeting.groundsForDemerit'),
           align: 'center',
           width: 300,
           dataIndex: 'deductionScoreReason',
+          slots: { title: 'customTitleGroundsForDemerit' },
           customRender: (text, row, index) => {
             const obj = {
               // children: <a-input v-model={this.dataSource[index].deductionScoreReason} maxLength={50}