From 16ff414ff688128f072a4135c4bb02f1c2779bda Mon Sep 17 00:00:00 2001 From: kgdxpr Date: Thu, 25 Jul 2024 15:29:47 +0800 Subject: [PATCH] 'commit' --- WebRoot/view/tb/zbdc/cgzb_cz_new.html | 68 +++++- WebRoot/view/tb/zbdc/cgzb_gz_new.html | 68 +++++- WebRoot/view/tb/zbdc/cgzb_jnygz_new.html | 155 +++++++++--- WebRoot/view/tb/zbdc/cgzb_wqzx_new.html | 289 ++++++++++++++++++----- WebRoot/view/tb/zbdc/cgzb_xx_new.html | 72 +++++- 5 files changed, 538 insertions(+), 114 deletions(-) diff --git a/WebRoot/view/tb/zbdc/cgzb_cz_new.html b/WebRoot/view/tb/zbdc/cgzb_cz_new.html index 25edbe09..dc251297 100644 --- a/WebRoot/view/tb/zbdc/cgzb_cz_new.html +++ b/WebRoot/view/tb/zbdc/cgzb_cz_new.html @@ -914,53 +914,68 @@
-
-
-
+
-
- +
+ +
+ +
+
- +
+ +
+ +
+
@@ -1057,6 +1072,15 @@ , "cz_hjddwjzgnqshu": res.cz_hjddwjzgnqshu == null ? 0 : res.cz_hjddwjzgnqshu }); + var _cz_hjdjs_y = $('#cz_hjdjs_y').val(); + var _cz_hjdjs_n = $('#cz_hjdjs_n').val(); + $('#cz_hjdjs_total').val(parseFloat(_cz_hjdjs_y)+parseFloat(_cz_hjdjs_n)); + + + var _cz_hjdgns_y = $('#cz_hjdgns_y').val(); + var _cz_hjdgns_n = $('#cz_hjdgns_n').val(); + $('#cz_hjdgns_total').val(parseFloat(_cz_hjdgns_y)+parseFloat(_cz_hjdgns_n)); + if (res.cz_wl != null) { $('#div_czwl').empty(); @@ -1209,6 +1233,30 @@ + $('#cz_hjdjs_total, #cz_hjdjs_y').blur(function () { + var totalValue = $('#cz_hjdjs_total').val(); + var yValue = $('#cz_hjdjs_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#cz_hjdjs_n').val(nValue); + } + }); + + $('#cz_hjdgns_total, #cz_hjdgns_y').blur(function () { + var totalValue = $('#cz_hjdgns_total').val(); + var yValue = $('#cz_hjdgns_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#cz_hjdgns_n').val(nValue); + } + }); + + + $(document).on('click', 'i.layui-icon-error', function () { if (this.id != 'cz_addLjItem') { $('#div_' + this.id).remove(); diff --git a/WebRoot/view/tb/zbdc/cgzb_gz_new.html b/WebRoot/view/tb/zbdc/cgzb_gz_new.html index dec290a4..9640761a 100644 --- a/WebRoot/view/tb/zbdc/cgzb_gz_new.html +++ b/WebRoot/view/tb/zbdc/cgzb_gz_new.html @@ -853,54 +853,71 @@
-
-
-
+
-
- +
+ +
+ +
+
- +
+ +
+ +
+
+ +
@@ -972,6 +989,15 @@ , "gz_tjsjjsmj": res.gz_tjsjjsmj == null ? 0 : res.gz_tjsjjsmj }); + var _gz_hjdjs_y = $('#gz_hjdjs_y').val(); + var _gz_hjdjs_n = $('#gz_hjdjs_n').val(); + $('#gz_hjdjs_total').val(parseFloat(_gz_hjdjs_y)+parseFloat(_gz_hjdjs_n)); + + + var _gz_hjdgns_y = $('#gz_hjdgns_y').val(); + var _gz_hjdgns_n = $('#gz_hjdgns_n').val(); + $('#gz_hjdgns_total').val(parseFloat(_gz_hjdgns_y)+parseFloat(_gz_hjdgns_n)); + if (res.gz_wl != null) { $('#div_gzwl').empty(); @@ -1185,6 +1211,28 @@ return result; } + $('#gz_hjdjs_total, #gz_hjdjs_y').blur(function () { + var totalValue = $('#gz_hjdjs_total').val(); + var yValue = $('#gz_hjdjs_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#gz_hjdjs_n').val(nValue); + } + }); + + $('#gz_hjdgns_total, #gz_hjdgns_y').blur(function () { + var totalValue = $('#gz_hjdgns_total').val(); + var yValue = $('#gz_hjdgns_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#gz_hjdgns_n').val(nValue); + } + }); + form.on('submit(save)', function (data) { diff --git a/WebRoot/view/tb/zbdc/cgzb_jnygz_new.html b/WebRoot/view/tb/zbdc/cgzb_jnygz_new.html index 4cd59f6a..beb6cd46 100644 --- a/WebRoot/view/tb/zbdc/cgzb_jnygz_new.html +++ b/WebRoot/view/tb/zbdc/cgzb_jnygz_new.html @@ -636,58 +636,77 @@
-
-
-
- + +
- +
-
- +
+ +
+ +
+
- +
+ +
+ +
+
- + + +
- - + + @@ -1538,56 +1557,73 @@
-
-
-
- + +
+
-
- +
+ +
+ +
+
- +
+ +
+ +
+
- +
- + + @@ -1679,6 +1715,15 @@ , "xx_hjddwjzgnqshu": res.xx_hjddwjzgnqshu == null ? 0 : res.xx_hjddwjzgnqshu }); + var _xx_hjdjs_y = $('#xx_hjdjs_y').val(); + var _xx_hjdjs_n = $('#xx_hjdjs_n').val(); + $('#xx_hjdjs_total').val(parseFloat(_xx_hjdjs_y)+parseFloat(_xx_hjdjs_n)); + + + var _xx_hjdgns_y = $('#xx_hjdgns_y').val(); + var _xx_hjdgns_n = $('#xx_hjdgns_n').val(); + $('#xx_hjdgns_total').val(parseFloat(_xx_hjdgns_y)+parseFloat(_xx_hjdgns_n)); + if (res.xx_ldjy != null) { $('#div_xxldjy').empty(); @@ -1760,6 +1805,15 @@ , "cz_hjddwjzgnqshu": res.cz_hjddwjzgnqshu == null ? 0 : res.cz_hjddwjzgnqshu }); + var _cz_hjdjs_y = $('#cz_hjdjs_y').val(); + var _cz_hjdjs_n = $('#cz_hjdjs_n').val(); + $('#cz_hjdjs_total').val(parseFloat(_cz_hjdjs_y)+parseFloat(_cz_hjdjs_n)); + + + var _cz_hjdgns_y = $('#cz_hjdgns_y').val(); + var _cz_hjdgns_n = $('#cz_hjdgns_n').val(); + $('#cz_hjdgns_total').val(parseFloat(_cz_hjdgns_y)+parseFloat(_cz_hjdgns_n)); + if (res.cz_wl != null) { $('#div_czwl').empty(); @@ -2005,6 +2059,51 @@ }); + $('#xx_hjdjs_total, #xx_hjdjs_y').blur(function () { + var totalValue = $('#xx_hjdjs_total').val(); + var yValue = $('#xx_hjdjs_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#xx_hjdjs_n').val(nValue); + } + }); + + $('#xx_hjdgns_total, #xx_hjdgns_y').blur(function () { + var totalValue = $('#xx_hjdgns_total').val(); + var yValue = $('#xx_hjdgns_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#xx_hjdgns_n').val(nValue); + } + }); + + $('#cz_hjdjs_total, #cz_hjdjs_y').blur(function () { + var totalValue = $('#cz_hjdjs_total').val(); + var yValue = $('#cz_hjdjs_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#cz_hjdjs_n').val(nValue); + } + }); + + $('#cz_hjdgns_total, #cz_hjdgns_y').blur(function () { + var totalValue = $('#cz_hjdgns_total').val(); + var yValue = $('#cz_hjdgns_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#cz_hjdgns_n').val(nValue); + } + }); + + $(document).on('click', 'i', function () { if (this.id != 'addLjItem') { diff --git a/WebRoot/view/tb/zbdc/cgzb_wqzx_new.html b/WebRoot/view/tb/zbdc/cgzb_wqzx_new.html index 692a2c17..e50b9238 100644 --- a/WebRoot/view/tb/zbdc/cgzb_wqzx_new.html +++ b/WebRoot/view/tb/zbdc/cgzb_wqzx_new.html @@ -625,7 +625,7 @@
劳动教育
-
+
@@ -633,7 +633,8 @@
- @@ -643,10 +644,24 @@ +
+ + +
+
@@ -932,53 +948,72 @@
-
-
-
+
-
- +
+ +
+ +
+
- +
+ +
+ +
+
@@ -1785,55 +1820,76 @@
-
-
-
+
-
- +
+ +
+ +
+
- +
+ +
+ +
+
+ +
@@ -1911,6 +1967,15 @@ , "gz_tjsjjsmj": res.gz_tjsjjsmj == null ? 0 : res.gz_tjsjjsmj }); + var _gz_hjdjs_y = $('#gz_hjdjs_y').val(); + var _gz_hjdjs_n = $('#gz_hjdjs_n').val(); + $('#gz_hjdjs_total').val(parseFloat(_gz_hjdjs_y) + parseFloat(_gz_hjdjs_n)); + + + var _gz_hjdgns_y = $('#gz_hjdgns_y').val(); + var _gz_hjdgns_n = $('#gz_hjdgns_n').val(); + $('#gz_hjdgns_total').val(parseFloat(_gz_hjdgns_y) + parseFloat(_gz_hjdgns_n)); + if (res.gz_wl != null) { $('#div_gzwl').empty(); @@ -1943,29 +2008,29 @@ - if (typeof res.cz_wllshshshu !== 'undefined') { + // if (typeof res.cz_wllshshshu !== 'undefined') { - var arr = ["cz_ldjyqlhwsrshu", "cz_ldjyzyhwsrshu", "cz_ldjyprwywsrshu", "cz_ldjyjyqyqsyyh", "cz_ldjynyscld", "cz_ldjyccgyz", "cz_ldjygyscld", "cz_ldjyxjstyyyy", "cz_ldjyxdfwyld"]; - var ljRes = arr.filter(function (key) { - return res[key] !== 0 && res[key] !== null; - }); + // var arr = ["cz_ldjyqlhwsrshu", "cz_ldjyzyhwsrshu", "cz_ldjyprwywsrshu", "cz_ldjyjyqyqsyyh", "cz_ldjynyscld", "cz_ldjyccgyz", "cz_ldjygyscld", "cz_ldjyxjstyyyy", "cz_ldjyxdfwyld"]; + // var ljRes = arr.filter(function (key) { + // return res[key] !== 0 && res[key] !== null; + // }); - if (ljRes.length > 0) { - ljRes.forEach(function (item, index) { - if (index == 0) { - $('#cz_defaultSelect').val(item); - $('#cz_defaultInput').val(res[item]); - form.render(); - } else { - var id = generateRandomString(); - appendLjItem_cz(id); - $('#cz_select_' + id).val(item); - $('#cz_input_' + id).val(res[item]); - } - }); - form.render(); - } - } + // if (ljRes.length > 0) { + // ljRes.forEach(function (item, index) { + // if (index == 0) { + // $('#cz_defaultSelect').val(item); + // $('#cz_defaultInput').val(res[item]); + // form.render(); + // } else { + // var id = generateRandomString(); + // appendLjItem_cz(id); + // $('#cz_select_' + id).val(item); + // $('#cz_input_' + id).val(res[item]); + // } + // }); + // form.render(); + // } + // } form.val("myForm2", { "cz_tygyshshu": res.cz_tygyshshu == null ? 0 : res.cz_tygyshshu @@ -1994,6 +2059,15 @@ , "cz_hjddwjzgnqshu": res.cz_hjddwjzgnqshu == null ? 0 : res.cz_hjddwjzgnqshu }); + var _cz_hjdjs_y = $('#cz_hjdjs_y').val(); + var _cz_hjdjs_n = $('#cz_hjdjs_n').val(); + $('#cz_hjdjs_total').val(parseFloat(_cz_hjdjs_y) + parseFloat(_cz_hjdjs_n)); + + + var _cz_hjdgns_y = $('#cz_hjdgns_y').val(); + var _cz_hjdgns_n = $('#cz_hjdgns_n').val(); + $('#cz_hjdgns_total').val(parseFloat(_cz_hjdgns_y) + parseFloat(_cz_hjdgns_n)); + if (res.cz_wl != null) { $('#div_czwl').empty(); @@ -2023,6 +2097,20 @@ $('#div_czms').html(res.cz_ms); } + + if (res.cz_ldjy != null) { + $('#div_czldjy').empty(); + + $('#div_czldjy').html(res.cz_ldjy); + } + + if (typeof res.cz_ldjy_values !== 'undefined' && res.cz_ldjy_values != null) { + $('#div_czldjy').find('select').each(function (index) { + $(this).val(res.cz_ldjy_values.split(",")[index]); + }); + } + + form.render(); } }); @@ -2072,11 +2160,23 @@ selectValues.push(selectedValue); }); + var qtIndexArr = selectValues.reduce(function (result, item, index) { + if (item === "cz_ldjyqt") { + result.push(index); + } + return result; + }, []); + $('input[temp="cz_ljCount"]').each(function () { var inputValue = $(this).val(); inputValues.push(inputValue); }); + for (var i = qtIndexArr.length - 1; i >= 0; i--) { + selectValues.splice(qtIndexArr[i], 1); + inputValues.splice(qtIndexArr[i], 1); + } + if (hasDuplicates(selectValues)) { layer.msg('劳技中的教室分类重复！', { @@ -2101,6 +2201,16 @@ result.cz_sw = Base64.encode($("#div_czsw").html()); result.cz_yq = Base64.encode($("#div_czyy").html()); result.cz_ms = Base64.encode($("#div_czms").html()); + result.cz_ldjy = Base64.encode($("#div_czldjy").html()); + + var czldjySelectArr = []; + + $('#div_czldjy').find('select').each(function () { + var selectedValue = $(this).val(); + czldjySelectArr.push(selectedValue); + }); + + result.cz_ldjy_values = czldjySelectArr.join(','); @@ -2142,6 +2252,50 @@ }); + $('#cz_hjdjs_total, #cz_hjdjs_y').blur(function () { + var totalValue = $('#cz_hjdjs_total').val(); + var yValue = $('#cz_hjdjs_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#cz_hjdjs_n').val(nValue); + } + }); + + $('#cz_hjdgns_total, #cz_hjdgns_y').blur(function () { + var totalValue = $('#cz_hjdgns_total').val(); + var yValue = $('#cz_hjdgns_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#cz_hjdgns_n').val(nValue); + } + }); + + $('#gz_hjdjs_total, #gz_hjdjs_y').blur(function () { + var totalValue = $('#gz_hjdjs_total').val(); + var yValue = $('#gz_hjdjs_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#gz_hjdjs_n').val(nValue); + } + }); + + $('#gz_hjdgns_total, #gz_hjdgns_y').blur(function () { + var totalValue = $('#gz_hjdgns_total').val(); + var yValue = $('#gz_hjdgns_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#gz_hjdgns_n').val(nValue); + } + }); + function appendLjItem_cz(id) { @@ -2151,7 +2305,7 @@ '' + '
' + - '' + '' + '' + '' + @@ -2161,33 +2315,56 @@ '' + '' + '' + + '' + '' + '
' + '
' + '' + - '
' + + '' + '
' + - '
' + - '' + + '
' + + '' + + '
' + + '' + '
' + + '
' + + '' + '
' + - '
' + '
' + + '
' + + '
'; $('#ljItmes_cz').append(str); form.render(); } + form.on('select(cz_defaultSelect)', function (data) { + var tempId = data.elem.id.split('_')[2]; + console.log(tempId); + var idVal = 'cz_ldjy_custom'; + if (typeof tempId !== 'undefined') { + idVal = 'cz_ldjy_custom_' + tempId; + } + if (data.value == 'cz_ldjyqt') { + $('#' + idVal).show(); + } else { + $('#' + idVal).hide(); + } + }); + $("#czwl_sys_addItem").click(function () { diff --git a/WebRoot/view/tb/zbdc/cgzb_xx_new.html b/WebRoot/view/tb/zbdc/cgzb_xx_new.html index 4fcd03e8..992788f3 100644 --- a/WebRoot/view/tb/zbdc/cgzb_xx_new.html +++ b/WebRoot/view/tb/zbdc/cgzb_xx_new.html @@ -611,55 +611,74 @@
-
-
-
+
-
- +
+ +
+ +
+
- +
+ +
+ +
+
+ +
@@ -763,6 +782,17 @@ , "xx_hjddwjzgnqshu": res.xx_hjddwjzgnqshu == null ? 0 : res.xx_hjddwjzgnqshu }); + var _xx_hjdjs_y = $('#xx_hjdjs_y').val(); + var _xx_hjdjs_n = $('#xx_hjdjs_n').val(); + $('#xx_hjdjs_total').val(parseFloat(_xx_hjdjs_y)+parseFloat(_xx_hjdjs_n)); + + + var _xx_hjdgns_y = $('#xx_hjdgns_y').val(); + var _xx_hjdgns_n = $('#xx_hjdgns_n').val(); + $('#xx_hjdgns_total').val(parseFloat(_xx_hjdgns_y)+parseFloat(_xx_hjdgns_n)); + + + if (res.xx_ldjy != null) { $('#div_xxldjy').empty(); @@ -797,6 +827,28 @@ }); + $('#xx_hjdjs_total, #xx_hjdjs_y').blur(function () { + var totalValue = $('#xx_hjdjs_total').val(); + var yValue = $('#xx_hjdjs_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#xx_hjdjs_n').val(nValue); + } + }); + + + $('#xx_hjdgns_total, #xx_hjdgns_y').blur(function () { + var totalValue = $('#xx_hjdgns_total').val(); + var yValue = $('#xx_hjdgns_y').val(); + if (totalValue && yValue) { + totalValue = parseFloat(totalValue); + yValue = parseFloat(yValue); + var nValue = totalValue - yValue; + $('#xx_hjdgns_n').val(nValue); + } + }); form.on('submit(save)', function (data) {