样式及小功能

src/api/modules/approve.js

@@ -86,7 +86,7 @@ export const approveInterence = {
      * @param {Number} params.SortRule 排序方式: 1-正序; 2-倒序(默认)
      * @param {Number} params.SortField 排序字段：1-提交时间；2-处理时间；3-审批时间
      * @param {Number} params.ListType 列表类型：1-待处理；2-已处理；3-我发起的
-     * @param {Number} params.ApproveState 审批状态：1-待审批；2-已审批；3-已驳回；4-已撤回
+     * @param {Number} params.ApproveState 审批状态：1-待审批；2-已审批/已通过；3-已驳回；4-已撤回/已撤销
      * @param {Number} params.TimeType 时间类型：1-提交时间；2-处理时间；3-审批时间
      * @param {String} params.StartTime 开始时间
      * @param {String} params.EndTime 结束时间

src/components/notificationMsg.vue

@@ -24,8 +24,9 @@
                 </div>
                 <tableNoData v-if="!msgList.length" text="暂无消息"></tableNoData>
             </div>
+            <el-button type="text" class="close-btn" @click="visible=false">关闭</el-button>
         </div>
-        <span slot="reference" @click="visible = !visible" style="cursor: pointer;">
+        <span slot="reference" @click="visible = !visible" style="cursor: pointer;display:inline-block;width: 50px;text-align: center;">
             <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
                 <path d="M16.7344 15.4904L15.2941 12.9564V7.84847C15.2941 5.89142 13.8231 3.77337 11.6786 2.99732C11.5741 1.96012 10.8811 1.20374 9.97287 1.20374C9.06595 1.20374 8.37036 1.96014 8.26717 2.99732C6.12392 3.77337 4.65292 5.8914 4.65292 7.84847V12.9564L3.14258 15.6146C3.04183 15.7903 3.04429 16.0054 3.14504 16.1799C3.24581 16.3544 3.43263 16.4601 3.63415 16.4601H7.22871C7.49293 17.7357 8.62233 18.6967 9.97289 18.6967C11.3247 18.6967 12.4541 17.7357 12.7171 16.4601H16.3116C16.3215 16.4601 16.3288 16.4601 16.3374 16.4601C16.6508 16.4601 16.904 16.2082 16.904 15.8948C16.904 15.7362 16.8401 15.5925 16.7344 15.4904ZM9.97287 2.33803C10.1769 2.33803 10.3415 2.49286 10.4472 2.7239C10.2899 2.70792 10.1375 2.67106 9.97287 2.67106C9.8082 2.67106 9.65583 2.70792 9.49851 2.7239C9.60422 2.49284 9.76889 2.33803 9.97287 2.33803ZM9.97287 17.5636C9.25396 17.5636 8.65303 17.1016 8.41951 16.4601H11.5262C11.2927 17.1015 10.693 17.5636 9.97287 17.5636ZM4.60745 15.3282L5.71102 13.3853C5.76015 13.3017 5.78719 13.2034 5.78719 13.1051V7.84847C5.78719 5.93934 7.57648 3.80413 9.97287 3.80413C12.3692 3.80413 14.161 5.93934 14.161 7.84847V13.1051C14.161 13.2034 14.1868 13.3017 14.2347 13.3853L15.3395 15.3282H4.60745Z" fill="currentColor"/>
             </svg>
@@ -84,6 +85,7 @@ export default {
 
 <style lang="scss">
 .notifation-wrap{
+    position:relative;
     .massage-list{
         padding: 0 10px;
         max-height: 320px;
@@ -93,6 +95,7 @@ export default {
             display: flex;
             padding: 5px 0;
             border-bottom: 1px solid #E4E7ED;
+            color:#333;
             &.IsRead{
                 color:gray;
             }
@@ -112,5 +115,11 @@ export default {
             }
         }
     }
+    .close-btn{
+        position:absolute;
+        top:0;
+        right:0;
+        box-sizing: border-box;
+    }
 }
 </style>

src/views/approve_manage/approveDetail.vue

@@ -83,7 +83,7 @@ export default {
                 type:0,//1中文研报 2英文研报 3智能研报
             },
             approveInfo:{//审批相关的信息
-                state:1,//当前审批的状态：1-待审批；2-已审批；3-已驳回；4-已撤回
+                state:1,//当前审批的状态：1-待审批；2-已通过；3-已驳回；4-已撤回
                 stateText:'pending',//审批状态对应图片文字：待审批(pending)，已通过(passed)，已驳回(reject)，已撤回(return)
                 isCurrentApprover:false,//审批进行中的节点审批人是否是当前用户，控制通过&驳回按钮显示
             },
@@ -121,7 +121,7 @@ export default {
         //转换接口数据
         formatTimeLineData({Approve={},ApproveFlowNodes=[]}){
             const ApproveType = ['','依次审批','会签','或签']
-            const ApproveState = ['','待审批','已审批','已驳回']
+            const ApproveState = ['','待审批','已通过','已驳回']
             //发起人节点
             const startNode = {
                 nodeType:1,

src/views/approve_manage/approveList.vue

@@ -43,7 +43,7 @@
                     </template>
                     <template v-if="activeTab==='originate'">
                         <el-option label="待审批" :value="1" />
-                        <el-option label="已审批" :value="2" />
+                        <el-option label="已通过" :value="2" />
                         <el-option label="已驳回" :value="3" />
                         <el-option label="已撤销" :value="4" />
                     </template>
@@ -69,7 +69,7 @@
                     >
                         <template slot-scope="{row}">
                             <span v-if="item.key==='State'">
-                                {{['','待审批','已审批','已驳回','已撤销'][row.State]}}
+                                {{['','待审批','已通过','已驳回','已撤销'][row.State]}}
                             </span>
                             <span v-else>{{row[item.key]}}</span>
                         </template>

src/views/approve_manage/approveSetting.vue

@@ -11,7 +11,7 @@
                 @change="handleSearchChange"
                 style="margin-right: auto;margin-left: 15px;"></el-cascader>
             <el-input v-model="Keyword" @input="handleCurrentChange(1)"
-                placeholder="请输入审批流名称" prefix-icon="el-icon-search" style="width:260px;"></el-input>
+                placeholder="请输入审批流名称" prefix-icon="el-icon-search" clearable style="width:260px;"></el-input>
         </div>
         <div class="list-box">
             <el-table :data="tableData" @sort-change="sortChange" border>

src/views/approve_manage/components/flowNode/approveNode.vue

@@ -28,7 +28,7 @@
             <div class="approve-drawer-wrap">
                 <div class="header">
                     <p>审批人设置</p>
-                    <span class="close-icon" @click="drawerShow=false"><i class="el-icon-close"></i></span>
+                    <span class="close-icon" @click="drawerShow=false" style="cursor: pointer;"><i class="el-icon-close"></i></span>
                 </div>
                 <div class="drawer-content">
                     <div class="block">