用车管理PC端修改

webmain/flow/input/inputjs/mode_rjz_car_apply.js

@@ -62,7 +62,49 @@ function initbodys() {
 
                     // form('Usage').value = '下井转转';
                 } else {
-                    form('free_car_con').value = result.data.car_free_con;
+                    // var oTab = $('.ke-zeroborder');
+                    var htmlTrs = '';
+                    for (var i = 0; i < result.data.length; i++) {
+                        var info = result.data[i];
+                        htmlTrs  += '<tr class="car_type_con">';
+                        htmlTrs  += '<td height="34" align="right" class="ys1">';
+                        htmlTrs  += '<div class="form_title">['+info.car_type+']<br />申请数量<font color="red" font-szie="12"><br />(空闲'+info.car_free_con+'辆)</font></div>';
+                        htmlTrs  += '</td><td colspan="3" class="ys2">';
+                        htmlTrs  += '<div class="form_content">';
+                        htmlTrs  += '<div class="divinput">';
+                        htmlTrs  += '<input class="inputs" value="1" tag="'+info.car_type+'" type="number" onfocus="js.focusval=this.value" onblur="js.number(this);c.inputblur(this,0)" name="apply_con">';
+                        htmlTrs  += '</div></div></td><td></td></tr>';
+                    }
+                    $('.car_type_con').remove();
+                    $('.autoyijianview').after(htmlTrs);
+                    var oTr  = '<tr><td class="ys1">test</td><td colspan="3" class="ys2">content</td></tr>';
+
+
+                    // 申请信息
+                    var applyConParams = {};
+                    var applyConInfo = '';
+                    $("input[name=apply_con]").each(function() {
+                        var value = $(this).val();
+                        var key = $(this).attr('tag');
+                        applyConParams[key] = value;
+                        applyConInfo += key+' '+value+' 辆\n';
+                    });
+                    applyInfo = applyConParams;
+                    form('apply_con_info').value = applyConInfo;
+                    form('apply_con_json').value = JSON.stringify(applyConParams);
+
+                    $("*[name=apply_con]").change(function(){
+                        applyConInfo = '';
+                        applyConParams = {};
+                        $("input[name=apply_con]").each(function() {
+                            var value = $(this).val();
+                            var key = $(this).attr('tag');
+                            applyConParams[key] = value;
+                            applyConInfo += key+' '+value+' 辆\n';
+                        });
+                        form('apply_con_info').value = applyConInfo;
+                        form('apply_con_json').value = JSON.stringify(applyConParams);
+                    });
                 }
             }
         }, 'get, json');
@@ -100,6 +142,7 @@ function initbodys() {
                 // 3 - 运输队审批
             if (step === 'fleet_select_car') {
                 // 设置空闲车数量
+                console.log('dasdas');
                 setCarFreeCon(carTypeJson);
                 // 选择车辆
                 setSelectCar();
@@ -130,6 +173,57 @@ function initbodys() {
 
 
         }, 100);
+    } else {
+        $("#title_explain").text("调度说明");
+        console.log('PC端');
+        setTimeout(function() {
+            var time = getNowDatetime();
+            var step = getStep();
+            // 获取车辆类型
+            carTypeJson = $("*[name='data_apply_con_json']").val();
+
+            // 1 - 领导审核（暂时隐藏）
+            if (step === 'leader_review') {
+                $(".car_con_col").show();
+            } else
+                // 2 - 调度室审批
+            if (step === 'dispatch_assess') {
+                // 设置空闲车数量
+                // setCarFreeCon(carTypeJson);
+            } else
+                // 3 - 运输队审批
+            if (step === 'fleet_select_car') {
+                // 设置空闲车数量
+                console.log('dasdas');
+                // setCarFreeCon(carTypeJson);
+                // 选择车辆
+                setSelectCar();
+            } else
+                // 4 - 装车完成
+            if(step === 'load_car_succ') {
+                // 设置装车结束时间
+                $("*[name='load_end_time']").attr('value', time);
+                $("*[name='load_end_time']").removeAttr('onclick');
+            } else
+                // 5 - 运输队审核(车辆下放)
+            if (step == 'fleet_assess_load_car_succ') {
+                // load_end_use();
+                $("*[name='down_time']").attr('value', time);
+                $("*[name='down_time']").removeAttr('onclick');
+                getUpdateCarStateApi('卸车');
+            } else
+                // 6 - 使用完毕
+            if (step == 'load_end_use') {
+                $("*[name='actual_end_time']").attr('value', time);
+                $("*[name='actual_end_time']").removeAttr('onclick');
+            } else
+                // 7 - 运输队审核
+            if (step === 'fleet_assess_load_end_use') {
+                setAssessSuccStep();
+                submitAssessSucc();
+            }
+
+        }, 100);
     }
     function getUrlParamCN(name) {
 
@@ -162,6 +256,7 @@ function initbodys() {
 
     function getStep() {
         var step_text_original = $("#input_step").html();
+        if(step_text_original == null || step_text_original == '') step_text_original = $("#input_step").val();
 
         if(step_text_original == null) return;
 
@@ -206,7 +301,7 @@ function initbodys() {
 
 
     function isMobile() {
-        console.log("判断是否手机");
+        // console.log("判断是否手机");
         var userAgentInfo = navigator.userAgent;
 
         var mobileAgents = ["Android", "iPhone", "SymbianOS", "Windows Phone", "iPad", "iPod"];

webmain/flow/input/inputjs/renjiazhuang/rjz_car_apply.js

@@ -1,11 +1,7 @@
-
-
 var time = getNowDatetime();
 
 setTimeout(function() {
 
-
-
     var step_text_original = $("#input_step").val();
     if (step_text_original == null) return;
     $(".car_con_col").hide();

webmain/flow/input/mode_rjz_car_applyAction.php

@@ -61,6 +61,8 @@ class mode_rjz_car_applyClassAction extends inputAction{
 	public function carNum() {
 		$carType = $this->get('custom');
         $carTypeJson = json_decode($carType);
+        if(!isset($carTypeJson)) return [];
+
         $arr = [];
         foreach($carTypeJson as $k=>$v) {
             $arr[] = $k;
@@ -86,18 +88,17 @@ class mode_rjz_car_applyClassAction extends inputAction{
     // 获取空闲数量
 	public function getFreeCarConAjax() {
 		$carType = $this->get('car_type');
-        if($carType) {
+        if(isset($carType)) {
             $carTypeArr = [];
             $carType = json_decode($carType);
 
             foreach ($carType as $k => $v) {
-                $carTypeArr[] = $v->name;
+                $carTypeArr[] = $v;
             }
             $carTypeStr = implode('",',$carTypeArr);
             $carTypeStr = str_replace(["[","]"],"",json_encode($carTypeArr, JSON_UNESCAPED_UNICODE));
             $data = m('renjiazhuang')->getCarIdleCon($carTypeStr);
 
-//            return $data;
             return returnsuccess($data);
         } else {
             return returnerror('未选择类型！');

webmain/flow/page/input_rjz_car_apply.html

@@ -1,38 +1,46 @@
 <table width="100%" border="0" class="ke-zeroborder">
     <tbody>
-        <tr class="autoyijianview">
-            <td height="34" width="15%" align="right" class="ys1">*^car_type^</td>
-            <td width="35%" class="ys2">{car_type}</td>
-            <td height="34" width="15%" align="right" class="ys1">剩余车辆</td>
-            <td width="35%" class="ys2">
-<!--                <input class="inputs" style="border:none;background:none;font-weight: 600;color: red;" name="surplus" readonly="">-->
-                {free_car_con}
-            </td>
-        </tr>
-        <tr>
-            <td height="34" width="15%" align="right" class="ys1">
-                *申请车场
-            </td>
-            <td width="35%" class="ys2">
-                {parking_location}
-            </td>
-            <td height="34" align="right" class="ys1">
-            </td>
-            <td class="ys2">
-            </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>
-        </tr>
-        <tr>
-            <td height="34" align="right" class="ys1">^base_name^</td>
-            <td class="ys2">{base_name}</td>
-            <td align="right" class="ys1">^base_deptname^</td>
-            <td class="ys2">{base_deptname}</td>
-        </tr>
+    <tr class="autoyijianview">
+        <td height="34" width="15%" align="right" class="ys1">*^car_type^</td>
+        <td width="35%" class="ys2" colspan="3">{car_type}{apply_con_json}</td>
+    </tr>
+    <tr>
+        <td height="34" align="right" class="ys1">*^apply_con_info^</td>
+        <td colspan="3" class="ys2">{apply_con_info}</td>
+    </tr>
+    <tr>
+        <td height="34" width="15%" align="right" class="ys1">*^parking_location^</td>
+        <td width="35%" class="ys2">{parking_location}</td>
+        <td height="34" width="15%" align="right" class="ys1">*^destination^</td>
+        <td width="35%" class="ys2">{destination}</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>
+    </tr>
+    <tr>
+        <td height="34" align="right" class="ys1">*^Usage^</td>
+        <td colspan="3" class="ys2">{Usage}</td>
+    </tr>
+    <tr>
+        <td height="34" width="15%" align="right" class="ys1">*^method^</td>
+        <td width="35%" class="ys2">{method}</td>
+        <td height="34" width="15%" align="right" class="ys1">*^is_ferry^</td>
+        <td width="35%" class="ys2">{is_ferry}</td>
+    </tr>
+    <tr>
+        <td height="34" width="15%" align="right" class="ys1">*^direction^</td>
+        <td width="35%" class="ys2">{direction}</td>
+        <td height="34" align="right" class="ys1"></td>
+        <td class="ys2"></td>
+    </tr>
+    <tr>
+        <td height="34" align="right" class="ys1">^base_name^</td>
+        <td class="ys2">{base_name}</td>
+        <td align="right" class="ys1">^base_deptname^</td>
+        <td class="ys2">{base_deptname}</td>
+    </tr>
     </tbody>
-</table>
-
+</table>

webmain/flow/page/view_rjz_car_apply_0.html

@@ -6,22 +6,31 @@
         display: none;
     }
 </style>
-<script type="text/javascript" src="webmain/flow/input/inputjs/renjiazhuang/rjz_car_apply.js"></script>
+<!--<script type="text/javascript" src="webmain/flow/input/inputjs/renjiazhuang/rjz_car_apply.js"></script>-->
 <table width="100%" border="0" class="ke-zeroborder">
     <tbody>
         <!--申请信息-->
         <tr class="autoyijianview">
             <td height="34" colspan="4" width="15%" align="center" style="font-weight: 600" class="ys1">申请信息</td>
         </tr>
+        <input type="hidden" name="data_apply_con_json" value='{apply_con_json}' readonly="">
         <tr>
-            <td height="34" width="15%" align="right" class="ys1">申请信息</td>
-            <td width="35%" class="ys2" colspan="3">
-                <input class="inputs" style="border:none;background:none;" name="apply_con_json" value='{apply_con_json}' readonly="">
+            <td height="34" width="15%" align="right" class="ys1" rowspan="4" >申请信息</td>
+            <td width="35%" class="ys2" rowspan="4" > {apply_con_info}
+<!--                <input class="inputs" style="border:none;background:none;" name="apply_con_json" value='{apply_con_json}' readonly="">-->
             </td>
-<!--            <td height="34" width="15%" align="right" class="ys1">车牌号</td>-->
-<!--            <td width="35%" class="ys2">-->
-<!--                <input class="inputs" style="border:none;background:none;font-weight: 600;color: white; background: #0a6ebd;" name="carname_success" readonly="" value="{carname}">-->
-<!--            </td>-->
+        </tr>
+        <tr>
+            <td align="right" class="ys1">使用方式</td>
+            <td class="ys2">{method}</td>
+        </tr>
+        <tr>
+            <td align="right" class="ys2">需运输队装车</td>
+            <td class="ys2">{is_ferry}</td>
+        </tr>
+        <tr>
+            <td align="right" class="ys1">使用方向</td>
+            <td class="ys2">{direction}</td>
         </tr>
         <tr>
             <td height="34" width="15%" align="right" class="ys1">出发地</td>
@@ -54,14 +63,14 @@
             <td height="34" colspan="4" width="15%" align="center" style="font-weight: 600" class="ys1">车辆指派情况</td>
         </tr>
         <tr>
-            <td height="34" width="15%" align="right" class="ys1">平板车</td>
-            <td width="35%" class="ys2">
-                <input class="inputs" style="border:none;background:none;" name="car_con" readonly="">
-            </td>
-            <td height="34" width="15%" align="right" class="ys1">空闲车辆</td>
-            <td width="35%" class="ys2">
-                <input class="inputs" style="border:none;background:none;" name="surplus" readonly="">
+            <td height="34" width="15%" align="right" class="ys1">车辆编号</td>
+            <td width="35%" class="ys2" colspan="3">
+                <input class="inputs" style="border:none;background:none;" name="carname" readonly="" value="{carname}">
             </td>
+<!--            <td height="34" width="15%" align="right" class="ys1">空闲车辆</td>-->
+<!--            <td width="35%" class="ys2">-->
+<!--                <input class="inputs" style="border:none;background:none;" name="surplus" readonly="">-->
+<!--            </td>-->
         </tr>
         <!--实时信息-->
         <tr class="car_con_col">
@@ -100,6 +109,7 @@
             <td width="35%" class="ys2"></td>
         </tr>
         <!--考核信息-->
+        <input type = 'hidden' name="assess_timeout" value="" />
         <tr>
             <td height="34" colspan="4" width="15%" align="center" style="font-weight: 600" class="ys1">考核信息</td>
         </tr>

webmain/task/mode/tpl_mode_p.html

@@ -355,7 +355,7 @@ if($stype!=''){
 			if($smlx!=3){
 			?>
 			<tr>
-				<td class="tdys1"><div  align="right" style="color:#555555"><?php if($smlx==1)echo '<font color=red>*</font>';?>说明</div></td>
+				<td class="tdys1"><div id="title_explain" align="right" style="color:#555555"><?php if($smlx==1)echo '<font color=red>*</font>';?>说明</div></td>
 				<td class="tdys1" style="padding:5px"><div align="left"><textarea class="textarea" name="check_explain" style="width:95%;height:60px"></textarea></div></td>
 			</tr>