MES-WEB-LayUI.git

parent: 1cb610cf | 补丁 | 提交 | show whitespace

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

zzr99

2022-04-13 ce9792a066a219c2a2cef60e3f207a3cdb59a169

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

2个文件已修改

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

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

@@ -31,13 +31,22 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ä¸å¡ç¶æ</label>
                                    <label class="layui-form-label">åéç¶æ</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
                                            <option value="-1" selected>å¨é¨</option>
                                            <option value="1">æªåé</option>
                                            <option value="2">å·²åé</option>
                                            <option value="3">å·²åå¸</option>
                                            <option value="" selected="selected">å¨é¨</option>
                                            <option value="æªåé">æªåé</option>
                                            <option value="å·²åé">å·²åé</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">åå¸ç¶æ</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus2" lay-filter="HStatus2" style="width:190px;">
                                            <option value="" selected="selected">å¨é¨</option>
                                            <option value="æªåå¸">æªåå¸</option>
                                            <option value="å·²åå¸">å·²åå¸</option>
                                        </select>
                                    </div>
                                </div>
@@ -291,7 +300,9 @@
                    , { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
                    , { field: 'HBillType', title: 'HBillType', hide: true }
                    , { field: 'HSupID', title: 'HSupID', hide: true }
                    , { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100 }
                    , { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100 , hide: true }
                    , { field: 'åéç¶æ', title: 'åéç¶æ', width: 100  }
                    , { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
                    , { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/*ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·*/
                    , { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
                    , { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 130 }
@@ -973,7 +984,8 @@

            //å¿«éè¿æ»¤
            function get_FastQuery(table, option) {
                var HStatus = $("select[name='HStatus']").val();//ç¶æ
                var HStatus = $("select[name='HStatus']").val();// 
                var HStatus2 = $("select[name='HStatus2']").val();// 
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val(); //åæ®å·
@@ -985,23 +997,11 @@
                var HMaterShortNumber = $("#HMaterShortNumber").val();
                var HSupName = $("#HSupName").val();//ä¾åºå
                var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ

                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //å¨é¨
                            sWhere += "";
                            break;
                        case '1':    //æªåé
                            sWhere += " and ä¸å¡ç¶æ='æªåé'";
                            break;
                        case '2':    //å·²å®¡æ ¸
                            sWhere += " and ä¸å¡ç¶æ='å·²åé'";
                            break;
                        case '3':    //å·²å³é
                            sWhere += " and ä¸å¡ç¶æ='å·²åå¸'";
                        default:

                    sWhere += " and åéç¶æ like '%" + HStatus + "%'";
                    }
                if (HStatus2) {
                    sWhere += " and åå¸ç¶æ like '%" + HStatus2 + "%'";
                }
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";

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

@@ -30,13 +30,22 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">ä¸å¡ç¶æ</label>
                                    <label class="layui-form-label">åéç¶æ</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus" lay-filter="HStatus" style="width:190px;">
                                            <option value="-1" selected="selected">å¨é¨</option>
                                            <option value="1">æªåé</option>
                                            <option value="2">å·²åé</option>
                                            <option value="3">å·²åå¸</option>
                                            <option value="" selected="selected">å¨é¨</option>
                                            <option value="æªåé">æªåé</option>
                                            <option value="å·²åé">å·²åé</option>
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">åå¸ç¶æ</label>
                                    <div class="layui-input-block">
                                        <select name="HStatus2" lay-filter="HStatus2" style="width:190px;">
                                            <option value="" selected="selected">å¨é¨</option>
                                            <option value="æªåå¸">æªåå¸</option>
                                            <option value="å·²åå¸">å·²åå¸</option>
                                        </select>
                                    </div>
                                </div>
@@ -58,13 +67,15 @@
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

                                <div class="layui-inline">


                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">åæ®å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>-->


                                <div class="layui-colla-content">
@@ -78,7 +89,6 @@
                                        <label class="layui-form-label">ä¸å¡å</label>
                                        <div class="layui-input-block" style="width:190px;">
                                            <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
                                               
                                            </select>
                                        </div>
                                    </div>
@@ -301,7 +311,9 @@
                    , { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
                    , { field: 'HBillType', title: 'HBillType', hide: true }
                    , { field: 'HSupID', title: 'HSupID', hide: true }
                    , { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100 }
                    , { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
                    , { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
                    , { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
                    , { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/*ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·*/
                    , { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
                    , { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
@@ -982,7 +994,8 @@

            //å¿«éè¿æ»¤
            function get_FastQuery(table, option) {
                var HStatus = $("select[name='HStatus']").val();//ç¶æ
                var HStatus = $("select[name='HStatus']").val();// 
                var HStatus2 = $("select[name='HStatus2']").val();// 
                var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
                var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val(); //åæ®å·
@@ -996,21 +1009,10 @@
                var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ
                
                if (HStatus) {
                    switch (HStatus) {
                        case '-1':   //å¨é¨
                            sWhere += "";
                            break;
                        case '1':    //æªåé
                            sWhere += " and ä¸å¡ç¶æ='æªåé'";
                            break;
                        case '2':    //å·²å®¡æ ¸
                            sWhere += " and ä¸å¡ç¶æ='å·²åé'";
                            break;
                        case '3':    //å·²å³é
                            sWhere += " and ä¸å¡ç¶æ='å·²åå¸'";
                        default:

                    sWhere += " and åéç¶æ like '%" + HStatus + "%'";
                    }
                if (HStatus2) {
                    sWhere += " and åå¸ç¶æ like '%" + HStatus2 + "%'";
                }
                if (HBeginDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";

			@@ -31,13 +31,22 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡ç¶æ</label>
			<label class="layui-form-label">åéç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus" lay-filter="HStatus" style="width:190px;">
			<option value="-1" selected>å¨é¨</option>
			<option value="1">æªåé</option>
			<option value="2">å·²åé</option>
			<option value="3">å·²åå¸</option>
			<option value="" selected="selected">å¨é¨</option>
			<option value="æªåé">æªåé</option>
			<option value="å·²åé">å·²åé</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åå¸ç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus2" lay-filter="HStatus2" style="width:190px;">
			<option value="" selected="selected">å¨é¨</option>
			<option value="æªåå¸">æªåå¸</option>
			<option value="å·²åå¸">å·²åå¸</option>
			</select>
			</div>
			</div>
			@@ -291,7 +300,9 @@
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'HSupID', title: 'HSupID', hide: true }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100 }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100 , hide: true }
			, { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			, { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
			, { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			, { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 130 }
			@@ -973,7 +984,8 @@

			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HStatus = $("select[name='HStatus']").val();//ç¶æ
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			@@ -985,23 +997,11 @@
			var HMaterShortNumber = $("#HMaterShortNumber").val();
			var HSupName = $("#HSupName").val();//ä¾åºå
			var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ

			if (HStatus) {
			switch (HStatus) {
			case '-1': //å¨é¨
			sWhere += "";
			break;
			case '1': //æªåé
			sWhere += " and ä¸å¡ç¶æ='æªåé'";
			break;
			case '2': //å·²å®¡æ ¸
			sWhere += " and ä¸å¡ç¶æ='å·²åé'";
			break;
			case '3': //å·²å³é
			sWhere += " and ä¸å¡ç¶æ='å·²åå¸'";
			default:

			sWhere += " and åéç¶æ like '%" + HStatus + "%'";
			}
			if (HStatus2) {
			sWhere += " and åå¸ç¶æ like '%" + HStatus2 + "%'";
			}
			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";

			@@ -30,13 +30,22 @@
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">ä¸å¡ç¶æ</label>
			<label class="layui-form-label">åéç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus" lay-filter="HStatus" style="width:190px;">
			<option value="-1" selected="selected">å¨é¨</option>
			<option value="1">æªåé</option>
			<option value="2">å·²åé</option>
			<option value="3">å·²åå¸</option>
			<option value="" selected="selected">å¨é¨</option>
			<option value="æªåé">æªåé</option>
			<option value="å·²åé">å·²åé</option>
			</select>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åå¸ç¶æ</label>
			<div class="layui-input-block">
			<select name="HStatus2" lay-filter="HStatus2" style="width:190px;">
			<option value="" selected="selected">å¨é¨</option>
			<option value="æªåå¸">æªåå¸</option>
			<option value="å·²åå¸">å·²åå¸</option>
			</select>
			</div>
			</div>
			@@ -58,13 +67,15 @@
			</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">éç½®</button>

			<div class="layui-inline">


			<!--<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
			</div>
			</div>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>
			<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">éæ°åæ¥</button>-->


			<div class="layui-colla-content">
			@@ -78,7 +89,6 @@
			<label class="layui-form-label">ä¸å¡å</label>
			<div class="layui-input-block" style="width:190px;">
			<select name="HEmpName" lay-filter="HEmpName" id="HEmpName">

			</select>
			</div>
			</div>
			@@ -301,7 +311,9 @@
			, { field: 'ä¸å¡å', title: 'ä¸å¡å', width: 100 }
			, { field: 'HBillType', title: 'HBillType', hide: true }
			, { field: 'HSupID', title: 'HSupID', hide: true }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100 }
			, { field: 'ä¸å¡ç¶æ', title: 'ä¸å¡ç¶æ', width: 100, hide: true }
			, { field: 'åéç¶æ', title: 'åéç¶æ', width: 100 }
			, { field: 'åå¸ç¶æ', title: 'åå¸ç¶æ', width: 100 }
			, { field: 'ä¾åºåååç¶æ', title: 'ä¾åºåååç¶æ', width: 135 }/ç©æä»£ç ï¼ç©æåç§°ï¼è§æ ¼åå·ï¼æ¹å·ï¼æ°éï¼åä½ï¼æºååå·/
			, { field: 'åé¦ç¶æ', title: 'ä¾åºååé¦ç¶æ', width: 135 }
			, { field: 'ç©æç¼ç ', title: 'ç©æç¼ç ', width: 120 }
			@@ -982,7 +994,8 @@

			//å¿«éè¿æ»¤
			function get_FastQuery(table, option) {
			var HStatus = $("select[name='HStatus']").val();//ç¶æ
			var HStatus = $("select[name='HStatus']").val();//
			var HStatus2 = $("select[name='HStatus2']").val();//
			var HBeginDate = $("#HBeginDate").val();//å¼å§æ¥æ
			var HEndDate = $("#HEndDate").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val(); //åæ®å·
			@@ -996,21 +1009,10 @@
			var HFeedback = $("select[name='HFeedback']").val(); //ä¾åºååé¦ç¶æ

			if (HStatus) {
			switch (HStatus) {
			case '-1': //å¨é¨
			sWhere += "";
			break;
			case '1': //æªåé
			sWhere += " and ä¸å¡ç¶æ='æªåé'";
			break;
			case '2': //å·²å®¡æ ¸
			sWhere += " and ä¸å¡ç¶æ='å·²åé'";
			break;
			case '3': //å·²å³é
			sWhere += " and ä¸å¡ç¶æ='å·²åå¸'";
			default:

			sWhere += " and åéç¶æ like '%" + HStatus + "%'";
			}
			if (HStatus2) {
			sWhere += " and åå¸ç¶æ like '%" + HStatus2 + "%'";
			}
			if (HBeginDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HBeginDate + "'";