MES-WEB-LayUI.git

parent: 116797b1 | 补丁 | 提交 | ignore whitespace

王垚

2022-04-27 ad60402abad86aa75b19bda1b261cd4239b02567

完成状态

2个文件已修改

	WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html	56 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html	33 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/²É¹º¹ÜÀí/Î¯Íâ¶©µ¥/WW_EntrustOrderBillList.html

@@ -68,10 +68,10 @@
                                <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">
                                    <!--<div class="layui-inline">
            <div class="layui-inline">
                <span>å¶ä»æ¡ä»¶></span>
            </div>
        </div>-->
        <div class="layui-inline">
            <span>å¶ä»æ¡ä»¶></span>
        </div>
    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">åæ®å·</label>
                                        <div class="layui-input-block">
@@ -96,11 +96,11 @@
                                        </div>
                                    </div>
                                    <!--<div class="layui-inline">
            <label class="layui-form-label">åé¦ç¶æ</label>
            <div class="layui-input-block">
                <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
            </div>
        </div>-->
        <label class="layui-form-label">åé¦ç¶æ</label>
        <div class="layui-input-block">
            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
        </div>
    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æç¼ç </label>
                                        <div class="layui-input-block">
@@ -126,7 +126,7 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline" style="margin-left:30px">
                                        <label class="layui-form-label">ä¾åºååé¦ç¶æ</label>
                                        <label class="layui-form-label">åé¦ç¶æ</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFeedback" lay-filter="HFeedback">
                                                <option value="" selected>å¨é¨</option>
@@ -137,7 +137,15 @@
                                            </select>
                                        </div>
                                    </div>

                                    <div class="layui-inline" style="margin-left:30px">
                                        <label class="layui-form-label">å®æç¶æ</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFinishStatus" lay-filter="HFinishStatus">
                                                <option value="æªå®æ" selected>æªå®æ</option>
                                                <option value="å®æ">å®æ</option>
                                            </select>
                                        </div>
                                    </div>
                                </div>
                            </div>
                        </div>
@@ -187,12 +195,8 @@
            //#endregion

            //#region è¿å¥é¡µé¢æ¢å è½½
            //åå§åè¡¨æ ¼
            set_InitGrid();
            //å è½½æ°æ®å°ç½æ ¼
            get_Display(sWhere);
            //å è½½ä¸å¡å
            get_HEmpName();
            set_ClearBill();
        
            //#endregion

            //#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
@@ -285,11 +289,18 @@
            });
            //#endregion


            //#region æ¤é¡µé¢æææ¹æ³
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(table, option)
                //å è½½ä¸å¡å
                get_HEmpName();
            }
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBeginDate").val("2022-03-14");
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                var columns = [
                    { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
@@ -312,6 +323,7 @@
                    , { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120}
                    , { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
                    , { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
                    , { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
                    , { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
@@ -997,6 +1009,8 @@
                var HMaterShortNumber = $("#HMaterShortNumber").val();
                var HSupName = $("#HSupName").val();//ä¾åºå
                var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ
                var HFinishStatus = $("select[name='HFinishStatus']").val(); //å®æç¶æ

                if (HStatus) {
                    sWhere += " and åéç¶æ like '%" + HStatus + "%'";
                }
@@ -1040,6 +1054,10 @@
                    sWhere += " and åé¦ç¶æ like '%" + HFeedback + "%'";

                }
                if (HFinishStatus) {
                    sWhere += " and å®æç¶æ like '%" + HFinishStatus + "%'";

                }
                var index = layer.load(0);
                get_Display(sWhere);
                //è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å

 WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html

@@ -103,11 +103,11 @@
                                        </div>
                                    </div>
                                    <!--<div class="layui-inline">
                                        <label class="layui-form-label">åé¦ç¶æ</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
                                        </div>
                                    </div>-->
        <label class="layui-form-label">åé¦ç¶æ</label>
        <div class="layui-input-block">
            <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
        </div>
    </div>-->
                                    <div class="layui-inline">
                                        <label class="layui-form-label">ç©æç¼ç </label>
                                        <div class="layui-input-block">
@@ -133,7 +133,7 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline" style="margin-left:30px">
                                        <label class="layui-form-label">ä¾åºååé¦ç¶æ</label>
                                        <label class="layui-form-label">åé¦ç¶æ</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFeedback" lay-filter="HFeedback">
                                                <option value="" selected>å¨é¨</option>
@@ -141,6 +141,15 @@
                                                <option value="å¤æ">å¤æ</option>
                                                <option value="çäº§">çäº§</option>
                                                <option value="åè´§">åè´§</option>
                                            </select>
                                        </div>
                                    </div>
                                    <div class="layui-inline" style="margin-left:30px">
                                        <label class="layui-form-label">å®æç¶æ</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HFinishStatus" lay-filter="HFinishStatus">
                                                <option value="æªå®æ" selected>æªå®æ</option>
                                                <option value="å®æ">å®æ</option>
                                            </select>
                                        </div>
                                    </div>
@@ -293,14 +302,14 @@
            function set_ClearBill() {
                //åå§åè¡¨æ ¼
                set_InitGrid();
                //å è½½æ°æ®å°ç½æ ¼
                get_Display(sWhere);
                //ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
                get_FastQuery(table, option)
                //å è½½ä¸å¡å
                get_HEmpName();
            }
            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HBeginDate").val("2022-03-14");
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                var columns = [
                    { type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
@@ -323,6 +332,7 @@
                    , { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
                    , { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
                    , { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
                    , { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
@@ -1007,6 +1017,7 @@
                //var HXTFKStatus = $("#HXTFKStatus").val();
                var HSupName = $("#HSupName").val();//ä¾åºå
                var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ
                var HFinishStatus = $("select[name='HFinishStatus']").val(); //å®æç¶æ

                if (HStatus) {
                    sWhere += " and åéç¶æ like '%" + HStatus + "%'";
@@ -1051,6 +1062,10 @@
                    sWhere += " and åé¦ç¶æ like '%" + HFeedback + "%'";

                }
                if (HFinishStatus) {
                    sWhere += " and å®æç¶æ like '%" + HFinishStatus + "%'";

                }
                var index = layer.load(0);
                get_Display(sWhere);
                //è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å

			@@ -68,10 +68,10 @@
			<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">
			<!--<div class="layui-inline">
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>-->
			<div class="layui-inline">
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			@@ -96,11 +96,11 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block">
			@@ -126,7 +126,7 @@
			</div>
			</div>
			<div class="layui-inline" style="margin-left:30px">
			<label class="layui-form-label">ä¾åºååé¦ç¶æ</label>
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFeedback" lay-filter="HFeedback">
			<option value="" selected>å¨é¨</option>
			@@ -137,7 +137,15 @@
			</select>
			</div>
			</div>

			<div class="layui-inline" style="margin-left:30px">
			<label class="layui-form-label">å®æç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFinishStatus" lay-filter="HFinishStatus">
			<option value="æªå®æ" selected>æªå®æ</option>
			<option value="å®æ">å®æ</option>
			</select>
			</div>
			</div>
			</div>
			</div>
			</div>
			@@ -187,12 +195,8 @@
			//#endregion

			//#region è¿å¥é¡µé¢æ¢å è½½
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//å è½½æ°æ®å°ç½æ ¼
			get_Display(sWhere);
			//å è½½ä¸å¡å
			get_HEmpName();
			set_ClearBill();

			//#endregion

			//#region ç¹å»äºä»¶åæ¬on formäºä»¶ç
			@@ -285,11 +289,18 @@
			});
			//#endregion


			//#region æ¤é¡µé¢æææ¹æ³
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option)
			//å è½½ä¸å¡å
			get_HEmpName();
			}
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HBeginDate").val("2022-03-14");
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			var columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			@@ -312,6 +323,7 @@
			, { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120}
			, { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			, { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
			, { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è®¡éåä½ä»£ç ', title: 'è®¡éåä½ä»£ç ', width: 120 }
			, { field: 'è®¡éåä½', title: 'è®¡éåä½', width: 100 }
			@@ -997,6 +1009,8 @@
			var HMaterShortNumber = $("#HMaterShortNumber").val();
			var HSupName = $("#HSupName").val();//ä¾åºå
			var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ
			var HFinishStatus = $("select[name='HFinishStatus']").val(); //å®æç¶æ

			if (HStatus) {
			sWhere += " and åéç¶æ like '%" + HStatus + "%'";
			}
			@@ -1040,6 +1054,10 @@
			sWhere += " and åé¦ç¶æ like '%" + HFeedback + "%'";

			}
			if (HFinishStatus) {
			sWhere += " and å®æç¶æ like '%" + HFinishStatus + "%'";

			}
			var index = layer.load(0);
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å

			@@ -103,11 +103,11 @@
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
			</div>
			</div>-->
			<div class="layui-inline">
			<label class="layui-form-label">ç©æç¼ç </label>
			<div class="layui-input-block">
			@@ -133,7 +133,7 @@
			</div>
			</div>
			<div class="layui-inline" style="margin-left:30px">
			<label class="layui-form-label">ä¾åºååé¦ç¶æ</label>
			<label class="layui-form-label">åé¦ç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFeedback" lay-filter="HFeedback">
			<option value="" selected>å¨é¨</option>
			@@ -141,6 +141,15 @@
			<option value="å¤æ">å¤æ</option>
			<option value="çäº§">çäº§</option>
			<option value="åè´§">åè´§</option>
			</select>
			</div>
			</div>
			<div class="layui-inline" style="margin-left:30px">
			<label class="layui-form-label">å®æç¶æ</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HFinishStatus" lay-filter="HFinishStatus">
			<option value="æªå®æ" selected>æªå®æ</option>
			<option value="å®æ">å®æ</option>
			</select>
			</div>
			</div>
			@@ -293,14 +302,14 @@
			function set_ClearBill() {
			//åå§åè¡¨æ ¼
			set_InitGrid();
			//å è½½æ°æ®å°ç½æ ¼
			get_Display(sWhere);
			//ç´æ¥æ§è¡åè¡¨çé å è½½æ°æ®å°ç½æ ¼
			get_FastQuery(table, option)
			//å è½½ä¸å¡å
			get_HEmpName();
			}
			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HBeginDate").val("2022-03-14");
			$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
			var columns = [
			{ type: 'checkbox', fixed: 'left', totalRowText: 'åè®¡' }
			@@ -323,6 +332,7 @@
			, { field: 'æå°æ¡ç æ°é', title: 'æå°æ¡ç æ°é', width: 120 }
			, { field: 'å³èæ°é', title: 'å·²åè´§æ°é', width: 120 }
			, { field: 'æªå³èæ°é', title: 'æªå·²åè´§æ°é', width: 120 }
			, { field: 'å®æç¶æ', title: 'å®æç¶æ', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			, { field: 'è§æ ¼åå·', title: 'è§æ ¼åå·', width: 100 }
			, { field: 'HUnitID', title: 'HUnitID', hide: true }
			@@ -1007,6 +1017,7 @@
			//var HXTFKStatus = $("#HXTFKStatus").val();
			var HSupName = $("#HSupName").val();//ä¾åºå
			var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ
			var HFinishStatus = $("select[name='HFinishStatus']").val(); //å®æç¶æ

			if (HStatus) {
			sWhere += " and åéç¶æ like '%" + HStatus + "%'";
			@@ -1051,6 +1062,10 @@
			sWhere += " and åé¦ç¶æ like '%" + HFeedback + "%'";

			}
			if (HFinishStatus) {
			sWhere += " and å®æç¶æ like '%" + HFinishStatus + "%'";

			}
			var index = layer.load(0);
			get_Display(sWhere);
			//è°ç¨æ¥å£åæ¸ç©ºsWhereç¼å