Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

jero-web/src/common/lang/en-us.js

@@ -1283,4 +1283,6 @@ module.exports = {
   rejectReason:'Reject Reason',
   collectionLegislativeComments:'Collection of Legislative Comments',
   regulatoryAndTechnicalAssessment:'Regulatory and technical assessment',
+  listConfirmationRejectionReason:'List confirmation rejection reason',
+  taskConfirmationRejectionReason:'Task confirmation rejection reason'
 }

jero-web/src/common/lang/zh-cn.js

@@ -1385,5 +1385,6 @@ module.exports = {
   rejectReason:'拒绝原因',
   collectionLegislativeComments:'法规意见收集',
   regulatoryAndTechnicalAssessment:'法规技术评估',
-
+  listConfirmationRejectionReason:'清单确认驳回原因',
+  taskConfirmationRejectionReason:'任务确认驳回原因'
 }

jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue

@@ -189,8 +189,8 @@
           rejectUserId:this.userInfo().id,
           rejectTime:rejectTime,
           rejectCause:rejectCause,
-          projectLawsInventoryId:ids.join(','),
+          projectLawsInventoryId:ids,
-          rejectType:'0',
+          rejectType:'1',
         }
         postAction('/project/projectLawsInventoryRejectCauseEO/add', query).then((res) => {
 
@@ -198,9 +198,9 @@
       },
       completeTask(value, handlingTime) {
         let json = Object.assign(this.queryBy, { handlingTime: handlingTime }, value)
-        // if (json.flag == '1'){
+        if (json.flag == '1'){
-          // this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id)
+          this.rejectCauseAdd(value.approvalOpinion,this.queryBy.id)
-        // }
+        }
         Object.keys(json).forEach(res => {
           if (json[res] && typeof json[res] == 'string') {
             json[res] = json[res].replace(/\"/g, '“')

jero-web/src/views/projectManagement/components/listEditModel.vue

@@ -805,8 +805,9 @@
           </a-col>
         </a-row>
         <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
-          {{$t('reasonsForRejection')}}
+          {{$t('listConfirmationRejectionReason')}}
         </div>
+
         <div v-if="rejectCauseList && rejectCauseList.length > 0"
              v-for="(item,index) in rejectCauseList">
           <a-row :gutter="24">
@@ -847,6 +848,51 @@
             </a-col>
           </a-row>
         </div>
+
+        <div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0">
+          {{$t('taskConfirmationRejectionReason')}}
+        </div>
+
+        <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0"
+             v-for="(item,index) in rejectCauseListOne">
+          <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">
@@ -881,6 +927,7 @@
         visible: false,
         confirmLoading: false,
         rules: {},
+        rejectCauseListOne: [],
         rulesData: {
           subtitle: [
             {
@@ -966,9 +1013,20 @@
         }
         getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
           if (res.success) {
-            this.rejectCauseList = res.result
+            this.rejectCauseList = []
+            this.rejectCauseListOne = []
+            if (res.result && res.result.length > 0) {
+              res.result.forEach(val => {
+                if (val.rejectType == '0') {
+                  this.rejectCauseList.push(val)
+                } else if (val.rejectType == '1') {
+                  this.rejectCauseListOne.push(val)
+                }
+              })
+            }
           } else {
             this.rejectCauseList = []
+            this.rejectCauseListOne = []
           }
         })
       },

jero-web/src/views/projectManagement/components/listOfRegulationsView.vue

@@ -434,7 +434,7 @@
             </a-col>
           </a-row>
           <div class="header-text" v-if="rejectCauseList && rejectCauseList.length > 0">
-            {{$t('reasonsForRejection')}}
+            {{$t('listConfirmationRejectionReason')}}
           </div>
           <div v-if="rejectCauseList && rejectCauseList.length > 0"
                v-for="(item,index) in rejectCauseList">
@@ -476,6 +476,49 @@
               </a-col>
             </a-row>
           </div>
+          <div class="header-text" v-if="rejectCauseListOne && rejectCauseListOne.length > 0">
+            {{$t('taskConfirmationRejectionReason')}}
+          </div>
+          <div v-if="rejectCauseListOne && rejectCauseListOne.length > 0"
+               v-for="(item,index) in rejectCauseListOne">
+            <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">
@@ -507,7 +550,8 @@
         formInline: {},
         disabled: false,
         userInfoQuery: {},
-        rejectCauseList:[]
+        rejectCauseList:[],
+        rejectCauseListOne:[]
       }
     },
     mounted() {
@@ -527,9 +571,20 @@
         }
         getAction('/project/projectLawsInventoryRejectCauseEO/list', query).then((res) => {
           if (res.success) {
-            this.rejectCauseList = res.result
+            this.rejectCauseList = []
+            this.rejectCauseListOne = []
+            if (res.result && res.result.length > 0) {
+              res.result.forEach(val => {
+                if (val.rejectType == '0') {
+                  this.rejectCauseList.push(val)
+                } else if (val.rejectType == '1') {
+                  this.rejectCauseListOne.push(val)
+                }
+              })
+            }
           } else {
             this.rejectCauseList = []
+            this.rejectCauseListOne = []
           }
         })
       },