소스 검색

EHR-绩效:查询回车刷新页面问题处理;PC端企业微信进绩效应用跳转页面优化;

001295 1 년 전
부모
커밋
33516ccae0

+ 26 - 16
src/views/business/ehr/ehrpm-entrance.vue

@@ -5,31 +5,41 @@
 </template>
 <script>
 	import {getWxworkUser_ehrpm,getDrpUser} from "@/api/business/ehr/wxworklogin";
-	import {setToken} from '@/utils/auth'
+	import {setToken,getToken} from '@/utils/auth'
 	export default {
 		data() {
 			return {
+				//遮罩
+      			loading: false
 			}
 		},
 		methods: {
 		},
 		async created() {
-			let query = this.$route.query;
-			console.log("query",query);
-			let res = await getWxworkUser_ehrpm(query.code);
-			console.log("res",res);
-			if(res.code == '200'){
-				let staffCode = res.data.userid;
-				let dres = await getDrpUser(staffCode);
-				if (dres.code === 200) {
-					let token = dres.token
-					setToken(token)
-					this.$store.commit('SET_TOKEN', token)
-					this.$store.dispatch("GetInfo").then(() => {})
-					this.$store.dispatch("GenerateRoutes").then(
-						this.$router.push({ path: '/business/ehr/pm/myPm' }).catch(()=>{})
-					)
+			if(!getToken){
+				this.loading = true;
+				let query = this.$route.query;
+				console.log("query",query);
+				let res = await getWxworkUser_ehrpm(query.code);
+				console.log("res",res);
+				if(res.code == '200'){
+					let staffCode = res.data.userid;
+					let dres = await getDrpUser(staffCode);
+					if (dres.code === 200) {
+						let token = dres.token
+						setToken(token)
+						this.$store.commit('SET_TOKEN', token)
+						this.$store.dispatch("GetInfo").then(() => {})
+						this.$store.dispatch("GenerateRoutes").then(
+							this.$router.push({ path: '/business/ehr/pm/myPm' }).catch(()=>{})
+						)
+						this.loading = false;
+					}
 				}
+			}else{
+				this.$store.dispatch("GenerateRoutes").then(
+					this.$router.push({ path: '/business/ehr/pm/myPm' }).catch(()=>{})
+				)
 			}
 		}
 	}

+ 1 - 1
src/views/business/ehr/pm/adjustMark/index.vue

@@ -7,7 +7,7 @@
       </div>
     </div>
     <div class="app-container" v-if="isList">
-      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true">
+      <el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" @submit.native.prevent>
         <el-form-item label="员工" prop="staffName">
           <el-input
             v-model="queryParams.staffName"

+ 5 - 2
src/views/business/ehr/pm/myPm/detail.vue

@@ -196,7 +196,10 @@ export default {
       //遮罩
       loading: false,
       //单行明细
-      rowData:{},
+      rowData:{
+        asItem:null,
+        weight:null,
+      },
       //是否显示行明细弹出层
       rowDataOpen:false,
       //当行明细校验规则
@@ -437,7 +440,7 @@ export default {
     },
     //选择加减分项后
     handleCheckedChange(value){
-      this.rowData.weight = 0;
+      this.rowData.weight = undefined;
     },
     //必选标识
     addRedStar(h, { column }) {

+ 15 - 3
src/views/business/ehr/pm/psnrelation/detail.vue

@@ -29,9 +29,16 @@
           <el-table-column width="300" label="评估人编码" align="center" prop="staff" />
           <el-table-column width="300" label="评估人名称" align="center">
             <template slot-scope="scope">
-              <el-popover-select-v2 size="mini" v-model="form.psnrelationItem[scope.$index].staffName" title="员工" valueKey="name"
-                referName="CONTACTS_PARAM" :dataMapping="{staff:'code',staffName: 'name'}"
-                :source.sync="form.psnrelationItem[scope.$index]">
+              <el-popover-select-v2 
+                size="mini" 
+                v-model="form.psnrelationItem[scope.$index].staffName" 
+                title="员工" 
+                valueKey="name"
+                referName="CONTACTS_PARAM" 
+                :dataMapping="{staff:'code',staffName: 'name'}"
+                :source.sync="form.psnrelationItem[scope.$index]" 
+                @change="aa"
+              >
               </el-popover-select-v2>
             </template>
           </el-table-column>
@@ -195,6 +202,11 @@ export default {
         this.$modal.msgSuccess("已经是当前页最后一条了!");
       }
     },
+    aa(val,val1){
+      console.log('val',val);
+      console.log('val1',val1);
+      console.log(this.form.psnrelationItem);
+    }
   }
 }
 </script>

+ 4 - 2
src/views/business/ehr/pm/psnrelation/index.vue

@@ -6,7 +6,7 @@
           <el-col :span="18">
             <el-form-item label="员工" prop="staffName">
               <el-input
-                v-model="queryParams.staffName"
+                v-model="queryParams.params.staffCodeOrName"
                 clearable
                 @keyup.enter.native="btnSearch"
               />
@@ -72,7 +72,9 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        staffName: null,
+        params:{
+          staffCodeOrName: null,
+        },
       },
       //页面显示
       isList: true,