契約價審修改

wms/cont/apply_form.php

@@ -159,7 +159,7 @@ $data = DB::result($sql);
 
 #電梯詳細資料
 $con_maintance_examine_clear_columm = [
-	'register_code' => ['label' => "電梯許可證代碼", "value" => "", "tag" => 'text', 'attr' => ['colspan' => 2, 'name' => 'register_code[]', 'class' => 'form-control form-control-sm']],
+	'register_code' => ['label' => "電梯許可證代碼", "value" => "", "tag" => 'text', 'attr' => ['colspan' => 2, 'name' => 'register_code[]', 'required', 'class' => 'form-control form-control-sm']],
 	'elevator_brand' => ['label' => "品牌", "value" => "", "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'elevator_brand[]', 'class' => 'form-control form-control-sm'], 'options' => $elevator_brand_opt],
 	'elevator_kind' => ['label' => "電梯類型", "value" => "", "tag" => 'select', 'attr' => ['name' => 'elevator_kind[]', 'required', 'colspan' => 2, 'class' => 'form-control form-control-sm'], 'options' => $elevator_kind_opt],
 	'spec' => ['label' => "規格型號", "value" => "", "tag" => 'select', 'attr' => ['colspan' => 2, 'name' => 'spec[]', 'class' => 'form-control form-control-sm'], 'options' => $fp_kind_opt],
@@ -177,7 +177,9 @@ $con_maintance_examine_clear_columm = [
 	'last_check_date' => ['label' => "上次年檢日期", "value" => "", "tag" => 'number', 'attr' => ['required', 'name' => 'last_check_date[]', 'colspan' => 2, 'class' => 'form-control form-control-sm']],
 
 	'annual_survey_expense' => ['label' => "年檢費用(元)", "value" => "", "tag" => 'number', 'attr' => ['required', 'name' => 'annual_survey_expense[]',  'colspan' => 2, 'class' => 'form-control form-control-sm ']],
+    
 	'maintain_times' => ['label' => "保養次數",  "tag" => 'digits', 'attr' => ['name' => 'maintain_times[]', "value" => "1", 'min=1', 'required',  'class' => 'form-control form-control-sm']],
+    'register_code' => ['label' => "電梯許可證代碼", "tag" => 'text', 'attr' => ['colspan' => 2, 'name' => 'register_code[]', "placeholder" => "無證號請輸入A,B...", 'required',  'class' => 'form-control form-control-sm']],
 	'maintain_months' => ['label' => "保養月數", "tag" => 'digits', 'attr' => ['name' => 'maintain_months[]', "value" => "12", 'min=12', 'required',  'class' => 'form-control form-control-sm']],
 	'maintain_period' => ['label' => "保養周期", "tag" => 'digits', 'attr' => ['name' => 'maintain_period[]', "value" => "1", 'min=1', 'required', 'class' => 'form-control form-control-sm']],
 	'is_m1_bundle' => ['label' => "贈送M1", "value" => "", "tag" => 'select', 'attr' => ['name' => 'is_m1_bundle[]', 'required', 'class' => 'form-control form-control-sm'], 'options' => $is_m1_bundle_opt],
@@ -334,17 +336,46 @@ function   get_sequnece_no($seq_name = '', $p_yyyymm = '')
 			}
 			$("#next_users").append(_option_tmp);
 		});
+        $('#maintain_kind').change(function(){
+            if ($('#cmecTbody tr').length > 0) {
+                alert("保養方式已更動，請開始輸入電梯資料！");
+                $('#cmecTbody').find(':input').val('');
+                return false;
+            }
+        });
 		$("#form").validate();
         $("form").submit(function(e){
             $('#reg_del').val(regDelStr);
         });
 	});
 	addRow = function() {
+        if ($('#maintain_kind').val() == "") {
+            alert("請選擇保養方式！");
+            $('#maintain_kind').eq(0).focus();
+            return false;
+        }
 		var cmecRow = "<?= $cmecRow ?>";
 		$('#cmecTbody').append(cmecRow);
 		$("select[name^='elevator_kind'],select[name^='is_m1_bundle']").on('change', function(obj) {
-			//var children = $(this).parent().parent().parent().children();
+            //console.log('#'+$(this).attr('name')+'#');
+            var elen = 1;
+            if ('elevator_kind[]' == $(this).attr('name')) {
+                var children = $(this).parent().parent().parent();
+                var elementObj = $(children).next('tr').find("input[name^='stand_price']");
+                //var is_m1_bundle = $(children).next('tr').find("select[name^='is_m1_bundle'] option:selected").val();
+            } else if ('is_m1_bundle[]' == $(this).attr('name')) {
                 var children = $(this).parent().parent().parent().prev('tr');
+                var elementObj = $(this).parent().parent().parent().find("input[name^='stand_price']");
+                //var is_m1_bundle = $(this).val();
+            }
+            
+            var element = elementObj;
+            if ('elevator_kind[]' == $(this).attr('name')) {
+                var is_m1_bundle = $(children).next('tr').find("select[name^='is_m1_bundle'] option:selected").val();
+            } else if ('is_m1_bundle[]' == $(this).attr('name')) {
+                var is_m1_bundle = $(children).next('tr').find("select[name^='is_m1_bundle']").val();
+            }
+
             var floors = $(children).find("input[name^='floors']").val();
             var speed = $(children).find("input[name^='speed']").val();
             var weight = $(children).find("input[name^='weight']").val();
@@ -354,11 +385,7 @@ function   get_sequnece_no($seq_name = '', $p_yyyymm = '')
             var maintain_period = $(children).find("input[name^='maintain_period']").val();
             var maintain_kind = $('#maintain_kind').val();
             var elevator_type = $(children).find("select[name^='elevator_kind'] option:selected").val();
-			var is_m1_bundle = $(this).val();//$(children).find("select[name^='is_m1_bundle'] option:selected").val();
             
-			//console.info($(this).parent().parent().parent().parent().parent().next());
-			//.val(maintain_months)
-			var element = $(this).parent().parent().parent().find("input[name^='stand_price']");
             var param1 = {
                 ...param,
                 persons,
@@ -374,7 +401,6 @@ function   get_sequnece_no($seq_name = '', $p_yyyymm = '')
             }
             setStandPrice(param1, element);
             //console.info(param1);
-
 		});
 
 		$("input[name^='floors']" +
@@ -430,9 +456,8 @@ function   get_sequnece_no($seq_name = '', $p_yyyymm = '')
         $(btn).parent().parent().remove();
 	}
 	setStandPrice = function(p, obj) {
-
 		$.ajax({
-			url: '../con/t.php',
+			url: '../cont/t.php',
 			data: p,
 			type: 'get',
 			dataType: 'json',

wms/cont/submit.php

@@ -61,7 +61,7 @@ echo "<script type = 'text/JavaScript'>";
 //echo  "<h4 style='text-align:center'>成功提交<a href='https://www.masada.com.tw/wms/sign/list.php?function_name=show&token=" . $request['token'] . "'>返回待签 </a></h4>";
 if ($tosign) {
     echo "alert('成功提交');";
-    echo "location.href='../con/sign_list.php?function_name=sign_list&token=".$request['token']."';";
+    echo "location.href='../cont/sign_list.php?function_name=sign_list&token=".$request['token']."';";
 } else {
     echo "alert('資料已保存');";
     echo "location.href='../crm/crmm02-index.php?function_name=contract_customer&token=".$request['token']."';";