MES-WEB-LayUI.git

			@@ -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,7 +515,7 @@
			//æ°å¢è¡è¡¨æ ¼æ°æ®

			var NewRow = {
			"HBeginAddr": "0", "HTransportLineName ": "", "HPreventErrNote": "", "HLoseMode": "", "HLoseCheck": "", "HPreventErrResult": "", "HRemark": "",
			"HBeginAddr": "0", "HBeginAddrName": "", "HEndAddr": "0", "HEndAddrName": "", "HTransportLineName ": "", "HPreventErrNote": "", "HLoseMode": "", "HLoseCheck": "", "HPreventErrResult": "", "HRemark": "",
			"HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,"HTransportTyep":"å¾è¿"
			};
			switch (obj.event) {
			@@ -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;//æéä¸ä¸ææ¡idå¼èµå¼ç»è¡¨æ ¼ç¼å
			}
			});

			})

			//#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: 'å§åå°ID', edit: 'text', hide: true } //f7
			, { field: 'HBeginAddr', title: 'å§åå°', edit: 'text', event: "HBeginAddr" } //f7
			, { field: 'HEndAddrID', title: 'ç®çå°ID', edit: 'text', hide: true } //f7
			, { field: 'HEndAddr', title: 'ç®çå°', edit: 'text', event: "HEndAddr" } //f7
			, { field: 'HBeginAddr', title: 'å§åå°ID', edit: 'text', hide: true } //f7
			, { field: 'HBeginAddrName', title: 'å§åå°', edit: 'text', event: "HBeginAddrName" } //f7
			, { field: 'HEndAddr', title: 'ç®çå°ID', 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');
			}
			})
			}

	WebTM/views/基础资料/公用基础资料/Cg_ContractTransportBillEdit.html	81 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/基础资料/基础资料/Gy_CarTypeList.html	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -291,7 +291,7 @@
			}
			//#endregion

			f//#region æ¥è¯¢
			//#region æ¥è¯¢
			function get_Display(sWhere) {
			var ajaxLoad = layer.load();
			$.ajax({