故障分类、会议安排

webmain/flow/input/mode_repair_faultAction.php

@@ -13,7 +13,7 @@ class mode_repair_faultClassAction extends inputAction{
 	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
 	*/
 	protected function savebefore($table, $arr, $id, $addbo){
-		
+
 	}
 	
 	/**
@@ -24,7 +24,10 @@ class mode_repair_faultClassAction extends inputAction{
 	*	$addbo Boolean 是否添加时
 	*/	
 	protected function saveafter($table, $arr, $id, $addbo){
-		
+        // 保存当前ip
+        if ($id > 0) {
+            m("repair_fault")->update(["ip_addr"=>$this->ip], "id={$id}");
+        }
 	}
 }	
 			

webmain/flow/page/input_meeting.html

@@ -1,79 +1,90 @@
 <table width="100%" border="0" class="ke-zeroborder">
-    <style>
-        .ys1 {
-            font-weight: bold;
-        }
-    </style>
     <tbody>
     <tr class="autoyijianview">
-        <td height="34" width="15%" align="right" class="ys1">*^apply_date^</td>
-        <td width="35%" class="ys2" colspan="3">{apply_date}</td>
+        <td height="34" width="10%" align="right" class="ys1">*^apply_date^</td>
+        <td class="ys2" colspan="5">{apply_date}{meet_state}{apply_dept_id}{attn_id}{is_hand}{room_id}</td>
     </tr>
     <tr>
-        <td height="34" width="15%" align="right" class="ys1">*^apply_dept^</td>
-        <td width="35%" class="ys2" colspan="3">{apply_dept}{apply_dept_id}</td>
+        <td height="34" width="10%" align="right" class="ys1">*^apply_dept^</td>
+        <td width="20%" class="ys2">{apply_dept}</td>
+        <td height="34" width="10%" align="right" class="ys1">*^attn^</td>
+        <td width="20%" class="ys2">{attn}</td>
+        <td height="34" width="10%" align="right" class="ys1">*^mobile^</td>
+        <td width="20%" class="ys2">{mobile}</td>
     </tr>
     <tr>
-        <td height="34" width="15%" align="right" class="ys1">*^attn^</td>
-        <td width="35%" class="ys2">{attn}{attn_id}</td>
-        <td height="34" width="15%" align="right" class="ys1">*^mobile^</td>
-        <td width="35%" class="ys2">{mobile}</td>
-    </tr>
-    <tr>
-        <td height="34" width="15%" align="right" class="ys1">*^start_time^</td>
-        <td width="35%" class="ys2">{start_time}</td>
-        <td height="34" width="15%" align="right" class="ys1">*^end_time^</td>
-        <td width="35%" class="ys2">{end_time}</td>
+        <td height="34" width="10%" align="right" class="ys1">*^start_time^</td>
+        <td width="20%" class="ys2" colspan="2">{start_time}</td>
+        <td height="34" width="10%" align="right" class="ys1">*^end_time^</td>
+        <td width="20%" class="ys2" colspan="2">{end_time}</td>
     </tr>
     <tr>
         <td height="34" align="right" class="ys1">*^attendees^</td>
-        <td colspan="3" class="ys2" >{attendees}</td>
+        <td colspan="5" class="ys2">{attendees}</td>
     </tr>
     <tr>
         <td height="34" align="right" class="ys1">*^title^</td>
-        <td colspan="3" class="ys2" >{title}</td>
-    </tr>
-    <tr>
-        <td height="34" width="15%" align="right" class="ys1">*^meeting_room^</td>
-        <td width="35%" class="ys2" colspan="3">{meeting_room}{room_id}{meet_state}</td>
-    </tr>
-    <tr>
-        <td  height="34" align="center" class="ys0" colspan="4" style="background-color:#CCCCCC;">就餐安排</td>
-    </tr>
-    <tr>
-        <td height="34" width="15%" align="right" class="ys1">^bfp^</td>
-        <td width="35%" class="ys2">{bfp}</td>
-        <td height="34" width="15%" align="right" class="ys1">^lunp^</td>
-        <td width="35%" class="ys2">{lunp}</td>
+        <td colspan="5" class="ys2">{title}</td>
     </tr>
     <tr>
-        <td height="34" width="15%" align="right" class="ys1">^dnp^</td>
-        <td width="35%" class="ys2">{dnp}</td>
-        <td height="34" width="15%" align="right" class="ys1">^hotel^</td>
-        <td width="35%" class="ys2">{hotel}</td>
-    </tr>
-    <tr>
-        <td  height="34" align="center" class="ys0" colspan="4" style="background-color:#CCCCCC;">住宿安排</td>
+        <td height="34" align="right" class="ys1">^remark^</td>
+        <td colspan="5" class="ys2">{remark}</td>
     </tr>
-    <tr>
-        <td height="34" width="15%" align="right" class="ys1">^stay_day^</td>
-        <td width="35%" class="ys2">{stay_day}</td>
-        <td height="34" width="15%" align="left" class="ys2" colspan="2"></td>
+    </tbody>
+</table><br/>
+<div><b>会议室安排</b></div>
+<table width="100%" border="0" class="ke-zeroborder">
+    <tbody>
+    <tr class="autoyijianview">
+        <td height="34" width="10%" align="right" class="ys1">*^meeting_room^</td>
+        <td class="ys2" colspan="3">{meeting_room}</td>
     </tr>
-    <tr>
-        <td height="34" width="15%" align="right" class="ys1">^stay_man^</td>
-        <td width="35%" class="ys2">{stay_man}</td>
-        <td height="34" width="15%" align="right" class="ys1">^stay_lady^</td>
-        <td width="35%" class="ys2">{stay_lady}</td>
+    </tbody>
+</table><br/>
+<div><b>就餐安排</b></div>
+<table width="100%" border="0" class="ke-zeroborder">
+    <tbody>
+    <tr class="autoyijianview">
+        <td height="34" width="10%" align="right" class="ys1">^bfp^</td>
+        <td width="10%" class="ys2">{bfp}</td>
+        <td width="5%" class="ys2">人</td>
+        <td height="34" width="10%" align="right" class="ys1">^lunp^</td>
+        <td width="10%" class="ys2">{lunp}</td>
+        <td width="5%" class="ys2">人</td>
+        <td height="34" width="10%" align="right" class="ys1">^dnp^</td>
+        <td width="10%" class="ys2">{dnp}</td>
+        <td width="5%" class="ys2">人</td>
+        <td height="34" width="10%" align="right" class="ys1">^hotel^</td>
+        <td width="10%" class="ys2">{hotel}</td>
+        <td width="5%" class="ys2">人</td>
     </tr>
-    <tr>
-        <td height="34" align="right" class="ys1">^guset_well^</td>
-        <td class="ys2">{guset_well}</td>
-        <td width="35%" class="ys2" colspan="2" ></td>
+    </tbody>
+</table><br/>
+<div><b>住宿安排</b></div>
+<table width="100%" border="0" class="ke-zeroborder">
+    <tbody>
+    <tr class="autoyijianview">
+        <td height="34" width="10%" align="right" class="ys1">^stay_day^</td>
+        <td width="10%" class="ys2">{stay_day}</td>
+        <td width="5%" class="ys2">人</td>
+        <td height="34" width="10%" align="right" class="ys1">^stay_man^</td>
+        <td width="10%" class="ys2">{stay_man}</td>
+        <td width="5%" class="ys2">人</td>
+        <td height="34" width="10%" align="right" class="ys1">^stay_lady^</td>
+        <td width="10%" class="ys2">{stay_lady}</td>
+        <td width="5%" class="ys2">人</td>
+        <td height="34" width="25%" align="right" class="ys1" colspan="4"></td>
     </tr>
-    <tr>
-        <td height="34" align="right" class="ys1">^remark^</td>
-        <td colspan="3" class="ys2">{remark}</td>
+    </tbody>
+</table><br/>
+<div><b>来宾入井安排</b></div>
+<table width="100%" border="0" class="ke-zeroborder">
+    <tbody>
+    <tr class="autoyijianview">
+        <td height="34" width="10%" align="right" class="ys1">^guest_well^</td>
+        <td width="10%" class="ys2" colspan="2">{guest_well}</td>
+        <td width="5%" class="ys2">人</td>
+        <td width="75%" class="ys2"></td>
     </tr>
     </tbody>
 </table>

webmain/flow/page/input_repair_fault.html

@@ -1,19 +1,19 @@
 <table width="100%" border="0" class="ke-zeroborder">
     <tbody>
     <tr class="autoyijianview">
-        <td height="34" align="right" class="ys1">*^type^</td>
-        <td colspan="3" class="ys2">{type}{type_id}</td>
+        <td height="34" width="15%" align="right" class="ys1">*^type^</td>
+        <td colspan="3" width="35%" class="ys2">{type}{type_id}{sms_state}</td>
     </tr>
-    <tr class="autoyijianview">
+    <tr>
         <td height="34" align="right" class="ys1">*^site^</td>
         <td colspan="3" class="ys2">{site}</td>
     </tr>
     <tr>
-        <td height="34" width="15%" align="right" class="ys1">*^mobile^</td>
-        <td width="35%" class="ys2">{mobile}</td>
+        <td height="34" align="right" class="ys1">*^mobile^</td>
+        <td colspan="3" class="ys2">{mobile}</td>
     </tr>
     <tr>
-        <td height="34" width="15%" align="right" class="ys1">*^reporter^</td>
+        <td height="34" width="15%" align="right" class="ys1">^reporter^</td>
         <td width="35%" class="ys2">{reporter}</td>
     </tr>
     <tr>

webmain/task/openapi/openRepairFaultAction.php

@@ -15,22 +15,34 @@ class openRepairFaultClassAction extends openapiAction
 
     public function getListAction()
     {
-        return m("repair_fault")->getall("1=1", "*");
+        $data = m("repair_fault")->getall("1=1", "*");
+        $this->showreturn($data);
+    }
+
+    public function getTypeListAction() {
+        $data = m("repair_type")->getall("1=1", "id, name, dept");
+        $this->showreturn($data);
     }
 
     public function addAction()
     {
         $arr 	 = $this->postdata;
         if(empty($arr))return returnerror('not data');
-
         $arr 	 = json_decode($this->postdata, true);
-        if (empty($arr['site']) || empty($arr['reporter']) || empty($arr['mobile'])) {
+        if (empty($arr['site']) || empty($arr['reporter']) || empty($arr['mobile']) || empty($arr['type']) || empty($arr['type_id']) ) {
             return returnerror('参数缺失');
         }
 
         $ipAddr = $_SERVER['REMOTE_ADDR'];
 
-        $haveData = m("repair_fault")->getall("site='{$arr['site']}' and reporter='{$arr['reporter']}' and mobile = '{$arr['mobile']}' and ip_addr = '{$ipAddr}'");
+        $where = " site='{$arr['site']}' and ";
+        $where .= " reporter='{$arr['reporter']}' and ";
+        $where .= " mobile='{$arr['mobile']}' and ";
+        $where .= " ip_addr='{$ipAddr}' and ";
+        $where .= " type_id='{$arr['type_id']}' ";
+
+
+        $haveData = m("repair_fault")->getall($where);
         if (!empty($haveData)) {
             return returnerror('请勿重复添加');
         }