MES-WEB-LayUI.git

parent: 99a1efda | 补丁 | 提交 | ignore whitespace

工序流转卡维护，生产订单维护，还有投产计划报表都要加上这个筛选条件：滨海TIT车间只显示，1，水箱一条流 2、卡车水箱一条流3、部件油冷器巴 4、小...

yangle

2023-08-21 b8d8550609fa60ad45252c7b82d7ac8adf6a6c64

工序流转卡维护，生产订单维护，还有投产计划报表都要加上这个筛选条件：滨海TIT车间只显示 ，1，水箱一条流 2、卡车水箱一条流3、部件油冷器巴 4、小车装芯巴小车总成巴 6、卡车装芯巴7、卡车总成巴

3个文件已修改

	WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/车间管理/报表分析/ProductionPlanReportList.html	50 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -255,16 +255,27 @@
            $.ajax({
                type: "get",
                url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                async: false,
                data: { "HOrgID": sessionStorage["OrganizationID"] },
                success: function (result) {
                    if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            if (i == 0)
                                HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                            else
                                HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                        if (sessionStorage["OrganizationID"] == 100014) {
                            HDeptName += '<option  style="color:blue;"  value="2679633" >æ°´ç®±ä¸æ¡æµ</option>';
                            HDeptName += '<option  style="color:blue;"  value="1592361" >é¨ä»¶æ²¹å·å¨å·´</option>';
                            HDeptName += '<option  style="color:blue;"  value="1592371" >å°è½¦è£è¯å·´</option>';
                            HDeptName += '<option  style="color:blue;"  value="1592374" >å°è½¦æ»æå·´</option>';
                            HDeptName += '<option  style="color:blue;"  value="1743766" >å¡è½¦è£è¯å·´</option>';
                            HDeptName += '<option  style="color:blue;"  value="1743767" >å¡è½¦æ»æå·´</option>';
                            HDeptName += '<option  style="color:blue;"  value="2679647" >å¡è½¦æ°´ç®±ä¸æ¡æµ</option>';
                        } else {
                            for (var i = 0; i < data.length; i++) {
                                if (i == 0)
                                    HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                                else
                                    HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';

                            }
                        }
                        $("#HDeptName").append(HDeptName);
                        if (!isNaN(HDeptID)) {

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷×ª¿¨/Sc_ProcessExchangeBillList.html

@@ -94,6 +94,16 @@
                                                <input type="text" class="layui-input" name="HErpID" id="HErpID">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">çäº§è½¦é´</label>
                                            <div class="layui-input-block">
                                                <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

                                                    <!--å¨ææ¸²æè½¦é´-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
                                    </div>
                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
@@ -411,6 +421,7 @@

            //#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
            function set_ClearBill() {
                get_Dept();
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//å¼å§æ¥æ
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
                //åå§åä¸»è¡¨åè¡¨
@@ -460,6 +471,7 @@
                var ColName = $("#ColName").val();//å¤éæ¡
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var HDeptName = $("#HDeptName").val();//è½¦é´

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
@@ -514,6 +526,9 @@
                }
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'"
                }
                if (HDeptName!="0") {
                    sWhere += " and HWorkShopID like '%" + HDeptName + "%'"
                }
                if (HErpID) {
                    sWhere += " and å¯ä¸ID like '%" + HErpID + "%'";
@@ -707,6 +722,40 @@
            }
            //#endregion

            //çäº§è½¦é´
            function get_Dept() {
                //è·åè½¦é´å
                var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            if (sessionStorage["OrganizationID"] == 100014) {
                                HDeptName += '<option  style="color:blue;"  value="2679633" >æ°´ç®±ä¸æ¡æµ</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592361" >é¨ä»¶æ²¹å·å¨å·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592371" >å°è½¦è£è¯å·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592374" >å°è½¦æ»æå·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="1743766" >å¡è½¦è£è¯å·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="1743767" >å¡è½¦æ»æå·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="2679647" >å¡è½¦æ°´ç®±ä¸æ¡æµ</option>';
                            } else {
                                for (var i = 0; i < data.length; i++) {
                                    HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                                }
                            }

                            $("#HDeptName").append(HDeptName);
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            function check_row(obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/ProductionPlanReportList.html

@@ -81,13 +81,12 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">çç»</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShopList" id="HWorkShopList" style="width: 40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            <label class="layui-form-label">çäº§è½¦é´</label>
                                            <div class="layui-input-block">
                                                <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

                                                    <!--å¨ææ¸²æè½¦é´-->
                                                </select>
                                            </div>
                                        </div>
                                    </div>
@@ -259,6 +258,7 @@

            //åå§åçé¢
            function set_ClearBill() {
                get_Dept();
                //åå§åæ¶é´
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//å¼å§æ¥æ
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
@@ -362,13 +362,47 @@
                });
            }

            //çäº§è½¦é´
            function get_Dept() {
                //è·åè½¦é´å
                var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æéªè¯æåäºï¼
                            var data = result.data;
                            if (sessionStorage["OrganizationID"] == 100014) {
                                HDeptName += '<option  style="color:blue;"  value="2679633" >æ°´ç®±ä¸æ¡æµ</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592361" >é¨ä»¶æ²¹å·å¨å·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592371" >å°è½¦è£è¯å·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="1592374" >å°è½¦æ»æå·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="1743766" >å¡è½¦è£è¯å·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="1743767" >å¡è½¦æ»æå·´</option>';
                                HDeptName += '<option  style="color:blue;"  value="2679647" >å¡è½¦æ°´ç®±ä¸æ¡æµ</option>';
                            } else {
                                for (var i = 0; i < data.length; i++) {
                                    HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                                }
                            }
                           
                            $("#HDeptName").append(HDeptName);
                            form.render('select');
                        }
                        layer.closeAll("loading");
                    }
                })
            }

            //å¿«éè¿æ»¤
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val();//æµè½¬å¡å·
                var HICMOBillNo = $("#HICMOBillNo").val(); //æ¹å·
                var HWorkShopID = $("#HWorkShopID").val();//çç»
                var HWorkShopID = $("#HDeptName").val();//è½¦é´
                var F_BSV_WYID = $("#F_BSV_WYID").val();//å¯ä¸ID
                var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç 
                var HState = $("#HState").val();//ç¶æ

			@@ -255,16 +255,27 @@
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			for (var i = 0; i < data.length; i++) {
			if (i == 0)
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			else
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
			if (sessionStorage["OrganizationID"] == 100014) {
			HDeptName += '<option style="color:blue;" value="2679633" >æ°´ç®±ä¸æ¡æµ</option>';
			HDeptName += '<option style="color:blue;" value="1592361" >é¨ä»¶æ²¹å·å¨å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592371" >å°è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592374" >å°è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="1743766" >å¡è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1743767" >å¡è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="2679647" >å¡è½¦æ°´ç®±ä¸æ¡æµ</option>';
			} else {
			for (var i = 0; i < data.length; i++) {
			if (i == 0)
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			else
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';

			}
			}
			$("#HDeptName").append(HDeptName);
			if (!isNaN(HDeptID)) {

			@@ -94,6 +94,16 @@
			<input type="text" class="layui-input" name="HErpID" id="HErpID">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			</div>
			</div>
			</div>
			<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
			<div class="layui-inline">
			@@ -411,6 +421,7 @@

			//#region æ¬é¡µé¢ææè¢«è°ç¨çæ¹æ³
			function set_ClearBill() {
			get_Dept();
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			//åå§åä¸»è¡¨åè¡¨
			@@ -460,6 +471,7 @@
			var ColName = $("#ColName").val();//å¤éæ¡
			var Comparator = $("#Comparator").val()
			var ColContent = $("#ColContent").val();
			var HDeptName = $("#HDeptName").val();//è½¦é´

			if (ColName != 0 && Comparator != 0) {
			var com = "";
			@@ -514,6 +526,9 @@
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'"
			}
			if (HDeptName!="0") {
			sWhere += " and HWorkShopID like '%" + HDeptName + "%'"
			}
			if (HErpID) {
			sWhere += " and å¯ä¸ID like '%" + HErpID + "%'";
			@@ -707,6 +722,40 @@
			}
			//#endregion

			//çäº§è½¦é´
			function get_Dept() {
			//è·åè½¦é´å
			var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			if (sessionStorage["OrganizationID"] == 100014) {
			HDeptName += '<option style="color:blue;" value="2679633" >æ°´ç®±ä¸æ¡æµ</option>';
			HDeptName += '<option style="color:blue;" value="1592361" >é¨ä»¶æ²¹å·å¨å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592371" >å°è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592374" >å°è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="1743766" >å¡è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1743767" >å¡è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="2679647" >å¡è½¦æ°´ç®±ä¸æ¡æµ</option>';
			} else {
			for (var i = 0; i < data.length; i++) {
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			}
			}

			$("#HDeptName").append(HDeptName);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			function check_row(obj) {
			var flag = !obj.tr.find(':checkbox:first').prop('checked');
			obj.tr.find(':checkbox').prop('checked', flag);

			@@ -81,13 +81,12 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çç»</label>
			<div class="layui-input-inline">
			<input type="text" class="layui-input" name="HWorkShopName" id="HWorkShopName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
			<input type="hidden" name="HWorkShopID" id="HWorkShopID" value="0">
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HWorkShopList" id="HWorkShopList" style="width: 40px;">
			<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
			</button>
			<label class="layui-form-label">çäº§è½¦é´</label>
			<div class="layui-input-block">
			<select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">

			<!--å¨ææ¸²æè½¦é´-->
			</select>
			</div>
			</div>
			</div>
			@@ -259,6 +258,7 @@

			//åå§åçé¢
			function set_ClearBill() {
			get_Dept();
			//åå§åæ¶é´
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 10), "yyyy-MM-dd"));//å¼å§æ¥æ
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//ç»ææ¥æ
			@@ -362,13 +362,47 @@
			});
			}

			//çäº§è½¦é´
			function get_Dept() {
			//è·åè½¦é´å
			var HDeptName = '<option value="0" style="color:red;" selected>å¨é¨è½¦é´</option>';
			$.ajax({
			type: "get",
			url: GetWEBURL() + "/Sc_ICMOBill/GetHDeptList",
			async: false,
			data: { "HOrgID": sessionStorage["OrganizationID"] },
			success: function (result) {
			if (result.count == 1) { // è¯´æéªè¯æåäºï¼
			var data = result.data;
			if (sessionStorage["OrganizationID"] == 100014) {
			HDeptName += '<option style="color:blue;" value="2679633" >æ°´ç®±ä¸æ¡æµ</option>';
			HDeptName += '<option style="color:blue;" value="1592361" >é¨ä»¶æ²¹å·å¨å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592371" >å°è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1592374" >å°è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="1743766" >å¡è½¦è£è¯å·´</option>';
			HDeptName += '<option style="color:blue;" value="1743767" >å¡è½¦æ»æå·´</option>';
			HDeptName += '<option style="color:blue;" value="2679647" >å¡è½¦æ°´ç®±ä¸æ¡æµ</option>';
			} else {
			for (var i = 0; i < data.length; i++) {
			HDeptName += '<option style="color:blue;" value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
			}
			}

			$("#HDeptName").append(HDeptName);
			form.render('select');
			}
			layer.closeAll("loading");
			}
			})
			}

			//å¿«éè¿æ»¤
			function get_FastQuery() {
			var HBeginDate = $("#HBeginDate").val();//ä¸è¾¾æ¥æ å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//æµè½¬å¡å·
			var HICMOBillNo = $("#HICMOBillNo").val(); //æ¹å·
			var HWorkShopID = $("#HWorkShopID").val();//çç»
			var HWorkShopID = $("#HDeptName").val();//è½¦é´
			var F_BSV_WYID = $("#F_BSV_WYID").val();//å¯ä¸ID
			var HMaterNumber = $("#HMaterNumber").val();//ç©æä»£ç
			var HState = $("#HState").val();//ç¶æ