智慧后勤

WebUI/CallCenterWeb.UI/equipmentOperationManage/distributingEquipment.html

@@ -70,7 +70,7 @@
 							<th data-field="Qdepartment" data-align="center">申请科室</th>
 							<th data-field="borrowpeoplec" data-align="center">借出操作人</th>
 							<th data-field="Qqtime" data-align="center">办理时间</th>
-							<th data-field="Cktime" data-align="center">出库时间</th>
+							<th data-field="Cktime" data-align="center">到达时间</th>
 							<th data-field="borrowpeoplej" data-align="center">接收操作人</th>
 							<!-- <th data-field="plandleth" data-align="center">借出路程</th> -->
 							<th data-field="beom" data-align="center">借出备注</th>

WebUI/CallCenterWeb.UI/equipmentOperationManage/js/addEquipment.js

@@ -12,20 +12,18 @@ $(document).ready(function() {
 
 	//保存
 	$("#HY_save").click(function() {
-		// if(!$("#projectid").val()) {
-		// 	layer.confirm('请选择设备状态！', {
-		// 		icon: 2,
-		// 		btn: ['确定'] //按钮
-		// 	});
-		// 	return;
-		// }
-		// if(!$("#equipname").val()) {
-		// 	layer.confirm('请输入设备名称！', {
-		// 		icon: 2,
-		// 		btn: ['确定'] //按钮
-		// 	});
-		// 	return;
-		// }
+		if($("#Qdepartment").val()==''){
+			layer.msg('科室不许为空');
+			return;
+		}
+		if($("#borrowpeoplec").val()==''){
+			layer.msg('借出操作人不许为空');
+			return;
+		}
+		if($("#borrowpeoplej").val()==''){
+			layer.msg('接收操作人不许为空');
+			return;
+		}
 		addValue(ajaxUrl);
 	})
 	//获取所有科室信息
@@ -41,7 +39,7 @@ $(document).ready(function() {
 	//获取科室名
 	function getQdepartment(obj){
 		obj.empty();
-		obj.append('<option value="">请选择状态</option>');
+		obj.append('<option value="">请选择科室</option>');
 		$(QdepartmentList).each(function(i,n){
 			obj.append('<option value="'+n.name+'">'+n.name+'</option>');
 		})

WebUI/CallCenterWeb.UI/equipmentOperationManage/js/brow.js

@@ -8,42 +8,35 @@ $(document).ready(function() {
 		trigger:'click',
 		value: new Date(timestamp)
 	});
-	if (equipmentmanagementsname == null) {
-		$("#equipmentmanagementsname").val('')
-	}
-	if (equipmentmanagementsid == null) {
-		$("#equipmentmanagementsid").val('')
-	}
-	if (Qdepartment == null) {
-		$("#Qdepartment").val('')
-	}
-	if (borrowpeoplec == null) {
-		$("#borrowpeoplec").val('')
-	}
-	if (borrowpeoplej == null) {
-		$("#borrowpeoplej").val('')
-	}
-	if (plandleth == null) {
-		$("#plandleth").val('')
-	}
-	if (beom == null) {
-		$("#beom").val('')
-	}
-	if (zmoney == null) {
-		$('#zmoney').val('')
-	}
+	// if (equipmentmanagementsname == null) {
+	// 	$("#equipmentmanagementsname").val('')
+	// }
+	// if (equipmentmanagementsid == null) {
+	// 	$("#equipmentmanagementsid").val('')
+	// }
+	// if (Qdepartment == null) {
+	// 	$("#Qdepartment").val('')
+	// }
+	// if (borrowpeoplec == null) {
+	// 	$("#borrowpeoplec").val('')
+	// }
+	// if (borrowpeoplej == null) {
+	// 	$("#borrowpeoplej").val('')
+	// }
+	// if (plandleth == null) {
+	// 	$("#plandleth").val('')
+	// }
+	// if (beom == null) {
+	// 	$("#beom").val('')
+	// }
+	// if (zmoney == null) {
+	// 	$('#zmoney').val('')
+	// }
 
 	//保存
 	$("#HY_save").click(function() {
-		addValue(ajaxUrl);
+		addValue();
 	})
-	
-	// laydate.render({
-	// 	elem: '#giveBackTime',
-	// 	range: '~',
-	// 	theme: '#249fea'
-	// });
-
 })
 detailsL();
 //获取详情
@@ -74,20 +67,18 @@ function detailsL() {
 	});
 }
 //添加
-function addValue(ajaxUrl) {
+function addValue() {
 	$.ajax({
 		type: "get",
 		url: huayi.config.callcenter_url + "testusertypeapi/api/TestUserType/upquipmentmanagementlistr",
-		//					url: "http://192.168.1.21:28230/api/Equipment/update",
 		async: true,
 		dataType: 'json',
 		data: {
 			id: id,
 			borrowpeopleg: $("#borrowpeopleg").val(),
-			plandleths: $('#plandleths').val(),
+			// plandleths: $('#plandleths').val(),
+			Rktime:$("#giveBackTime").val(),
 			beoms: $("#beoms").val(),
-
-
 		},
 		success: function(data) {
 			if (data.state.toLowerCase() == 'success') {

WebUI/CallCenterWeb.UI/equipmentOperationManage/js/distributingEquipment.js

@@ -1,6 +1,8 @@
 var f_State = '出库时间';
 var $storages = window.localStorage;
 var roleName = $storages.getItem('roleName');
+var usercode=$storages.getItem('userCode');
+console.log(roleName);
 $(document).ready(function() {
 	$('.tool_bars').authorizeButton();
 
@@ -52,11 +54,10 @@ function initTable() {
 		//设置为limit可以获取limit, offset, search, sort, order
 		queryParamsType: "undefined",
 		queryParams: function queryParams(params) { //设置查询参数
-			console.log(params)
 			var param = {
 				PageIndex: params.pageNumber,
 				PageSize: params.pageSize,
-				usercode: 8000, //维修工账号
+				usercode: usercode, //维修工账号
 				stime: $('#startTime').val() && $('#startTime').val().split(' ~ ')[0], //开始时间
 				etime: $('#startTime').val() && $('#startTime').val().split(' ~ ')[1], //结束时间
 				ckorrk: f_State
@@ -83,40 +84,24 @@ function initTable() {
 
 //格式化操作
 function formatterOperate(val, row) {
-  var str= ''
-  console.log(val+'')
-  console.log(row);
+  var str= '';
   if(val+'' != '已归还'){
-	 // str = '<ul class="tool_downs">' +
-	 //  	'<li><a class="aBtn" authorize="yes" id="HY_brow_' + row.id + '" onclick="btn_brow(\'' + row.equipmentmanagementsid +
-	 //  	'\',\'' + row.Qdepartment + '\',\'' + row.borrowpeoplec + '\',\'' + row.borrowpeoplej + '\',\'' + row.plandleth +
-	 //  	'\',\'' + row.beom + '\',\'' + row.zmoney + '\',\'' + row.equipmentmanagementsname + '\',\'' + row.id + '\')">归还</a><li>'
-	 //  '</ul>';
-	 str = '<ul class="tool_downs">' +
-	  	'<li><a class="aBtn" authorize="yes" id="HY_brow_' + row.id + '" onclick="btn_brow(\'' + row.id + '\')">归还</a><li>'+
-		'<li><a class="aBtn" authorize="yes" id="HY_brow_' + row.id + '" onclick="btn_getTime(\'' + row.id +  '\',\'' + row.Cktime +'\')">到达时间</a><li>'+
-	  '</ul>';
-	 // if(roleName=="器械科班"){
-		//  str = '<ul class="tool_downs">' +
-		//   	'<li><a class="aBtn" authorize="yes" id="HY_brow_' + row.id + '" onclick="btn_brow(\'' + row.id + '\')">归还</a><li>'+
-		//   '</ul>';
-	 // }else{
-		//  str = '<ul class="tool_downs">' +
-		//  		'<li><a class="aBtn" authorize="yes" id="HY_brow_' + row.id + '" onclick="btn_getTime(\'' + row.id +  '\',\'' + row.Cktime +'\')">到达时间</a><li>'+
-		//   '</ul>';
-	 // }
-	  
+	 if(roleName=="器械科班"){
+		 str = '<ul class="tool_downs">' +
+				'<li><a  onclick="btn_brow(\'' + row.id + '\')">确认归还</a><li>'+
+				'</ul>';
+	 }else{
+		 str = '<ul class="tool_downs">' +
+		 		'<li><a onclick="btn_getTime(\'' + row.id +  '\',\'' + row.Cktime +'\')">确认到达</a><li>'+
+				'</ul>';
+		   console.log(str)
+	 }
   }else{
 	  str = '<ul class="tool_downs">' +
 	   	'<li style="color:red">已归还<li>'
 	   '</ul>';
   }
-	
-	return str
-
-
-
-
+  return str
 }
 
 // 添加

WebUI/CallCenterWeb.UI/equipmentOperationManage/js/equipmentReportform.js

@@ -117,7 +117,7 @@ function initTable() {
 //获取科室名
 function getQdepartment(obj) {
 	obj.empty();
-	obj.append('<option value="">请选择状态</option>');
+	obj.append('<option value="">请选择科室</option>');
 	$(QdepartmentList).each(function(i, n) {
 		obj.append('<option value="' + n.name + '">' + n.name + '</option>');
 	})

WebUI/CallCenterWeb.UI/equipmentOperationManage/template/addEquipment.html

@@ -79,7 +79,7 @@
          <div class="form-group">
              <label for="equipmentmanagementsname" class="col-sm-3 control-label text-right">名称</label>
              <div class="col-sm-9">
-                 <input id="equipmentmanagementsname" class="form-control" type="text" autocomplete="off" placeholder="请输入名称" />
+                 <input id="equipmentmanagementsname" disabled="disabled" class="form-control" type="text" autocomplete="off" value="心电监护仪"/>
              </div>
          </div>
 		 <div class="form-group">
@@ -104,17 +104,17 @@
 			    </div>
 			</div>
 				 <div class="form-group">
-				     <label for="borrowpeoplej" class="col-sm-3 control-label text-right">借出人</label>
+				     <label for="borrowpeoplej" class="col-sm-3 control-label text-right">接收操作人</label>
 				     <div class="col-sm-9">
-				         <input id="borrowpeoplej" class="form-control" type="text" autocomplete="off" placeholder="请输入借出人" />
+				         <input id="borrowpeoplej" class="form-control" type="text" autocomplete="off" placeholder="请输入接收操作人" />
 				     </div>
 				 </div>
-				 <div class="form-group">
+				 <!-- <div class="form-group">
 				     <label for="plandleth" class="col-sm-3 control-label text-right">借出路程</label>
 				     <div class="col-sm-9">
 				         <input id="plandleth" class="form-control" type="text" autocomplete="off" placeholder="请输入借出路程" />
 				     </div>
-				 </div>
+				 </div> -->
 				 <div class="form-group">
 				     <label for="beom" class="col-sm-3 control-label text-right">借出备注</label>
 				     <div class="col-sm-9">
@@ -124,7 +124,7 @@
 				 <div class="form-group">
 				     <label for="zmoney" class="col-sm-3 control-label text-right">租金</label>
 				     <div class="col-sm-9">
-				         <input id="zmoney" class="form-control" type="text" autocomplete="off" placeholder="请输入租金" />
+				         <input id="zmoney" class="form-control" type="text" autocomplete="off" value="1.2" disabled="disabled"/>
 				     </div>
 				 </div>
             <div class="form-group">

WebUI/CallCenterWeb.UI/equipmentOperationManage/template/arrivalTime.html

@@ -13,7 +13,7 @@
 		<style type="text/css">
 			.time-box{margin-top: 20px;padding-left: 10px;}
 			input{padding: 5px 20px 5px 15px;}
-			.btn_gray{position:absolute;background-color: #249fea ;color: #fff;bottom: 30px;}
+			.btn_gray{background-color: #249fea ;color: #fff;position: absolute;bottom: 30px;right: 20px;}
 		</style>
 	</head>
 	<body>
@@ -47,11 +47,12 @@
 					Cktime:$("#giveBackTime").val()
 				},
 				success:function(res){
-					console.log(res);
-					var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
-					parent.layer.close(index); //再执行关闭  
-					layer.msg(data.message);
-					parent.initTable();
+					if(res.state=='success'){
+						var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
+						parent.layer.close(index); //再执行关闭  
+						// layer.msg(res.message);
+						parent.initTable();
+					}					
 				}
 			})
 		})