MESWMS-LayUI.git

parent: a791468e | 补丁 | 提交 | ignore whitespace

2021-08-12 33e60d4f1d622323dfff5a612eb673e697d15c56

报工台开工单审核，web端开工单列表及编辑

2个文件已修改

	WebTM/views/生产管理/生产开工单/Sc_Add_MESBeginWorkBillList.html	51 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	WebTM/views/生产管理/生产开工单/Sc_MESBeginWorkBillList.html	60 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -86,8 +86,8 @@
                    <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
                        <div class="layui-card-header">
                            <div class="layui-btn-group">

                                <button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
                                <button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
                            </div>

@@ -628,9 +628,14 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                layer.close(layer.index);
                                window.parent.location.reload();
                            $("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
                            layer.confirm(data.Message, {
                                btn: ['ç¡®è®¤']
                            }, function (index) {
                                 if (data.Verify == "Y") //èªå¨å®¡æ ¸
                                 {
                                     SaveVerify(); //å®¡æ ¸
                                 }
                            });
                        }
                        else {
@@ -643,9 +648,47 @@
                })
            });

            //å®¡æ ¸æé®æäº¤
            form.on('submit(VerIfySaver)', function (data) {
                SaveVerify();
            });

            //å®¡æ ¸æäº¤
            function SaveVerify()
            {
                var InterID = $("#HInterID").val();
                if (!AllowLoadData())//æ°æ®éªè¯
                {
                    return false;
                }
                $.ajax({
                    type: "POST",
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
                    async: true,
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æéªè¯æåäºï¼
                            layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
                                //layer.close(layer.index);
                                //window.parent.location.reload();
                            });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 })
                        }
                    },
                    error: function (err) {
                        layer.alert(err, { icon: 5 })
                    }
                })
            }
           

            //éåº
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                window.parent.location.reload();
            });



 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_MESBeginWorkBillList.html

@@ -40,6 +40,18 @@
                                        <input type="date" class="layui-input" id="HDate1">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">åæ®å·</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">çäº§èµæº</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HSource" id="HSource">
                                    </div>
                                </div>
                                <!--<div class="layui-inline">
                                    <label class="layui-form-label">åæ®ç±»å</label>
                                    <div class="layui-input-block">
@@ -72,12 +84,7 @@
                                            <span>å¶ä»æ¡ä»¶></span>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">åæ®å·</label>
                                        <div class="layui-input-block">
                                            <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
                                        </div>
                                    </div>

                                </div>
                            </div>
                        </div>
@@ -88,8 +95,9 @@
                                <button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>ç¼è¾</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>

                            </div>
                        </script>
@@ -129,7 +137,7 @@
            var sWhere = "";
            var option = [];
            //#endregion
           

            //#region è¿å¥é¡µé¢å³å è½½
            //å¤ææä½ç±»å
            if (OperationType == 1) {//æ æºå
@@ -143,6 +151,7 @@
            //#endregion

            //#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

            //å¤´å·¥å·æ äºä»¶
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus(obj.config.id);
@@ -153,20 +162,25 @@
                        break;
                    case 'btn-Delete': set_DeleteBill();
                        break;
                    //å·æ°
                    case 'get_Refresh': set_Refresh();
                        break;
                    //å®¡æ ¸æé®
                    case 'btn-Audit': set_CheckBill();
                        break;
                    //åå®¡æ ¸æé®
                    case 'btn-DeAudit': set_AbandonCheck();
                    //éåº
                    case 'get_Exit': Pub_Close(2);
                        break;
                };
            });

            //æ¥è¯¢æé®
            form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½
                var ajaxLoad = layer.load();
                var HDate = $("#HDate").val();//å¼å§æ¥æ
                var HDate1 = $("#HDate1").val();//ç»ææ¥æ
                var HBillNo = $("#HBillNo").val();//åæ®å·
                var HSource = $("#HSource").val();//çäº§èµæº
                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
                }
@@ -175,6 +189,9 @@
                }
                if (HBillNo) {
                    sWhere += " and åæ®å· like '%" + HBillNo + "%'";
                }
                if (HSource) {
                    sWhere += " and èµæºä»£ç  like '%" + HSource + "%' or èµæºåç§° like '%" + HSource + "%'";
                }
                $.ajax({
                    url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
@@ -224,10 +241,12 @@
                get_Display();

            }
            


            //åå§åè¡¨æ ¼
            function set_InitGrid() {
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
                 option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
@@ -240,6 +259,7 @@
                        , { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
                        , { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
                        , { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160 }
                        , { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160 }
                        , { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
                        , { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 200 }
                        , { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 115 }
@@ -318,6 +338,12 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var linterid = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1")
                    {
                        layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸ç¼è¾ï¼');
                        return false;
                    }
                    //if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
                    layer.open({
                        type: 2
@@ -350,6 +376,11 @@
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var InterID = data[0].hmainid.toString();
                    var HBillStatus = data[0].HBillStatus.toString();
                    if (HBillStatus != "1") {
                        layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸å é¤ï¼');
                        return false;
                    }
                    //é»è¾å é¤æ¹æ³
                    layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
                        $.ajax({
@@ -379,6 +410,12 @@
                else {
                    layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
                }
            }

            //å·æ°
            function set_Refresh()
            {
                $("#btnSearch").click();
            }

            //å®¡æ ¸
@@ -453,6 +490,7 @@

            }


            //#endregion

            //ä»¥ä¸æ¯layuiæ¨¡å

			@@ -86,8 +86,8 @@
			<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
			<div class="layui-card-header">
			<div class="layui-btn-group">

			<button type="button" id="Saver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">ä¿å</button>
			<button type="button" id="VerIfySaver" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="VerIfySaver">å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">éåº</button>
			</div>

			@@ -628,9 +628,14 @@
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
			layer.close(layer.index);
			window.parent.location.reload();
			$("#HInterID").val(data.HInterID);//è·åæäº¤æåè¿åçåæ®ä¸»ID
			layer.confirm(data.Message, {
			btn: ['ç¡®è®¤']
			}, function (index) {
			if (data.Verify == "Y") //èªå¨å®¡æ ¸
			{
			SaveVerify(); //å®¡æ ¸
			}
			});
			}
			else {
			@@ -643,9 +648,47 @@
			})
			});

			//å®¡æ ¸æé®æäº¤
			form.on('submit(VerIfySaver)', function (data) {
			SaveVerify();
			});

			//å®¡æ ¸æäº¤
			function SaveVerify()
			{
			var InterID = $("#HInterID").val();
			if (!AllowLoadData())//æ°æ®éªè¯
			{
			return false;
			}
			$.ajax({
			type: "POST",
			url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //æ¹æ³æå¨é¡µé¢åæ¹æ³å
			async: true,
			data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
			dataType: "json",
			success: function (data) {
			if (data.count == 1) { // è¯´æéªè¯æåäºï¼
			layer.msg(data.Message, { time: 1 * 2000, icon: 1 }, function (index) {
			//layer.close(layer.index);
			//window.parent.location.reload();
			});
			}
			else {
			layer.alert(data.Message, { icon: 5 })
			}
			},
			error: function (err) {
			layer.alert(err, { icon: 5 })
			}
			})
			}


			//éåº
			form.on('submit(Exit)', function (data) {
			Pub_Close(1);
			window.parent.location.reload();
			});

			@@ -40,6 +40,18 @@
			<input type="date" class="layui-input" id="HDate1">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">çäº§èµæº</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HSource" id="HSource">
			</div>
			</div>
			<!--<div class="layui-inline">
			<label class="layui-form-label">åæ®ç±»å</label>
			<div class="layui-input-block">
			@@ -72,12 +84,7 @@
			<span>å¶ä»æ¡ä»¶></span>
			</div>
			</div>
			<div class="layui-inline">
			<label class="layui-form-label">åæ®å·</label>
			<div class="layui-input-block">
			<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
			</div>
			</div>

			</div>
			</div>
			</div>
			@@ -88,8 +95,9 @@
			<button type="button" class="layui-btn layui-btn-sm layui-btn-disabled" lay-event="btn-Add" id="btn-Add"><i class="layui-icon layui-icon-add-1"></i>æ°å¢</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-edit"></i>ç¼è¾</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>å é¤</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>å·æ°</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>å®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>åå®¡æ ¸</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>éåº</button>

			</div>
			</script>
			@@ -129,7 +137,7 @@
			var sWhere = "";
			var option = [];
			//#endregion


			//#region è¿å¥é¡µé¢å³å è½½
			//å¤ææä½ç±»å
			if (OperationType == 1) {//æ æºå
			@@ -143,6 +151,7 @@
			//#endregion

			//#region è§¦åäºä»¶ï¼åæ¬form.on(){}æ ¼å¼çææç¹å»äºä»¶ãéæ©äºä»¶ç

			//å¤´å·¥å·æ äºä»¶
			table.on('toolbar(mainTable)', function (obj) {
			var checkStatus = table.checkStatus(obj.config.id);
			@@ -153,20 +162,25 @@
			break;
			case 'btn-Delete': set_DeleteBill();
			break;
			//å·æ°
			case 'get_Refresh': set_Refresh();
			break;
			//å®¡æ ¸æé®
			case 'btn-Audit': set_CheckBill();
			break;
			//åå®¡æ ¸æé®
			case 'btn-DeAudit': set_AbandonCheck();
			//éåº
			case 'get_Exit': Pub_Close(2);
			break;
			};
			});

			//æ¥è¯¢æé®
			form.on('submit(btnSearch)', function (data) {//éæ©ä»ä½
			var ajaxLoad = layer.load();
			var HDate = $("#HDate").val();//å¼å§æ¥æ
			var HDate1 = $("#HDate1").val();//ç»ææ¥æ
			var HBillNo = $("#HBillNo").val();//åæ®å·
			var HSource = $("#HSource").val();//çäº§èµæº
			if (HDate) {
			sWhere += " and CONVERT(varchar(100),æ¥æ, 23) >= '" + HDate + "'";
			}
			@@ -175,6 +189,9 @@
			}
			if (HBillNo) {
			sWhere += " and åæ®å· like '%" + HBillNo + "%'";
			}
			if (HSource) {
			sWhere += " and èµæºä»£ç like '%" + HSource + "%' or èµæºåç§° like '%" + HSource + "%'";
			}
			$.ajax({
			url: GetWEBURL() + '/Sc_MESBeginWorkBill/GetMESBeginWorkBill',
			@@ -224,10 +241,12 @@
			get_Display();

			}



			//åå§åè¡¨æ ¼
			function set_InitGrid() {
			$("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
			$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));
			option = {
			elem: '#mainTable'
			, toolbar: '#toolbarDemo'
			@@ -240,6 +259,7 @@
			, { field: 'æ¥æ', title: 'æ¥æ', width: 160, templet: "<div>{{d.æ¥æ ==null ?'':layui.util.toDateString(d.æ¥æ, 'yyyy-MM-dd')}}</div>" }
			, { field: 'åæ®å·', title: 'åæ®å·', width: 160 }
			, { field: 'åæ®ç±»å', title: 'åæ®ç±»å', width: 160 }
			, { field: 'HBillStatus', title: 'åæ®ç¶æ', width: 160 }
			, { field: 'é¨é¨ä»£ç ', title: 'é¨é¨ä»£ç ', width: 115 }
			, { field: 'é¨é¨åç§°', title: 'é¨é¨åç§°', width: 200 }
			, { field: 'çç»ä»£ç ', title: 'çç»ä»£ç ', width: 115 }
			@@ -318,6 +338,12 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var linterid = data[0].hmainid.toString();
			var HBillStatus = data[0].HBillStatus.toString();
			if (HBillStatus != "1")
			{
			layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸ç¼è¾ï¼');
			return false;
			}
			//if (AllowLoadData(sSubStr) != false) {//éç©ºéªè¯
			layer.open({
			type: 2
			@@ -350,6 +376,11 @@
			, data = checkStatus.data;
			if (checkStatus.data.length === 1) {
			var InterID = data[0].hmainid.toString();
			var HBillStatus = data[0].HBillStatus.toString();
			if (HBillStatus != "1") {
			layer.msg('åæ®ç¶æä¸ä¸ºæªå®¡æ ¸ç¶æ,ä¸åè®¸å é¤ï¼');
			return false;
			}
			//é»è¾å é¤æ¹æ³
			layer.confirm("ç¡®è®¤è¦å é¤åï¼å é¤åä¸è½æ¢å¤", { title: "å é¤ç¡®è®¤" }, function (index) {
			$.ajax({
			@@ -379,6 +410,12 @@
			else {
			layer.msg('è¯·éæ©ä¸è¡æ°æ®å é¤ï¼');
			}
			}

			//å·æ°
			function set_Refresh()
			{
			$("#btnSearch").click();
			}

			//å®¡æ ¸
			@@ -453,6 +490,7 @@

			}


			//#endregion

			//ä»¥ä¸æ¯layuiæ¨¡å