From 621cc74ca68b34573e440e652b267210ca09b19d Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 08 十二月 2025 08:48:52 +0800
Subject: [PATCH] 车辆 模块 添加车型选择
---
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Car.html | 13 +++-
WebTM/views/基础资料/基础资料/Gy_CarTypeList.html | 60 ++++++++++++++++---
WebTM/views/基础资料/公用基础资料/Gy_CarList.html | 56 +++++++++++-------
WebTM/layuiadmin/Scripts/webConfig.js | 4
4 files changed, 96 insertions(+), 37 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 490664f..ab159ec 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -6,12 +6,12 @@
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
- var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+ // var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
//var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
- //var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
+ var WEBURL = "http://localhost:81/API/"; // 闄堥晲鍝叉湰鍦伴厤缃�*/
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html"
index 62786f0..83b2567 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Car.html"
@@ -480,7 +480,10 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
+
debugger
+ $("#HCarTypeName").val(checkStatus.data[0]['杞﹀瀷鍚嶇О'])
+ $("#HCarTypeID").val(checkStatus.data[0]['HItemID'])
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
@@ -797,9 +800,9 @@
"HModifyEmp": data.淇敼浜�,
"HModifyTime": data.淇敼鏃堕棿 ? util.toDateString(data.淇敼鏃堕棿, 'yyyy-MM-dd') : ""
});
-
+
// 鑾峰彇鏈嶅姟鍣ㄥ熀鍦板潃
- var apiIndex = GetWEBURL().indexOf("/API/");
+ var apiIndex = GetWEBURL().indexOf("/API/");
var filePath = GetWEBURL().slice(0, apiIndex) + "/"
if (data['杞﹁締鐓х墖']) {
$("#HCarPric").css("cursor", "pointer")
@@ -929,10 +932,14 @@
}
function GetHCar(data) {
- debugger
$("#HParentID").val(data[0]["hmainid"])
$("#HParentName").val(data[0]["杞﹁締鍚嶇О"])
}
+
+ function GetHCarType(data) {
+ $("#HCarTypeName").val(data[0]['杞﹀瀷鍚嶇О'])
+ $("#HCarTypeID").val(data[0]['HItemID'])
+ }
</script>
</body>
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.html"
index 72bbe20..54c1a61 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarList.html"
@@ -419,17 +419,29 @@
//鍙屽嚮琛ㄦ牸浜嬩欢
table.on('rowDouble(mainTable)', function (obj) {
- if (window.top == window.self) {
- // 闈濱Frame椤甸潰鎵ц浠ｇ爜
+ // IFrame椤甸潰鎵ц浠ｇ爜
+ var data = [];
+ data.push(obj.data);
+ var index = parent.layer.getFrameIndex(window.name);
+ if(!index){
+ // 闈炲脊鍑哄眰椤甸潰
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2,
+ area: ['100%', '100%'],
+ title: '杞﹁締-缂栬緫',
+ shift: 0,
+ content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
+ end: function () {
+ // 寮圭獥鍏抽棴鍚庡埛鏂拌〃鏍兼暟鎹紝涓嶅埛鏂版暣涓〉闈�
+ get_Refresh();
+ }
+ })
return
}
- // IFrame椤甸潰鎵ц浠ｇ爜
- var data = [];
- data.push(obj.data);
parent.GetHCar(data);
- var index = parent.layer.getFrameIndex(window.name);
parent.layer.close(index);
})
@@ -507,7 +519,7 @@
//, cols: [[
// { type: 'checkbox', fixed: 'left' }
// , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
- // , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ // , { field: '杞︾墝鍙�', title: '杞︾墝鍙�' }
// , { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О' }
// , { field: '缁勭粐', title: '缁勭粐' }
// , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
@@ -543,8 +555,8 @@
table.on('tool(mainTable)', function (obj) {
var data = obj.data;
- //鐢熶骇璧勬簮浠ｇ爜
- if (obj.event == '鐢熶骇璧勬簮浠ｇ爜') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '鐢熶骇璧勬簮浠ｇ爜'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
+ //杞︾墝鍙�
+ if (obj.event == 'onCarNumberClickHandler') { //妫�鏌� obj.event 鏄惁绛変簬瀛楃涓� '杞︾墝鍙�'銆傚鏋滅瓑浜庯紝鍒欐墽琛宨f寰幆
var linterid = data.HItemID.toString(); //澹版槑鍙橀噺linterid 涓� data.hmainid
layer.open({ //浣跨敤 layer鐨刼pen鎵撳紑寮瑰嚭 灞�
type: 2 //琛ㄧず寮瑰嚭灞傜殑鍐呭鏄竴涓� iframe
@@ -554,7 +566,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
+ , content: '../鍏敤鍩虹璧勬枡/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=' //璁剧疆 iframe 鐨� URL锛孶RL 涓寘鍚簡鏌ヨ鍙傛暟锛屾潵璋冪敤鎵�闇�瑕佺殑鍊�
, resize: false, //鏄惁鍏佽鐢ㄦ埛璋冩暣寮瑰嚭澶у皬
end: function () { //褰撳叧闂椂璋冪敤
get_FastQuery(table, option);
@@ -592,10 +604,10 @@
}
else if ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
- } else if (data[i].name == '鐢熶骇璧勬簮浠ｇ爜') {
+ } else if (data[i].name == '杞︾墝鍙�') {
col.push({
- field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鐢熶骇璧勬簮浠ｇ爜', templet: function (d) {
- return '<span style="color: blue;">' + d.鐢熶骇璧勬簮浠ｇ爜 + '</span>'
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '杞︾墝鍙�', templet: function (d) {
+ return '<span style="color: blue;">' + d.杞︾墝鍙� + '</span>'
}, style: 'cursor: pointer;'
});
} else {
@@ -704,16 +716,16 @@
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- //if (data[i].name === '鏉＄爜缂栧彿') {
- // col.push({
- // field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
- // templet: function (d) {
- // return '<span style="color: blue;" lay-unrow >' + d.鏉＄爜缂栧彿 + '</span>'
- // }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
- // });
- //} else {
+ if (data[i].name === '杞︾墝鍙�') {
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
+ templet: function (d) {
+ return '<span style="color: blue;" lay-unrow >' + d.杞︾墝鍙� + '</span>'
+ }, style: 'cursor: pointer;', event: 'onCarNumberClickHandler'
+ });
+ } else {
col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
- //}
+ }
}
}
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
index fa66c842..73bcfa9 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_CarTypeList.html"
@@ -1,5 +1,6 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
+
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>杞﹀瀷缁存姢</title>
@@ -16,6 +17,7 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
</head>
+
<body>
<div class="layui-fluid">
<div class="layui-col-md12">
@@ -41,28 +43,36 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
+ lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:5px">
<div class="layui-inline">
<label class="layui-form-label">杩囨护</label>
<div class="layui-input-block">
- <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
+ <select name="ColName" id="ColName" lay-filter="ColName"
+ style="width:190px;">
</select>
</div>
</div>
<div class="layui-inline">
- <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
+ <select name="Comparator" id="Comparator" lay-filter="Comparator"
+ style="width:190px;">
<option value="0" selected="selected"></option>
<option value="=">=</option>
<option value=">=">>=</option>
<option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
+ <option value="<=">
+ <=< /option>
+ <option value="<">
+ << /option>
+ <option value="<>">
+ <>
+ </option>
<option value="7">鍖呭惈</option>
<option value="8">宸﹀寘鍚�</option>
<option value="9">鍙冲寘鍚�</option>
@@ -70,7 +80,8 @@
</select>
</div>
<div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
+ <input type="text" class="layui-input" value="" name="ColContent"
+ id="ColContent">
</div>
</div>
</div>
@@ -225,6 +236,34 @@
});
//#endregion
+ //#region 鍙屽嚮杩斿洖鏁版嵁
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ // IFrame椤甸潰鎵ц浠ｇ爜
+ var data = [];
+ data.push(obj.data);
+ var index = parent.layer.getFrameIndex(window.name);
+ if (!index) {
+ // 闈炲脊鍑哄眰椤甸潰
+ var linterid = data[0].HItemID.toString();
+ layer.open({
+ type: 2,
+ area: ['100%', '100%'],
+ title: '杞﹀瀷-缂栬緫',
+ shift: 0,
+ content: '../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_CarTypeEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
+ end: function () {
+ // 寮圭獥鍏抽棴鍚庡埛鏂拌〃鏍兼暟鎹紝涓嶅埛鏂版暣涓〉闈�
+ get_Refresh();
+ }
+ })
+ return
+ }
+ parent.GetHCarType(data);
+ parent.layer.close(index);
+
+ })
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -326,7 +365,7 @@
}
});
}
-//#endregion
+ //#endregion
//#endregion
//#region 蹇�熻繃婊�
@@ -436,7 +475,7 @@
$.ajax({
url: GetWEBURL() + 'Gy_CarType/delete',
type: "GET",
- data: { "HInterID": ItemID, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": ItemID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 }, function () {
@@ -719,4 +758,5 @@
</script>
</body>
+
</html>
\ No newline at end of file
--
Gitblit v1.9.1