会议接口、故障报修增加类型

webmain/flow/input/inputjs/mode_repair_fault.js

@@ -1,4 +1,7 @@
 //流程模块【repair_fault.故障维修】下录入页面自定义js页面,初始函数
 function initbodys(){
-	
+    c.onselectdata['type']=function(d) {
+        form('type_id').value=d.value;
+        console.log(d.value);
+    }
 }

webmain/flow/input/inputjs/mode_repair_type.js

@@ -0,0 +1,4 @@
+//流程模块【repair_type.故障报修分类】下录入页面自定义js页面,初始函数
+function initbodys(){
+	
+}

webmain/flow/input/mode_repair_typeAction.php

@@ -0,0 +1,30 @@
+<?php
+/**
+*	此文件是流程模块【repair_type.故障报修分类】对应控制器接口文件。
+*/ 
+class mode_repair_typeClassAction extends inputAction{
+	
+	/**
+	*	重写函数：保存前处理，主要用于判断是否可以保存
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id 0添加时，大于0修改时
+	*	$addbo Boolean 是否添加时
+	*	return array('msg'=>'错误提示内容','rows'=> array()) 可返回空字符串，或者数组 rows 是可同时保存到数据库上数组
+	*/
+	protected function savebefore($table, $arr, $id, $addbo){
+		
+	}
+	
+	/**
+	*	重写函数：保存后处理，主要保存其他表数据
+	*	$table String 对应表名
+	*	$arr Array 表单参数
+	*	$id Int 对应表上记录Id
+	*	$addbo Boolean 是否添加时
+	*/	
+	protected function saveafter($table, $arr, $id, $addbo){
+		
+	}
+}	
+			

webmain/flow/page/input_meeting.html

@@ -1,4 +1,9 @@
 <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>
@@ -6,7 +11,7 @@
     </tr>
     <tr>
         <td height="34" width="15%" align="right" class="ys1">*^apply_dept^</td>
-        <td width="35%" class="ys2">{apply_dept}{apply_dept_id}</td>
+        <td width="35%" class="ys2" colspan="3">{apply_dept}{apply_dept_id}</td>
     </tr>
     <tr>
         <td height="34" width="15%" align="right" class="ys1">*^attn^</td>
@@ -22,17 +27,49 @@
     </tr>
     <tr>
         <td height="34" align="right" class="ys1">*^attendees^</td>
-        <td colspan="3" class="ys2">{attendees}</td>
+        <td colspan="3" class="ys2" >{attendees}</td>
     </tr>
     <tr>
         <td height="34" align="right" class="ys1">*^title^</td>
-        <td colspan="3" class="ys2" colspan="3">{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">{meeting_room}{room_id}{meet_state}</td>
-        <td height="34" align="right" class="ys1"></td>
-        <td class="ys2"></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>
+    </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>
+    </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>
+    </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>
+    </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>
     </tr>
     <tr>
         <td height="34" align="right" class="ys1">^remark^</td>

webmain/flow/page/input_repair_fault.html

@@ -1,14 +1,20 @@
 <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>
+    </tr>
+    <tr class="autoyijianview">
         <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"></td>
-        <td class="ys2"></td>
+    </tr>
+    <tr>
+        <td height="34" width="15%" align="right" class="ys1">*^reporter^</td>
+        <td width="35%" class="ys2">{reporter}</td>
     </tr>
     <tr>
         <td height="34" align="right" class="ys1">^other_info^</td>

webmain/flow/page/rock_page_repair_fault.php

@@ -1,15 +1,15 @@
 <?php
 /**
-*	模块：repair_fault.故障维修
+*	模块：repair_fault.故障报修
 *	说明：自定义区域内可写你想要的代码
-*	来源：流程模块→表单元素管理→[模块.故障维修]→生成列表页
+*	来源：流程模块→表单元素管理→[模块.故障报修]→生成列表页
 */
 defined('HOST') or die ('not access');
 ?>
 <script>
 $(document).ready(function(){
 	{params}
-	var modenum = 'repair_fault',modename='故障维修',isflow=0,modeid='164',atype = params.atype,pnum=params.pnum,modenames='',listname='cmVwYWlyX2ZhdWx0';
+	var modenum = 'repair_fault',modename='故障报修',isflow=0,modeid='164',atype = params.atype,pnum=params.pnum,modenames='',listname='cmVwYWlyX2ZhdWx0';
 	if(!atype)atype='';if(!pnum)pnum='';
 	var fieldsarr = [],fieldsselarr= [],chufarr= [];
 	

webmain/flow/page/rock_page_repair_type.php

@@ -0,0 +1,59 @@
+<?php
+/**
+*	模块：repair_type.故障报修分类
+*	说明：自定义区域内可写你想要的代码
+*	来源：流程模块→表单元素管理→[模块.故障报修分类]→生成列表页
+*/
+defined('HOST') or die ('not access');
+?>
+<script>
+$(document).ready(function(){
+	{params}
+	var modenum = 'repair_type',modename='故障报修分类',isflow=0,modeid='165',atype = params.atype,pnum=params.pnum,modenames='',listname='cmVwYWlyX3R5cGU:';
+	if(!atype)atype='';if(!pnum)pnum='';
+	var fieldsarr = [],fieldsselarr= [],chufarr= [];
+	
+	<?php
+	include_once('webmain/flow/page/rock_page.php');
+	?>
+	
+//[自定义区域start]
+
+
+
+//[自定义区域end]
+	c.initpagebefore();
+	js.initbtn(c);
+	var a = $('#view'+modenum+'_{rand}').bootstable(bootparams);
+	c.init();
+	
+});
+</script>
+<!--SCRIPTend-->
+<!--HTMLstart-->
+<div>
+	<table width="100%">
+	<tr>
+		<td style="padding-right:10px;" id="tdleft_{rand}" nowrap><button id="addbtn_{rand}" class="btn btn-primary" click="clickwin,0" disabled type="button"><i class="icon-plus"></i> <?=lang('新增')?></button></td>
+		
+		<td><select class="form-control" style="width:110px;border-top-right-radius:0;border-bottom-right-radius:0;padding:0 2px" id="fields_{rand}"></select></td>
+		<td><select class="form-control" style="width:60px;border-radius:0px;border-left:0;padding:0 2px" id="like_{rand}"><option value="0"><?=lang('包含')?></option><option value="1"><?=lang('等于')?></option><option value="2"><?=lang('大于')?><?=lang('等于')?></option><option value="3"><?=lang('小于')?><?=lang('等于')?></option><option value="4"><?=lang('不包含')?></option></select></td>
+		<td><select class="form-control" style="width:130px;border-radius:0;border-left:0;display:none;padding:0 5px" id="selkey_{rand}"><option value="">-<?=lang('请选择')?>-</option></select><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px" id="keygj_{rand}" placeholder="<?=lang('关键字')?>"><input class="form-control" style="width:130px;border-radius:0;border-left:0;padding:0 5px;display:none;" id="key_{rand}" placeholder="<?=lang('关键字')?>">
+		</td>
+		
+		<td>
+			<div style="white-space:nowrap">
+			<button style="border-right:0;border-radius:0;border-left:0" class="btn btn-default" click="searchbtn" type="button"><?=lang('搜索')?></button><button class="btn btn-default" id="downbtn_{rand}" type="button" style="padding-left:8px;padding-right:8px;border-top-left-radius:0;border-bottom-left-radius:0"><i class="icon-angle-down"></i></button> 
+			</div>
+		</td>
+		<td  width="90%" style="padding-left:10px"><div id="changatype{rand}" class="btn-group"></div></td>
+	
+		<td align="right" id="tdright_{rand}" nowrap>
+			<span style="display:none" id="daoruspan_{rand}"><button class="btn btn-default" click="daoru,1" type="button"><?=lang('导入')?></button>&nbsp;&nbsp;&nbsp;</span><button class="btn btn-default" style="display:none" id="daobtn_{rand}" disabled click="daochu" type="button"><?=lang('导出')?> <i class="icon-angle-down"></i></button> 
+		</td>
+	</tr>
+	</table>
+</div>
+<div class="blank10"></div>
+<div id="viewrepair_type_{rand}"></div>
+<!--HTMLend-->

webmain/flow/page/view_repair_type_0.html

@@ -0,0 +1 @@
+<table width="100%" border="0" class="ke-zeroborder"><tbody><tr class="autoyijianview"><td height="34" width="15%" align="right" class="ys1">^name^</td><td width="35%" class="ys2">{name}</td><td height="34" width="15%" align="right" class="ys1">^dept^</td><td width="35%" class="ys2">{dept}</td></tr><tr><td height="34" width="15%" align="right" class="ys1">^head^</td><td width="35%" class="ys2">{head}</td><td height="34" align="right" class="ys1"></td><td class="ys2"></td></tr></tbody></table>

webmain/model/repair_faultModel.php

@@ -0,0 +1,25 @@
+<?php
+
+class repair_faultClassModel extends Model
+{
+
+    public function initModel()
+    {
+    }
+
+    public function typeList()
+    {
+        $listArr = m("repair_type")->getall("1=1");
+        for ($i = 0; $i < count($listArr); $i++) {
+            $list = $listArr[$i];
+            $arr[] = [
+                "name"=>$list['name'],
+                "value"=>$list['id'],
+                "subname"=>$list['dept']
+            ];
+        }
+
+        return $arr ?? [["name"=>"第一个下拉框","value"=>"0"]];
+
+    }
+}

webmain/task/openapi/openmeetAction.php

@@ -97,6 +97,7 @@ class openmeetClassAction extends openapiAction
         $nowMeetingSql = /** @lang text */
             "select * from (
             SELECT 1 as type, id, title, start_time, end_time, null as compere, meet_state, meeting_room, attendees, null as attends
+                    ,`bfp`, `lunp`, `dnp`, `hotel`, `stay_day`, `stay_man`, `stay_lady`, `guset_well`
                FROM `[Q]meeting` 
               where status = 1 
                 and start_time < now() 
@@ -104,6 +105,7 @@ class openmeetClassAction extends openapiAction
                 and meeting_room = '".$rawData['room_name']."'
              union all
              SELECT 2 as type, id, title, start_time, end_time, compere, meet_state, meeting_room, attendees, attends
+                    ,0 `bfp`, 0 `lunp`, 0 `dnp`, 0 `hotel`, 0 `stay_day`, 0 `stay_man`, 0 `stay_lady`, 0 `guset_well`
                FROM `[Q]meeting_key` 
               where start_time < now() and end_time > now() and meeting_room = '".$rawData['room_name']."'
               ) as t order by start_time";
@@ -170,7 +172,16 @@ class openmeetClassAction extends openapiAction
                     [
                         "topics"=>$nowMeet['title'],
                         "personnel_list"=>str_replace("\n", "<br />", $nowMeet['attendees']),
-                    ]
+                    ],
+                ];
+                $pl = "";
+                $pl .= "就餐安排：早餐 {$nowMeet['bfp']} 人，午餐 {$nowMeet['lunp']} 人，晚餐 {$nowMeet['dnp']} 人，招待所 {$nowMeet['dnp']} 号厅。 <br />";
+                $pl .= "住宿安排：天数 {$nowMeet['bfp']} 天（午休），男士 {$nowMeet['lunp']} 人，女士 {$nowMeet['dnp']} 人。 <br />";
+                $pl .= "来宾入井安排： {$nowMeet['bfp']}人。";
+
+                $data['participants'][] = [
+                    "topics"=>"会议事项",
+                    "personnel_list"=>$pl,
                 ];
             }
         } else {
@@ -237,6 +248,7 @@ class openmeetClassAction extends openapiAction
             $list[$i] = [
                 'meeting_room_id' => $data['id'],
                 'meeting_room_name' => $data['room_name'],
+                'meeting_room_text' => $data['desc'],
                 'meeting_room_state' => $meetingHave[0]['con'] ?? 0 > 0 ? 1 : 0,
                 'meeting_room_state_text' => $meetingHave[0]['con']  ?? 0 > 0 ? "会议中" : "空闲中",
                 'meeting_today_num' => $meetCon[0]['con'] ?? 0
@@ -376,7 +388,15 @@ class openmeetClassAction extends openapiAction
         // 普通会议
         if ($meetType == 1) {
             $meetInfo = $this->db->getone("[Q]meeting", "`id` = '".$meetId."'");
+
             if (!empty($meetInfo)) {
+
+                $pl = "";
+                $pl .= "就餐安排：早餐 {$meetInfo['bfp']} 人，午餐 {$meetInfo['lunp']} 人，晚餐 {$meetInfo['dnp']} 人，招待所 {$meetInfo['dnp']} 号厅。 <br />";
+                $pl .= "住宿安排：天数 {$meetInfo['bfp']} 天（午休），男士 {$meetInfo['lunp']} 人，女士 {$meetInfo['dnp']} 人。 <br />";
+                $pl .= "来宾入井安排： {$meetInfo['bfp']}人。";
+
+
                 $info['basic_information'] = [
                     "meeting_name"=>str_replace("\n", "",$meetInfo['title']),
                     "meeting_time"=>$meetInfo['start_time'],
@@ -392,6 +412,10 @@ class openmeetClassAction extends openapiAction
                         [
                             "label"=>"备注",
                             "remark"=>$meetInfo['remark']
+                        ],
+                        [
+                            "label"=>"会议事项",
+                            "remark"=>$pl
                         ]
                     ]
                 ];