bug修改，消息修改，流程修改

src/components/headerBar/header-bar.vue

@@ -43,7 +43,7 @@
                 </div>
                 <ul>
                   <li :class="menuName == i.menuName ? 'active' : ''" @click="openLeftBaner(i, index)" v-for="(i, index) in sidebarRoutersCopy" :key="i.name" v-show="i.type == 1 && i.status == '0'">
-                    {{ i.menuName }}
+                    <i :class="'iconfont icon-' + i.icon" style="position: relative;top:-1px;"></i>{{ i.menuName }}
                   </li>
                 </ul>
                 <!-- <div class="first-order">
@@ -74,7 +74,8 @@
                     <li class="menu-title" v-else-if="i.isTitle">
                       <a v-if="i.icon && i.icon !== '#'" :class="'iconfont icon-' + i.icon" style="margin-right: 4px"></a><span>{{ i.menuName }}</span>
                     </li>
-                    <li v-else class="menu-ul" @click="commonsBannerToRouter(i)" style="cursor: pointer">
+                    <li v-else class="menu-ul" @click="commonsBannerToRouter(i)" style="cursor: pointer;display: flex;">
+                      <a :class="'iconfont icon-' + i.icon" style="margin-right: 4px;width:20px;min-height: 20px;display: block;"></a>
                       <span>{{ i.menuName }}</span>
                     </li>
                   </div>

src/components/headerBar/header.scss

@@ -47,9 +47,15 @@
 					li {
 						height: 50px;
 						line-height: 50px;
-						padding: 0 50px;
+						padding: 0 30px;
 						font-size: 12px;
 						cursor: pointer;
+						display: flex;
+						i{
+							display: block;
+							width:20px;
+							
+						}
 					}
 					li.active{
 						color: #0084FF;
@@ -179,7 +185,7 @@
 				border-bottom: 1px solid #ddd;
 				font-size: 14px;
 				width: 140px;
-				margin: 0 100px 0 0;
+				margin: 0 50px 0 0;
 				i {
 					position: relative;
 					top: 3px;
@@ -190,7 +196,7 @@
 				float: left;
 				width: 140px;
 				list-style: none;
-				margin: 0 100px 0 0;
+				margin: 0 50px 0 0;
 				padding: 0;
 				height: 36px;
 				line-height: 36px;

src/components/notice/index.vue

@@ -51,11 +51,11 @@
 			<div class="notice-table" @click.stop  v-loading="loading" >
 				<div class="tabs">
 					<ul>
-						<li style="padding-left: 0; border: none" @click="pushInfoReq.type = '';getPushInfo()" :class="pushInfoReq.type == '' ? 'active' : ''">
+						<li style="padding-left: 0; border: none" @click="pushInfoReq.whetherFlow = '';getPushInfo()" :class="pushInfoReq.whetherFlow === '' ? 'active' : ''">
 							全部（{{pushInfoReq.total}}）
 						</li>
-						<li  @click="pushInfoReq.type = 1;getPushInfo()" :class="pushInfoReq.type == 1 ? 'active' : ''">流程（0）</li>
-						<li  @click="pushInfoReq.type = 2;getPushInfo()" :class="pushInfoReq.type == 2 ? 'active' : ''">业务（0）</li>
+						<li  @click="pushInfoReq.whetherFlow = 1;getPushInfo()" :class="pushInfoReq.whetherFlow === 1 ? 'active' : ''">流程</li>
+						<li  @click="pushInfoReq.whetherFlow = 0;getPushInfo()" :class="pushInfoReq.whetherFlow === 0 ? 'active' : ''">业务</li>
 					</ul>
 					<!-- <div class="more">查看更多&gt;</div> -->
 				</div>
@@ -68,7 +68,7 @@
 								:content="scope.row.title"
 								placement="top"
 							>
-								<div class="noticeData-title">{{ scope.row.title }}</div>
+								<div class="noticeData-title" @click="toDealWith(scope.row)">{{ scope.row.title }}</div>
 							</el-tooltip>
 							
 						</template>
@@ -119,6 +119,18 @@ const moreFn = () => {
 	noticeTableModal.value = true
 }
 
+const toDealWith = (item) => {
+	
+	let urlConfig = {
+		"0":'DealWith',
+		"5":'Claim',
+		"6":"Abnormal"
+	}
+	proxy.$router.push({
+		name:urlConfig[item.businessType],
+	})
+}
+
 const allReadFn = () => {
 	ElMessageBox.confirm('此操作将会把所有未读消息标记为已读，是否继续？', '提示', {
 		confirmButtonText: '确定',
@@ -219,6 +231,7 @@ let pushInfoReq = ref({
 	pushRead: 0,
 	type: '',
 	total:0,
+	whetherFlow:'',
 })
 
 const handlePageChange = (val) => {
@@ -231,7 +244,7 @@ const getPushInfo = () => {
 	loading.value = true
 	proxy.post('/pushInfo/page',pushInfoReq.value).then(res=>{
 		noticeData.value = res.rows
-		pushInfoReq.value.total = res.total
+		pushInfoReq.value.total = pushInfoReq.value.whetherFlow === '' ? res.total : pushInfoReq.value.total
 		console.log(pushInfoReq)
 		setTimeout(() => {
 			loading.value = false

src/components/product/treeList.vue

@@ -285,9 +285,10 @@ const handleMouseOver = (data) => {
     overflow-y: auto;
     overflow-x: auto;
     .el-tree {
-      // .el-tree-node__content {
-      //   display: block;
-      // }
+      .el-tree-node__content {
+        width:min-content;
+        min-width: 260px;
+      }
 
       .el-tree-node > .el-tree-node__children {
         overflow: visible;

src/views/index.vue

@@ -44,7 +44,7 @@
 								size="small"
 								@click="pushProcessApproval(scope.row)"
 							>
-								审批
+								办理
 							</el-button>
 						</template>
 					</el-table-column>

src/views/process/processApproval/index.vue

@@ -3,7 +3,9 @@
     <div class="left-card">
       <div class="top">
         <div class="commons-title title">
-          {{ route.query.flowName || "流程标题（发起）" }}
+          {{ processConfig[route.query.flowKey] ?  
+            processConfig[route.query.flowKey].name + `(${processStaus[route.query.processType] || '发起'})` : "流程标题（发起）" 
+          }}
         </div>
         <div class="line"></div>
         <SendSubscribe ref="makeDom" @auxiliaryChange='(e) => getAuxiliaryData(e)' v-if="flowForm.flowKey == 'subscribe_flow'" :queryData="queryData.data"></SendSubscribe>
@@ -166,7 +168,28 @@ import SendSubscribeWDLY from "@/components/WDLY/process/SendSubscribeWDLY";
 //采购发起
 import SendPurchaseWDLY from "@/components/WDLY/process/SendPurchaseWDLY";
 import { ref } from "vue";
+const processConfig = ref({
+  subscribe_flow:{name:'申购'},
+  purchase_flow:{name:'采购'},
+  account_request_funds_flow:{name:'请款'},
+  sales_return_flow:{name:'退货'},
+  refund_flow:{name:'退款'},
+  pay_flow:{name:'付款'},
+  sale_quotation_flow:{name:'报价单'},
+  contract_flow:{name:'销售合同'},
+  contract_update_flow:{name:'销售合同变更'},
+  sample_flow:{name:'样品单'},
+  ehsd_purchase_flow:{name:'采购交接单'},
+  service_contract_flow:{name:'服务合同'},
+  wdly_apply_purchase:{name:'申购'},
+  wdly_purchase:{name:'采购'},
+});
 
+const processStaus = ref({
+  10: "审批",
+  20: "查看",
+  30: "退回发起",
+});
 const router = useRouter();
 const route = useRoute();
 // tab切换逻辑