From 57cccbad2191c7e2398e66f6a630f77ccde041d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167@qq.com>
Date: Thu, 1 Sep 2022 16:56:41 +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=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/listEditModel.vue              |  68 +++++++++++-
 .../components/listOfRegulations.vue          |  48 +++++++-
 .../components/listOfRegulationsView.vue      | 103 ++++++++++--------
 3 files changed, 170 insertions(+), 49 deletions(-)

diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index 38b7f34f6..9d45f7dec 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -804,6 +804,49 @@
             </div>
           </a-col>
         </a-row>
+        <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
+          {{$t('reasonsForRejection')}}
+        </div>
+        <div v-if="rejectCauseList && rejectCauseList.length > 0"
+             v-for="(item,index) in rejectCauseList">
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                        <span class="title-text-text"
+                              :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.createBy ? item.createBy : '--'}}
+                </div>
+              </div>
+            </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                        <span class="title-text-text"
+                              :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.rejectTime ? item.rejectTime : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+          <a-row :gutter="24">
+            <a-col :span="24">
+              <div class="box-title-text">
+                <div class="title-text">
+                        <span class="title-text-text"
+                              :title="$t('rejectReason')">{{$t('rejectReason')}}</span>
+                </div>
+                <div class="itemModel-reject">
+                  {{item.rejectCause ? item.rejectCause : '--'}}
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
       </a-form-model>
     </a-spin>
     <div class="drawer-bootom-button">
@@ -907,7 +950,8 @@
         verifyDutyIdDisabled: false,
         verifyInitiatorIdDisabled: false,
         DeliverableTreeList: [],
-        userInfoQuery: {}
+        userInfoQuery: {},
+        rejectCauseList: []
       }
     },
     mounted() {
@@ -916,6 +960,18 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      getRejectCause(id) {
+        let query = {
+          projectLawsInventoryId: id
+        }
+        getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
+          if (res.success) {
+            this.rejectCauseList = res.result
+          } else {
+            this.rejectCauseList = []
+          }
+        })
+      },
       getDeliverableTree() {
         getAction('/sys/category/getDeliverableTree', {}).then((res) => {
           if (res.success) {
@@ -1110,6 +1166,7 @@
         item.designDeliverableType = item.designDeliverableType ? item.designDeliverableType.split(',') : []
         item.prehomoDeliverableType = item.prehomoDeliverableType ? item.prehomoDeliverableType.split(',') : []
         item.verifyDeliverableType = item.verifyDeliverableType ? item.verifyDeliverableType.split(',') : []
+        this.getRejectCause(item.id)
         if (item.dutyTerritory) {
           this.queryPersonByProject(item)
         } else {
@@ -1400,6 +1457,15 @@
     margin-top: 2px;
   }
 
+  .itemModel-reject {
+    width: calc(100% - 130px);
+    display: inline-block;
+    font-size: 16px;
+    word-break: break-all;
+    color: #040B29;
+    padding-top: 11px;
+  }
+
   .Required {
     color: red;
     margin-right: 4px;
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 8b943d1a5..4a01f7b1e 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -220,6 +220,11 @@
                  @click="edit(record)">
                 {{ $t('edit') }}
               </a>
+              <a class="text-operation"
+                 v-else
+                 @click="viewClick(record)">
+                {{$t('view')}}
+              </a>
               <a class="text-operation"
                  v-if="(record.inventoryAffirmStatus == 'Not started' || record.inventoryAffirmStatus == 'Rejected') && record.roleCode == 0"
                  @click="deleteLib(record)">
@@ -229,10 +234,13 @@
                  @click="resultReportedClick(record)">
                 {{$t('resultReported')}}
               </a>
-               <a class="text-operation"
-                  @click="viewClick(record)">
+
+        </span>
+        <span slot="operationOne" slot-scope="text,record">
+          <a class="text-operation"
+             @click="viewClick(record)">
                 {{$t('view')}}
-              </a>
+          </a>
         </span>
         <span slot="titleName" slot-scope="text,record" :title="text">
               <span class="textName">
@@ -745,6 +753,13 @@
             fixed: 'right',
             width: 240,
             scopedSlots: { customRender: 'operation' }
+          },
+          {
+            title: this.$t('operation'),
+            align: 'center',
+            fixed: 'right',
+            width: 140,
+            scopedSlots: { customRender: 'operationOne' }
           }
         ],
         columnsFileAll: [
@@ -1014,7 +1029,14 @@
         let columnResult = JSON.parse(JSON.stringify(this.columnsAll))
         if (!this.isRoleSwitching) {
           for (var i = 0; i < columnResult.length; i++) {
-            if (columnResult[i].title === this.$t('operation')) {
+            if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 240) {
+              columnResult.splice(i, 1)
+              i--
+            }
+          }
+        } else if (this.isRoleSwitching) {
+          for (var i = 0; i < columnResult.length; i++) {
+            if (columnResult[i].title === this.$t('operation') && columnResult[i].width == 140) {
               columnResult.splice(i, 1)
               i--
             }
@@ -2019,15 +2041,18 @@
           if (valid) {
             let url = '/project/projectCommentEO/add'
             let content = []
+            let ids = []
             if (this.rowKeysSuccessList && this.rowKeysSuccessList.length > 0) {
               this.rowKeysSuccessList.forEach(res => {
                 content.push(res.serialNumber)
+                ids.push(res.id)
               })
             }
             let query = {
               commentContent: this.$t('For') + content.join(',') + this.$t('markedRejection') + '：' + this.formInlineComment.commentContent,
               projectLibraryId: this.$route.query.id
             }
+            this.rejectCauseAdd(this.formInlineComment.commentContent,ids)
             this.confirmLoadingComment = true
             let selectedRowKeys = JSON.parse(JSON.stringify(this.selectedRowKeys))
             this.updateStatusBatch(1, selectedRowKeys)
@@ -2042,6 +2067,19 @@
           }
         })
       },
+      rejectCauseAdd(rejectCause,ids) {
+        let rejectTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        let query = {
+          rejectUserId:this.userInfo().id,
+          rejectTime:rejectTime,
+          rejectCause:rejectCause,
+          projectLawsInventoryId:ids.join(','),
+          rejectType:'0',
+        }
+        postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
+
+        })
+      },
       handleCancelComment() {
         this.visibleComment = false
       },
@@ -2368,7 +2406,7 @@
   }
 
   ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
     opacity: 0.9;
   }
 
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
index 1642cae03..d95bdb5cc 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulationsView.vue
@@ -433,46 +433,49 @@
               </div>
             </a-col>
           </a-row>
-<!--          <div class="header-text">-->
-<!--            {{$t('reasonsForRejection')}}-->
-<!--          </div>-->
-<!--          <a-row :gutter="24">-->
-<!--            <a-col :span="12">-->
-<!--              <div class="box-title-text">-->
-<!--                <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>-->
-<!--                </div>-->
-<!--                <div class="itemModel">-->
-<!--                  {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </a-col>-->
-<!--            <a-col :span="12">-->
-<!--              <div class="box-title-text">-->
-<!--                <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>-->
-<!--                </div>-->
-<!--                <div class="itemModel">-->
-<!--                  {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </a-col>-->
-<!--          </a-row>-->
-<!--          <a-row :gutter="24">-->
-<!--            <a-col :span="12">-->
-<!--              <div class="box-title-text">-->
-<!--                <div class="title-text">-->
-<!--                <span class="title-text-text"-->
-<!--                      :title="$t('rejectReason')">{{$t('rejectReason')}}</span>-->
-<!--                </div>-->
-<!--                <div class="itemModel">-->
-<!--                  {{formInline.verifyRemark ? formInline.verifyRemark : '&#45;&#45;'}}-->
-<!--                </div>-->
-<!--              </div>-->
-<!--            </a-col>-->
-<!--          </a-row>-->
+          <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
+            {{$t('reasonsForRejection')}}
+          </div>
+          <div v-if="rejectCauseList && rejectCauseList.length > 0"
+               v-for="(item,index) in rejectCauseList">
+            <a-row :gutter="24">
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectedBy')">{{$t('rejectedBy')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.createBy ? item.createBy : '--'}}
+                  </div>
+                </div>
+              </a-col>
+              <a-col :span="12">
+                <div class="box-title-text">
+                  <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectionTime')">{{$t('rejectionTime')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.rejectTime ? item.rejectTime : '--'}}
+                  </div>
+                </div>
+              </a-col>
+            </a-row>
+            <a-row :gutter="24">
+              <a-col :span="24">
+                <div class="box-title-text">
+                  <div class="title-text">
+                <span class="title-text-text"
+                      :title="$t('rejectReason')">{{$t('rejectReason')}}</span>
+                  </div>
+                  <div class="itemModel">
+                    {{item.rejectCause ? item.rejectCause : '--'}}
+                  </div>
+                </div>
+              </a-col>
+            </a-row>
+          </div>
         </a-form-model>
       </a-spin>
       <div class="drawer-bootom-button">
@@ -486,7 +489,7 @@
 
 <script>
   import viewFileModel from '@/components/viewFileModel/index'
-
+  import { getAction, postAction, putAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
 
   export default {
@@ -503,7 +506,8 @@
         rulesData: {},
         formInline: {},
         disabled: false,
-        userInfoQuery: {}
+        userInfoQuery: {},
+        rejectCauseList:[]
       }
     },
     mounted() {
@@ -514,8 +518,21 @@
       editModel(item) {
         this.visible = true
         this.formInline = item
+        this.getRejectCause(item.id)
         this.formInline = { ...this.formInline }
       },
+      getRejectCause(id) {
+        let query = {
+          projectLawsInventoryId: id
+        }
+        getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
+          if (res.success) {
+            this.rejectCauseList = res.result
+          } else {
+            this.rejectCauseList = []
+          }
+        })
+      },
       handleCancel() {
         this.visible = false
       },
@@ -550,7 +567,7 @@
     width: calc(100% - 130px);
     display: inline-block;
     font-size: 16px;
-    word-break: break-word;
+    word-break: break-all;
     color: #040B29;
   }