智云MES-UI前端
parent: 3ddeb79b | 补丁 | 提交 | show whitespace
杨乐
2022-02-07 4915fc2aec6f6e89485479d8be712a92fdc85d08 
工序管理
12个文件已修改
89 ■■■■■ 已修改文件
WebTM/views/生产工序管理/委外工序派工单/WW_AddEntrustProcSendWork.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/委外工序派工单/WW_EntrustProcSendWorkBillList.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/委外工序计划汇报单/WW_Add_EntrustProcessReport.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/委外工序计划汇报单/WW_EntrustProcessReportBillList.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/委外工序计划转出单/WW_Add_EntrustProcessSendOutBill.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/委外工序计划转出单/WW_EntrustProcessSendOutBillList.html 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序汇报单/Sc_ProcessReportList.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序派工单/Sc_Add_ProcessSendWork.html 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序派工单/Sc_ProcessSendWorkList.html 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanEdit.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产工序管理/工序计划单/Sc_ProcessPlanList.html 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/ίÍ⹤ÐòÅɹ¤µ¥/WW_AddEntrustProcSendWork.html


@@ -344,7 +344,7 @@




                var sMainStr = JSON.stringify(data.field);


                var sSubStr = JSON.stringify(table.cache['mainTable']);


                var sMainSub = sMainStr + ';' + sSubStr;


                  var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];


                $.ajax(


                {


                    type: "POST",




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/ίÍ⹤ÐòÅɹ¤µ¥/WW_EntrustProcSendWorkBillList.html


@@ -396,7 +396,7 @@


                    type: "get",


                    url: GetWEBURL() + "/Sc_ProcessMangement/MES_WW_EntrustProcSendWorkBill_Json",


                    async: true,


                    data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"],


                    data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],


                    success: function (result) {


                        if (result.count == 1) {


                            ajaxReturnData = JSON.parse(JSON.stringify(result)).data;




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/ίÍ⹤Ðò¼Æ»®»ã±¨µ¥/WW_Add_EntrustProcessReport.html


@@ -353,7 +353,7 @@




                var sMainStr = JSON.stringify(data.field);


                var sSubStr = JSON.stringify(table.cache['mainTable']);


                var sMainSub = sMainStr + ';' + sSubStr;


                  var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];


                $.ajax(


                {


                    type: "POST",




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/ίÍ⹤Ðò¼Æ»®»ã±¨µ¥/WW_EntrustProcessReportBillList.html


@@ -453,7 +453,7 @@


                    type: "get",


                    url: GetWEBURL()+"/Sc_ProcessMangement/MES_WW_EntrustProcessReportBill_Json",


                    async: true,


                    data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"], 


                    data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"]},//"HSupNo": sessionStorage["HUserName"],


                    success: function (result) {


                        if (result.count == 1) {


                         ajaxReturnData = JSON.parse(JSON.stringify(result)).data;


@@ -468,16 +468,16 @@




                            }


                        });


                        layer.close(index0);


                        //layer.close(index0);


                    } else {


                            layer.close(index0);


                            //layer.close(index0);


                            layer.alert(result.code + result.Message, { icon: 5 });


                    }


                     


                    },


                    error: function (result) {


                        console.log(result);


                        layer.close(index0);


                        //layer.close(index0);


                        layer.alert("接口请求失败!", { icon: 5 });


                    }


                });




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/ίÍ⹤Ðò¼Æ»®×ª³öµ¥/WW_Add_EntrustProcessSendOutBill.html


@@ -422,7 +422,7 @@




                var sMainStr = JSON.stringify(data.field);


                var sSubStr = JSON.stringify(table.cache['mainTable']);


                var sMainSub = sMainStr + ';' + sSubStr;


                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];


                $.ajax(


                {


                    type: "POST",




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/ίÍ⹤Ðò¼Æ»®×ª³öµ¥/WW_EntrustProcessSendOutBillList.html


@@ -2,7 +2,7 @@


<html>


<head>


    <meta charset="utf-8">


    <title>委外工序派工单列表</title>


    <title>委外工序计划转出单列表</title>


    <meta name="renderer" content="webkit">


    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">


    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">


@@ -450,7 +450,7 @@


                    type: "get",


                    url: GetWEBURL()+"/Sc_ProcessMangement/MES_WW_EntrustProcessSendOutBillList_Json",


                    async: true,


                    data: { "sqlWhere": sqlWhere },//"HSupNo": sessionStorage["HUserName"], 


                    data: { "sqlWhere": sqlWhere, "user": sessionStorage["HUserName"] },//"HSupNo": sessionStorage["HUserName"],


                    success: function (result) {


                        if (result.count == 1) {


                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;


@@ -465,15 +465,15 @@




                            }


                        });


                        layer.close(index0);


                        //layer.close(index0);


                    } else {


                            layer.close(index0);


                            //layer.close(index0);


                            layer.alert(result.code + result.Message, { icon: 5 });


                    }


                


                    },


                    error: function (result) {


                        layer.close(index0);


                        //layer.close(index0);


                    layer.alert("接口请求失败!", { icon: 5 });


                    }


                });




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤Ðò»ã±¨µ¥/Sc_Add_ProcessReportList.html


@@ -2,7 +2,7 @@


<html>


<head>


    <meta charset="utf-8" />


    <title>新增派工单</title>


    <title>工序汇报单新增派工单</title>


    <meta name="renderer" content="webkit">


    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">


    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">


@@ -225,17 +225,21 @@


        }


        var params = getUrlVars();


        var HInterID = params[params[0]];


        if (HInterID == null) {


            HInterID = 0;


            console.log(HInterID)


        }


        var lentryid = params[params[1]];


        var PlanBeginDate = params[params[2]];


        var PlanEndDate = params[params[3]];


        alert("看看" + HInterID + "lentryid" + lentryid);


        //alert("看看" + HInterID + "lentryid" + lentryid);


        var date = new Date();


        var day = date.getDate();


        var month = date.getMonth() + 1;


        var year = date.getFullYear();


        var shijian = year + "-" + month + "-" + day;


        var CurUserName;


        if (typeof (lentryid) == "undefined") {


        if (typeof (lentryid) != "undefined") {


            $('#HDeptID-BT').addClass("layui-btn-disabled").attr("disabled", true);


            $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);


            $('#HRemark').addClass("layui-btn-disabled").attr("disabled", true);


@@ -405,7 +409,7 @@


                $.ajax({


                    url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json',


                    type: "GET",


                    data: { "sWhere": "and hmainid in(" + lentryid + ")" },


                    data: { "sWhere": "and hmainid in(" + lentryid + ")", "user": sessionStorage["HUserName"] },


                    success: function (result) {


                        console.log(result);


                        //$("#HBillNo").val(result.data[0].HInterID);


@@ -457,7 +461,7 @@


               


                var sMainStr = JSON.stringify(data.field);


                var sSubStr = JSON.stringify(table.cache['mainTable']);


                var sMainSub = sMainStr + ';' + sSubStr;


                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];


                $.ajax(


                {


                    type: "POST",




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤Ðò»ã±¨µ¥/Sc_ProcessReportList.html


@@ -204,7 +204,7 @@


                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",


                url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessReportList_Json',


                type: "GET",


                data: { "sWhere": sWhere },


                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},


                success: function (data1) {


                    if (data1.count == 1) {


                        option.data = data1.data;




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤ÐòÅɹ¤µ¥/Sc_Add_ProcessSendWork.html


@@ -200,7 +200,7 @@


        var lentryid = params[params[1]];


        var PlanBeginDate = params[params[2]];


        var PlanEndDate = params[params[3]];


        alert(HInterID + '第二个：' + lentryid);


        //alert(HInterID + '第二个：' + lentryid);


        var date = new Date();


        var day = date.getDate();


        var month = date.getMonth() + 1;


@@ -360,12 +360,12 @@


                }




            });


            ///加载显示数据


            ///编辑 åŠ è½½æ˜¾ç¤ºæ•°æ®


            function RoadHBillSub() {


                $.ajax({


                    url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json',


                    type: "GET",


                    data: { "sWhere": "and hmainid in(" + lentryid + ")" },


                    data: { "sWhere": "and hmainid in('" + lentryid + "')", "user": sessionStorage["HUserName"]},


                    success: function (result) {


                        console.log(result);


                        //$("#HBillNo").val(result.data[0].HInterID);


@@ -391,7 +391,7 @@


               


                var sMainStr = JSON.stringify(data.field);


                var sSubStr = JSON.stringify(table.cache['mainTable']);


                var sMainSub = sMainStr + ';' + sSubStr;


                var sMainSub = sMainStr + ';' + sSubStr + ";" + sessionStorage["HUserName"];


                $.ajax(


                {


                    type: "POST",




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤ÐòÅɹ¤µ¥/Sc_ProcessSendWorkList.html


@@ -2,7 +2,7 @@


<html xmlns="http://www.w3.org/1999/xhtml">


<head>


<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>


    <title>生产工序汇报单列表</title>


    <title>生产工序派工单列表</title>


    <meta name="renderer" content="webkit">


    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">


    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">


@@ -72,6 +72,8 @@


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>-->


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>


                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Pushdown"><i class="layui-icon layui-icon-form"></i>下推</button>




                            </div>


@@ -210,13 +212,26 @@


          


                        }


                        break;


                    case 'add':


                        var date = new Date();


                        var day = date.getDate();


                        var month = date.getMonth() + 1;


                        var year = date.getFullYear();


                        var shijian = year + "/" + month + "/" + day;


                        layer.msg(shijian);


                    //添加


                    case 'btn-Add':


                        //页面层-自定义


                        layer.open({


                            type: 2,


                            skin: 'layui-layer-rim', //加上边框


                            title: '工序计划单',


                            closeBtn: 1,


                            shift: 2,


                            area: ['100%', '100%'],


                            maxmin: true,


                            content: '../../生产工序管理/工序汇报单/Sc_Add_ProcessReportList.html?HInterID=-1&OperationType=1&linterid=0&HSouceBillType=0&linteridSub=-1',


                            end: function () {


                                //刷新页面,


                                location.reload();


                            },


                            success: function (layero, index) {




                            }


                        });


                        break;


                    case '':


                        layer.msg('');


@@ -231,7 +246,7 @@


                //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",


                url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessSendWorkMain_Json',


                type: "GET",


                data: { "sWhere": sWhere },


                data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },


                success: function (data1) {


                    if (data1.count == 1) {


                        option.data = data1.data;




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤Ðò¼Æ»®µ¥/Sc_ProcessPlanEdit.html


@@ -738,7 +738,7 @@


                var sMainStr = JSON.stringify(data.field);


                var sSubStr = JSON.stringify(num);


                var hentryid = linteridSub;//子表 æŽ’序id


                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType;


                var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];


                var index = layer.load();




                //console.log(JSON.stringify(table.cache['mainTable'][0]))




 WebTM/views/Éú²ú¹¤Ðò¹ÜÀí/¹¤Ðò¼Æ»®µ¥/Sc_ProcessPlanList.html


@@ -421,7 +421,7 @@


                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",


                    url: GetWEBURL() + '/Sc_ProcessMangement/MES_Sc_ProcessPlanMain_Json',


                    type: "GET",


                    data: { "sWhere": sWhere },


                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},


                    success: function (data1) {


                        if (data1.count == 1) {


                            option.data = data1.data;


@@ -593,7 +593,7 @@


                        btn: ["确定", "取消"]


                        , btn1: function () {




                            var ModRightNameDelete = "";//删除权限


                            var ModRightNameDelete = "Sc_ProcessPlan_Drop";//删除权限


                            var HInterID = checkstatus.data[0].hmainid;




                            $.ajax({