zhengkaixin 2 年之前
父节点
当前提交
90d56ec2a9
共有 5 个文件被更改,包括 62 次插入6 次删除
  1. 8 0
      src/apis/Common/notice.js
  2. 2 2
      src/utils/request.js
  3. 2 2
      src/views-oa/Document/Form.vue
  4. 1 1
      src/views-oa/Document/Info.vue
  5. 49 1
      src/views/Master/Home.vue

+ 8 - 0
src/apis/Common/notice.js

@@ -1,5 +1,13 @@
 import request from '@/utils/request'
 import Qs from 'qs';
+//文件审批
+export function checkPageList(data) {
+	return request({
+		url: '/mobile/doc/checkPageList' ,
+		data: Qs.stringify(data),
+		method: 'post',
+	})
+}
 
 //获取通知列表
 export function getNoticeList(params) {

+ 2 - 2
src/utils/request.js

@@ -57,8 +57,8 @@ var BACKEND_URL = baseApiList[apiTypeIndex];
 
 if (process.env.VUE_APP_NODE_NAME == 'devlopment') {			
 	//BACKEND_URL = 'http://192.168.77.162:8086/jp-housekeeper-server/'
-	//baseApiList = ['http://127.0.0.1:8086/jp-housekeeper-server/']
-	//BACKEND_URL="http://192.168.33.220:8086/gaoa-server/";
+	////baseApiList = ['http://127.0.0.1:8086/jp-housekeeper-server/']
+	BACKEND_URL="http://192.168.33.220:8086/gaoa-server/";
 }
 
 // 创建axios实例

+ 2 - 2
src/views-oa/Document/Form.vue

@@ -118,7 +118,7 @@
                     approvedPersonPopedomId: '',
 					remark: '',
 				},
-				reasonDefault: '请假申请',
+				reasonDefault: '公文申请',
 				picList: [],
 			}
 		},
@@ -296,7 +296,7 @@
 			},
 			//提交
 			submit() {
-				this.tjForm.reason = this.tjForm.reason ? this.tjForm.reason : this.reasonDefault;
+				//this.tjForm.reason = this.tjForm.reason ? this.tjForm.reason : this.reasonDefault;
 				if (this.checkFrom()) {
 					var data=this.$refs.examineDetail.getData()
 					if(data.length==0){

+ 1 - 1
src/views-oa/Document/Info.vue

@@ -89,7 +89,7 @@ export default {
     data() {
         return {
 			list:null,
-            pageTitle: '请假详情',
+            pageTitle: '公文详情',
             daytime:'',
             isLoading: false,
             id: this.$route.query.id,

+ 49 - 1
src/views/Master/Home.vue

@@ -32,12 +32,16 @@
 				<div class="vongi-index">
 					<ul class="mui-table-view mui-grid-view mui-grid-9 vongi-grid-head">
 						<li v-for="(item,index) in common_menu_list" :class="'mui-table-view-cell mui-media mui-col-xs-3 '+(item.iconRoute?'':'kfz')">
+							<span class="mui-badge mui-badge-danger" style="    z-index: 999;" v-show="badgeObj[item.iconRoute]" >{{badgeObj[item.iconRoute]}}</span>
+							
 							<a v-if="item.iconUrl" @click="goto(item.iconUrl)">
 								<img :src="requirePic(item.iconCommonPic)" />
+								
 								<div class="mui-media-body" v-text="item.iconName"></div>
 							</a>
 							<router-link v-else :to="{name:item.iconRoute,query:item.iconParam}">
 								<img :src="requirePic(item.iconCommonPic)" />
+							
 								<div class="mui-media-body" v-text="item.iconName"></div>
 							</router-link>
 						</li>
@@ -45,6 +49,8 @@
 				</div>
 				<ul class="mui-table-view mui-grid-view mui-grid-9">
 					<li v-for="(item,index) in menu_list" :class="'mui-table-view-cell mui-media mui-col-xs-3 '+(item.iconRoute?'':'kfz')">
+						<span class="mui-badge mui-badge-danger" style="    z-index: 999;" v-show="badgeObj[item.iconRoute]" >{{badgeObj[item.iconRoute]}}</span>
+						
 						<a v-if="item.iconUrl" @click="goto(item.iconUrl)">
 							<img :src="requirePic(item.iconPic)" />
 							<div class="mui-media-body" v-text="item.iconName"></div>
@@ -183,6 +189,7 @@
 		},
 		data() {
 			return {
+				badgeObj:{},
 				isLoading: false,
 
 				roleList: [],
@@ -313,12 +320,53 @@
 			},
 			//预读取通知消息
 			prefetchNotice() {
+				
+				
+				var list=this.common_menu_list;
+				var sz=[]
+				for(var i in list){
+					var  obj=list[i];
+					if("OaDocumentVerifyList"==obj.iconRoute){
+						sz.push(obj)
+					}
+				}
+				var list=this.menu_list;
+				
+				for(var i in list){
+					var  obj=list[i];
+					if("OaDocumentVerifyList"==obj.iconRoute){
+						sz.push(obj)
+					}
+				}
+				if(sz.length>0){
+					API_Notice.checkPageList({
+						pageIndex: 1,
+						pageSize: 1,
+						totalPage: 1,
+						type: 0,
+					}).then(response => {
+						this.isLoading = false;
+						// response.totalPage;
+						if( response.totalPage){
+							
+							this.badgeObj["OaDocumentVerifyList"]=response.recordsTotal
+							this.$forceUpdate()
+						}
+					
+					}).catch(error => {
+						this.isLoading = false;
+						mui.toast(error);
+					})
+				}
+				// if(OaDocumentVerifyList){
+					
+				// }
 				//this.isLoading = true;
 				API_Notice.prefetch().then(response => {
 					this.isLoading = false;
 
 					this.set_wd_message_num(response);
-
+						
 					this.getLastNotice();
 				}).catch(error => {
 					this.isLoading = false;