运维问题开发

adm/src/main/java/com/minpay/db/table/model/ObsQuestion.java

@@ -49,6 +49,47 @@ public class ObsQuestion extends AbstractMINBean implements Serializable {
      * 状态
      */
     private String oqState;
+    
+    /**
+     * 所属模块
+     */
+    private String oqModule;
+    
+    /**
+     * 期望时间
+     */
+    private String oqExpectTime;
+    
+    /**
+     * 服务人员
+     */
+    private String oqEngineer;
+    
+    /**
+     * 确认时间
+     */
+    private String oqConfirmTime;
+    
+    /**
+     * 完成时间
+     */
+    private String oqCompleteTime;
+    
+    /**
+     * 实际完成情况
+     */
+    private String oqCompleteDesc;
+    
+
+	/**
+     * 反馈时间
+     */
+    private String oqFeedbackTime;
+    
+	/**
+     * 操作记录
+     */
+    private String oqRecord;
 
     /**
      * 创建人
@@ -147,4 +188,73 @@ public class ObsQuestion extends AbstractMINBean implements Serializable {
     public void setOqUpdateTime(String oqUpdateTime) {
         this.oqUpdateTime = oqUpdateTime;
     }
+    
+    public String getOqModule() {
+		return oqModule;
+	}
+
+	public void setOqModule(String oqModule) {
+		this.oqModule = oqModule;
+	}
+
+	public String getOqExpectTime() {
+		return oqExpectTime;
+	}
+
+	public void setOqExpectTime(String oqExpectTime) {
+		this.oqExpectTime = oqExpectTime;
+	}
+
+	public String getOqEngineer() {
+		return oqEngineer;
+	}
+
+	public void setOqEngineer(String oqEngineer) {
+		this.oqEngineer = oqEngineer;
+	}
+
+	public String getOqConfirmTime() {
+		return oqConfirmTime;
+	}
+
+	public void setOqConfirmTime(String oqConfirmTime) {
+		this.oqConfirmTime = oqConfirmTime;
+	}
+
+	public String getOqCompleteTime() {
+		return oqCompleteTime;
+	}
+
+	public void setOqCompleteTime(String oqCompleteTime) {
+		this.oqCompleteTime = oqCompleteTime;
+	}
+
+	public String getOqCompleteDesc() {
+		return oqCompleteDesc;
+	}
+
+	public void setOqCompleteDesc(String oqCompleteDesc) {
+		this.oqCompleteDesc = oqCompleteDesc;
+	}
+
+	public String getOqFeedbackTime() {
+		return oqFeedbackTime;
+	}
+
+	public void setOqFeedbackTime(String oqFeedbackTime) {
+		this.oqFeedbackTime = oqFeedbackTime;
+	}
+
+	public void setOqType(String oqType) {
+		this.oqType = oqType;
+	}
+
+	public String getOqRecord() {
+		return oqRecord;
+	}
+
+	public void setOqRecord(String oqRecord) {
+		this.oqRecord = oqRecord;
+	}
+	
 }

adm/src/main/java/com/minpay/db/table/own/mapper/QuestionMapper.java

@@ -17,4 +17,6 @@ import com.startup.minpay.frame.jdbc.IMINMybatisEntityMapper;
  */
 public interface QuestionMapper  extends  IMINMybatisEntityMapper<ImUser, String, ImUserExample> {
 	public List<Map<String, String>> getList(Map<String, Object> param);
+	
+	public List<Map<String, String>> getMenuListByRoleId(Map<String, Object> param);
 }

adm/src/main/java/com/minpay/guomao/obsmanage/action/ObsQuestionManage.java

@@ -1,5 +1,7 @@
 package com.minpay.guomao.obsmanage.action;
 
+import java.io.IOException;
+import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -10,9 +12,14 @@ import org.springframework.context.ApplicationContext;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.min.base64.Base64;
 import com.minpay.SpringContextUtil;
 import com.minpay.common.bean.User;
 import com.minpay.common.format.IFormatService;
+import com.minpay.db.table.mapper.ImBranchMapper;
+import com.minpay.db.table.mapper.ImUserMapper;
+import com.minpay.db.table.model.ImBranch;
+import com.minpay.db.table.model.ImUser;
 import com.minpay.db.table.model.ObsQuestion;
 import com.minpay.db.table.own.mapper.QuestionMapper;
 import com.minpay.db.table.service.IObsQuestionService;
@@ -35,6 +42,8 @@ public class ObsQuestionManage implements IMINAction{
 	public final static String	QUESTION_QUERY				= "questionQuery";
 	public final static String	QUESTION_EDIT				= "questionEdit";
 	public final static String	QUESTION_DEAL				= "questionDeal";
+	public final static String	MENU_LIST					= "menuList";
+	public final static String	QUESTION_PRINT_QUERY		= "questionPrintQuery";
 
 	ApplicationContext applicationContext = SpringContextUtil.getApplicationContext();
 	
@@ -43,25 +52,34 @@ public class ObsQuestionManage implements IMINAction{
 			MINSession session,
 			@MINParam(key = "name") String name,
 			@MINParam(key = "degree") String degree,
+			@MINParam(key = "module") String module,
+			@MINParam(key = "expectTime") String expectTime,
 			@MINParam(key = "step") String step
-			){
+			) throws IOException{
+		step = Base64.decode(step);
+		step = URLDecoder.decode(step, "UTF-8");
+		
 		IObsQuestionService iObsQuestionService = applicationContext.getBean(IObsQuestionService.class);
 		User u = session.getUser();
 		
 		Date date = new Date();
-		SimpleDateFormat sd = new SimpleDateFormat("yyyyMMddhhmmss");
+		SimpleDateFormat sd = new SimpleDateFormat("yyyyMMddHHmmss");
 		String dateString = sd.format(date);
 		
 		MINActionResult res = new MINActionResult();
 		ObsQuestion obsQuestion = new ObsQuestion();
 		obsQuestion.setOqId(String.valueOf(System.currentTimeMillis()));
-		obsQuestion.setoqType("问题");
+		obsQuestion.setoqType("0");
 		obsQuestion.setOqName(name);
 		obsQuestion.setOqDegree(degree);
 		obsQuestion.setOqStep(step);
+		obsQuestion.setOqModule(module);
+		obsQuestion.setOqExpectTime(expectTime.replaceAll("-", ""));
 		obsQuestion.setOqState("00");
 		obsQuestion.setOqCreateTime(dateString);
 		obsQuestion.setOqCreateUser(u.getId());
+		String record = u.getName() + "在" + dateString + "提出";
+		obsQuestion.setOqRecord(record);
 		iObsQuestionService.save(obsQuestion);
 		return res;
 	}
@@ -135,22 +153,112 @@ public class ObsQuestionManage implements IMINAction{
 	public MINActionResult questionDeal(
 			MINSession session,
 			@MINParam(key = "id") String id,
-			@MINParam(key = "state") String state
+			@MINParam(key = "state") String state,
+			@MINParam(key = "desc") String desc
 			){
 		Date date = new Date();
-		SimpleDateFormat sd = new SimpleDateFormat("yyyyMMddhhmmss");
+		SimpleDateFormat sd = new SimpleDateFormat("yyyyMMddHHmmss");
+		SimpleDateFormat sd2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 		String dateString = sd.format(date);
+		String dateString2 = sd2.format(date);
 		User u = session.getUser();
 		
 		IObsQuestionService iObsQuestionService = applicationContext.getBean(IObsQuestionService.class);
+		// 原记录
+		String record = iObsQuestionService.getById(id).getOqRecord();
+		
 		ObsQuestion obsQuestion = new ObsQuestion();
 		obsQuestion.setOqId(id);
 		obsQuestion.setOqState(state);
 		obsQuestion.setOqUpdateUser(u.getId());
 		obsQuestion.setOqUpdateTime(dateString);
+		
+		// 确认
+		if("01".equals(state)) {
+			obsQuestion.setOqConfirmTime(dateString);
+			obsQuestion.setOqEngineer(u.getId());
+			record = record + "\n" + u.getName() + "在" + dateString2 + "确认";
+		} else if("02".equals(state)) {
+			obsQuestion.setOqCompleteTime(dateString);
+			record = record + "\n" + u.getName() + "在" + dateString2 + "解决了该问题";
+		} else if("03".equals(state)) {
+			obsQuestion.setOqFeedbackTime(dateString);
+			record = record + "\n" + u.getName() + "在" + dateString2 + "确认该问题已解决";
+		} else if("04".equals(state)) {
+			obsQuestion.setOqFeedbackTime(dateString);
+			obsQuestion.setOqCompleteDesc(desc);
+			record = record + "\n" + u.getName() + "在" + dateString2 + "确认该问题未解决";
+		} 
+		obsQuestion.setOqRecord(record);
 		iObsQuestionService.updateById(obsQuestion);
+		MINActionResult res = new MINActionResult();
+		return res;
+	}
+	
+	@MINAction(value = MENU_LIST)
+	public MINActionResult menuList(
+			MINSession session
+	) throws MINBusinessException{
+		User u = session.getUser();
+		Map<String, Object> param = new HashMap<>();
+		param.put("roleId", u.getRoleId());
+		List<Map<String, String>> list = Service.lookup(IMINDataBaseService.class).getMybatisMapper(QuestionMapper.class)
+				  .getMenuListByRoleId(param);
+		MINActionResult res = new MINActionResult();
+		res.set(IMINBusinessConstant.F_PAGING_LAY, list);
+		return res;
+	}
+	
+	@MINAction(value = QUESTION_PRINT_QUERY)
+	public MINActionResult questionPrintQuery(
+			@MINParam(key = "oqId") String oqId
+			) throws MINBusinessException{
+		IObsQuestionService iObsQuestionService = applicationContext.getBean(IObsQuestionService.class);
+		ObsQuestion obsQuestion = iObsQuestionService.getById(oqId);
+		
+		ImUser imUser = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ImUserMapper.class).selectByPrimaryKey(obsQuestion.getOqCreateUser());
+		ImBranch imBranch = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ImBranchMapper.class).selectByPrimaryKey(imUser.getBranchid());
+		
+		Map<String, String> data = new HashMap<>();
+		data.put("shenqingriqi", obsQuestion.getOqCreateTime());
+		data.put("shenqingrenxingming", imUser.getName());
+		data.put("suozaibumen", imBranch.getName());
+		data.put("lianxidianhua", imUser.getPhone());
+		
+		Map<String, Object> param = new HashMap<>();
+		param.put("itemId", obsQuestion.getOqModule());
+		List<Map<String, String>> list = Service.lookup(IMINDataBaseService.class).getMybatisMapper(QuestionMapper.class)
+				  .getMenuListByRoleId(param);
+		data.put("mukuai", list.get(0).get("menuName"));
+		
+		data.put("shixiangmiaoshu", obsQuestion.getOqStep());
+		data.put("yaoqiuwanchengqixian", obsQuestion.getOqExpectTime());
+		
+		if(obsQuestion.getOqEngineer() != null && !"".equals(obsQuestion.getOqEngineer())) {
+			ImUser imUser2 = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ImUserMapper.class).selectByPrimaryKey(obsQuestion.getOqEngineer());
+			if("02".equals(obsQuestion.getOqState()) || "03".equals(obsQuestion.getOqState())) {
+				data.put("wanchengqingkuang", "已解决");
+			} else if ("00".equals(obsQuestion.getOqState()) || "04".equals(obsQuestion.getOqState())) {
+				data.put("wanchengqingkuang", "待确认");
+			} else if ("01".equals(obsQuestion.getOqState())) {
+				data.put("wanchengqingkuang", "已确认");
+			}
+			data.put("yaoqiuwanchengqixian", obsQuestion.getOqExpectTime());
+			data.put("fuwurenyuan", imUser2.getName());
+			data.put("wanchengshijian", obsQuestion.getOqCompleteTime());
+		}
+		
+		if("04".equals(obsQuestion.getOqState())){
+			data.put("shifouwancheng", "fou");
+		} else if("03".equals(obsQuestion.getOqState())){
+			data.put("shifouwancheng", "shi");
+		}
+		data.put("miaoshu", obsQuestion.getOqCompleteDesc());
+		data.put("shenqingrenyuan", imUser.getName());
+		data.put("fanguiriqi", obsQuestion.getOqFeedbackTime());
 		
 		MINActionResult res = new MINActionResult();
+		res.set(IMINBusinessConstant.F_PAGING_LAY, data);
 		return res;
 	}
 }

adm/src/main/resources/com/minpay/db/table/own/mapper/QuestionMapper.xml

@@ -31,4 +31,28 @@
 			</if>
 			order by oq_Id desc
 	</select>
+	<select id="getMenuListByRoleId" parameterType="map" resultType="map">
+		SELECT 
+		  ITM_ID id,
+		  CONCAT(m1.`MEU_NAME`, '/', m2.`MEU_NAME`, '/', ITM_NAME) menuName
+		FROM
+		  im_role_item_rel ri
+		  LEFT JOIN im_item i
+		  ON i.ITM_ID = ri.RIR_ITEMID
+		  LEFT JOIN im_menu_item_rel mi
+		  ON mi.MIR_ITEMID = i.ITM_ID
+		  LEFT JOIN im_menu m2
+		  ON m2.MEU_ID = mi.MIR_MENUID
+		  LEFT JOIN im_menu m1
+		  ON m1.MEU_ID = m2.MEU_PARENTID
+		WHERE m1.`MEU_PROJECT_CODE` != '00002'
+		<if test="roleId != null and roleId != ''">
+			and ri.RIR_ROLEID = #{roleId}
+		</if>
+		<if test="itemId != null and itemId != ''">
+			and ITM_ID = #{itemId}
+		</if>
+		ORDER BY m1.`MEU_SERIALNO`, m2.`MEU_SERIALNO`
+	</select>
+	
 </mapper>

adm/src/main/webapp/admin/ops/addQuestion.html

@@ -45,10 +45,27 @@
 			</div>
 		</div>
 	</div>
-	
+	<div class="layui-form-item">
+		<div class="layui-inline">
+			<label class="layui-form-label">*系统/模块：</label>
+			<div class="layui-input-inline" style = "width: 400px;">
+				<select name="module" id = "module" lay-search>
+					
+				</select>
+			</div>
+		</div>
+	</div>
+	<div class="layui-form-item">
+		<div class="layui-inline">
+			<label class="layui-form-label">*期望完成时间：</label>
+			<div class="layui-input-inline">
+				<input type="text" name="expectTime" id="expectTime" maxlength="10" autocomplete="off" placeholder="请选择日期" class="layui-input" readOnly>
+			</div>
+		</div>
+	</div>
 	<div class="layui-form-item">	
 		<div class="layui-inline">
-			<label class="layui-form-label">*重现步骤：</label>
+			<label class="layui-form-label">*事项描述：</label>
 			<div class="layui-input-inline">
 				<script id="editor" type="text/plain" style="width:1024px;height:500px;"></script>
 			</div>
@@ -65,7 +82,7 @@
     <script>
     //建议使用工厂方法getEditor创建和引用编辑器实例，如果在某个闭包下引用该编辑器，直接调用UE.getEditor('editor')就能拿到相关的实例
 	$(function(){
-		layui.use(['form'], function() {
+		layui.use(['form', 'laydate'], function() {
 			var ue = UE.getEditor('editor',{
 				toolbars : [
 					[
@@ -91,13 +108,41 @@
 			});
 
 			var form = layui.form;
+			var laydate = layui.laydate;
+			laydate.render({
+				elem: '#expectTime' //指定元素
+				,min: getNowFormatDate()
+			});
+			
+			// 查询模块数据
+			$.request({
+				action : 'ObsQuestionManage/menuList',
+				data :  {},
+				success : function(data) {
+					let optionHtml = '<option value="" selected></option>';
+					for(let menu of data.data) {
+						optionHtml += '<option value="' + menu.id + '">' + menu.menuName + '</option>';
+					}
+					$("#module").html(optionHtml);
+					form.render();
+				},
+				error : function(data2) {
+					layer.alert(data2.MINErrorMessage, {
+						icon: 5,
+						title: "提示"
+					});
+				}
+			});
+			
 			//监听提交
 			form.on('submit(demo1)', function(data) {
 				var param = {};
 				param.type = data.field.type;
 				param.name = data.field.name;
 				param.degree = data.field.degree;
-				param.step = ue.getContent();
+				param.module = data.field.module;
+				param.expectTime = data.field.expectTime;
+				param.step = window.btoa(encodeURI(ue.getContent()));
 				$.request({
 					action : 'ObsQuestionManage/questionAdd',
 					data :  param,
@@ -115,6 +160,18 @@
 					}
 				});
 			})
+			
+			//获取当前日期函数
+			function getNowFormatDate() {
+			  let date = new Date(),
+			    year = date.getFullYear(), //获取完整的年份(4位)
+			    month = date.getMonth() + 1, //获取当前月份(0-11,0代表1月)
+			    strDate = date.getDate() // 获取当前日(1-31)
+			  if (month < 10) month = `0${month}` // 如果月份是个位数，在前面补0
+			  if (strDate < 10) strDate = `0${strDate}` // 如果日是个位数，在前面补0
+			 
+			  return `${year}-${month}-${strDate}`
+			}
 		})
 	})
 

adm/src/main/webapp/admin/ops/printQuestion.html

@@ -0,0 +1,172 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <meta name="renderer" content="webkit">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <script src="../../js/min-loader-next.js"></script>
+    <style type="text/css">
+	     @page{
+	            margin-top: 1mm;
+	            margin-bottom: 1mm;
+	     }
+	    .printDiv {
+		    width: 600px;
+		    margin-left: auto;
+		    margin-right: auto;
+		    text-align: center;
+		    -webkit-print-color-adjust: exact;
+		    print-color-adjust: exact;
+			color-adjust: exact;
+		}
+		.head {
+		    font-size: 18px;
+		    font-weight: 800;
+		}
+		.subHead {
+		    text-align: right;
+		    margin-right: 5%;
+		}
+		table {
+			width: 100%;
+			height: 900px;
+			border: 2px solid #000000;
+			border-collapse:collapse;
+		}
+	    table td {
+	        border: 1px solid #000000;
+	        empty-cells:show;
+	    }
+	    .widht17{
+	    	width: 17%;
+	    }
+	    .height1{
+	    	height: 5%;
+	    }
+	    .height2{
+	    	height: 10%;
+	    }
+   	    .height3{
+	    	height: 20%;
+	    }
+   	    .height4{
+	    	height: 30%;
+	    }
+	    .td1{
+	    	padding: 8px;
+	    	text-align: left;
+	    }
+	    .textAlignCenter {
+	    	text-align: center;
+	    }
+	    .height5{
+	    	height: 60%;
+	    }
+   	    .height6{
+	    	height: 80%;
+	    }
+    </style>
+</head>
+
+<body class="">
+	<div id = "printDiv" class = "printDiv">
+		<p class="head">铝业国贸电子商务平台运维服务申请表</p>
+		<p class="subHead" id="shenqingriqi">申请日期：    年    月    日</p>
+		<table>
+			<thead>
+				<tr>
+					<td class="widht17"></td>
+					<td class="widht17"></td>
+					<td class="widht17"></td>
+					<td class="widht17"></td>
+					<td class="widht17"></td>
+					<td class="widht17"></td>
+				</tr>
+			</thead>
+			<tbody>
+				<tr class="height1">
+					<td>申请人姓名</td>
+					<td id="shenqingrenxingming"></td>
+					<td>所在部门</td>
+					<td id="suozaibumen"></td>
+					<td>联系电话</td>
+					<td id="lianxidianhua"></td>
+				</tr>
+				<tr class="height2">
+					<td>系统/模块</td>
+					<td colspan="5" class="td1" id="mukuai"></td>
+				</tr>
+				<tr class="height3">
+					<td>运维事项描述</td>
+					<td colspan="5" class="td1" id="shixiangmiaoshu"></td>
+				</tr>
+				<tr class="height1">
+					<td>要求完成期限</td>
+					<td colspan="5" class="td1" id="yaoqiuwanchengqixian">  年    月    日前完成</td>
+				</tr>
+				<tr class="height4">
+					<td>运维完成情况</td>
+					<td colspan="5" class="td1">
+						<div class="height6" id = "wanchengqingkuang"></div>
+						<p class="textAlignCenter" id = "fuwurenyuan">服务人员：</p>
+						<p class="textAlignCenter" id = "wanchengshijian">日期：</p>
+					</td>
+				</tr>
+				<tr class="height4">
+					<td>申请人员服务反馈意见</td>
+					<td colspan="5" class="td1">
+						<p>是否按要求及时解决问题？</p>
+						<p><input type="checkbox" id = "shi">是</p>
+						<p><input type="checkbox" id = "fou">否（请具体描述）</p>
+						<div class="height5" id="miaoshu"></div>
+						<p class="textAlignCenter" id = "shenqingrenyuan">申请人员：</p>
+						<p class="textAlignCenter" id = "fanguiriqi">日期：</p>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+
+
+    <script>
+	var oqId = getQueryString("oqId");
+	$.request({
+		action : 'ObsQuestionManage/questionPrintQuery',
+		data :  {oqId: oqId},
+		success : function(data) {
+			var printData = data.data;
+			$("#shenqingriqi").html('申请日期：' + printData.shenqingriqi.substr(0, 4) + '年' + printData.shenqingriqi.substr(4, 2) + '月' + printData.shenqingriqi.substr(6, 2) + '日')
+			$("#shenqingrenxingming").html(printData.shenqingrenxingming);
+			$("#suozaibumen").html(printData.suozaibumen);
+			$("#lianxidianhua").html(printData.lianxidianhua);
+			$("#mukuai").html(printData.mukuai);
+			$("#shixiangmiaoshu").html(printData.shixiangmiaoshu);
+			$("#yaoqiuwanchengqixian").html(printData.yaoqiuwanchengqixian.substr(0, 4) + '年' + printData.yaoqiuwanchengqixian.substr(4, 2) + '月' + printData.yaoqiuwanchengqixian.substr(6, 2) + '日前完成');
+			$("#wanchengqingkuang").html(printData.wanchengqingkuang);
+			$("#fuwurenyuan").html('服务人员：' + printData.fuwurenyuan);
+			$("#wanchengshijian").html('日期：' + printData.wanchengshijian);
+			$("#" + printData.shifouwancheng).attr("checked", true)
+			$("#miaoshu").html(printData.miaoshu);
+			$("#shenqingrenyuan").html('申请人员：' + printData.shenqingrenyuan);
+			$("#fanguiriqi").html('日期：' + printData.fanguiriqi.substr(0, 4) + '年' + printData.fanguiriqi.substr(4, 2) + '月' + printData.fanguiriqi.substr(6, 2) + '日');
+			
+	        window.print()
+		},
+		error : function(data2) {
+			layer.alert(data2.MINErrorMessage, {
+				icon: 5,
+				title: "提示"
+			});
+		}
+	});
+	$("#printDiv").click(function(){
+        window.print()
+	})
+    </script>
+
+</body>
+
+</html>

adm/src/main/webapp/admin/ops/questionManage.html

@@ -30,13 +30,28 @@
 				<div class="layui-input-inline">
 					<select name="state" id="state">
 						<option value="">请选择</option>
-						<option value="00">激活</option>
-						<option value="01">已解决</option>
-						<option value="02">已关闭</option>
+						<option value="00">待确认</option>
+						<option value="01">已确认</option>
+						<option value="02">已解决</option>
+						<option value="03">确认解决</option>
+						<option value="04">未解决</option>
 						<option value="99">已作废</option>
 					</select>
 				</div>
 			</div>
+			<div class="d-dashed" style="margin: 10px 0;"></div>
+			<div class="layui-inline">
+				<label class="f12-gray4">联系人:</label>
+				<div class="layui-input-inline">
+					<input type="text" class="layui-input" id="stock" name="stock" value="付丙羊" style="border:none;color: red" disabled="disabled">
+				</div>
+			</div>
+			<div class="layui-inline">
+				<label class="f12-gray4">联系电话:</label>
+				<div class="layui-input-inline">
+					<input type="text" class="layui-input" id="stock" name="stock" value="15866747970" style="border:none;color: red" disabled="disabled">
+				</div>
+			</div>
    		</div>
 	 </form>
 </div>
@@ -50,16 +65,24 @@
 </div>	
     <!--操作功能-->
     <script type="text/html" id="barDemo1">
-	<a class="f12-blue ml0-4" lay-event="edit">编辑</a>
+	
+	{{#  if(d.oqState == '00' || d.oqState == '04'){ }}
+		<a class="f12-blue ml0-4" lay-event="confirm">确认</a>
+	{{#  } }}
 	{{#  if(d.oqState == '01'){ }}
-		<a class="f12-blue ml0-4" lay-event="active">激活</a>
-		<a class="f12-blue ml0-4" lay-event="complete">已完成</a>
-		<a class="f12-red2 ml0-4" lay-event="delete">作废</a>
+		<a class="f12-blue ml0-4" lay-event="complete">已解决</a>
 	{{#  } }}
-	{{#  if(d.oqState == '00'){ }}
-		<a class="f12-blue ml0-4" lay-event="deal">已解决</a>
+	{{#  if(d.oqState == '02'){ }}
+		<a class="f12-blue ml0-4" lay-event="confirmComplete">确认解决</a>
+		<a class="f12-blue ml0-4" lay-event="notComplete">未解决</a>
+	{{#  } }}
+	{{#  if(d.oqState != '03'){ }}
+		<a class="f12-blue ml0-4" lay-event="edit">编辑</a>
 		<a class="f12-red2 ml0-4" lay-event="delete">作废</a>
 	{{#  } }}
+	{{#  if(d.oqState == '03' || d.oqState == '04'){ }}
+		<a class="f12-blue ml0-4" lay-event="print">打印</a>
+	{{#  } }}
    </script>
    
 	<script>
@@ -82,14 +105,14 @@
 		    ,page: true //开启分页
 		    ,cols: [[ //表头
 		       {type:'numbers',title: '序号',width:"5%"}   
-		      ,{field: 'oqName', title: '标题', width:"15%"}
+		      ,{field: 'oqName', title: '标题', width:"10%"}
 		      ,{field: 'oqDegree', title: '严重程度', width:"10%"}
 		      ,{field: 'oqStateDesc', title: '状态', width:"10%"}
 		      ,{field: 'createUser', title: '创建人', width:"10%"}
 		      ,{field: 'oqCreateTime', title: '创建时间', width:"15%"}
 		      ,{field: 'updateUser', title: '修改人', width:"10%"}
 		      ,{field: 'oqUpdateTime', title: '修改时间', width:"15%"}
-		      ,{field: 'operate', title: '操作',width:"10%", toolbar: '#barDemo1'}	   
+		      ,{field: 'operate', title: '操作',width:"15%", toolbar: '#barDemo1'}	   
 		    ]]
 		    ,done: function(res, curr, count){
 		    }
@@ -110,13 +133,28 @@
 		    else if(layEvent === 'complete'){
 		    	changeState(data, '02');
 		  	}
-		 	// 已激活
-		    else if(layEvent === 'active'){
-		    	changeState(data, '00');
+		 	// 确认
+		    else if(layEvent === 'confirm'){
+		    	changeState(data, '01');
 		  	}
 		    // 已解决
-		    else if(layEvent === 'deal'){
-		    	changeState(data, '01');
+		    else if(layEvent === 'confirmComplete'){
+		    	changeState(data, '03');
+		  	}
+		    // 未解决
+		    else if(layEvent === 'notComplete'){
+		        layer.prompt({title: '请具体描述', formType: 2}, function(value, index, elem){
+		            if(value === '') {
+		            	return elem.focus();
+		            }
+		            changeState(data, '04', value);
+		            // 关闭 prompt
+		            layer.close(index);
+		        });
+		    	
+		  	} 
+		    else if(layEvent === 'print'){
+		    	window.open("printQuestion.html?oqId=" + data.oqId);
 		  	}
 		});
 	});
@@ -169,7 +207,7 @@
   	function cancle(){
 		$('#formName')[0].reset();
 	}
-  	function changeState(data, state){
+  	function changeState(data, state, desc){
   		layer.confirm('确认当前操作？', function(index){
     		layer.close(index);
     		//向服务端发送删除指令roleDelete
@@ -177,7 +215,8 @@
 				action : "ObsQuestionManage/questionDeal",
 				data : {
 					id : data.oqId,
-					state : state
+					state : state,
+					desc: desc
 				},
 				success : function(resData) {
 					if (resData.MINStatus == 0) {