From 439be4eabe175481e8027f0d64a562c68abaa266 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期三, 10 十二月 2025 17:09:59 +0800
Subject: [PATCH] 1
---
WebTM/views/基础资料/公用基础资料/Cg_ContractTransportBillEdit.html | 83 ++++++++++++++++++++++++++++-------------
WebTM/views/基础资料/基础资料/Gy_CarTypeList.html | 2
2 files changed, 58 insertions(+), 27 deletions(-)
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/Cg_ContractTransportBillEdit.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/Cg_ContractTransportBillEdit.html"
index 681ec9f..2eb1206 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/Cg_ContractTransportBillEdit.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/Cg_ContractTransportBillEdit.html"
@@ -23,12 +23,12 @@
.layui-table-cell {
overflow: visible !important;
}
- /* 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫� */
- /*td .layui-form-select {
+ 浣垮緱涓嬫媺妗嗕笌鍗曞厓鏍煎垰濂藉悎閫�
+ td .layui-form-select {
margin-top: -10px;
margin-left: -15px;
margin-right: -15px;
- }*/
+ }
</style>
</head>
<body>
@@ -266,7 +266,13 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
-
+ <!--琛屼笅鎷夐�夋嫨-->
+ <script type="text/html" id="HTransportTyep">
+ <select name="HTransportTyep" lay-filter="HTransportTyep" id="HTransportTyep{{d.LAY_TABLE_INDEX+1}}">
+ <option value="鍗曠▼">鍗曠▼</option>
+ <option value="寰�杩�">寰�杩�</option>
+ </select>
+ </script>
<script>
@@ -509,8 +515,8 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HBeginAddr": "0", "HTransportLineName ": "", "HPreventErrNote": "", "HLoseMode": "", "HLoseCheck": "", "HPreventErrResult": "", "HRemark": "",
- "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,"HTransportTyep":"寰�杩�"
+ "HBeginAddr": "0", "HBeginAddrName": "", "HEndAddr": "0", "HEndAddrName": "", "HTransportLineName ": "", "HPreventErrNote": "", "HLoseMode": "", "HLoseCheck": "", "HPreventErrResult": "", "HRemark": "",
+ "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HTransportTyep": "寰�杩�"
};
switch (obj.event) {
case 'btn-AddLine':
@@ -518,7 +524,10 @@
option.data = table.cache["mainTable"];
table.render(option);
-
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HTransportTyep' + i + '').find("option[value='" + option.data[i - 1].HTransportTyep + "']").attr("selected", true);
+ }
+ form.render('select');
break;
case 'btn-CopyLine':
var copydata = JSON.stringify(data);
@@ -534,7 +543,10 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- fo
+ for (var i = 1; i <= option.data.length; i++) {
+ $('#HTransportTyep' + i + '').find("option[value='" + option.data[i - 1].HTransportTyep + "']").attr("selected", true);
+ }
+ form.render('select');
}
break;
@@ -551,7 +563,18 @@
//#endregion
+ //鐘舵��
+ form.on('select(HTransportTyep)', function (data) {
+ //鑾峰彇涓嬫媺妗嗛�変腑鐨勫��
+ var elem = data.othis.parents('tr');
+ var dataindex = elem.attr("data-index");
+ $.each(option.data, function (index, value) {
+ if (value.LAY_TABLE_INDEX == dataindex) {
+ value.HTransportTyep = data.value;//鎶婇�変腑涓嬫媺妗唅d鍊艰祴鍊肩粰琛ㄦ牸缂撳瓨
+ }
+ });
+ })
//#endregion
@@ -667,15 +690,15 @@
, { type: 'numbers', title: '搴忓彿', style: 'background-color: #f9f9f9;' }
/* , { field: 'HPreventErrMouldID', title: 'HPreventErrMouldID', hide: true, style: 'background-color: #f9f9f9;' }*/
, { field: 'HTransportLineName', title: '杩愯緭绾胯矾鍚嶇О', edit: 'text' } //f7
- , { field: 'HBeginAddrID', title: '濮嬪彂鍦癐D', edit: 'text', hide: true } //f7
- , { field: 'HBeginAddr', title: '濮嬪彂鍦�', edit: 'text', event: "HBeginAddr" } //f7
- , { field: 'HEndAddrID', title: '鐩殑鍦癐D', edit: 'text', hide: true } //f7
- , { field: 'HEndAddr', title: '鐩殑鍦�', edit: 'text', event: "HEndAddr" } //f7
+ , { field: 'HBeginAddr', title: '濮嬪彂鍦癐D', edit: 'text', hide: true } //f7
+ , { field: 'HBeginAddrName', title: '濮嬪彂鍦�', edit: 'text', event: "HBeginAddrName" } //f7
+ , { field: 'HEndAddr', title: '鐩殑鍦癐D', edit: 'text', hide: true } //f7
+ , { field: 'HEndAddrName', title: '鐩殑鍦�', edit: 'text', event: "HEndAddrName" } //f7
, { field: 'HTransportCar', title: '杩愯緭鏂瑰紡', edit: 'text', hide: true } //f7
, { field: 'HTransportCarName', title: '杩愯緭鏂瑰紡', edit: 'text', event: "HTransportCarName" } //f7
, { field: 'HDistance', title: '璺濈锛堝叕閲岋級', edit: 'text' }
, { field: 'HTransportTimes', title: '杩愯緭鏃舵晥', edit: 'text' }
- , { field: 'HTransportTyep', title: '杩愯緭绫诲瀷', edit: 'select' }
+ , { field: 'HTransportTyep', title: '杩愯緭绫诲瀷', templet: "#HTransportTyep" }
, { field: 'HMoney', title: '杩愯緭璐圭敤', edit: 'text' }
, { field: 'HMoney_His', title: '鍘嗗彶杩愯緭璐圭敤', edit: 'text' }
, { field: 'HSourceInterID', title: '婧愬崟鍐呯爜', hide: true, style: 'background-color: #f9f9f9;' }
@@ -688,7 +711,9 @@
var rowdata = [
{
- "HBeginAddr": ""
+ "HBeginAddrName": ""
+ ,"HBeginAddr": ""
+ , "HEndAddrName": ""
, "HEndAddr": ""
, "HTransportLineName": ""
, "HTransportCar": ""
@@ -790,7 +815,7 @@
}
})
}
- if (obj.event == "HEndAddr") {
+ if (obj.event == "HEndAddrName") {
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -811,8 +836,8 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HEndAddrID": checkStatus.data[0].HItemID,
- "HEndAddr": checkStatus.data[0].鍦板尯鍚嶇О
+ "HEndAddr": checkStatus.data[0].HItemID,
+ "HEndAddrName": checkStatus.data[0].鍦板尯鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -820,8 +845,8 @@
, end: function () {
if (typeof (OptionData.HItemID) != "undefined") {
obj.update({
- "HEndAddrID": checkStatus.data[0].HItemID,
- "HEndAddr": checkStatus.data[0].鍦板尯鍚嶇О
+ "HEndAddr": checkStatus.data[0].HItemID,
+ "HEndAddrName": checkStatus.data[0].鍦板尯鍚嶇О
})
OptionData = [];
}
@@ -830,7 +855,7 @@
}
})
}
- if (obj.event == "HBeginAddr") {
+ if (obj.event == "HBeginAddrName") {
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -851,8 +876,8 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
- "HBeginAddrID": checkStatus.data[0].HItemID,
- "HBeginAddr": checkStatus.data[0].鍦板尯鍚嶇О
+ "HBeginAddr": checkStatus.data[0].HItemID,
+ "HBeginAddrName": checkStatus.data[0].鍦板尯鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
}
@@ -860,8 +885,8 @@
, end: function () {
if (typeof (OptionData.HItemID) != "undefined") {
obj.update({
- "HEndAddrID": checkStatus.data[0].HItemID,
- "HEndAddr": checkStatus.data[0].鍦板尯鍚嶇О
+ "HBeginAddr": checkStatus.data[0].HItemID,
+ "HBeginAddrName": checkStatus.data[0].鍦板尯鍚嶇О
})
OptionData = [];
}
@@ -888,7 +913,11 @@
table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
num.push(table.cache["mainTable"][i])
}
+ if ($("#HTransportTyep" + (i + 1)).val()) {
+ num[i].HTransportTyep = $("#HTransportTyep" + (i + 1)).val();
+ }
}
+
//璁板綍鎿嶄綔绫诲瀷
var refSav = "";
if (OperationType == 1 || OperationType == 2 || OperationType == 4) {
@@ -990,8 +1019,8 @@
rowdata.push(
{
"HTransportLineName": tableSub[i]["杩愯緭绾胯矾鍚嶇О"],
- "HBeginAddr": tableSub[i]["濮嬪彂鍦�"],
- "HEndAddr": tableSub[i]["鐩殑鍦�"],
+ "HBeginAddrName": tableSub[i]["濮嬪彂鍦�"],
+ "HEndAddrName": tableSub[i]["鐩殑鍦�"],
"HTransportCar": tableSub[i]["杩愯緭鏂瑰紡"],
"HDistance": tableSub[i]["璺濈"],
"HTransportTimes": tableSub[i]["杩愯緭鏃舵晥"],
@@ -1001,8 +1030,10 @@
}
);
}
+
option.data = rowdata;
table.render(option);
+ form.render('select');
}
})
}
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 73bcfa9..d523607 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"
@@ -291,7 +291,7 @@
}
//#endregion
- f//#region 鏌ヨ
+ //#region 鏌ヨ
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
--
Gitblit v1.9.1