From 0e21c294a290decb001099f4169c514ca19fd98d Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 22 Apr 2022 10:34:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=B8=E5=85=B3=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=90=8D=E5=8D=95;=202.=E5=B8=83=E5=B1=80=E6=8F=A1?=
 =?UTF-8?q?=E6=89=8B=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/ImportFile/index.vue  |  15 ++-
 jero-web/src/components/layouts/TabLayout.vue |   3 +-
 jero-web/src/components/processForm/index.vue |  34 ------
 jero-web/src/config/router.config.js          |   5 +
 .../components/headerProcess.vue              | 107 ++++++++++++++++++
 .../processForm/handshakeProcess/index.vue    |  21 ++++
 .../components/listOfRelevantPersonnel.vue    |   2 +-
 7 files changed, 149 insertions(+), 38 deletions(-)
 create mode 100644 jero-web/src/views/processCenter/components/headerProcess.vue
 create mode 100644 jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue

diff --git a/jero-web/src/components/ImportFile/index.vue b/jero-web/src/components/ImportFile/index.vue
index b949dc0b7..b14ee360d 100644
--- a/jero-web/src/components/ImportFile/index.vue
+++ b/jero-web/src/components/ImportFile/index.vue
@@ -3,7 +3,7 @@
     <a-upload name="file" :showUploadList="false"
               class="upload-text"
               :multiple="false" :headers="tokenHeader"
-              :action="importUrl+'?cut='+cut"
+              :action="importUrl"
               @change="handleImport"
               :accept="accept">
       <a-icon type="import" :rotate="270"/>
@@ -33,14 +33,25 @@
         type: String,
         default: ''
       },
+      projectId:{
+        type: String,
+        default: ''
+      },
     },
     data() {
       return {
         tokenHeader: {'X-Access-Token': Vue.ls.get(ACCESS_TOKEN)},
-        importUrl: window._CONFIG['domianURL'] +'/'+ this.url.importZipUrl,
         cut: '',
       }
     },
+    computed:{
+      importUrl(){
+         if (this.projectId){
+           return window._CONFIG['domianURL'] +'/'+ this.url.importZipUrl+'?cut='+this.cut+'&projectId='+this.projectId
+         }
+         return window._CONFIG['domianURL'] +'/'+ this.url.importZipUrl+'?cut='+this.cut
+      },
+    },
     mounted() {
       let long = localStorage.getItem('language')
       this.cut = ''
diff --git a/jero-web/src/components/layouts/TabLayout.vue b/jero-web/src/components/layouts/TabLayout.vue
index 2c9c250b6..ecac1c01c 100644
--- a/jero-web/src/components/layouts/TabLayout.vue
+++ b/jero-web/src/components/layouts/TabLayout.vue
@@ -90,7 +90,8 @@
           this.$route.path == '/system/MessageDetails' ||
           this.$route.path == '/ProcessMapping' ||
           this.$route.path == '/virtualListDetails' ||
-          this.$route.path == '/ProjectDetails') {
+          this.$route.path == '/ProjectDetails' ||
+          this.$route.path == '/handshakeProcess') {
           return false
         } else {
           return true
diff --git a/jero-web/src/components/processForm/index.vue b/jero-web/src/components/processForm/index.vue
index 1b3f98735..61576bc93 100644
--- a/jero-web/src/components/processForm/index.vue
+++ b/jero-web/src/components/processForm/index.vue
@@ -1,39 +1,5 @@
 <template>
     <div class="process-from">
-      <div class="process-header">
-        <div class="process-header-top">
-          <div></div>
-          <div class="right">
-            <a-popover placement="bottom" trigger="click" class="right-select">
-              <template slot="content">
-                <p>Content</p>
-                <p>Content</p>
-              </template>
-              <span>工作空间</span><a-icon type="down" />
-            </a-popover>
-            <a-icon type="bell" />
-            <a-icon type="tool" />
-            <a-icon type="question-circle" />
-            <i class="right-img"></i>
-          </div>
-        </div>
-        <div class="process-header-title">
-          <div class="process-title">
-            <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" type="danger" ghost>{{$t('terminationProcess')}}</a-button>
-  <!--          保存-->
-            <a-button class="header-btn prese">{{$t('preservation')}}</a-button>
-  <!--          下发-->
-            <a-button class="header-btn issue" type="primary" ghost>{{$t('issue')}}</a-button>
-  <!--          提交-->
-            <a-button class="header-btn submit" type="primary" @click="submit">{{$t('submit')}}</a-button>
-          </div>
-        </div>
-      </div>
       <div class="process-content">
         <div class="process-content-wrapper" >
           <div v-for="(item,index) in formData" class="content-box">
diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js
index 42cd38f45..43070fd2e 100644
--- a/jero-web/src/config/router.config.js
+++ b/jero-web/src/config/router.config.js
@@ -337,6 +337,11 @@ export const constantRouterMap = [
     name: 'ProjectDetails',
     component: () => import(/* webpackChunkName: "user" */ '@/views/projectManagement/ProjectDetails/index')
   },
+  {
+    path: '/handshakeProcess',
+    name: 'handshakeProcess',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/processCenter/processForm/handshakeProcess/index')
+  },
   {
     path: '/docManage/form/detail',
     name: 'processIndex',
diff --git a/jero-web/src/views/processCenter/components/headerProcess.vue b/jero-web/src/views/processCenter/components/headerProcess.vue
new file mode 100644
index 000000000..8a8d57fb5
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/headerProcess.vue
@@ -0,0 +1,107 @@
+<template>
+  <div class="process-header">
+    <div class="process-header-title">
+      <div class="process-title">
+        <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" @click="terminationProcessClick" type="danger" ghost>{{$t('terminationProcess')}}</a-button>
+        <!--          保存-->
+        <a-button class="header-btn prese">{{$t('preservation')}}</a-button>
+        <!--          下发-->
+        <a-button class="header-btn issue" type="primary" ghost>{{$t('issue')}}</a-button>
+        <!--          提交-->
+        <a-button class="header-btn submit" type="primary" @click="submit">{{$t('submit')}}</a-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'headerProcess',
+    props:['title'],
+    methods:{
+      terminationProcessClick(){
+
+      },
+    },
+  }
+</script>
+
+<style lang="less" scoped>
+  .process-header {
+    position: fixed;
+    top: 0;
+    width: 100%;
+
+    .process-header-top {
+      height: 56px;
+      line-height: 56px;
+      margin: 0 32px;
+      display: flex;
+      justify-content: space-between;
+      font-size: 14px;
+
+      .right {
+        display: flex;
+        justify-content: flex-end;
+
+        .anticon {
+          line-height: 56px;
+          margin-left: 15px;
+          font-size: 18px;
+        }
+
+        .right-select {
+          cursor: pointer;
+
+          .anticon-down {
+            font-size: 12px;
+            margin-right: 15px;
+            margin-left: 5px;
+          }
+        }
+
+        .right-img {
+          display: inline-block;
+          width: 18px;
+          height: 18px;
+          margin: 19px;
+          margin-left: 15px;
+          border-radius: 50%;
+        }
+      }
+    }
+
+    .process-header-title {
+      display: flex;
+      justify-content: space-between;
+      height: 68px;
+      line-height: 68px;
+      border-top: 1px solid #efefef;
+      border-bottom: 1px solid #efefef;
+      background: #FFFFFF;
+
+      .process-title {
+        padding-left: 32px;
+        font-size: 16px;
+        font-width: 600;
+
+        .back-to {
+          margin-right: 10px;
+        }
+      }
+
+      .process-header-btn {
+        padding-right: 22px;
+
+        .header-btn {
+          margin-right: 10px;
+        }
+      }
+    }
+  }
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
new file mode 100644
index 000000000..c2c251097
--- /dev/null
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -0,0 +1,21 @@
+<template>
+<div>
+  <headerProcess
+    :title="'工程接口人确认符合性要求'"
+  />
+</div>
+</template>
+
+<script>
+  import headerProcess from '../../components/headerProcess'
+  export default {
+    name: 'handshakeProcess',
+    components:{
+      headerProcess
+    },
+  }
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
index 2ad3176ad..c734ffda2 100644
--- a/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRelevantPersonnel.vue
@@ -18,7 +18,7 @@
           {{$t('export')}}
         </div>
         <div class="operator-text">
-          <ImportFile :url="url" :isTrue="true" :accept="'.xls'" @getList="getPersonnelList"/>
+          <ImportFile :url="url" :projectId="$route.query.id" :isTrue="true" :accept="'.xls'" @getList="getPersonnelList"/>
         </div>
       </div>
       <a-table