对接任务确认流程

jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue

@@ -2,9 +2,9 @@
   <div class="doc-detail">
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
-          <span style="line-height: 74px;display: inline-block;float: left">
-            <a-icon @click="iconClick" type="arrow-left" style="margin-right: 6px;font-size: 26px;"/>
-          </span>
+<!--          <span style="line-height: 74px;display: inline-block;float: left">-->
+<!--            <a-icon @click="iconClick" type="arrow-left" style="margin-right: 6px;font-size: 26px;"/>-->
+<!--          </span>-->
         <span>
           {{isTrue ? $t('maintainVirtualList'):$t('virtualListDetails')}}
         </span>

jero-web/src/views/processCenter/components/engineeringConfirmation.vue

@@ -419,25 +419,7 @@
         })
       },
       distributionEngineer() {
-        let msgType = ''
-        if (this.$route.query.flowType == 2) {
-          msgType = 'designIssueDreMsg'
-        } else if (this.$route.query.flowType == 3) {
-          msgType = 'prehomoIssueDreMsg'
-        } else if (this.$route.query.flowType == 4) {
-          msgType = 'verifyIssueDreMsg'
-        }
-        let query = {
-          status: 'NotDone',
-          actiProcInstId: this.$route.query.actiProcInstId,
-          projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
-          flowType: this.$route.query.flowType,
-          userIds: this.formInline.userId,
-          taskDefinitionKey: 'dreDispose',
-          msgType: msgType,
-          formData: JSON.stringify(this.distributionEngineerList)
-        }
-        postAction(this.url.DetailEOAdd, query).then((res) => {
+        postAction(this.url.DetailEOAdd, this.distributionEngineerList).then((res) => {
           if (res.success) {
             if (res.success) {
               this.confirmLoading = false
@@ -532,10 +514,25 @@
       PersonnelSelectionChange(value, id) {
         this.formInline[value] = id
         if (id) {
-          this.formInline.userName.split(',').forEach(res => {
+          let msgType = ''
+          if (this.$route.query.flowType == 2) {
+            msgType = 'designIssueDreMsg'
+          } else if (this.$route.query.flowType == 3) {
+            msgType = 'prehomoIssueDreMsg'
+          } else if (this.$route.query.flowType == 4) {
+            msgType = 'verifyIssueDreMsg'
+          }
+          this.formInline.userName.split(',').forEach((res, index) => {
             this.distributionEngineerList.push({
               deliveryInstructions: '',
-              name: res
+              name: res,
+              status: 'NotDone',
+              actiProcInstId: this.$route.query.actiProcInstId,
+              projectTaskInventoryId: this.$route.query.projectTaskInventoryId,
+              flowType: this.$route.query.flowType,
+              userIds: this.formInline[value].split(',')[index],
+              taskDefinitionKey: 'dreDispose',
+              msgType: msgType
             })
           })
         }

jero-web/src/views/processCenter/components/examineInformation.vue

@@ -195,7 +195,7 @@
 
 <style scoped lang="less">
   .box {
-    padding: 0 24px 24px 24px;
+    padding: 0 24px 0 24px;
     box-sizing: border-box;
   }
 
@@ -255,9 +255,9 @@
     margin-top: 9px;
   }
 
-  .formAdd {
-    margin-bottom: 40px;
-  }
+  /*.formAdd {*/
+  /*  margin-bottom: 40px;*/
+  /*}*/
 
   .button-text {
     height: 38px;

jero-web/src/views/processCenter/components/footerProcess.vue

@@ -0,0 +1,117 @@
+<template>
+  <div class="process-header">
+    <div class="process-header-title">
+      <div class="process-header-btn">
+        <!--          终止流程-->
+        <a-button class="header-btn termin" v-if="isTerminationProcess" @click="terminationProcess" type="danger" ghost>
+          {{$t('terminationProcess')}}
+        </a-button>
+        <!--          保存-->
+        <a-button class="header-btn prese" v-if="isPreservation" @click="preservation">{{$t('preservation')}}</a-button>
+        <!--          下发-->
+        <a-button class="header-btn issue" v-if="isIssue" @click="issue" type="primary" ghost>{{$t('issue')}}</a-button>
+        <!--          提交-->
+        <a-button class="header-btn submit" v-if="isSubmit" @click="submit" type="primary">{{$t('submit')}}</a-button>
+        <a-button class="header-btn termin" v-if="isSendBack" @click="sendBackCkick" type="danger" ghost>
+          {{$t('sendBack')}}
+        </a-button>
+        <a-button class="header-btn submit" v-if="isAdopt" @click="adopt" type="primary">{{$t('adopt')}}</a-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import moment from 'moment'
+
+  export default {
+    name: 'footerProcess',
+    props: {
+      title: {
+        type: String,
+        default: ''
+      },
+      //是否显示终止流程按钮
+      isTerminationProcess: {
+        type: Boolean,
+        default: false
+      },
+      //是否显示下发按钮
+      isIssue: {
+        type: Boolean,
+        default: false
+      },
+      //是否显示提交按钮
+      isSubmit: {
+        type: Boolean,
+        default: false
+      },
+      //是否显示保存按钮
+      isPreservation: {
+        type: Boolean,
+        default: false
+      },
+      //是否显示退回按钮
+      isSendBack: {
+        type: Boolean,
+        default: false
+      },
+      isAdopt: {
+        type: Boolean,
+        default: false
+      }
+    },
+    methods: {
+      terminationProcess() {
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        this.$emit('terminationProcess', handlingTime)
+      },
+      preservation() {
+        this.$emit('preservation')
+      },
+      issue() {
+        this.$emit('issue')
+      },
+      submit() {
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        this.$emit('submit', handlingTime)
+      },
+      sendBackCkick() {
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        this.$emit('sendBack', handlingTime)
+      },
+      backTo() {
+
+      },
+      adopt() {
+        let handlingTime = moment(new Date()).format('YYYY-MM-DD HH:mm:ss')
+        this.$emit('adopt', handlingTime)
+      }
+    }
+  }
+</script>
+
+
+<style lang="less" scoped>
+  .process-header {
+    padding: 0 24px;
+    box-sizing: border-box;
+
+    .process-header-title {
+      height: 68px;
+      line-height: 68px;
+      background: #FFFFFF;
+      text-align: right;
+
+      .process-header-btn {
+
+        .header-btn {
+          margin-right: 10px;
+        }
+        .header-btn:last-child{
+          margin-right: 0;
+        }
+      }
+    }
+  }
+</style>

jero-web/src/views/processCenter/components/headerProcess.vue

@@ -2,25 +2,25 @@
   <div class="process-header">
     <div class="process-header-title">
       <div class="process-title">
-        <a-icon type="arrow-left" class="back-to" @click="backTo"/>
+<!--        <a-icon type="arrow-left" class="back-to" @click="backTo"/>-->
         <span>{{title}}</span>
       </div>
-      <div class="process-header-btn">
-        <!--          终止流程-->
-        <a-button class="header-btn termin" v-if="isTerminationProcess" @click="terminationProcess" type="danger" ghost>
-          {{$t('terminationProcess')}}
-        </a-button>
-        <!--          保存-->
-        <a-button class="header-btn prese" v-if="isPreservation" @click="preservation">{{$t('preservation')}}</a-button>
-        <!--          下发-->
-        <a-button class="header-btn issue" v-if="isIssue" @click="issue" type="primary" ghost>{{$t('issue')}}</a-button>
-        <!--          提交-->
-        <a-button class="header-btn submit" v-if="isSubmit" @click="submit" type="primary">{{$t('submit')}}</a-button>
-        <a-button class="header-btn termin" v-if="isSendBack" @click="sendBackCkick" type="danger" ghost>
-          {{$t('sendBack')}}
-        </a-button>
-        <a-button class="header-btn submit" v-if="isAdopt" @click="adopt" type="primary">{{$t('adopt')}}</a-button>
-      </div>
+<!--      <div class="process-header-btn">-->
+<!--        &lt;!&ndash;          终止流程&ndash;&gt;-->
+<!--        <a-button class="header-btn termin" v-if="isTerminationProcess" @click="terminationProcess" type="danger" ghost>-->
+<!--          {{$t('terminationProcess')}}-->
+<!--        </a-button>-->
+<!--        &lt;!&ndash;          保存&ndash;&gt;-->
+<!--        <a-button class="header-btn prese" v-if="isPreservation" @click="preservation">{{$t('preservation')}}</a-button>-->
+<!--        &lt;!&ndash;          下发&ndash;&gt;-->
+<!--        <a-button class="header-btn issue" v-if="isIssue" @click="issue" type="primary" ghost>{{$t('issue')}}</a-button>-->
+<!--        &lt;!&ndash;          提交&ndash;&gt;-->
+<!--        <a-button class="header-btn submit" v-if="isSubmit" @click="submit" type="primary">{{$t('submit')}}</a-button>-->
+<!--        <a-button class="header-btn termin" v-if="isSendBack" @click="sendBackCkick" type="danger" ghost>-->
+<!--          {{$t('sendBack')}}-->
+<!--        </a-button>-->
+<!--        <a-button class="header-btn submit" v-if="isAdopt" @click="adopt" type="primary">{{$t('adopt')}}</a-button>-->
+<!--      </div>-->
     </div>
   </div>
 </template>

jero-web/src/views/processCenter/components/reviewedByThePersonInCharge.vue

@@ -100,7 +100,7 @@
 
 <style scoped lang="less">
   .box {
-    padding: 0 24px 24px 24px;
+    padding: 0 24px 0 24px;
     box-sizing: border-box;
   }
 
@@ -160,9 +160,9 @@
     margin-top: 9px;
   }
 
-  .formAdd {
-    margin-bottom: 40px;
-  }
+  /*.formAdd {*/
+  /*  margin-bottom: 40px;*/
+  /*}*/
 
   .button-text {
     height: 38px;

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

@@ -2,12 +2,6 @@
   <div id="examineBox">
     <headerProcess
       :title="$t('theRequirementst')"
-      is-termination-process
-      is-submit
-      :isSendBack="isSendBack"
-      @terminationProcess="terminationProcess"
-      @submit="submit"
-      @sendBack="sendBack"
     />
     <div class="detail-box">
       <div class="detail-content">
@@ -35,6 +29,14 @@
           isApprovalOpinion
           ref="examineInformationRef"
           :url="url"/>
+        <footerProcess
+          is-termination-process
+          is-submit
+          :isSendBack="isSendBack"
+          @terminationProcess="terminationProcess"
+          @submit="submit"
+          @sendBack="sendBack"
+        />
         <circulationHistory v-if="isDisplay"/>
       </div>
     </div>
@@ -44,6 +46,7 @@
 
 <script>
   import headerProcess from '../../components/headerProcess'
+  import footerProcess from '../../components/footerProcess'
   import projectInformation from '../../components/projectInformation'
   import standardContent from '../../components/standardContent'
   import standardContentListTable from '../../components/standardContentList'
@@ -61,7 +64,8 @@
       standardContent,
       standardContentListTable,
       examineInformation,
-      circulationHistory
+      circulationHistory,
+      footerProcess
     },
     data() {
       return {

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

@@ -2,14 +2,6 @@
   <div id="examineBox">
     <headerProcess
       :title="$t('confirmationOfDesignConformity')"
-      :is-termination-process="isTerminationProcess"
-      :is-adopt="isAdopt"
-      :isSendBack="isSendBack"
-      :isSubmit="isSubmit"
-      @terminationProcess="terminationProcess"
-      @adopt="adopt"
-      @sendBack="sendBack"
-      @submit="submit"
     />
     <div class="detail-box">
       <div class="detail-content">
@@ -35,7 +27,18 @@
           v-if="(isDisplay && $route.query.TaskKey == 'zrrclrw') ||
           (isDisplay && $route.query.TaskKey == 'fqrsh')"
         />
+        <footerProcess
+          :is-termination-process="isTerminationProcess"
+          :is-adopt="isAdopt"
+          :isSendBack="isSendBack"
+          :isSubmit="isSubmit"
+          @terminationProcess="terminationProcess"
+          @adopt="adopt"
+          @sendBack="sendBack"
+          @submit="submit"
+        />
         <circulationHistory v-if="isDisplay"/>
+
       </div>
     </div>
     <JLoading :loading="loading">{{textLoading}}</JLoading>
@@ -44,6 +47,7 @@
 
 <script>
   import headerProcess from '../../components/headerProcess'
+  import footerProcess from '../../components/footerProcess'
   import projectInformation from '../../components/projectInformation'
   import standardContent from '../../components/standardContent'
   import standardContentListTable from '../../components/standardContentList'
@@ -62,7 +66,8 @@
       standardContentListTable,
       reviewedByThePersonInCharge,
       circulationHistory,
-      engineeringConfirmation
+      engineeringConfirmation,
+      footerProcess
     },
     data() {
       return {
@@ -98,7 +103,7 @@
           {
             title: this.$t('applicableSupplement'),
             value: 'applicableSupplement'
-          },
+          }
           // {
           //   title: this.$t('remarks'),
           //   value: 'remark'

jero-web/src/views/projectManagement/ProjectDetails/index.vue

@@ -2,9 +2,9 @@
   <div class="doc-detail">
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
-          <span style="line-height: 74px;display: inline-block;float: left">
-            <a-icon type="left-circle" theme="filled" style="margin-right: 6px;font-size: 30px;color: #21c9cc;"/>
-          </span>
+<!--          <span style="line-height: 74px;display: inline-block;float: left">-->
+<!--            <a-icon type="left-circle" theme="filled" style="margin-right: 6px;font-size: 30px;color: #21c9cc;"/>-->
+<!--          </span>-->
         <span>
              {{this.title}}
         </span>