From fd0199d8fdbabfe858968340cbcd49991464b8bf Mon Sep 17 00:00:00 2001
From: caoyang <caoyang@syxysoft.com>
Date: Mon, 7 Mar 2022 16:40:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/components/processForm/index.vue | 123 +++++++++++++-----
 .../views/documentManage/process/detail.vue   |   6 +-
 .../documentManage/tags/tabs/tagContent.vue   |   8 +-
 3 files changed, 100 insertions(+), 37 deletions(-)

diff --git a/jero-web/src/components/processForm/index.vue b/jero-web/src/components/processForm/index.vue
index ec452515d..1b3f98735 100644
--- a/jero-web/src/components/processForm/index.vue
+++ b/jero-web/src/components/processForm/index.vue
@@ -1,19 +1,37 @@
 <template>
     <div class="process-from">
       <div class="process-header">
-        <div class="process-title">
-          <a-icon type="arrow-left" class="back-to" @click="backTo"/>
-          <span>{{title}}</span>
+        <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-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 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">
@@ -39,7 +57,9 @@
                       <span :title="ol.name">{{ol.name}}</span>
                    </span>
                   <span class="text-info-content-title">
-                    <span :title="ol.value">{{ol.value ? ol.value : '--'}}</span>
+                    <a href="javascript:;" v-if="ol.name=='交付物模板'" @click="downloadFile">{{ol.value ? ol.value : '--'}}<a-icon type="file-text" style="margin-left: 3px" /></a>
+                    <span :title="ol.value" v-else>{{ol.value ? ol.value : '--'}}</span>
+
                   </span>
                 </div>
               </div>
@@ -194,6 +214,10 @@
 
           }
         })
+      },
+      //下载文件
+      downloadFile(){
+
       }
     }
   }
@@ -205,25 +229,64 @@
       position: fixed;
       top:0;
       width: 100%;
-      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-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-btn{
-        padding-right: 22px;
-        .header-btn{
-          margin-right: 10px;
+      .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;
+          }
         }
       }
     }
diff --git a/jero-web/src/views/documentManage/process/detail.vue b/jero-web/src/views/documentManage/process/detail.vue
index 2e3aa6369..e24595f47 100644
--- a/jero-web/src/views/documentManage/process/detail.vue
+++ b/jero-web/src/views/documentManage/process/detail.vue
@@ -36,7 +36,7 @@
                 },
                 {
                   area: "项目信息",
-                  name: 'Studio工程师',
+                  name: '工程师',
                   value: "李四"
                 }
               ],
@@ -61,8 +61,8 @@
                 },
                 {
                   area: "标准内容",
-                  name: 'WVTA ID',
-                  value: "字段占位符"
+                  name: '交付物模板',
+                  value: "交付物模板.pdf"
                 }
               ]
           }
diff --git a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
index 009fcce30..03933dc65 100644
--- a/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
+++ b/jero-web/src/views/documentManage/tags/tabs/tagContent.vue
@@ -111,8 +111,8 @@
         columns: [
           {
             title: this.$t('LabelName'),
-            dataIndex: 'dictName',
-            key: 'dictName',
+            dataIndex: 'dict_name',
+            key: 'dict_name',
             align: "center",
             width: 100,
           },
@@ -120,7 +120,7 @@
             title: this.$t('LabelType'),
             align: "center",
             width: 100,
-            dataIndex: 'attributeType_dictText',
+            dataIndex: 'attribute_type_name',
           },
           {
             title: this.$t('describe'),
@@ -170,7 +170,7 @@
         getAction(`sys/dict/page`,params).then(res=>{
           if(res.success){
             this.total=res.result.total
-            this.tableData=[...res.result.records]
+            this.tableData=[...res.result]
           }
         })
       },