zhengkaixin 2 лет назад
Родитель
Сommit
a93d661a3b

+ 1 - 1
.env.development

@@ -4,7 +4,7 @@ OUT_PUT_NAME=dev
 VUE_APP_LOCAL_STORAGE_PREFIX=dev
 
 #项目缓存抬头
-VUE_APP_LOCAL_PREFIX_MAIN=ga_file_xpgj_
+VUE_APP_LOCAL_PREFIX_MAIN=medical_xpgj_
 
 #VUE_APP_BACKEND_URL=https://ykt-test.xiaoxinda.com/gaoa-server/
 #VUE_APP_BACKEND_URL=http://localhost:8086/gaoa-server/

+ 1 - 1
.env.production

@@ -4,7 +4,7 @@ OUT_PUT_NAME=prod
 VUE_APP_LOCAL_STORAGE_PREFIX=prod
 
 #项目缓存抬头
-VUE_APP_LOCAL_PREFIX_MAIN=ga_file_xpgj_
+VUE_APP_LOCAL_PREFIX_MAIN=medical_xpgj_
 VUE_APP_BACKEND_URL=http://47.98.231.198:8081/gaoa-server
 ##VUE_APP_BACKEND_URL=http://47.98.231.198:8081/jp-housekeeper-server
 VUE_APP_BACKEND_URL51=https://51team.xiaoxinda.com/charging-parking/

+ 1 - 1
.env.test

@@ -4,7 +4,7 @@ OUT_PUT_NAME=test
 VUE_APP_LOCAL_STORAGE_PREFIX=test
 
 #项目缓存抬头
-VUE_APP_LOCAL_PREFIX_MAIN=ga_file_xpgj_
+VUE_APP_LOCAL_PREFIX_MAIN=medical_xpgj_
 VUE_APP_BACKEND_URL=http://47.98.231.198:8081/gaoa-server
 
 VUE_APP_BACKEND_URL51=https://51team.xiaoxinda.com/charging-parking/

+ 1 - 1
README.md

@@ -1,4 +1,4 @@
-# jp-xpgj 小鹏管家
+# jp-xpgj 小鹏管家  medical
 
 ## 项目描述
 ```

BIN
src/assets/img-oa/logo.png


+ 1 - 1
src/views-home/User/Login.vue

@@ -7,7 +7,7 @@
 			<div class="mui-content-padded">
 				<div class="vongi-login-logo" v-if="!selectCompany">
 					<img src="~@/assets/img-oa/logo.png" />
-					<h2>交建OA</h2>
+					<h2>医保局OA</h2>
 				</div>
 				<div class="vongi-login-logo" v-if="selectCompany">
 				 

+ 13 - 29
src/views-oa/Document/Form.vue

@@ -104,6 +104,7 @@
                 workOverTime:0,
 				typeName: '请选择',
 				approvalPersonName: '请选择',
+				//selectIndex:0,
 				tjForm: {
 					startTime: '请选择',
 					endTime: '请选择',
@@ -161,40 +162,23 @@
 						mod.value=mod.id
 						this.leaveTypeList.push(mod)
 					}
-				}).catch(error => {
-					mui.toast(error);
-				})
-			},
-			//获取审核人列表
-			getPsersonList() {
-				this.isLoading = true;
-                //补卡1,外出2,出差3 ,请假4
-                var p={type:4};
-
-				API_Leave.approvedList(p).then(response => {
-                   this.workOverTime=response.workOverTime;
-                    var sz=[];
-					for (var i in response.data) {
-						var mod = response.data[i]
-						mod.text = mod.personName
-						mod.value = mod.id;
-                        sz.push(mod)
-					}
-                    this.approvedList=sz;
 					
-					if(this.approvedList.length==1){
-						this.tjForm.approvedPersonPopedomId = this.approvedList[0].value;
-						this.approvalPersonName = this.approvedList[0].text;
+					if( this.$route.query.select!=null){
+						try{
+							var selectItems =this.leaveTypeList[this.$route.query.select];
+							this.tjForm.docType = selectItems.value;
+							this.tjForm.typeName= selectItems.text;
+							this.typeName = selectItems.text;
+							
+						}catch(e){
+							
+						}
 					}
-					
-					this.isLoading = false;
-                    //设置默认审核人
-                    this.setDefaultExaminePerson();
 				}).catch(error => {
-					this.isLoading = false;
 					mui.toast(error);
 				})
 			},
+			 
 			//微信选择图片
 			chooseImage() {
 				WxJsApi.chooseImage().then(res => {
@@ -331,7 +315,7 @@
 		mounted() {
 			//获取微信配置
 			WxJsApi.getWxConfig();
-            //this.getPsersonList();
+         
 
 			this.getLeaveTypeList();
 

+ 6 - 0
src/views-oa/Document/List.vue

@@ -13,10 +13,16 @@
 			
 						<ul class="mui-table-view fyy-view" @click="detail(item.id)">
 							
+							
+							
 							<li class="mui-table-view-cell"   >
 								<label>公文标题:</label>
 								<span>{{item.docTitle}}<span   class="mui-pull-right " :class="statusColor[item.docStatus]">{{status[item.docStatus]}}</span></span>
 							</li>
+							<li class="mui-table-view-cell"   >
+								<label>文件类型:</label>
+								<span>{{item.typeName}}</span>
+							</li>
 							<li class="mui-table-view-cell"  v-show="listForm.templateFlag==1" >
 								<label>模板标题:</label>
 								<span>{{item.templateTitle}}</span>

+ 1 - 1
vue.config.js

@@ -17,7 +17,7 @@ const conf =  {
 				entry: 'src/main.js',
 				template: 'index/business/index.html',
 				filename: 'index.html',
-				title: '交建OA' + title,
+				title: '医保局OA' + title,
 			}
 		},
 		outputDir: 'dist',