From bc8ca6e924d5d36d277c8cb100c805a78309cff0 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Tue, 1 Nov 2022 16:54:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/engineeringConfirmation.vue    | 102 ++++++++++--------
 1 file changed, 56 insertions(+), 46 deletions(-)

diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 3028d1b80..34ffd4e5d 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -8,24 +8,24 @@
       </div>
     </div>
     <div class="header-content">
-      <div class="operator-text"
-           v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
-           @click="distributionEngineerClick($t('distributionEngineer'),1)">
-        <a-icon type="audit"/>
-        {{ $t('distributionEngineer') }}
-      </div>
-      <div class="operator-text"
-           v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
-           @click="reminderHandling()">
-        <a-icon type="sound"/>
-        {{ $t('reminderHandling') }}
-      </div>
-      <div class="operator-text"
-           v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
-           @click="distributionEngineerClick($t('addFeedback'),2)">
-        <a-icon type="plus-circle"/>
-        {{ $t('addFeedback') }}
-      </div>
+      <a-button class="header-btn submit"
+                v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
+                @click="distributionEngineerClick($t('distributionEngineer'),1)"
+                type="primary">
+        {{$t('distributionEngineer')}}
+      </a-button>
+      <a-button class="header-btn submit"
+                v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"
+                @click="distributionEngineerClick($t('addFeedback'),2)"
+                type="primary">
+        {{$t('addFeedback')}}
+      </a-button>
+      <!--      <div class="operator-text"-->
+      <!--           v-if="$route.query.TaskKey == 'zrrclrw' && this.$route.query.isDisplay"-->
+      <!--           @click="reminderHandling()">-->
+      <!--        <a-icon type="sound"/>-->
+      <!--        {{ $t('reminderHandling') }}-->
+      <!--      </div>-->
     </div>
     <a-table
       ref="table"
@@ -74,6 +74,11 @@
             @click="deleted(result)">
            {{$t('deleteLib')}}
          </a>
+         <a class="text"
+            @click="reminderClick(result)"
+            v-if="$route.query.TaskKey == 'zrrclrw' && !result.createUser">
+            {{ $t('reminderHandling') }}
+         </a>
       </span>
     </a-table>
     <a-modal
@@ -279,31 +284,31 @@
       </div>
       <JLoading :loading="pageLoading">{{$t('dataLoading')}}</JLoading>
     </a-modal>
-    <a-modal
-      :title="$t('reminderHandling')"
-      :width="800"
-      :visible="visibleTable"
-      :maskClosable="false"
-      @cancel="visibleTable = false"
-    >
-      <template slot="footer">
-        <a-button key="back" @click="visibleTable = false">
-          {{$t('cancel')}}
-        </a-button>
-      </template>
-      <a-table
-        ref="table"
-        :loading="loadingTable"
-        :pagination="false"
-        :scroll="{x: true,y:400}"
-        :data-source="dataSourceTable"
-        :columns="columnsTable"
-      >
-        <span slot="operationTable" slot-scope="result">
-               <a @click="reminderClick(result)">{{$t('reminder')}}</a>
-        </span>
-      </a-table>
-    </a-modal>
+<!--    <a-modal-->
+<!--      :title="$t('reminderHandling')"-->
+<!--      :width="800"-->
+<!--      :visible="visibleTable"-->
+<!--      :maskClosable="false"-->
+<!--      @cancel="visibleTable = false"-->
+<!--    >-->
+<!--      <template slot="footer">-->
+<!--        <a-button key="back" @click="visibleTable = false">-->
+<!--          {{$t('cancel')}}-->
+<!--        </a-button>-->
+<!--      </template>-->
+<!--      <a-table-->
+<!--        ref="table"-->
+<!--        :loading="loadingTable"-->
+<!--        :pagination="false"-->
+<!--        :scroll="{x: true,y:400}"-->
+<!--        :data-source="dataSourceTable"-->
+<!--        :columns="columnsTable"-->
+<!--      >-->
+<!--        <span slot="operationTable" slot-scope="result">-->
+<!--               <a @click="reminderClick(result)">{{$t('reminder')}}</a>-->
+<!--        </span>-->
+<!--      </a-table>-->
+<!--    </a-modal>-->
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"/>
     <viewFileModel ref="viewFileModelRef"/>
   </div>
@@ -436,7 +441,7 @@
           {
             title: this.$t('operation'),
             align: 'left',
-            width: 160,
+            width: 190,
             scopedSlots: { customRender: 'operation' }
           }
         ],
@@ -722,7 +727,7 @@
             _this.formInline.userId.splice(num, 1)
             _this.formInline.userId = _this.formInline.userId.join(',')
             _this.formInline = { ..._this.formInline }
-            if (id){
+            if (id) {
               deleteAction('/project/projectTaskInventoryDetailEO/delete', { id: id }).then((res) => {
                 if (res.success) {
                   _this.$message.success(_this.$t('OperationSuccessful'))
@@ -829,7 +834,7 @@
     line-height: 80px;
 
     .header-text {
-      font-size: 16px;
+      font-size: 18px;
       font-weight: 400;
       color: #000F16;
     }
@@ -960,4 +965,9 @@
     line-height: 200px;
     text-align: center;
   }
+
+  .header-btn {
+    height: 38px;
+    margin-left: 16px;
+  }
 </style>
\ No newline at end of file