MES-WEB-LayUI.git

parent: 3977e015 | 补丁 | 提交 | show whitespace

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

chenhaozhe

7 天以前 99d50244a4b233cd882bd8a20f20b7993d3011fd

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

4个文件已修改

	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillEdit.html	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/模治具管理/模治具仓库管理/Sc_MouldScrapOutBill.html	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdBackBillEdit.html

@@ -1712,7 +1712,7 @@
                            async: false,
                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
                            success: function (data1) {
                                if (data1.count == 1) {
                                if (data1.count>0) {
                                    data = data1.data
                                }
                            },
@@ -1743,21 +1743,22 @@
                    },
                    done: function (elem, data) {
                        $(".layui-table-edit").blur();//ååæ ¼å¤±å»ç¦ç¹
                        if (typeof (OptionData) != "undefined" && OptionData != []) {
                        obj.update({
                            "HMaterID": data.data[0]["hmainid"]
                                "HMaterID": OptionData["hmainid"]
                            , "HMaterCode": data.data[0]["æ¨¡å·ç¼å·"]
                            , "HMaterName": data.data[0]["æ¨¡å·åç§°"]

                            , "HMaterSpec": data.data[0]["æ¨¡å·åå·"]
                                , "HMaterModel": data.data[0]["æ¨¡å·åå·"]
                            , "HUnitID": data.data[0]["HUnitID"]
                            , "HUnitCode": data.data[0]["è®¡éåä½ä»£ç "]
                                , "HUnitNumber": data.data[0]["è®¡éåä½ä»£ç "]
                            , "HUnitName": data.data[0]["è®¡éåä½"]
                            , "HWHID": data.data[0]["HWHID"]
                            , "HWHName": data.data[0]["é»è®¤ä»åº"]
                            , "HWHCode": data.data[0]["é»è®¤ä»åºä»£ç "]
                                , "HWHNumber": data.data[0]["é»è®¤ä»åºä»£ç "]
                            , "HSPID": data.data[0]["HSPID"]
                            , "HSPName": data.data[0]["é»è®¤ä»ä½"]
                            , "HSPCode": data.data[0]["æ¨¡å·åç§°"]
                                , "HSPNumber": data.data[0]["æ¨¡å·åç§°"]
                            , "HDesignLife": 0
                            , "HLeaveLife": 0
                            , "HQty": 1
@@ -1765,6 +1766,8 @@
                        })

                        table.render(option);
                        }
                        




 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdInBillEdit.html

@@ -1526,6 +1526,7 @@
                    searchKey: 'æ¨¡å·åç§°,æ¨¡å·ç¼å·',
                    sWhere: " ",//tableæç´¢sWhereæ¡ä»¶
                    ajaxSelect: function (sWhere) {
                        console.log("sWhere", sWhere)
                        var data = '';
                        var ModRightNameSelect = 'Gy_MouldFileList';
                        $.ajax({
@@ -1534,7 +1535,7 @@
                            async: false,
                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page":1, "size": 5},
                            success: function (data1) {
                                if (data1.count == 1) {
                                if (data1.count  >0) {
                                    data = data1.data
                                }
                            },
@@ -1580,6 +1581,11 @@
                            , "HSPID": data.data[0]["HSPID"]
                            , "HSPName": data.data[0]["é»è®¤ä»ä½"]
                            , "HSPCode": data.data[0]["æ¨¡å·åç§°"]

                            , "HDesignLife": 0
                            , "HLeaveLife": 0
                            , "HQty": 1
                            , "HMoney": 0
                        })

                        table.render(option);

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldProdOutBillEdit.html

@@ -1713,7 +1713,7 @@
                            async: false,
                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
                            success: function (data1) {
                                if (data1.count == 1) {
                                if (data1.count > 0) {
                                    data = data1.data
                                }
                            },
@@ -1746,19 +1746,19 @@
                        $(".layui-table-edit").blur();//ååæ ¼å¤±å»ç¦ç¹
                        obj.update({
                            "HMaterID": data.data[0]["hmainid"]
                            , "HMaterCode": data.data[0]["æ¨¡å·ç¼å·"]
                            , "HMaterNumber": data.data[0]["æ¨¡å·ç¼å·"]
                            , "HMaterName": data.data[0]["æ¨¡å·åç§°"]

                            , "HMaterSpec": data.data[0]["æ¨¡å·åå·"]
                            , "HMaterModel": data.data[0]["æ¨¡å·åå·"]
                            , "HUnitID": data.data[0]["HUnitID"]
                            , "HUnitCode": data.data[0]["è®¡éåä½ä»£ç "]
                            , "HUnitNumber": data.data[0]["è®¡éåä½ä»£ç "]
                            , "HUnitName": data.data[0]["è®¡éåä½"]
                            , "HWHID": data.data[0]["HWHID"]
                            , "HWHName": data.data[0]["é»è®¤ä»åº"]
                            , "HWHCode": data.data[0]["é»è®¤ä»åºä»£ç "]
                            , "HWHNumber": data.data[0]["é»è®¤ä»åºä»£ç "]
                            , "HSPID": data.data[0]["HSPID"]
                            , "HSPName": data.data[0]["é»è®¤ä»ä½"]
                            , "HSPCode": data.data[0]["æ¨¡å·åç§°"]
                            , "HSPNumber": data.data[0]["é»è®¤ä»ä½ä»£ç "]
                            , "HDesignLife": 0
                            , "HLeaveLife": 0
                            , "HQty": 1

 WebTM/views/Ä£ÖÎ¾ß¹ÜÀí/Ä£ÖÎ¾ß²Ö¿â¹ÜÀí/Sc_MouldScrapOutBill.html

@@ -817,7 +817,7 @@
                            async: false,
                            data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
                            success: function (data1) {
                                if (data1.count == 1) {
                                if (data1.count > 0) {
                                    data = data1.data
                                }
                            },
@@ -869,7 +869,7 @@
                            , "HMoney": 0
                        })

                        table.render(option);
                        //table.render(option);



@@ -1801,9 +1801,11 @@
                                }
                            });
                        }
                        
                        obj.event = "";
                        return false;
                    }
                    
                })
                //åå»
                $('.layui-table-box tbody td[data-field="HMaterCode"]').off('dblclick').on('dblclick', function () {

			@@ -1712,7 +1712,7 @@
			async: false,
			data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count>0) {
			data = data1.data
			}
			},
			@@ -1743,21 +1743,22 @@
			},
			done: function (elem, data) {
			$(".layui-table-edit").blur();//ååæ ¼å¤±å»ç¦ç¹
			if (typeof (OptionData) != "undefined" && OptionData != []) {
			obj.update({
			"HMaterID": data.data[0]["hmainid"]
			"HMaterID": OptionData["hmainid"]
			, "HMaterCode": data.data[0]["æ¨¡å·ç¼å·"]
			, "HMaterName": data.data[0]["æ¨¡å·åç§°"]

			, "HMaterSpec": data.data[0]["æ¨¡å·åå·"]
			, "HMaterModel": data.data[0]["æ¨¡å·åå·"]
			, "HUnitID": data.data[0]["HUnitID"]
			, "HUnitCode": data.data[0]["è®¡éåä½ä»£ç "]
			, "HUnitNumber": data.data[0]["è®¡éåä½ä»£ç "]
			, "HUnitName": data.data[0]["è®¡éåä½"]
			, "HWHID": data.data[0]["HWHID"]
			, "HWHName": data.data[0]["é»è®¤ä»åº"]
			, "HWHCode": data.data[0]["é»è®¤ä»åºä»£ç "]
			, "HWHNumber": data.data[0]["é»è®¤ä»åºä»£ç "]
			, "HSPID": data.data[0]["HSPID"]
			, "HSPName": data.data[0]["é»è®¤ä»ä½"]
			, "HSPCode": data.data[0]["æ¨¡å·åç§°"]
			, "HSPNumber": data.data[0]["æ¨¡å·åç§°"]
			, "HDesignLife": 0
			, "HLeaveLife": 0
			, "HQty": 1
			@@ -1765,6 +1766,8 @@
			})

			table.render(option);
			}

			@@ -1526,6 +1526,7 @@
			searchKey: 'æ¨¡å·åç§°,æ¨¡å·ç¼å·',
			sWhere: " ",//tableæç´¢sWhereæ¡ä»¶
			ajaxSelect: function (sWhere) {
			console.log("sWhere", sWhere)
			var data = '';
			var ModRightNameSelect = 'Gy_MouldFileList';
			$.ajax({
			@@ -1534,7 +1535,7 @@
			async: false,
			data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page":1, "size": 5},
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count >0) {
			data = data1.data
			}
			},
			@@ -1580,6 +1581,11 @@
			, "HSPID": data.data[0]["HSPID"]
			, "HSPName": data.data[0]["é»è®¤ä»ä½"]
			, "HSPCode": data.data[0]["æ¨¡å·åç§°"]

			, "HDesignLife": 0
			, "HLeaveLife": 0
			, "HQty": 1
			, "HMoney": 0
			})

			table.render(option);

			@@ -1713,7 +1713,7 @@
			async: false,
			data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count > 0) {
			data = data1.data
			}
			},
			@@ -1746,19 +1746,19 @@
			$(".layui-table-edit").blur();//ååæ ¼å¤±å»ç¦ç¹
			obj.update({
			"HMaterID": data.data[0]["hmainid"]
			, "HMaterCode": data.data[0]["æ¨¡å·ç¼å·"]
			, "HMaterNumber": data.data[0]["æ¨¡å·ç¼å·"]
			, "HMaterName": data.data[0]["æ¨¡å·åç§°"]

			, "HMaterSpec": data.data[0]["æ¨¡å·åå·"]
			, "HMaterModel": data.data[0]["æ¨¡å·åå·"]
			, "HUnitID": data.data[0]["HUnitID"]
			, "HUnitCode": data.data[0]["è®¡éåä½ä»£ç "]
			, "HUnitNumber": data.data[0]["è®¡éåä½ä»£ç "]
			, "HUnitName": data.data[0]["è®¡éåä½"]
			, "HWHID": data.data[0]["HWHID"]
			, "HWHName": data.data[0]["é»è®¤ä»åº"]
			, "HWHCode": data.data[0]["é»è®¤ä»åºä»£ç "]
			, "HWHNumber": data.data[0]["é»è®¤ä»åºä»£ç "]
			, "HSPID": data.data[0]["HSPID"]
			, "HSPName": data.data[0]["é»è®¤ä»ä½"]
			, "HSPCode": data.data[0]["æ¨¡å·åç§°"]
			, "HSPNumber": data.data[0]["é»è®¤ä»ä½ä»£ç "]
			, "HDesignLife": 0
			, "HLeaveLife": 0
			, "HQty": 1

			@@ -817,7 +817,7 @@
			async: false,
			data: { "sWhere": sWhere, "ModRightNameSelect": ModRightNameSelect, "user": sessionStorage["HUserName"], "page": 1, "size": 5 },
			success: function (data1) {
			if (data1.count == 1) {
			if (data1.count > 0) {
			data = data1.data
			}
			},
			@@ -869,7 +869,7 @@
			, "HMoney": 0
			})

			table.render(option);
			//table.render(option);



			@@ -1801,9 +1801,11 @@
			}
			});
			}

			obj.event = "";
			return false;
			}

			})
			//åå»
			$('.layui-table-box tbody td[data-field="HMaterCode"]').off('dblclick').on('dblclick', function () {