沈泽
2021-09-22 9036218de581fe0e930604d1587e98027224fd5d
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
1个文件已删除
4个文件已修改
163 ■■■■ 已修改文件
WebTM/WebTM.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/test.html 124 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -527,7 +527,6 @@
    <Content Include="views\基础资料\生产基础资料\Add_Edit_Gy_Process.html" />
    <Content Include="views\基础资料\采购基础资料\Gy_Supplier_Edit.html" />
    <Content Include="views\基础资料\销售基础资料\Gy_Customer_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\test.html" />
    <Content Include="views\基础资料\公用基础资料\Xt_ORGANIZATIONSList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_PropertyList.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_Material.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,15 +2,16 @@
function GetWEBURL() {
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地
    var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8085/API/";   //zgq本地
    //var WEBURL = "http://localhost:8080/API/";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/lubao";   //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器
    //var WEBURL = "http://localhost/API/";
    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器外网
    //var WEBURL = "http://192.168.1.253:8080/API/";   //凯贝奈特客户服务器内网
    var WEBURL = "http://localhost/API/";
    return WEBURL
}
WebTM/views/index.html
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/test.html
File was deleted
WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html
@@ -85,15 +85,6 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <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>-->
                            </div>
                        </script>
                    </form>
@@ -122,6 +113,7 @@
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //var sWhere = " äº§å“ä»£ç  = 'BX0002'";
            var sWhere = "";
            var option = "";
@@ -148,7 +140,6 @@
                    //删除
                    case 'set_DeleteBill': set_DeleteBill();
                        break;
                    //刷新
                    case 'get_Refresh': get_Refresh();
                        break;
@@ -171,6 +162,7 @@
                get_FastQuery();
            });
            //#endregion
            //#region æœ¬é¡µé¢æ‰€æœ‰è¢«è°ƒç”¨çš„æ–¹æ³•
            function set_ClearBill() {
                //初始化主表列表
@@ -190,7 +182,7 @@
                $("#HDate1").val("");//结束日期
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#SHname").val("");//物料|子件名称|子件规格
                $("#btnSearch").click();
                //$("#btnSearch").click();
                sWhere = "";
            }
            //#endregion
@@ -307,6 +299,7 @@
            table.on('row(mainTable)', function (obj) { //注:tool æ˜¯å·¥å…·æ¡äº‹ä»¶åï¼Œtest æ˜¯ table åŽŸå§‹å®¹å™¨çš„å±žæ€§ lay-filter="对应的值"
                var datas = obj.data; //获得当前行数据
                var HMainID = datas.hmainid;
                var wait = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_Sc_ProcessExchangeBillQuerySub_Json',
                    type: "GET",
@@ -315,10 +308,13 @@
                        if (data1.count == 1) {
                            option2.data = data1.data;
                            table.render(option2);
                            layer.close(wait);
                        } else {
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                            layer.close(wait);
                        }
                    }, error: function () {
                        layer.close(wait);
                        layer.alert("接口失效!", { icon: 5 });
                    }
                });
@@ -333,14 +329,21 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , height: 256
                    , height: 300
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        //{ field: 'hmainid', title: 'hmainid', width: 90 }
                        , { field: '打印次数', title: '打印次数' }
                        , { field: '类型', title: '类型' }
                        , { field: '日期', title: '日期', width: 120, sort: true }
                        , {
                            field: '日期', title: '日期', width: 120, sort: true, templet: function (d) {
                                if (d.日期 == null) {
                                    return "";
                                }
                                return util.toDateString(d.日期, "yyyy-MM-dd");
                            }
                        }
                        , { field: '订单跟踪号', title: '订单跟踪号', width: 120 }
                        , { field: '单据号', title: '单据号', width: 190 }
                        //, { field: 'hicmointerid', title: 'hicmointerid', width: 80 }
@@ -397,7 +400,7 @@
                    elem: '#mainTable2'
                    //, toolbar: '#toolbarDemo'
                    , page: true
                    , height: 226
                    , height: 300
                    , cellMinWidth: 90
                    , cols: [[