党员评价查询、党员信息管理调整、移动端新增党员评价

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/config/config.js

@@ -6,10 +6,10 @@
 //    webapi: 'http://112.230.201.53:31173/',
 //    web:"http://112.230.201.53/:8081/"//web地址，用于配置logo
 //};
-//var config = {
-//    webapi: 'http://localhost:31173/',
-//    web: "http://localhost:20472/"//web地址，用于配置logo
-//}; 
+// var config = {
+//    webapi: 'http://localhost:8080/',
+//    web: "http://localhost:8082/"//web地址，用于配置logo
+// }; 
 
 
 var config = {

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/PartyevaluatQuestionsZP.html

@@ -0,0 +1,5 @@
+<div class="box">
+	<div class="button">
+		开始评价
+	</div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/PartyevaluatQuestionsZP.js

@@ -0,0 +1,30 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-26 16:33
+ * 描  述：党员评价
+ */
+(function() {
+	var ScoreYear='';
+	var ScoreQuarter='';
+	var page = {
+		isScroll: false,
+		init: function($page, param) {
+			ScoreYear = param.ScoreYear;
+			ScoreQuarter = param.ScoreQuarter;
+			$page.find('.button').on('tap', function() {
+				learun.nav.go({
+					path: 'PartyevaluatQuestionsZP/PartyevaluateTopicZP',//'partyevaluate/partyevaluatetopic',
+					title: '党员评价',
+					isBack: true,
+					isHead: true,
+					param: { ScoreYear: ScoreYear ,ScoreQuarter:ScoreQuarter}
+				});
+					
+				// 关闭当前页
+			    //learun.nav.closeCurrent();
+			});
+		}
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/PartyevaluateTopicZP/PartyevaluateTopicZP.css

@@ -0,0 +1,272 @@
+* {
+	padding: 0;
+	margin: 0;
+}
+
+ul,
+ol,
+li {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+html,
+body {
+	height: 100%;
+	width: 100%;
+}
+
+.box {
+	height: 100%;
+	width: 100%;
+	background: url(../../images/content.png);
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+	/* position: relative; */
+}
+
+.contents {
+	position: relative;
+	top: 150px;
+	width: 93%;
+	margin: 0 auto;
+	/* background: blue; */
+}
+
+.progress {
+	height: 32.5px;
+	position: relative;
+}
+
+.progress p {
+	height: 7.5px;
+	width: 100%;
+	background-color: #EFEFEF;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	opacity: .3;
+}
+
+.progress .shade {
+	height: 12.5px;
+	width: 10%;
+	position: absolute;
+	top: 50%;
+	left: 0%;
+	transform: translate(0%, -50%);
+	background: url(../../images/jd.png);
+	background-size: 100% 100%;
+	border-radius: 50px;
+}
+
+.progress b {
+	position: absolute;
+	width: 47.5px;
+	height: 30px;
+	border-top-left-radius: 50px;
+	border-bottom-left-radius: 50px;
+	background-color: #f4df81;
+	background-image: linear-gradient(#f4df81, #d19f31);
+	top: 0;
+	right: -3.7%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: #FFFFFF;
+	font-size: 18px;
+}
+
+.topic {
+	position: relative;
+	background-color: #FFFFFF;
+	border-radius: 25px;
+	margin-top: 35px;
+}
+
+.title>div {
+	height: 37.5px;
+	width: 75%;
+	margin: 0 auto;
+	background: #FFFFFF;
+	border-radius: 20px;
+	line-height: 37.5px;
+	font-size: 12px;
+	color: #404040;
+	text-align: center;
+	font-weight: 800;
+	position: absolute;
+	top: -4%;
+	left: 52%;
+	transform: translate(-50%, 0%);
+	box-shadow: #d6d4d4 0px 6px 20px 5px; //边框阴影
+	/* padding:0  50px; */
+}
+
+.title>div span {
+	color: #a6a6a6;
+}
+
+.title>p {
+	background-color: #FFFFFF;
+	height: 57.5px;
+	width: 57.5px;
+	border-radius: 50%;
+	position: absolute;
+	top: -7%;
+	left: 35px;
+	z-index: 90;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	box-shadow: #d6d4d4 0px 6px 20px 5px; //边框阴影
+}
+
+.title>p span {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 40px;
+	width: 40px;
+	border: 6px solid #e17465;
+	border-radius: 50%;
+	font-size: 20px;
+}
+
+.topicCon {
+	padding-top: 45px;
+	margin-bottom: 10px;
+	/* border-bottom: 1px solid #efefef; */
+	padding: 0 25px;
+	padding-top: 50px;
+}
+
+.topicCon h1 {
+	font-size: 18px;
+	color: #404040;
+}
+
+.topicCon p {
+	font-size: 14px;
+	color: #404040;
+	line-height: 2;
+}
+
+.topicCon ul {
+	background: #efefef;
+	border-radius: 8px;
+	padding: 15px;
+	margin-top: 20px;
+}
+
+.topicCon ul li b {
+	font-size: 12px;
+	color: #404040;
+	font-weight: 800;
+	margin-right: 10px;
+}
+
+.topicCon ul li span {
+	font-size: 14px;
+	color: #404040;
+}
+
+.topicCon ul p {
+	font-size: 12px;
+	color: #404040;
+}
+
+.footer {
+	border-top: 2px solid #efefef;
+	padding: 25px;
+
+}
+
+.footer ol {
+	border: 1px solid #c8c8c8;
+	border-radius: 8px;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	height: 40px;
+	color: #404040;
+	font-size: 12px;
+	margin-bottom: 20px;
+}
+
+.footer ol li {
+	height: 25px;
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.footer ol li span {
+	color: #be1211;
+}
+
+.footer ol li:first-child {
+	width: 30%;
+	border-right: 1px solid #c8c8c8;
+}
+
+.footer ol li input {
+	width: 100%;
+	height: 20px;
+	border: none;
+	font-size: 16px;
+	text-align: center;
+	outline: none;
+	padding: 0;
+	margin: 0;
+}
+
+.buttons {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	height: 40px;
+	margin-top: 17.5px;
+}
+
+.buttons p {
+	border: 2px solid #e1bb53;
+	border-radius: 25px;
+	font-size: 18px;
+	color: #FFFFFF;
+	width: 40%;
+	height: 36px;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	color: #e1bb53;
+	flex: 1;
+}
+
+.buttons p:hover {
+	background-color: #e1bb53;
+	color: #FFFFFF;
+}
+
+.lookButton p {
+	background-color: #e1bb53;
+	margin: 0 auto;
+	color: #FFFFFF;
+	border-radius: 25px;
+	font-size: 18px;
+	color: #FFFFFF;
+	width: 80%;
+	height: 36px;
+	text-align: center;
+	line-height: 36px;
+	display: none;
+
+}
+
+.homebuttom {
+	background-color: #e1bb53;
+	color: #FFFFFF !important;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/PartyevaluateTopicZP/PartyevaluateTopicZP.html

@@ -0,0 +1,37 @@
+<div class="box">
+	<div class="contents">
+		<div class="progress">
+			<div class="shade"></div>
+			<p></p>
+			<b></b>
+		</div>
+		<div class="topic">
+			<div class="title">
+				<p><span></span></p>
+				<div>一. 工作业绩 <span> ( 20分 ) </span></div>
+			</div>
+			<div class="topicCon">
+				<h1>优质完成任务。</h1>
+				<p>潜心教育培训，落实立德树人根本任务，按时保质保量完成本职各项工作任务。</p>
+				<ul>
+					<li><b>评分标准</b><span>(保留小数点最后一位)</span></li>
+					<p>若有参加封建迷信活动，工作中表现出信心不足、精神萎靡不振的现象，此项不得分。精神萎靡不振的现象精神萎靡不振的现象</p>
+				</ul>
+			</div>
+			<div class="footer">
+				<ol>
+					<li>分值：<span class="scorenum">7</span>分</li>
+					<li><input type="text" class="inputvalue" id="inputvalue"></li>
+				</ol>
+				<div class="buttons">
+					<p class="last">上一题</p>
+					<div style="width: 10px;"></div>
+					<p class="next">下一题</p>
+				</div>
+				<div class="lookButton">
+					<p>查看总分</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/PartyevaluateTopicZP/PartyevaluateTopicZP.js

@@ -0,0 +1,243 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-26 16:33
+ * 描  述：党员评价
+ */
+(function() {
+	var data = [];
+	var ScoreYear='';
+	var ScoreQuarter='';
+	
+	// var data = [
+	// 	{
+	// 		Assessment:'一，通知公告',
+	// 		scorePre:'80',
+	// 		ConductRequirements:'优质完成任务',
+	// 		CRRemark:'潜心教育培训，落实立德树人根本任务，按时保质保量完成本职各项工作任务',
+	// 		gradetitle:'评分标准',
+	// 		gradenum:'保留小数点最后一位',
+	// 		ScoringCriteria:'若有参加封建迷信活动，工作中表现出信心不足、精神萎靡不振的现象，此项不得分。精神萎靡不振的现象精神萎靡不振的现象',
+	// 		MaxScore:'20'
+	// 	},
+	// 	{
+	// 		title:'二，专职22专访',
+	// 		scorePre:'100',
+	// 		subhead:'访问222人员',
+	// 		subheadcon:'悉心照料，耐心疏导',
+	// 		gradetitle:'评分2222标准',
+	// 		gradenum:'保留整数',
+	// 		gradecon:'此项不得分。精神萎靡不振的现象精神萎靡不振的现象',
+	// 		scorenum:'10'
+	// 	},
+	// 	{
+	// 		title:'三，红头33文件',
+	// 		scorePre:'30',
+	// 		subhead:'优质任333务',
+	// 		subheadcon:'潜心教育培训，落实立德树人根本任务，按时保质保量完成本职各项工作任务',
+	// 		gradetitle:'结果判定',
+	// 		gradenum:'无需结果',
+	// 		gradecon:'精神萎靡不振的现象精神萎靡不振的现象',
+	// 		scorenum:'40'
+	// 	}
+	// 	];
+		
+		function loadData(data,num){
+			console.log("数据",data)
+			var titleCon = ''
+				titleCon+='<p>'+'<span>'+num+'</span>'+'</p>'+'<div>'+data.Assessment+'<span>'+'（'+data.scorePre+'）'+'</span>'+'</div>'
+			
+			$(".title").html(titleCon)
+			
+			var topicCon =""
+				topicCon +='<h1>'+data.ConductRequirements+'</h1>'+
+				'<p>'+data.CRRemark+'</p>'+
+				'<ul>'+
+				'<li>'+
+				'<b>'+data.gradetitle+'</b>'+
+				'<span>'+data.gradenum+'</span>'+
+				'</li>'+
+				'<p>'+data.ScoringCriteria+'</p>'
+				'</ul>'
+			$(".topicCon").html(topicCon)
+			var footerCon  = ''
+			    footerCon+='<li>'+'分值：'+
+				'<span calss="scorenum">'+ data.MaxScore +'</span>'+
+				'</li>'+
+				'<li>'+'<input type="text" class="inputvalue" id="inputvalue">'+'</li>'
+				$(".footer ol").html(footerCon)
+		}
+	
+	var page = {
+		isScroll: false,
+		init: function($page, param) {
+			ScoreYear = param.ScoreYear;
+						ScoreQuarter = param.ScoreQuarter;
+						
+						learun.httpget(config.webapi + 'learun/adms/evaluatingindicator/getevaluationlistforzp', {ScoreYear:ScoreYear,ScoreQuarter:ScoreQuarter,BeAssessed:learun.storage.get('logininfo').account}, (data) => {
+						    $page.find('.lr-badge').text('0');
+						    if (data) {
+								console.log('data',data);
+								data=data;
+						        // $page.find('.lr-badge').text(data.records);
+						        // callback(data.rows, parseInt(data.records));
+						    }
+						    else {
+						        callback([], 0);
+						    }
+						});
+						return;
+			loadData(data[0],1)
+			// 当前题目
+			var num = 1
+			// 总数量
+			var total = data.length
+			// 单个宽度
+			var mom = 100 / total
+			if (num <= 1) {
+				$(".last").hide()
+				$(".next").addClass("homebuttom")
+			} else {
+				$(".buttons").hide()
+				$(".lookButton p").show()
+			}
+			$(".progress b").text(total)
+			$(".title p span").text(num)
+			// 最大分数值
+			var scorenum = data[num-1].MaxScore
+			console.log("scorenum",scorenum)
+            // 题目数量
+			var valList = new Array(total).fill('')
+
+			$page.find('.next').on('tap', function() {
+				
+				$(".next").removeClass("homebuttom")
+				$(".next").css({
+					'background': '#e1bb53',
+					'color': '#FFFFFF'
+				})
+				$(".last").css({
+					'background': '#FFFFFF',
+					'color': '#e1bb53'
+				})
+				var val = $(".inputvalue").val()
+				console.log("val",val)
+				console.log("scorenum22222",scorenum)
+					console.log("scorenum999",(val - 0)<= (scorenum - 0))
+				if (val != "") {
+					if (Number(val)<= Number(scorenum)) {
+							
+						if (num <= total) {
+							// 点击下一题   要把当前题目的分数给了对应下标的数组
+							valList[num-1] = val
+							// 进入下一题  题目下标++
+							num++
+							loadData(data[num-1],num)
+							// 清空输入框
+							$(".inputvalue").val(valList[num-1])	
+							var ws = num * mom
+							$(".shade").width(ws + '%')
+							$(".title p span").text(num)
+							if (num > 1) {
+								$(".last").show()
+							}
+							if(num==total){
+								$(".buttons").hide()
+								$(".lookButton p").show()
+							}
+
+						}
+							
+					} else {
+						learun.layer.toast("分数不能大于最大值");
+					}
+				} else {
+					learun.layer.toast("分数不能为空");
+				}
+			});
+
+			$page.find('.last').on('tap', function() {
+				$(".last").css({
+					'background': '#e1bb53',
+					'color': '#FFFFFF'
+				})
+				$(".next").css({
+					'background': '#FFFFFF',
+					'color': '#e1bb53'
+				})
+				if (num => 1) {
+					$(".last").show()
+					if (num <= total - 1) {
+						--num
+						var ws = num * mom
+						$(".shade").width(ws + '%')
+						$(".title p span").text(num)
+						if (num <= 1) {
+							$(".last").hide()
+							$(".next").addClass("homebuttom")
+							$(".next").css({
+								'background': '#e1bb53',
+								'color': '#FFFFFF'
+							})
+						}
+						loadData(data[num-1],num)
+						// 点击上一题  从分数数组中取到上一题的分数 并且赋给输入框  num为当前题目序号  对应下标应-1
+						console.log(num,'num')
+						$(".inputvalue").val(valList[num-1])
+						
+						
+					}
+				} else {
+					num = 1
+					$(".last").hide()
+
+				}
+
+			});
+			// 查看总分
+			$page.find('.lookButton').on('tap', function() {
+				var val = $(".inputvalue").val()
+				if(val !=''){
+					if(Number(val)<= Number(scorenum)){
+						valList[valList.length-1] = val
+						// 计算数组和
+						function sum(arr) {
+						  var s = 0;
+						  for (var i=arr.length-1; i>=0; i--) {
+						    s += Number(arr[i]);
+						  }
+						  return s;
+						}
+						// learun.nav.closeCurrent();
+						learun.nav.go({
+							path: 'partyevaluate/answertotal',
+							title: '党员评价',
+							isBack: true,
+							isHead: true,
+							param: sum(valList),
+							type: 'right'
+						});
+						
+					}else{
+						learun.layer.toast("分数不能大于最大值");
+					}
+				}else{
+					learun.layer.toast("分数不能为空");
+				}
+				
+				
+				// learun.nav.getpage('partyevaluate');
+				// 	learun.nav.getpage();
+				// learun.nav.close('partyevaluate/partyevaluatetopic');
+				// learun.nav.getpage('partyevaluate/partyevaluatetopic);
+			});
+
+		},
+		// beforedestroy: function(pageinfo) {
+		// 	return true; // false 就不关闭
+		// },
+		// destroy: function(pageinfo) {},
+		// reload: function($page, pageinfo) {}
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/answertotal/answertotal.css

@@ -0,0 +1,76 @@
+  .box{
+			  height: 100%;
+			  width: 100%;
+			  background: url(../../images/content.png);
+			  background-repeat: no-repeat;
+			  background-size: 100% 100%;
+			  /* position: relative; */
+		  }
+		 .answertotalContent{
+			position: relative;
+			background-color: #FFFFFF;
+			height: 70%;
+			top: 25%;
+			width: 93%;
+			margin: 0 auto;
+			border-radius: 10px;
+		  }
+		  .answertotalTopic{
+			   width: 175px;
+			   height: 175px;
+			   box-shadow: #e8e7e7 0px 0px 4px 2px ;
+			   border-radius: 50%;
+				position: relative;
+				top: 35%;
+				left: 50%;
+				transform: translate(-50%,-50%);
+				display: flex;
+				justify-content: center;
+				align-items: center;
+		  }
+		  .answertotaScore{
+			  width: 145px;
+			  height: 145px;
+			  border: 3px solid #f5e285;
+			  border-radius: 50%;
+			  display: flex;
+			  justify-content: center;
+			  align-items: center;
+			  flex-direction:column;
+		  }
+		  .answertotaScore span{
+			  color: #b0afaf;
+			  font-size: 15px;
+		  }
+		  .answertotaScore p{
+		  			  color: #404040;
+		  			  font-size: 35px;
+					  font-weight: 800;
+		  }
+		  .answertotalLookButton{
+			  width: 80%;
+			  float: none;
+			  position: absolute;
+			  bottom: 0%;
+			  left: 50%;
+			  transform: translate(-50%,-50%);
+		  }
+		   .answertotalLookButton p{
+			  background-color: #e1bb53;
+			  margin: 0 auto;
+			  color: #FFFFFF;
+			  border-radius: 25px;
+			  font-size: 18px;
+			  color: #FFFFFF;
+			  width: 80%;
+			  height: 36px;
+			  text-align: center;
+			  line-height: 36px;
+			   margin-bottom: 10px;
+		   }
+		   .answertotalLookButton p:last-child{
+			   border: 1px solid #e1bb53;
+			   background-color: #FFFFFF;
+			   color: #e1bb53;
+			   
+		   }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/answertotal/answertotal.html

@@ -0,0 +1,22 @@
+<div class="box">
+	<div class="answertotalContent">
+		<div class="progress">
+			<!-- <div class="shade"></div>
+			<p></p>
+			<b>6</b> -->
+		</div>
+		<div class="answertotalTopic">
+			<div class="answertotaScore">
+				<span>评价总分</span>
+				<p id="cpageTitle">33.9</p>
+			</div>
+
+		</div>
+		<div class="answertotalLookButton">
+			<p class="confirm" >确认分数，并提交</p>
+			<p class="backs">
+					返回重测
+			</p>
+		</div>
+	</div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/answertotal/answertotal.js

@@ -0,0 +1,48 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-26 16:33
+ * 描  述：党员评价
+ */
+(function() {
+	var page = {
+		isScroll: false,
+		init: function($page,param) {
+			$page.find('#cpageTitle').text(param);
+			$page.find('.confirm').on('tap', function() {
+				learun.nav.go({
+					path: 'partyevaluate/succeed',
+					title: '党员评价',
+					isBack: true,
+					isHead: true,
+				});
+			});
+			$page.find('.backs').on('tap', function() {
+				// learun.nav.closeCurrent();
+				location.reload();
+				learun.nav.go({
+					path: 'partyevaluate',
+					title: '党员评价',
+					isBack: true,
+					isHead: true,
+				});
+				
+				// $(location).prop('href','pages/partyevaluate/partyevaluatetopic')
+				// window.location.reload()
+				// learun.tab.go('/partyevaluate/partyevaluatetopic');
+				// learun.nav.getpage('partyevaluate');
+				 // learun.nav.getpage('partyevaluate/partyevaluatetopic');
+				// learun.nav.close('partyevaluate/partyevaluatetopic');
+				  // learun.nav.close('demo/page');
+				
+			});
+
+		},
+		// beforedestroy: function(pageinfo) {
+		// 	return true; // false 就不关闭
+		// },
+		// destroy: function(pageinfo) {},
+		// reload: function($page, pageinfo) {}
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/succeed/succeed.css

@@ -0,0 +1,63 @@
+.box {
+	height: 100%;
+	width: 100%;
+	background: url(../../images/content.png);
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+	/* position: relative; */
+}
+
+.succeedcontent {
+	position: relative;
+	background-color: #FFFFFF;
+	height: 70%;
+	top: 20%;
+	width: 93%;
+	margin: 0 auto;
+	border-radius: 10px;
+}
+
+.succeedtopic {
+	height: 250px;
+}
+
+.succeedscore {
+	width: 175px;
+	height: 175px;
+	background: url(../../images/succeed.png);
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+	position: relative;
+	top: 58%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.texts {
+	height: 30px;
+	/* background-color: red; */
+	text-align: center;
+}
+
+.succeedlookButton {
+	width: 80%;
+	float: none;
+	position: absolute;
+	bottom: 0%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.succeedlookButton p {
+	background-color: #e1bb53;
+	margin: 0 auto;
+	color: #FFFFFF;
+	border-radius: 25px;
+	font-size: 18px;
+	color: #FFFFFF;
+	width: 80%;
+	height: 36px;
+	text-align: center;
+	line-height: 36px;
+	margin-bottom: 10px;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/PartyevaluatQuestionsZP/succeed/succeed.html

@@ -0,0 +1,13 @@
+<div class="box">
+	<div class="succeedcontent">
+		<div class="succeedtopic">
+			<div class="succeedscore">
+			</div>
+          
+		</div>
+		  <p class="texts">提交成功</p>
+		<!-- <div class="succeedlookButton">
+			<p>提交</p>
+		</div> -->
+	</div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/answertotal/answertotal.css

@@ -0,0 +1,76 @@
+  .box{
+			  height: 100%;
+			  width: 100%;
+			  background: url(../../images/content.png);
+			  background-repeat: no-repeat;
+			  background-size: 100% 100%;
+			  /* position: relative; */
+		  }
+		 .answertotalContent{
+			position: relative;
+			background-color: #FFFFFF;
+			height: 70%;
+			top: 25%;
+			width: 93%;
+			margin: 0 auto;
+			border-radius: 10px;
+		  }
+		  .answertotalTopic{
+			   width: 175px;
+			   height: 175px;
+			   box-shadow: #e8e7e7 0px 0px 4px 2px ;
+			   border-radius: 50%;
+				position: relative;
+				top: 35%;
+				left: 50%;
+				transform: translate(-50%,-50%);
+				display: flex;
+				justify-content: center;
+				align-items: center;
+		  }
+		  .answertotaScore{
+			  width: 145px;
+			  height: 145px;
+			  border: 3px solid #f5e285;
+			  border-radius: 50%;
+			  display: flex;
+			  justify-content: center;
+			  align-items: center;
+			  flex-direction:column;
+		  }
+		  .answertotaScore span{
+			  color: #b0afaf;
+			  font-size: 15px;
+		  }
+		  .answertotaScore p{
+		  			  color: #404040;
+		  			  font-size: 35px;
+					  font-weight: 800;
+		  }
+		  .answertotalLookButton{
+			  width: 80%;
+			  float: none;
+			  position: absolute;
+			  bottom: 0%;
+			  left: 50%;
+			  transform: translate(-50%,-50%);
+		  }
+		   .answertotalLookButton p{
+			  background-color: #e1bb53;
+			  margin: 0 auto;
+			  color: #FFFFFF;
+			  border-radius: 25px;
+			  font-size: 18px;
+			  color: #FFFFFF;
+			  width: 80%;
+			  height: 36px;
+			  text-align: center;
+			  line-height: 36px;
+			   margin-bottom: 10px;
+		   }
+		   .answertotalLookButton p:last-child{
+			   border: 1px solid #e1bb53;
+			   background-color: #FFFFFF;
+			   color: #e1bb53;
+			   
+		   }

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/answertotal/answertotal.html

@@ -0,0 +1,22 @@
+<div class="box">
+	<div class="answertotalContent">
+		<div class="progress">
+			<!-- <div class="shade"></div>
+			<p></p>
+			<b>6</b> -->
+		</div>
+		<div class="answertotalTopic">
+			<div class="answertotaScore">
+				<span>评价总分</span>
+				<p id="cpageTitle">33.9</p>
+			</div>
+
+		</div>
+		<div class="answertotalLookButton">
+			<p class="confirm" >确认分数，并提交</p>
+			<p class="backs">
+					返回重测
+			</p>
+		</div>
+	</div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/answertotal/answertotal.js

@@ -0,0 +1,48 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-26 16:33
+ * 描  述：党员评价
+ */
+(function() {
+	var page = {
+		isScroll: false,
+		init: function($page,param) {
+			$page.find('#cpageTitle').text(param);
+			$page.find('.confirm').on('tap', function() {
+				learun.nav.go({
+					path: 'partyevaluate/succeed',
+					title: '党员评价',
+					isBack: true,
+					isHead: true,
+				});
+			});
+			$page.find('.backs').on('tap', function() {
+				// learun.nav.closeCurrent();
+				location.reload();
+				learun.nav.go({
+					path: 'partyevaluate',
+					title: '党员评价',
+					isBack: true,
+					isHead: true,
+				});
+				
+				// $(location).prop('href','pages/partyevaluate/partyevaluatetopic')
+				// window.location.reload()
+				// learun.tab.go('/partyevaluate/partyevaluatetopic');
+				// learun.nav.getpage('partyevaluate');
+				 // learun.nav.getpage('partyevaluate/partyevaluatetopic');
+				// learun.nav.close('partyevaluate/partyevaluatetopic');
+				  // learun.nav.close('demo/page');
+				
+			});
+
+		},
+		// beforedestroy: function(pageinfo) {
+		// 	return true; // false 就不关闭
+		// },
+		// destroy: function(pageinfo) {},
+		// reload: function($page, pageinfo) {}
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/partyevaluate.html

@@ -0,0 +1,5 @@
+<div class="box">
+	<div class="button">
+		开始评价
+	</div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/partyevaluate.js

@@ -0,0 +1,25 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-26 16:33
+ * 描  述：党员评价
+ */
+(function() {
+	var page = {
+		isScroll: false,
+		init: function($page) {
+			$page.find('.button').on('tap', function() {
+				// 关闭当前页
+			    learun.nav.closeCurrent();
+				learun.nav.go({
+					path: 'partyevaluate/partyevaluatetopic',
+					title: '党员评价',
+					isBack: true,
+					isHead: true,
+				});
+					
+			});
+		}
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/partyevaluatetopic/partyevaluatetopic.css

@@ -0,0 +1,272 @@
+* {
+	padding: 0;
+	margin: 0;
+}
+
+ul,
+ol,
+li {
+	list-style: none;
+	padding: 0;
+	margin: 0;
+}
+
+html,
+body {
+	height: 100%;
+	width: 100%;
+}
+
+.box {
+	height: 100%;
+	width: 100%;
+	background: url(../../images/content.png);
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+	/* position: relative; */
+}
+
+.contents {
+	position: relative;
+	top: 150px;
+	width: 93%;
+	margin: 0 auto;
+	/* background: blue; */
+}
+
+.progress {
+	height: 32.5px;
+	position: relative;
+}
+
+.progress p {
+	height: 7.5px;
+	width: 100%;
+	background-color: #EFEFEF;
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+	opacity: .3;
+}
+
+.progress .shade {
+	height: 12.5px;
+	width: 10%;
+	position: absolute;
+	top: 50%;
+	left: 0%;
+	transform: translate(0%, -50%);
+	background: url(../../images/jd.png);
+	background-size: 100% 100%;
+	border-radius: 50px;
+}
+
+.progress b {
+	position: absolute;
+	width: 47.5px;
+	height: 30px;
+	border-top-left-radius: 50px;
+	border-bottom-left-radius: 50px;
+	background-color: #f4df81;
+	background-image: linear-gradient(#f4df81, #d19f31);
+	top: 0;
+	right: -3.7%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	color: #FFFFFF;
+	font-size: 18px;
+}
+
+.topic {
+	position: relative;
+	background-color: #FFFFFF;
+	border-radius: 25px;
+	margin-top: 35px;
+}
+
+.title>div {
+	height: 37.5px;
+	width: 75%;
+	margin: 0 auto;
+	background: #FFFFFF;
+	border-radius: 20px;
+	line-height: 37.5px;
+	font-size: 12px;
+	color: #404040;
+	text-align: center;
+	font-weight: 800;
+	position: absolute;
+	top: -4%;
+	left: 52%;
+	transform: translate(-50%, 0%);
+	box-shadow: #d6d4d4 0px 6px 20px 5px; //边框阴影
+	/* padding:0  50px; */
+}
+
+.title>div span {
+	color: #a6a6a6;
+}
+
+.title>p {
+	background-color: #FFFFFF;
+	height: 57.5px;
+	width: 57.5px;
+	border-radius: 50%;
+	position: absolute;
+	top: -7%;
+	left: 35px;
+	z-index: 90;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	box-shadow: #d6d4d4 0px 6px 20px 5px; //边框阴影
+}
+
+.title>p span {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	height: 40px;
+	width: 40px;
+	border: 6px solid #e17465;
+	border-radius: 50%;
+	font-size: 20px;
+}
+
+.topicCon {
+	padding-top: 45px;
+	margin-bottom: 10px;
+	/* border-bottom: 1px solid #efefef; */
+	padding: 0 25px;
+	padding-top: 50px;
+}
+
+.topicCon h1 {
+	font-size: 18px;
+	color: #404040;
+}
+
+.topicCon p {
+	font-size: 14px;
+	color: #404040;
+	line-height: 2;
+}
+
+.topicCon ul {
+	background: #efefef;
+	border-radius: 8px;
+	padding: 15px;
+	margin-top: 20px;
+}
+
+.topicCon ul li b {
+	font-size: 12px;
+	color: #404040;
+	font-weight: 800;
+	margin-right: 10px;
+}
+
+.topicCon ul li span {
+	font-size: 14px;
+	color: #404040;
+}
+
+.topicCon ul p {
+	font-size: 12px;
+	color: #404040;
+}
+
+.footer {
+	border-top: 2px solid #efefef;
+	padding: 25px;
+
+}
+
+.footer ol {
+	border: 1px solid #c8c8c8;
+	border-radius: 8px;
+	display: flex;
+	justify-content: flex-start;
+	align-items: center;
+	height: 40px;
+	color: #404040;
+	font-size: 12px;
+	margin-bottom: 20px;
+}
+
+.footer ol li {
+	height: 25px;
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.footer ol li span {
+	color: #be1211;
+}
+
+.footer ol li:first-child {
+	width: 30%;
+	border-right: 1px solid #c8c8c8;
+}
+
+.footer ol li input {
+	width: 100%;
+	height: 20px;
+	border: none;
+	font-size: 16px;
+	text-align: center;
+	outline: none;
+	padding: 0;
+	margin: 0;
+}
+
+.buttons {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	height: 40px;
+	margin-top: 17.5px;
+}
+
+.buttons p {
+	border: 2px solid #e1bb53;
+	border-radius: 25px;
+	font-size: 18px;
+	color: #FFFFFF;
+	width: 40%;
+	height: 36px;
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	color: #e1bb53;
+	flex: 1;
+}
+
+.buttons p:hover {
+	background-color: #e1bb53;
+	color: #FFFFFF;
+}
+
+.lookButton p {
+	background-color: #e1bb53;
+	margin: 0 auto;
+	color: #FFFFFF;
+	border-radius: 25px;
+	font-size: 18px;
+	color: #FFFFFF;
+	width: 80%;
+	height: 36px;
+	text-align: center;
+	line-height: 36px;
+	display: none;
+
+}
+
+.homebuttom {
+	background-color: #e1bb53;
+	color: #FFFFFF !important;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/partyevaluatetopic/partyevaluatetopic.html

@@ -0,0 +1,37 @@
+<div class="box">
+	<div class="contents">
+		<div class="progress">
+			<div class="shade"></div>
+			<p></p>
+			<b></b>
+		</div>
+		<div class="topic">
+			<div class="title">
+				<p><span></span></p>
+				<div>一. 工作业绩 <span> ( 20分 ) </span></div>
+			</div>
+			<div class="topicCon">
+				<h1>优质完成任务。</h1>
+				<p>潜心教育培训，落实立德树人根本任务，按时保质保量完成本职各项工作任务。</p>
+				<ul>
+					<li><b>评分标准</b><span>(保留小数点最后一位)</span></li>
+					<p>若有参加封建迷信活动，工作中表现出信心不足、精神萎靡不振的现象，此项不得分。精神萎靡不振的现象精神萎靡不振的现象</p>
+				</ul>
+			</div>
+			<div class="footer">
+				<ol>
+					<li>分值：<span class="scorenum">7</span>分</li>
+					<li><input type="text" class="inputvalue" id="inputvalue"></li>
+				</ol>
+				<div class="buttons">
+					<p class="last">上一题</p>
+					<div style="width: 10px;"></div>
+					<p class="next">下一题</p>
+				</div>
+				<div class="lookButton">
+					<p>查看总分</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/partyevaluatetopic/partyevaluatetopic.js

@@ -0,0 +1,237 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2019-12-26 16:33
+ * 描  述：党员评价
+ */
+(function() {
+	var data = [
+		{
+			num:1,
+			title:'一，通知公告',
+			score:'80',
+			subhead:'优质完成任务',
+			subheadcon:'潜心教育培训，落实立德树人根本任务，按时保质保量完成本职各项工作任务',
+			gradetitle:'评分标准',
+			gradenum:'保留小数点最后一位',
+			gradecon:'若有参加封建迷信活动，工作中表现出信心不足、精神萎靡不振的现象，此项不得分。精神萎靡不振的现象精神萎靡不振的现象',
+			scorenum:'20'
+		},
+		{
+			num:2,
+			title:'二，专职22专访',
+			score:'100',
+			subhead:'访问222人员',
+			subheadcon:'悉心照料，耐心疏导',
+			gradetitle:'评分2222标准',
+			gradenum:'保留整数',
+			gradecon:'此项不得分。精神萎靡不振的现象精神萎靡不振的现象',
+			scorenum:'10'
+		},
+		{
+			num:3,
+			title:'三，红头33文件',
+			score:'30',
+			subhead:'优质任333务',
+			subheadcon:'潜心教育培训，落实立德树人根本任务，按时保质保量完成本职各项工作任务',
+			gradetitle:'结果判定',
+			gradenum:'无需结果',
+			gradecon:'精神萎靡不振的现象精神萎靡不振的现象',
+			scorenum:'40'
+		},
+		{
+			num:4,
+			title:'三，红头44文件',
+			score:'30',
+			subhead:'优质任334444443务',
+			subheadcon:'潜心教44444育培训，落实立德树人根本任务，按时保质保量完成本职各项工作任务',
+			gradetitle:'结果判4444定',
+			gradenum:'无需结果',
+			gradecon:'精神萎靡不振的现象精神萎靡不振的现象',
+			scorenum:'40'
+		},
+		];
+		
+		function loadData(data){
+			console.log("数据",data)
+			var titleCon = ''
+				titleCon+='<p>'+'<span>'+data.num+'</span>'+'</p>'+'<div>'+data.title+'<span>'+'（'+data.score+'）'+'</span>'+'</div>'
+			
+			$(".title").html(titleCon)
+			
+			var topicCon =""
+				topicCon +='<h1>'+data.subhead+'</h1>'+
+				'<p>'+data.subheadcon+'</p>'+
+				'<ul>'+
+				'<li>'+
+				'<b>'+data.gradetitle+'</b>'+
+				'<span>'+data.gradenum+'</span>'+
+				'</li>'+
+				'<p>'+data.gradecon+'</p>'
+				'</ul>'
+			$(".topicCon").html(topicCon)
+			var footerCon  = ''
+			    footerCon+='<li>'+'分值：'+
+				'<span calss="scorenum">'+ data.scorenum +'</span>'+
+				'</li>'+
+				'<li>'+'<input type="text" class="inputvalue" id="inputvalue">'+'</li>'
+				$(".footer ol").html(footerCon)
+		}
+	
+	var page = {
+		isScroll: false,
+		init: function($page) {
+			loadData(data[0])
+			// 当前题目
+			var num = 1
+			// 总数量
+			var total = data.length
+			// 单个宽度
+			var mom = 100 / total
+			if (num <= 1) {
+				$(".last").hide()
+				$(".next").addClass("homebuttom")
+			} else {
+				$(".buttons").hide()
+				$(".lookButton p").show()
+			}
+			$(".progress b").text(total)
+			$(".title p span").text(num)
+			// 最大分数值
+			var scorenum = data[num-1].scorenum
+			console.log("scorenum",scorenum)
+            // 题目数量
+			var valList = new Array(total).fill('')
+
+			$page.find('.next').on('tap', function() {
+				
+				$(".next").removeClass("homebuttom")
+				$(".next").css({
+					'background': '#e1bb53',
+					'color': '#FFFFFF'
+				})
+				$(".last").css({
+					'background': '#FFFFFF',
+					'color': '#e1bb53'
+				})
+				var val = $(".inputvalue").val()
+				console.log("val",val)
+				console.log("scorenum22222",scorenum)
+					console.log("scorenum999",(val - 0)<= (scorenum - 0))
+				if (val != "") {
+					if (Number(val)<= Number(scorenum)) {
+							
+						if (num <= total) {
+							// 点击下一题   要把当前题目的分数给了对应下标的数组
+							valList[num-1] = val
+							// 进入下一题  题目下标++
+							num++
+							loadData(data[num-1])
+							// 清空输入框
+							$(".inputvalue").val(valList[num-1])	
+							var ws = num * mom
+							$(".shade").width(ws + '%')
+							$(".title p span").text(num)
+							if (num > 1) {
+								$(".last").show()
+							}
+							if(num==total){
+								$(".buttons").hide()
+								$(".lookButton p").show()
+							}
+
+						}
+							
+					} else {
+						learun.layer.toast("分数不能大于最大值");
+					}
+				} else {
+					learun.layer.toast("分数不能为空");
+				}
+			});
+
+			$page.find('.last').on('tap', function() {
+				$(".last").css({
+					'background': '#e1bb53',
+					'color': '#FFFFFF'
+				})
+				$(".next").css({
+					'background': '#FFFFFF',
+					'color': '#e1bb53'
+				})
+				if (num => 1) {
+					$(".last").show()
+					if (num <= total - 1) {
+						--num
+						var ws = num * mom
+						$(".shade").width(ws + '%')
+						$(".title p span").text(num)
+						if (num <= 1) {
+							$(".last").hide()
+							$(".next").addClass("homebuttom")
+							$(".next").css({
+								'background': '#e1bb53',
+								'color': '#FFFFFF'
+							})
+						}
+						loadData(data[num-1])
+						// 点击上一题  从分数数组中取到上一题的分数 并且赋给输入框  num为当前题目序号  对应下标应-1
+						console.log(num,'num')
+						$(".inputvalue").val(valList[num-1])
+						
+						
+					}
+				} else {
+					num = 1
+					$(".last").hide()
+
+				}
+
+			});
+			// 查看总分
+			$page.find('.lookButton').on('tap', function() {
+				var val = $(".inputvalue").val()
+				if(val !=''){
+					if(Number(val)<= Number(scorenum)){
+						valList[valList.length-1] = val
+						// 计算数组和
+						function sum(arr) {
+						  var s = 0;
+						  for (var i=arr.length-1; i>=0; i--) {
+						    s += Number(arr[i]);
+						  }
+						  return s;
+						}
+						// learun.nav.closeCurrent();
+						learun.nav.go({
+							path: 'partyevaluate/answertotal',
+							title: '党员评价',
+							isBack: true,
+							isHead: true,
+							param: sum(valList),
+							type: 'right'
+						});
+						
+					}else{
+						learun.layer.toast("分数不能大于最大值");
+					}
+				}else{
+					learun.layer.toast("分数不能为空");
+				}
+				
+				
+				// learun.nav.getpage('partyevaluate');
+				// 	learun.nav.getpage();
+				// learun.nav.close('partyevaluate/partyevaluatetopic');
+				// learun.nav.getpage('partyevaluate/partyevaluatetopic);
+			});
+
+		},
+		// beforedestroy: function(pageinfo) {
+		// 	return true; // false 就不关闭
+		// },
+		// destroy: function(pageinfo) {},
+		// reload: function($page, pageinfo) {}
+	};
+	return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/succeed/succeed.css

@@ -0,0 +1,63 @@
+.box {
+	height: 100%;
+	width: 100%;
+	background: url(../../images/content.png);
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+	/* position: relative; */
+}
+
+.succeedcontent {
+	position: relative;
+	background-color: #FFFFFF;
+	height: 70%;
+	top: 20%;
+	width: 93%;
+	margin: 0 auto;
+	border-radius: 10px;
+}
+
+.succeedtopic {
+	height: 250px;
+}
+
+.succeedscore {
+	width: 175px;
+	height: 175px;
+	background: url(../../images/succeed.png);
+	background-repeat: no-repeat;
+	background-size: 100% 100%;
+	position: relative;
+	top: 58%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.texts {
+	height: 30px;
+	/* background-color: red; */
+	text-align: center;
+}
+
+.succeedlookButton {
+	width: 80%;
+	float: none;
+	position: absolute;
+	bottom: 0%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.succeedlookButton p {
+	background-color: #e1bb53;
+	margin: 0 auto;
+	color: #FFFFFF;
+	border-radius: 25px;
+	font-size: 18px;
+	color: #FFFFFF;
+	width: 80%;
+	height: 36px;
+	text-align: center;
+	line-height: 36px;
+	margin-bottom: 10px;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluate/succeed/succeed.html

@@ -0,0 +1,13 @@
+<div class="box">
+	<div class="succeedcontent">
+		<div class="succeedtopic">
+			<div class="succeedscore">
+			</div>
+          
+		</div>
+		  <p class="texts">提交成功</p>
+		<!-- <div class="succeedlookButton">
+			<p>提交</p>
+		</div> -->
+	</div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatxz/partyevaluatxz.css

@@ -0,0 +1,3 @@
+.lr-btn-join {
+    background-color: #007aff !important;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatxz/partyevaluatxz.html

@@ -0,0 +1,19 @@
+<div class="lr-page lr-partyevaluatxz-page">
+    <div class="lr-page-tool">
+        <div class="lr-tool-left">
+            总共<span class="lr-badge lr-badge-primary">0</span>条
+        </div>
+        <div class="lr-tool-right">
+            <!-- <div class="lr-tool-right-btn lr_multiple_search">
+                <i class="iconfont icon-searchlist"></i>
+                <div class="lr-tool-right-btn-content lr-form-container">
+                    <div class="lr-form-row">
+                        <label>社团名称</label>
+                        <input id="CommunityName" type="text">
+                    </div>
+                </div>
+            </div> -->
+        </div>
+    </div>
+    <div class="lr-page-content" id="lr_partyevaluatxz_list"></div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatxz/partyevaluatxz.js

@@ -0,0 +1,153 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-01-04 11:47
+ * 描  述：社团管理
+ */
+(function () {
+    var begin = '';
+    var end = '';
+    var multipleData = null;
+    var page = {
+        grid: null,
+        init: function ($page) {
+            begin = '';
+            end = '';
+            multipleData = null;
+            page.grid = $page.find('#lr_partyevaluatxz_list').lrpagination({
+                lclass: page.lclass,
+                rows: 10,                            // 每页行数
+                getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
+                    param.multipleData = multipleData;
+                    page.loadData(param, callback, $page);
+                },
+                renderData: function (_index, _item, _$item) {// 渲染数据模板
+                    return page.rowRender(_index, _item, _$item, $page);
+                },
+                click: function (item, $item, $et) {// 列表行点击事件
+				//提交
+                    if ($et.hasClass('lr-btn-blue')) {
+                        page.btnClick(item, $item, $page);
+                    }
+                    else if ($et.hasClass('lr-btn-green')) {
+                        page.btnPJClick(item, $item, $page);
+                    }
+                    else {
+                        //page.rowClick(item, $item, $page);
+                    }
+                },
+                btns: page.rowBtns
+            });
+            // 多条件查询
+            var $multiple = $page.find('.lr_multiple_search').multiplequery({
+                callback: function (data) {
+                    begin = '';
+                    end = '';
+                    multipleData = data || {};
+                    page.grid.reload();
+                }
+            });
+            $page.find('#lr_partyevaluatxz_btn').on('tap', function () {
+                //learun.nav.go({ path: 'PersonnelManagement/CommunityInfo/form', title: '新增', type: 'right' });
+            });
+        },
+        lclass: 'lr-list',
+        loadData: function (param, callback, $page) {// 列表加载后台数据
+            var _postParam = {
+                pagination: {
+                    rows: param.rows,
+                    page: param.page,
+                    sidx: '',//t. desc,t.ScoreQuarter desc
+                    //sord: 'asc'
+                },
+                queryJson: '{}'
+            };
+			var account = learun.storage.get('logininfo').account;
+			_postParam.queryJson=JSON.stringify({ account:account });
+            if (param.multipleData) {
+                _postParam.queryJson = JSON.stringify(multipleData);
+            }
+            if (param.begin && param.end) {
+                _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end });
+            }
+			
+            learun.httpget(config.webapi + 'learun/adms/evaluatingindicator/GetEvaluationListForXZ', _postParam, (data) => {
+                $page.find('.lr-badge').text('0');
+                if (data) {
+                    $page.find('.lr-badge').text(data.records);
+                    callback(data.rows, parseInt(data.records));
+                }
+                else {
+                    callback([], 0);
+                }
+            });
+        },
+        rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据
+		var status=_item.Status;
+		var statusname='';
+		if (status == '-1') 
+		{
+		                                statusname='未打分';
+		                            }
+		                            else if (status == '0') {
+		                                statusname= '草稿';
+		                            }
+		                            else if (status == '1') {
+		                                statusname= '已提交';
+		                            }
+		                            // else if (status == '2') {
+		                            //     statusname= '审核通过';
+		                            // }
+		                            // else if (status == '3') {
+		                            //     statusname= '审核未通过';
+		                            // }
+            _$item.addClass('lr-list-item lr-list-item-multi');
+            _$item.append($('<p class="lr-ellipsis"><span>姓名:</span></p>').dataFormatter({ value: _item.empname }));
+            _$item.append($('<p class="lr-ellipsis"><span>党员编号:</span></p>').dataFormatter({ value: _item.empno }));
+            _$item.append($('<p class="lr-ellipsis"><span>年度:</span></p>').dataFormatter({ value: _item.ScoreYear }));
+            _$item.append($('<p class="lr-ellipsis"><span>季度:</span></p>').dataFormatter({ value: _item.ScoreQuarter }));
+            _$item.append($('<p class="lr-ellipsis"><span>分值:</span></p>').dataFormatter({ value: _item.Scorexz }));
+            _$item.append($('<p class="lr-ellipsis"><span>状态:</span></p>').dataFormatter({ value: statusname }));
+            return '';
+        },
+        // rowClick: function (item, $item, $page) {// 列表行点击触发方法
+        //     learun.nav.go({ path: 'PersonnelManagement/CommunityInfo/form', title: '详情', type: 'right', param: { keyValue: item.Id } });
+        // },
+        btnClick: function (item, $item, $page) {// 左滑按钮点击事件
+		var status=item.Status;
+		if(status == '-1')
+		{
+			learun.layer.toast("当前项目未打分，请先评价!");
+			return;
+		}
+		else if(status != '0')
+		{
+			learun.layer.toast("当前项目已提交!");
+			return;
+		}
+           learun.layer.confirm('确定要提交该项数据吗？', function (_index) {
+               if (_index === '1') {
+                   learun.layer.loading(true, '正在提交...');
+                   learun.httppost(config.webapi + 'learun/adms/evaluatingindicator/submitevaluationforzp', {Assessed:item.BeAssessed,Status:1}, (data) => {
+                       if (data) {// 提交数据成功
+                           page.grid.reload();
+                       }
+                       learun.layer.loading(false);
+                   });
+               }
+           }, '智慧校园提示', ['取消', '确定']);
+        },
+        btnPJClick: function (item, $item, $page) {// 左滑按钮点击事件
+            learun.layer.confirm('确定要打分吗？', function (_index) {
+                if (_index === '1') {
+                    
+                }
+            }, '智慧校园提示', ['取消', '确定']);
+        },
+        rowBtns: [
+			'<a class="lr-btn-blue">提交</a>',
+			'<a class="lr-btn-green">打分</a>',
+			] // 列表行左滑按钮
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatzp/partyevaluatzp.css

@@ -0,0 +1,3 @@
+.lr-btn-join {
+    background-color: #007aff !important;
+}

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatzp/partyevaluatzp.html

@@ -0,0 +1,19 @@
+<div class="lr-page lr-partyevaluatzp-page">
+    <div class="lr-page-tool">
+        <div class="lr-tool-left">
+            总共<span class="lr-badge lr-badge-primary">0</span>条
+        </div>
+        <div class="lr-tool-right">
+            <!-- <div class="lr-tool-right-btn lr_multiple_search">
+                <i class="iconfont icon-searchlist"></i>
+                <div class="lr-tool-right-btn-content lr-form-container">
+                    <div class="lr-form-row">
+                        <label>社团名称</label>
+                        <input id="CommunityName" type="text">
+                    </div>
+                </div>
+            </div> -->
+        </div>
+    </div>
+    <div class="lr-page-content" id="lr_partyevaluatzp_list"></div>
+</div>

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/pages/partyevaluatzp/partyevaluatzp.js

@@ -0,0 +1,152 @@
+/* * 版 本 Learun-ADMS-Ultimate V7.0.0 数字化智慧校园(http://www.learun.cn) 
+ * Copyright (c) 2013-2018 北京泉江科技有限公司 
+ * 创建人：超级管理员
+ * 日  期：2020-01-04 11:47
+ * 描  述：社团管理
+ */
+(function () {
+    var begin = '';
+    var end = '';
+    var multipleData = null;
+    var page = {
+        grid: null,
+        init: function ($page) {
+            begin = '';
+            end = '';
+            multipleData = null;
+            page.grid = $page.find('#lr_partyevaluatzp_list').lrpagination({
+                lclass: page.lclass,
+                rows: 10,                            // 每页行数
+                getData: function (param, callback) {// 获取数据 param 分页参数,callback 异步回调
+                    param.multipleData = multipleData;
+                    page.loadData(param, callback, $page);
+                },
+                renderData: function (_index, _item, _$item) {// 渲染数据模板
+                    return page.rowRender(_index, _item, _$item, $page);
+                },
+                click: function (item, $item, $et) {// 列表行点击事件
+				//提交
+                    if ($et.hasClass('lr-btn-blue')) {
+                        page.btnClick(item, $item, $page);
+                    }
+                    else if ($et.hasClass('lr-btn-green')) {
+                        page.btnPJClick(item, $item, $page);
+                    }
+                    else {
+                        //page.rowClick(item, $item, $page);
+                    }
+                },
+                btns: page.rowBtns
+            });
+            // 多条件查询
+            var $multiple = $page.find('.lr_multiple_search').multiplequery({
+                callback: function (data) {
+                    begin = '';
+                    end = '';
+                    multipleData = data || {};
+                    page.grid.reload();
+                }
+            });
+            $page.find('#lr_partyevaluatzp_btn').on('tap', function () {
+                //learun.nav.go({ path: 'PersonnelManagement/CommunityInfo/form', title: '新增', type: 'right' });
+            });
+        },
+        lclass: 'lr-list',
+        loadData: function (param, callback, $page) {// 列表加载后台数据
+            var _postParam = {
+                pagination: {
+                    rows: param.rows,
+                    page: param.page,
+                    sidx: '',//t. desc,t.ScoreQuarter desc
+                    //sord: 'asc'
+                },
+                queryJson: '{}'
+            };
+			var account = learun.storage.get('logininfo').account;
+			_postParam.queryJson=JSON.stringify({ account:account });
+            if (param.multipleData) {
+                _postParam.queryJson = JSON.stringify(multipleData);
+            }
+            if (param.begin && param.end) {
+                _postParam.queryJson = JSON.stringify({ StartTime: param.begin, EndTime: param.end });
+            }
+			
+            learun.httpget(config.webapi + 'learun/adms/evaluatingindicator/gezplist', _postParam, (data) => {
+                $page.find('.lr-badge').text('0');
+                if (data) {
+                    $page.find('.lr-badge').text(data.records);
+                    callback(data.rows, parseInt(data.records));
+                }
+                else {
+                    callback([], 0);
+                }
+            });
+        },
+        rowRender: function (_index, _item, _$item, $page) {// 渲染列表行数据
+		var status=_item.Status;
+		var statusname='';
+		if (status == '-1') 
+		{
+		                                statusname='未打分';
+		                            }
+		                            else if (status == '0') {
+		                                statusname= '草稿';
+		                            }
+		                            else if (status == '1') {
+		                                statusname= '已提交';
+		                            }
+		                            // else if (status == '2') {
+		                            //     statusname= '审核通过';
+		                            // }
+		                            // else if (status == '3') {
+		                            //     statusname= '审核未通过';
+		                            // }
+            _$item.addClass('lr-list-item lr-list-item-multi');
+            _$item.append($('<p class="lr-ellipsis"><span>年度:</span></p>').dataFormatter({ value: _item.ScoreYear }));
+            _$item.append($('<p class="lr-ellipsis"><span>季度:</span></p>').dataFormatter({ value: _item.ScoreQuarter }));
+            _$item.append($('<p class="lr-ellipsis"><span>自评分值:</span></p>').dataFormatter({ value: _item.ScoreZP }));
+            _$item.append($('<p class="lr-ellipsis"><span>状态:</span></p>').dataFormatter({ value: statusname }));
+            return '';
+        },
+        // rowClick: function (item, $item, $page) {// 列表行点击触发方法
+        //     learun.nav.go({ path: 'PersonnelManagement/CommunityInfo/form', title: '详情', type: 'right', param: { keyValue: item.Id } });
+        // },
+        btnClick: function (item, $item, $page) {// 左滑按钮点击事件
+		var status=item.Status;
+		if(status == '-1')
+		{
+			learun.layer.toast("当前项目未打分，无法提交!");
+			return;
+		}
+		else if(status != '0')
+		{
+			learun.layer.toast("当前项目已提交!");
+			return;
+		}
+           learun.layer.confirm('确定要提交该项数据吗？', function (_index) {
+               if (_index === '1') {
+                   learun.layer.loading(true, '正在提交...');
+                   learun.httppost(config.webapi + 'learun/adms/evaluatingindicator/submitevaluationforzp', {Assessed:item.BeAssessed,Status:1}, (data) => {
+                       if (data) {// 提交数据成功
+                           page.grid.reload();
+                       }
+                       learun.layer.loading(false);
+                   });
+               }
+           }, '智慧校园提示', ['取消', '确定']);
+        },
+        btnPJClick: function (item, $item, $page) {// 左滑按钮点击事件
+		learun.nav.go({ path: 'PartyevaluatQuestionsZP', title: '党员自评', type: 'right', param: { ScoreYear: item.ScoreYear ,ScoreQuarter:item.ScoreQuarter} });
+            // learun.layer.confirm('确定要自评打分吗？', function (_index) {
+            //     if (_index === '1') {
+            //         learun.nav.go({ path: 'partyevaluate', title: '党员自评', type: 'right' });
+            //     }
+            // }, '智慧校园提示', ['取消', '确定']);
+        },
+        rowBtns: [
+			'<a class="lr-btn-blue">提交</a>',
+			'<a class="lr-btn-green">自评打分</a>',
+			] // 列表行左滑按钮
+    };
+    return page;
+})();

Learun.Framework.Ultimate V7/Learun.Application.Mobile/www/scripts/index.js

@@ -1,4 +1,4 @@
-// 有关“空白”模板的简介，请参阅以下文档:
+// 有关“空白”模板的简介，请参阅以下文档:
 // http://go.microsoft.com/fwlink/?LinkID=397704
 // 若要在 cordova-simulate 或 Android 设备/仿真器上在页面加载时调试代码: 启动应用，设置断点，
 // 然后在 JavaScript 控制台中运行 "window.location.reload()"。
@@ -37,41 +37,23 @@
         document.addEventListener('pause', onPause.bind(this), false);
         document.addEventListener('resume', onResume.bind(this), false);
         learun.tab.init(tabdata);
-		//直接登录
-		var data = {
-		    username: '',
-			password: $.md5('www.qj.com')			
-		};
-		var postdata = {
-		    token: '',
-		    loginMark: learun.deviceId(),// 正式请换用设备号
-		    data: JSON.stringify(data)
-		};
-		learun.http.post(path + "learun/adms/user/logindt", postdata, (res) => {
-			var logininfo = {
-			    account: account,
-			    token: res.data.baseinfo.token,
-			    date: learun.date.format(new Date(), 'yyyy-MM-dd hh:mm:ss')
-			};
-			learun.storage.set('logininfo', logininfo);
-			learun.storage.set('userinfo', res.data);
-			var logininfo = learun.storage.get('logininfo');
-			if (logininfo) {// 有登录的token
-			    learun.tab.go('workspace');
-			    // $.ajax({
-			    //     url: config.webapi + "weixinapi/weixinconfig",
-			    //     type: "get",
-			    //     success: function (res) {
-			    //         learun.storage.set('weixinappid', res.data.appid );
-			    //         learun.storage.set('weixinappsecret', res.data.secret );
-			    //     }
-			    // });
-			}
-			else {
-			    learun.nav.go({ path: 'login', isBack: false, isHead: false });
-			}
-			learun.splashscreen.hide();
-		});
+
+        var logininfo = learun.storage.get('logininfo');
+        if (logininfo) {// 有登录的token
+            learun.tab.go('workspace');
+            $.ajax({
+                url: config.webapi + "weixinapi/weixinconfig",
+                type: "get",
+                success: function (res) {
+                    learun.storage.set('weixinappid', res.data.appid );
+                    learun.storage.set('weixinappsecret', res.data.secret );
+                }
+            });
+        }
+        else {
+            learun.nav.go({ path: 'login', isBack: false, isHead: false });
+        }
+        learun.splashscreen.hide();
     });
 
     function onPause() {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DT_EvaluationDataController.cs

@@ -38,7 +38,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             return View();
         }
         /// <summary>
-        /// 表单页
+        /// 
         /// <summary>
         /// <returns></returns>
         [HttpGet]
@@ -46,7 +46,6 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         {
             return View();
         }
-
         #endregion
 
         #region 获取数据

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/DT_EvaluationDataMainController.cs

@@ -15,7 +15,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
     /// </summary>
     public class DT_EvaluationDataMainController : MvcControllerBase
     {
-        private DT_EvaluationDataMainIBLL dT_EvaluationDataMainIBLL = new DT_EvaluationDataMainBLL();
+        private DT_EvaluationDataMainIBLL dT_EvaluationDataMainIBLL = new DT_EvaluationDataMainBLL(); //党员小组
+        private DT_PartyMemberGroupIBLL partyMemberGroupIBLL = new DT_PartyMemberGroupBLL();
+        private DT_EvaluationDataIBLL dT_EvaluationDataIBLL = new DT_EvaluationDataBLL();
 
         #region 视图功能
 
@@ -26,8 +28,27 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Index()
         {
-             return View();
+            return View();
         }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult IndexXF()
+        {
+            return View();
+        }
+        /// <summary>
+        /// 主页面
+        /// <summary>
+        /// <returns></returns>
+        [HttpGet]
+        public ActionResult FormXF()
+        {
+            return View();
+        }
+
         /// <summary>
         /// 表单页
         /// <summary>
@@ -35,7 +56,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [HttpGet]
         public ActionResult Form()
         {
-             return View();
+            return View();
         }
         #endregion
 
@@ -62,6 +83,54 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 下发评价--获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPageListXF(string pagination, string queryJson)
+        {
+            Pagination paginationobj = pagination.ToObject<Pagination>();
+            var data = dT_EvaluationDataMainIBLL.GetPageListXF(paginationobj, queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = paginationobj.total,
+                page = paginationobj.page,
+                records = paginationobj.records
+            };
+            return Success(jsonData);
+        }
+
+        /// <summary>
+        /// 获取年份yyyy
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetScoreYear()
+        {
+            var data = WebHelper.GenerateNearByYear();
+
+            return Success(data);
+        }
+        /// <summary>
+        /// 获取党小组列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetPartyMemberGroupList()
+        {
+            var data = partyMemberGroupIBLL.GetList("");
+
+            return Success(data);
+        }
+        
         /// <summary>
         /// 获取表单数据
         /// </summary>
@@ -71,8 +140,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         [AjaxOnly]
         public ActionResult GetFormData(string keyValue)
         {
-            var DT_EvaluationDataMainData = dT_EvaluationDataMainIBLL.GetDT_EvaluationDataMainEntity( keyValue );
-            var jsonData = new {
+            var DT_EvaluationDataMainData = dT_EvaluationDataMainIBLL.GetDT_EvaluationDataMainEntity(keyValue);
+            var jsonData = new
+            {
                 DT_EvaluationDataMain = DT_EvaluationDataMainData,
             };
             return Success(jsonData);
@@ -80,7 +150,20 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         #endregion
 
         #region 提交数据
-
+        /// <summary>
+        /// 下发评价
+        /// </summary>
+        /// <param name="strEntity"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [AjaxOnly]
+        public ActionResult AddEvaluationData(string strEntity)
+        {
+            DT_EvaluationDataMainEntity entity = strEntity.ToObject<DT_EvaluationDataMainEntity>();
+            dT_EvaluationDataIBLL.AddEvaluationData(entity.ScoreYear, entity.ScoreQuarter, entity.PartyMemberGroupId);
+            return Success("下发成功！");
+        }
+        
         /// <summary>
         /// 删除实体数据
         /// </summary>
@@ -105,7 +188,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
         public ActionResult SaveForm(string keyValue, string strEntity)
         {
             DT_EvaluationDataMainEntity entity = strEntity.ToObject<DT_EvaluationDataMainEntity>();
-            dT_EvaluationDataMainIBLL.SaveEntity(keyValue,entity);
+            dT_EvaluationDataMainIBLL.SaveEntity(keyValue, entity);
             if (string.IsNullOrEmpty(keyValue))
             {
             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationData/IndexXZ.js

@@ -40,11 +40,11 @@ var bootstrap = function ($, learun) {
                         label: "组长", name: "Assessed", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'empno',
                                 callback: function (_data) {
-                                    callback(_data['name']);
+                                    callback(_data['empname']);
                                 }
                             });
                         }
@@ -61,14 +61,14 @@ var bootstrap = function ($, learun) {
                                 return '草稿';
                             }
                             else if (value == '1') {
-                                return '待审核';
-                            }
-                            else if (value == '2') {
-                                return '审核通过';
-                            }
-                            else if (value == '3') {
-                                return '审核未通过';
+                                return '已提交';
                             }
+                            //else if (value == '2') {
+                            //    return '审核通过';
+                            //}
+                            //else if (value == '3') {
+                            //    return '审核未通过';
+                            //}
                         }
                     },
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/FormXF.cshtml

@@ -0,0 +1,20 @@
+@{
+    ViewBag.Title = "党员评价考核主表";
+    Layout = "~/Views/Shared/_Form.cshtml";
+}
+<div class="lr-form-wrap" id="form">
+    <div class="col-xs-12 lr-form-item"  data-table="DT_EvaluationDataMain" >
+        <div class="lr-form-item-title">年度<font face="宋体">*</font></div>
+        <div id="ScoreYear"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="DT_EvaluationDataMain">
+        <div class="lr-form-item-title">季度<font face="宋体">*</font></div>
+        <div id="ScoreQuarter"></div>
+    </div>
+    <div class="col-xs-12 lr-form-item"  data-table="DT_EvaluationDataMain" >
+        <div class="lr-form-item-title">党小组<font face="宋体">*</font></div>
+        <div id="PartyMemberGroupId"></div>
+    </div>
+    
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/FormXF.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/FormXF.js

@@ -0,0 +1,68 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2021-12-09 16:16
+ * 描  述：党员评价考核主表
+ */
+var acceptClick;
+var keyValue = request('keyValue');
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            $('.lr-form-wrap').lrscroll();
+            page.bind();
+            page.initData();
+        },
+        bind: function () {
+            //年度
+            $('#ScoreYear').lrselect({
+                placeholder: "请选择年度",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/GetScoreYear',
+                value: 'value',
+                text: 'text'
+            });
+            $('#ScoreQuarter').lrselect({ data: [{ id: '1', text: '一' }, { id: '2', text: '二' }, { id: '3', text: '三' }, { id: '4', text: '四' }] });
+
+            //党小组
+            $('#PartyMemberGroupId').lrselect({
+                placeholder: "请选择党小组",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/GetPartyMemberGroupList',
+                value: 'Id',
+                text: 'Name'
+            });
+        },
+        initData: function () {
+            if (!!keyValue) {
+                $.lrSetForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/GetFormData?keyValue=' + keyValue, function (data) {
+                    for (var id in data) {
+                        if (!!data[id].length && data[id].length > 0) {
+                            $('#' + id).jfGridSet('refreshdata', data[id]);
+                        }
+                        else {
+                            $('[data-table="' + id + '"]').lrSetFormData(data[id]);
+                        }
+                    }
+                });
+            }
+        }
+    };
+    // 保存数据
+    acceptClick = function (callBack) {
+        if (!$('body').lrValidform()) {
+            return false;
+        }
+        var postData = {
+            strEntity: JSON.stringify($('body').lrGetFormData())
+        };
+        $.lrSaveForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/AddEvaluationData', postData, function (res) {
+            // 保存成功后才回调
+            if (!!callBack) {
+                callBack();
+            }
+        });
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/Index.js

@@ -127,11 +127,11 @@ var bootstrap = function ($, learun) {
                         label: "被考核党员", name: "BeAssessed", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
                             learun.clientdata.getAsync('custmerData', {
-                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                 key: value,
-                                keyId: 'id',
+                                keyId: 'empno',
                                 callback: function (_data) {
-                                    callback(_data['name']);
+                                    callback(_data['empname']);
                                 }
                             });
                         }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/IndexXF.cshtml

@@ -0,0 +1,45 @@
+@{
+    ViewBag.Title = "下发评价";
+    Layout = "~/Views/Shared/_Index.cshtml";
+}
+<div class="lr-layout ">
+    <div class="lr-layout-center">
+        <div class="lr-layout-wrap lr-layout-wrap-notitle ">
+            <div class="lr-layout-tool">
+                <div class="lr-layout-tool-left">
+                    <div class="lr-layout-tool-item">
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">年度</div>
+                                    <div id="ScoreYear"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">季度</div>
+                                    <div id="ScoreQuarter">
+                                    </div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">党小组</div>
+                                    <div id="PartyMemberGroupId"></div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="lr-layout-tool-right">
+                    <div class=" btn-group btn-group-sm">
+                        <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
+                    </div>
+                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                        <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;下发评价</a>
+                        @*<a id="lr_search"  class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;查看详情</a>*@
+                        <a id="lr_print" class="btn btn-default"><i class="fa fa-print"></i>&nbsp;打印</a>
+                    </div>
+                </div>
+            </div>
+            <div class="lr-layout-body" id="gridtable"></div>
+        </div>
+    </div>
+</div>
+@Html.AppendJsFile("/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/IndexXF.js")

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_EvaluationDataMain/IndexXF.js

@@ -0,0 +1,164 @@
+/* * 版 本 Learun-ADMS V7.0.6 力软敏捷开发框架(http://www.learun.cn)
+ * Copyright (c) 2013-2020 力软信息技术（苏州）有限公司
+ * 创建人：超级管理员
+ * 日  期：2022-01-05 15:07
+ * 描  述：下发评价
+ */
+var refreshGirdData;
+var bootstrap = function ($, learun) {
+    "use strict";
+    var page = {
+        init: function () {
+            page.initGird();
+            page.bind();
+        },
+        bind: function () {
+            $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
+                page.search(queryJson);
+            }, 220, 400);
+            //年度
+            $('#ScoreYear').lrselect({
+                placeholder: "请选择年度",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/GetScoreYear',
+                value: 'value',
+                text: 'text'
+            });
+            $('#ScoreQuarter').lrselect({ data: [{ id: '1', text: '一' }, { id: '2', text: '二' }, { id: '3', text: '三' }, { id: '4', text: '四' }] });
+            //党小组
+            $('#PartyMemberGroupId').lrselect({
+                placeholder: "请选择党小组",
+                allowSearch: true,
+                url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/GetPartyMemberGroupList',
+                value: 'Id',
+                text: 'Name'
+            });
+            // 刷新
+            $('#lr_refresh').on('click', function () {
+                location.reload();
+            });
+            // 下发评价
+            $('#lr_add').on('click', function () {
+                learun.layerForm({
+                    id: 'form',
+                    title: '下发评价',
+                    url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/FormXF',
+                    width: 600,
+                    height: 400,
+                    callBack: function (id) {
+                        return top[id].acceptClick(refreshGirdData);
+                    }
+                });
+            });
+            ////查看详情
+            //$('#lr_search').on('click', function () {
+            //    var keyValue = $('#gridtable').jfGridValue('Id');
+            //    if (learun.checkrow(keyValue)) {
+            //        learun.layerConfirm('是否确认删除该项！', function (res) {
+            //            if (res) {
+            //                learun.deleteForm(top.$.rootUrl + '/PersonnelManagement/DT_EvaluationData/DeleteForm', { keyValue: keyValue}, function () {
+            //                    refreshGirdData();
+            //                });
+            //            }
+            //        });
+            //    }
+            //});
+            // 打印
+            $('#lr_print').on('click', function () {
+                $('#gridtable').jqprintTable();
+            });
+        },
+        // 初始化列表
+        initGird: function () {
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/PersonnelManagement/DT_EvaluationDataMain/GetPageListXF',
+                headData: [
+                    { label: "年度", name: "ScoreYear", width: 100, align: "left" },
+                    { label: "季度", name: "ScoreQuarter", width: 100, align: "left" },
+                    { label: "党小组", name: "PartyMemberGroupName", width: 150, align: "left" },
+                    {
+                        label: "组长", name: "GroupLeader", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            if (value.indexOf(',') != -1) {
+                                var content = '';
+                                var arr = value.split(',');
+                                for (var i = 0; i < arr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData', {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                        key: arr[i],
+                                        keyId: 'empno',
+                                        callback: function (_data) {
+                                            content += _data['empname'] + ',';
+                                        }
+                                    });
+
+                                }
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                    key: value,
+                                    keyId: 'empno',
+                                    callback: function (_data) {
+                                        callback(_data['empname']);
+                                    }
+                                });
+                            }
+                        }
+                    },
+                    {
+                        label: "组员", name: "PartyMember", width: 200, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            if (value.indexOf(',') != -1) {
+                                var content = '';
+                                var arr = value.split(',');
+                                for (var i = 0; i < arr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData', {
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                        key: arr[i],
+                                        keyId: 'empno',
+                                        callback: function (_data) {
+                                            content += _data['empname'] + ',';
+                                        }
+                                    });
+
+                                }
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                    key: value,
+                                    keyId: 'empno',
+                                    callback: function (_data) {
+                                        callback(_data['empname']);
+                                    }
+                                });
+                            }
+                        }
+                    },
+                    {
+                        label: "状态", name: "", width: 100, align: "left",
+                        formatter: function (value, row) {
+                            return "<span class=\"label label-success\">已下发</span>";
+                        }
+                    },
+                ],
+                mainId:'Id',
+                isPage: true,
+                sidx: 'ScoreYear DESC,ScoreQuarter DESC,GOrder ASC',
+            });
+            page.search();
+        },
+        search: function (param) {
+            param = param || {};
+            
+            $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
+        }
+    };
+    refreshGirdData = function () {
+        $('#gridtable').jfGridSet('reload');
+    };
+    page.init();
+}

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_PartyMemberGroup/Form.js

@@ -16,26 +16,43 @@ var bootstrap = function ($, learun) {
         },
         bind: function () {
             //组长
-            $('#GroupLeader').lrselect(
-                {
-                    allowSearch: true,
-                    type: 'multiple',
-                    url: top.$.rootUrl + '/PersonnelManagement/PartyMember/GetList',
-                    param: { strWhere: " CheckStatus=1 " },
-                    value: "ID",
-                    text: "Name"
-                 
+            //$('#GroupLeader').lrDataSourceSelect({ code: 'EmpInfo', value: 'empno', text: 'empname', type: 'multiple' });
+            $('#GroupLeader').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "PartyFaceNo ='01' " },
+                value: "empno",
+                text: "empname",
+                type: 'multiple',
             });
-            //组员
             $('#PartyMember').lrselect({
                 allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "PartyFaceNo ='01' " },
+                value: "empno",
+                text: "empname",
                 type: 'multiple',
-                url: top.$.rootUrl + '/PersonnelManagement/PartyMember/GetList',
-                param: { strWhere: " CheckStatus=1 " },
-                value: "ID",
-                text: "Name"
-
             });
+            //$('#GroupLeader').lrselect(
+            //    {
+            //        allowSearch: true,
+            //        type: 'multiple',
+            //        url: top.$.rootUrl + '/PersonnelManagement/PartyMember/GetList',
+            //        param: { strWhere: " CheckStatus=1 " },
+            //        value: "ID",
+            //        text: "Name"
+                 
+            //});
+            //组员
+            //$('#PartyMember').lrselect({
+            //    allowSearch: true,
+            //    type: 'multiple',
+            //    url: top.$.rootUrl + '/PersonnelManagement/PartyMember/GetList',
+            //    param: { strWhere: " CheckStatus=1 " },
+            //    value: "ID",
+            //    text: "Name"
+
+            //});
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/DT_PartyMemberGroup/Index.js

@@ -82,11 +82,11 @@ var bootstrap = function ($, learun) {
                                 var arr = value.split(',');
                                 for (var i = 0; i < arr.length; i++) {
                                     learun.clientdata.getAsync('custmerData', {
-                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                         key: arr[i],
-                                        keyId: 'id',
+                                        keyId: 'empno',
                                         callback: function (_data) {
-                                            content += _data['name'] + ',';
+                                            content += _data['empname'] + ',';
                                         }
                                     });
 
@@ -95,11 +95,11 @@ var bootstrap = function ($, learun) {
                                 callback(content);
                             } else {
                                 learun.clientdata.getAsync('custmerData', {
-                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                     key: value,
-                                    keyId: 'id',
+                                    keyId: 'empno',
                                     callback: function (_data) {
-                                        callback(_data['name']);
+                                        callback(_data['empname']);
                                     }
                                 });
                             }
@@ -113,11 +113,11 @@ var bootstrap = function ($, learun) {
                                 var arr = value.split(',');
                                 for (var i = 0; i < arr.length; i++) {
                                     learun.clientdata.getAsync('custmerData', {
-                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
+                                        url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                         key: arr[i],
-                                        keyId: 'id',
+                                        keyId: 'empno',
                                         callback: function (_data) {
-                                            content += _data['name'] + ',';
+                                            content += _data['empname'] + ',';
                                         }
                                     });
 
@@ -126,11 +126,11 @@ var bootstrap = function ($, learun) {
                                 callback(content);
                             } else {
                                 learun.clientdata.getAsync('custmerData', {
-                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'PartyMember',
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
                                     key: value,
-                                    keyId: 'id',
+                                    keyId: 'empno',
                                     callback: function (_data) {
-                                        callback(_data['name']);
+                                        callback(_data['empname']);
                                     }
                                 });
                             }

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember/Index.cshtml

@@ -11,13 +11,27 @@
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
                                 <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">名字</div>
-                                    <input id="Name" type="text" class="form-control" />
+                                    <div class="lr-form-item-title">姓名</div>
+                                    <input id="EmpName" type="text" class="form-control" />
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">联系电话</div>
+                                    <input id="mobile" type="text" class="form-control" />
+                                </div>
+                                
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">部门</div>
-                                    <div id="Department"></div>
+                                    <div id="F_DepartmentId"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">民族</div>
+                                    <div id="NationalityNo"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">性别</div>
+                                    <div id="GenderNo"></div>
+                                </div>
+
                             </div>
                         </div>
                     </div>
@@ -26,7 +40,7 @@
                     <div class=" btn-group btn-group-sm">
                         <a id="lr_refresh" class="btn btn-default"><i class="fa fa-refresh"></i></a>
                     </div>
-                    <div class=" btn-group btn-group-sm" learun-authorize="yes">
+                    @*<div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_add" class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;录入</a>
                         <a id="lr_edit" class="btn btn-default"><i class="fa fa-pencil-square-o"></i>&nbsp;修改</a>
                         <a id="lr_delete" class="btn btn-default"><i class="fa fa-trash-o"></i>&nbsp;删除</a>
@@ -34,7 +48,7 @@
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_check" class="btn btn-default"><i class="fa fa-lock"></i>&nbsp;审核</a>
                         <a id="lr_uncheck" class="btn btn-default"><i class="fa fa-unlock"></i>&nbsp;去审核</a>
-                    </div>
+                    </div>*@
                 </div>
             </div>
             <div class="lr-layout-body" id="gridtable"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Views/PartyMember/Index.js

@@ -15,8 +15,21 @@ var bootstrap = function ($, learun) {
         bind: function () {
             $('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
                 page.search(queryJson);
-            }, 220, 400);
-            $('#Department').lrDepartmentSelect();
+            }, 250, 400);
+            //民族
+            $('#NationalityNo').lrDataSourceSelect({ code: 'BCdNationality', value: 'nationalityno', text: 'nationality' });
+            //性别
+            $('#GenderNo').lrDataItemSelect({ code: 'usersexbit' });
+            // 部门选择
+            $('#F_DepartmentId').lrselect({
+                type: 'tree',
+                // 是否允许搜索
+                allowSearch: true,
+                // 访问数据接口地址
+                url: top.$.rootUrl + '/LR_OrganizationModule/Department/GetTreeNoCheck',
+                // 访问数据接口参数
+            });
+
             // 刷新
             $('#lr_refresh').on('click', function () {
                 location.reload();
@@ -93,55 +106,85 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
-                url: top.$.rootUrl + '/PersonnelManagement/PartyMember/GetPageList',
+            $('#gridtable').jfGrid({
+                url: top.$.rootUrl + '/EducationalAdministration/EmpInfo/GetPageList',
                 headData: [
-                    { label: "名字", name: "Name", width: 100, align: "left" },
+                    { label: "姓名", name: "EmpName", width: 100, align: "left" },
+                    { label: "党员编号", name: "EmpNo", width: 100, align: "left" },
                     {
-                        label: "性别", name: "Gender", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('dataItem', {
-                                key: value,
-                                code: 'usersex',
-                                callback: function (_data) {
-                                    callback(_data.text);
-                                }
-                            });
+                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
                         }
                     },
-                    { label: "职位", name: "Position", width: 100, align: "left" },
                     {
-                        label: "部门", name: "Department", width: 100, align: "left",
+                        label: "部门", name: "F_DepartmentId", width: 100, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                            learun.clientdata.getAsync('department', {
+                            learun.clientdata.getAsync('custmerData', {
+                                url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'classdata',
                                 key: value,
+                                keyId: 'f_departmentid',
                                 callback: function (_data) {
-                                    callback(_data.name);
+                                    callback(_data['f_fullname']);
                                 }
                             });
                         }
-                    },
-                    { label: "学历", name: "Education", width: 100, align: "left" },
-                    { label: "联系方式", name: "Mobile", width: 100, align: "left" },
-                    { label: "特长", name: "Speciality", width: 100, align: "left" },
-                    { label: "时间", name: "Time", width: 100, align: "left" },
-                    { label: "备注", name: "Remark", width: 100, align: "left" },
-                    {
-                        label: "审核状态", name: "CheckStatus", width: 100, align: "left",
-                        formatter: function (cellvalue, row) {
-                            if (cellvalue == 1) {
-                                return "<span class=\"label label-success\">审核通过</span>";
-                            } else if (cellvalue == 2) {
-                                return "<span class=\"label label-danger\">未通过</span>";
-                            }
-                            else {
-                                return "<span class=\"label label-default\">草稿</span>";
-                            }
-
+                    }, {
+                        label: "性别", name: "GenderNo", width: 80, align: "left",
+                        formatter: function (cellvalue) {
+                            return cellvalue == true ? "男" : "女";
                         }
                     },
+                    { label: "身份证号", name: "IdentityCardNo", width: 150, align: "left" },
+                    { label: "联系电话", name: "mobile", width: 100, align: "left" },
+
+
+                    //{ label: "名字", name: "Name", width: 100, align: "left" },
+                    //{
+                    //    label: "性别", name: "Gender", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('dataItem', {
+                    //            key: value,
+                    //            code: 'usersex',
+                    //            callback: function (_data) {
+                    //                callback(_data.text);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{ label: "职位", name: "Position", width: 100, align: "left" },
+                    //{
+                    //    label: "部门", name: "Department", width: 100, align: "left",
+                    //    formatterAsync: function (callback, value, row, op, $cell) {
+                    //        learun.clientdata.getAsync('department', {
+                    //            key: value,
+                    //            callback: function (_data) {
+                    //                callback(_data.name);
+                    //            }
+                    //        });
+                    //    }
+                    //},
+                    //{ label: "学历", name: "Education", width: 100, align: "left" },
+                    //{ label: "联系方式", name: "Mobile", width: 100, align: "left" },
+                    //{ label: "特长", name: "Speciality", width: 100, align: "left" },
+                    //{ label: "时间", name: "Time", width: 100, align: "left" },
+                    //{ label: "备注", name: "Remark", width: 100, align: "left" },
+                    //{
+                    //    label: "审核状态", name: "CheckStatus", width: 100, align: "left",
+                    //    formatter: function (cellvalue, row) {
+                    //        if (cellvalue == 1) {
+                    //            return "<span class=\"label label-success\">审核通过</span>";
+                    //        } else if (cellvalue == 2) {
+                    //            return "<span class=\"label label-danger\">未通过</span>";
+                    //        }
+                    //        else {
+                    //            return "<span class=\"label label-default\">草稿</span>";
+                    //        }
+
+                    //    }
+                    //},
                 ],
-                mainId: 'ID',
+                mainId: 'EmpId',
                 isPage: true,
                 isMultiselect: true
             });
@@ -149,6 +192,7 @@ var bootstrap = function ($, learun) {
         },
         search: function (param) {
             param = param || {};
+            param.PartyFaceNo = '01';
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -1523,6 +1523,8 @@
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRemove.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormTerminate.js" />
     <Content Include="Areas\PersonnelManagement\Views\ContractManagement\FormRenew.js" />
+    <Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\FormXF.js" />
+    <Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\IndexXF.js" />
     <Content Include="Areas\PersonnelManagement\Views\DT_EvaluationData\IndexXZ.js" />
     <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Form.js" />
     <Content Include="Areas\PersonnelManagement\Views\FundExaminer\Index.js" />
@@ -7660,6 +7662,8 @@
     <Content Include="Areas\CustomFunction\Views\ContractStandingBook\IndexZJ.cshtml" />
     <Content Include="Areas\CustomFunction\Views\ContractStandingBook\FormZJ.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\DT_EvaluationData\IndexXZ.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\IndexXF.cshtml" />
+    <Content Include="Areas\PersonnelManagement\Views\DT_EvaluationDataMain\FormXF.cshtml" />
     <None Include="Properties\PublishProfiles\CustomProfile.pubxml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingManagement\IndexOfMyJoin.cshtml" />
     <Content Include="Areas\PersonnelManagement\Views\MeetingSignInRecord\IndexAttendance.cshtml" />

Learun.Framework.Ultimate V7/Learun.Application.WebApi/Modules/PersonnelManagement/EvaluatingIndicatorApi.cs

@@ -21,6 +21,8 @@ namespace Learun.Application.WebApi.Modules
             //评价考核  下发评价
             Post["/addevaluationdata"] = AddEvaluationData;
 
+            //党员自评列表
+            Get["/gezplist"] = GeZPList;
             //党员自评返回list
             Get["/getevaluationlistforzp"] = GetEvaluationListForZP;
             //党员自评 提交/审核
@@ -90,6 +92,24 @@ namespace Learun.Application.WebApi.Modules
             return Success("已下发！");
         }
 
+        /// <summary>
+        /// 党员自评列表
+        /// </summary>
+        /// <param name="_"></param>
+        /// <returns></returns>
+        public Response GeZPList(dynamic _)
+        {
+            ReqPageParam parameter = this.GetReqData<ReqPageParam>();
+            var data = dT_EvaluationDataMainIBLL.GeZPList(parameter.pagination, parameter.queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = parameter.pagination.total,
+                page = parameter.pagination.page,
+                records = parameter.pagination.records
+            };
+            return Success(jsonData);
+        }
 
         /// <summary>
         /// 党员自评返回题目
@@ -104,7 +124,7 @@ namespace Learun.Application.WebApi.Modules
                 return Fail("参数不可空！");
             }
 
-            parameter.BeAssessed = LoginUserInfo.Get().userId;
+            //parameter.BeAssessed = LoginUserInfo.Get().userId;
             parameter.ScoreType = 1;
             var list = dT_EvaluationDataIBLL.GetListByWhere(parameter);
             return Success(list);
@@ -146,10 +166,19 @@ namespace Learun.Application.WebApi.Modules
         /// <returns></returns>
         public Response GetEvaluationListForXZ(dynamic _)
         {
-            //党员ID
-            string Assessed = this.GetReqData();
-            var list = dT_EvaluationDataMainIBLL.GetEvaluationListForXZ(Assessed);
-            return Success(list);
+            ReqPageParam parameter = this.GetReqData<ReqPageParam>();
+            var data = dT_EvaluationDataMainIBLL.GetEvaluationListForXZ(parameter.pagination, parameter.queryJson);
+            var jsonData = new
+            {
+                rows = data,
+                total = parameter.pagination.total,
+                page = parameter.pagination.page,
+                records = parameter.pagination.records
+            };
+            ////党员ID
+            //string Assessed = this.GetReqData();
+            //var list = dT_EvaluationDataMainIBLL.GetEvaluationListForXZ(Assessed);
+            return Success(jsonData);
         }
 
         /// <summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataBLL.cs

@@ -253,7 +253,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="scoreQuarter">季度</param>
         /// <param name="partyMemberGroupId">小组Id</param>
         /// <returns></returns>
-        public void AddEvaluationData(int scoreYear, int scoreQuarter, string partyMemberGroupId)
+        public void AddEvaluationData(int? scoreYear, int? scoreQuarter, string partyMemberGroupId)
         {
             try
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataIBLL.cs

@@ -56,7 +56,7 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="scoreQuarter">季度</param>
         /// <param name="partyMemberGroupId">小组Id</param>
         /// <returns></returns>
-        void AddEvaluationData(int scoreYear,int scoreQuarter,string partyMemberGroupId);
+        void AddEvaluationData(int? scoreYear,int? scoreQuarter,string partyMemberGroupId);
 
         #endregion
 

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationData/DT_EvaluationDataService.cs

@@ -150,8 +150,7 @@ e.Assessment as Assessment,e.ConductRequirements as ConductRequirements,e.MaxSco
         {
             try
             {
-                string sql = @"select t.*,
-(case t.Status when -1 then '未打分' when 0 then '草稿' when 1 then '待审核' when 2 then '审核通过' when 3 then '未通过' end) as StatusName,
+                string sql = @"select t.*,0 as scorePre,'评分标准' as gradetitle,'保留小数点后一位' as gradenum,
 m.BeAssessed,m.ScoreYear,m.ScoreQuarter,e.Assessment,e.ConductRequirements,e.CRRemark,e.MaxScore,e.ScoringCriteria  
 FROM DT_EvaluationData t  join DT_EvaluatingIndicator e on t.EvaluatingIndicatorId=e.Id 
 join DT_EvaluationDataMain m on t.MainId=m.Id
@@ -315,7 +314,7 @@ where t.MainId='{data.MainId}' and t.ScoreType='2'
             {
                 var entity = db.FindEntity<DT_EvaluationDataEntity>(Id);
                 db.BeginTrans();
-                
+
                 string sql =
                     $"update DT_EvaluationData set Status='{Status}' where ScoreType=3 and Id='{Id}'";
                 db.ExecuteBySql(sql);
@@ -474,7 +473,7 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
         /// <param name="scoreQuarter">季度</param>
         /// <param name="partyMemberGroupId">小组Id</param>
         /// <returns></returns>
-        public void AddEvaluationData(int scoreYear, int scoreQuarter, string partyMemberGroupId)
+        public void AddEvaluationData(int? scoreYear, int? scoreQuarter, string partyMemberGroupId)
         {
             var db = this.BaseRepository("CollegeMIS");
             try
@@ -578,6 +577,7 @@ join DT_EvaluationDataMain m on t.MainId=m.Id
                                     entity1.ScoreType = 3;
                                     entity1.Assessed = groupLeader;
                                     entity1.PartyMemberGroupId = partyMemberGroupId;
+                                    entity1.EOrder = 999;
                                     db.Insert(entity1);
                                 }
                             }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainBLL.cs

@@ -42,17 +42,61 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 }
             }
         }
+        
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">分页参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<DT_EvaluationDataMainEntity> GetPageListXF(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return dT_EvaluationDataMainService.GetPageListXF(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="Assessed"></param>
         /// <returns></returns>
-        public IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(string Assessed)
+        public IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                return dT_EvaluationDataMainService.GetEvaluationListForXZ(pagination, queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<DT_EvaluationDataMainEntity> GeZPList(Pagination pagination, string queryJson)
         {
             try
             {
-                return dT_EvaluationDataMainService.GetEvaluationListForXZ(Assessed);
+                return dT_EvaluationDataMainService.GeZPList(pagination, queryJson);
             }
             catch (Exception ex)
             {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainEntity.cs

@@ -19,11 +19,11 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         [Column("ID")]
         public string Id { get; set; }
-        /// <summary>
-        /// 党员小组Id
-        /// </summary>
-        [Column("PARTYMEMBERGROUPID")]
-        public string PartyMemberGroupId { get; set; }
+        ///// <summary>
+        ///// 党员小组Id
+        ///// </summary>
+        //[Column("PARTYMEMBERGROUPID")]
+        //public string PartyMemberGroupId { get; set; }
         /// <summary>
         /// 被考核党员
         /// </summary>
@@ -86,11 +86,30 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public string Status { get; set; }
+        
         [NotMapped]
         public string StatusName { get; set; }
         [NotMapped]
+        public string PartyMember { get; set; }
+        [NotMapped]
+        public string GroupLeader { get; set; }
+        [NotMapped]
         public string PartyMemberName { get; set; }
-
+        [NotMapped]
+        public string PartyMemberGroupName { get; set; }
+        [NotMapped]
+        public string PartyMemberGroupId { get; set; }
+        [NotMapped]
+        public int? GOrder { get; set; }
+        [NotMapped]
+        public string empno { get; set; }
+        [NotMapped]
+        public string empname { get; set; }
+        [NotMapped]
+        public string Scorexz { get; set; }
+        
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainIBLL.cs

@@ -21,7 +21,9 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<DT_EvaluationDataMainEntity> GetPageList(Pagination pagination, string queryJson);
-        IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(string Assessed);
+        IEnumerable<DT_EvaluationDataMainEntity> GetPageListXF(Pagination pagination, string queryJson);
+        IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(Pagination pagination, string queryJson);
+        IEnumerable<DT_EvaluationDataMainEntity> GeZPList(Pagination pagination, string queryJson);
         /// <summary>
         /// 获取DT_EvaluationDataMain表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/PersonnelManagement/DT_EvaluationDataMain/DT_EvaluationDataMainService.cs

@@ -41,10 +41,59 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
                 var dp = new DynamicParameters(new { });
                 if (!queryParam["BeAssessed"].IsEmpty())
                 {
-                    dp.Add("BeAssessed",queryParam["BeAssessed"].ToString(), DbType.String);
+                    dp.Add("BeAssessed", queryParam["BeAssessed"].ToString(), DbType.String);
                     strSql.Append(" AND t.BeAssessed = @BeAssessed ");
                 }
-                return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(strSql.ToString(),dp, pagination);
+                return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(strSql.ToString(), dp, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 下发评价--获取页面显示列表数据
+        /// </summary>
+        /// <param name="pagination">查询参数</param>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<DT_EvaluationDataMainEntity> GetPageListXF(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var strSql = new StringBuilder();
+                strSql.Append(@"select distinct t.ScoreYear,t.ScoreQuarter, g.Name as PartyMemberGroupName,g.PartyMember,g.GroupLeader,g.GOrder from DT_EvaluationDataMain t
+                join DT_EvaluationData e on t.Id = e.MainId
+                join DT_PartyMemberGroup g on g.id = e.PartyMemberGroupId ");
+                strSql.Append("  WHERE 1=1 ");
+                var queryParam = queryJson.ToJObject();
+                // 虚拟参数
+                var dp = new DynamicParameters(new { });
+                if (!queryParam["ScoreYear"].IsEmpty())
+                {
+                    dp.Add("ScoreYear", queryParam["ScoreYear"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ScoreYear = @ScoreYear ");
+                }
+                if (!queryParam["ScoreQuarter"].IsEmpty())
+                {
+                    dp.Add("ScoreQuarter", queryParam["ScoreQuarter"].ToString(), DbType.String);
+                    strSql.Append(" AND t.ScoreQuarter = @ScoreQuarter ");
+                }
+                if (!queryParam["PartyMemberGroupId"].IsEmpty())
+                {
+                    dp.Add("PartyMemberGroupId", queryParam["PartyMemberGroupId"].ToString(), DbType.String);
+                    strSql.Append(" AND g.PartyMemberGroupId = @PartyMemberGroupId ");
+                }
+                return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(strSql.ToString(), dp, pagination);
             }
             catch (Exception ex)
             {
@@ -64,18 +113,52 @@ namespace Learun.Application.TwoDevelopment.PersonnelManagement
         /// </summary>
         /// <param name="Assessed"></param>
         /// <returns></returns>
-        public IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(string Assessed)
+        public IEnumerable<DT_EvaluationDataMainEntity> GetEvaluationListForXZ(Pagination pagination, string queryJson)
         {
             try
             {
-                string sql = $@" select p.name as PartyMemberName,t.*,(case t.Status when -1 then '未打分' when 0 then '草稿' when 1 then '待审核' when 2 then '审核通过' when 3 then '未通过' end) as StatusName
+                string sql = $@" select p.empno,p.empname,t.*,m.Scorexz,m.ScoreYear,m.ScoreQuarter
  from DT_EvaluationData t
  join DT_EvaluationDataMain m on t.MainId=m.Id
-left join PartyMember p on p.Id=m.BeAssessed 
+left join EmpInfo p on p.EmpNo=m.BeAssessed 
 left join DT_EvaluationData c on t.Id = c.MainId
- where t.ScoreType=3 and 
- t.Assessed = '{Assessed}'";
-                return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(sql);
+ where t.ScoreType=3 ";
+                var queryParam = queryJson.ToJObject();
+                if (!queryParam["account"].IsEmpty())
+                {
+                    sql += $" and t.Assessed = '{queryParam["account"].ToString()}'";
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(sql, pagination);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
+
+        public IEnumerable<DT_EvaluationDataMainEntity> GeZPList(Pagination pagination, string queryJson)
+        {
+            try
+            {
+                var queryParam = queryJson.ToJObject();
+                string sql = $@" select distinct t.*,e.Status from DT_EvaluationDataMain t
+left join DT_EvaluationData e on t.id=e.Mainid
+ where e.ScoreType=1 ";
+                if (!queryParam["account"].IsEmpty())
+                {
+                    var account = queryParam["account"].ToString();
+                    sql += $" and  t.beassessed='{account}'";
+                }
+
+                return this.BaseRepository("CollegeMIS").FindList<DT_EvaluationDataMainEntity>(sql, pagination);
             }
             catch (Exception ex)
             {
@@ -126,7 +209,7 @@ left join DT_EvaluationData c on t.Id = c.MainId
         {
             try
             {
-                this.BaseRepository("CollegeMIS").Delete<DT_EvaluationDataMainEntity>(t=>t.Id == keyValue);
+                this.BaseRepository("CollegeMIS").Delete<DT_EvaluationDataMainEntity>(t => t.Id == keyValue);
             }
             catch (Exception ex)
             {