wtt
2 天以前 b1016f79650b98e321a2acc3dad9446132518c82
工艺路线添加导入
3个文件已修改
29 ■■■■ 已修改文件
WebTM/WebTM.csproj 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj
@@ -581,13 +581,13 @@
    <Content Include="views\生产管理\三升排产\JIT_DayPlanPlatFormImport_SS.html" />
    <Content Include="views\生产管理\宝工排产\Cg_PODemandPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\Gy_RoutingBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_NeedMaterPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\宝工排产\JIT_PickUpCalculate_BaoGong.html" />
    <Content Include="views\生产管理\宝工排产\JIT_UnLockRequestBillList.html" />
    <Content Include="views\生产管理\宝工排产\JIT_UnLockRequestBill.html" />
    <Content Include="views\生产管理\宝工排产\JIT_LockRequestBill.html" />
    <Content Include="views\生产管理\宝工排产\JIT_DayPlanPlatForm.html" />
    <Content Include="views\生产管理\宝工排产\JIT_LockRequestBillList.html" />
    <Content Include="views\生产管理\宝工排产\JIT_NeedMaterPlanConfigBillReportForLack.html" />
    <Content Include="views\生产管理\异常反馈单\OA_ErrMsgBackSignBill_BrushCard.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillResumeList.html" />
    <Content Include="views\生产管理\异常反馈单\Sc_MESExecptFeedBackBillType.html" />
@@ -603,7 +603,6 @@
    <Content Include="views\生产管理\报工平台_PDA\质量汇报\Sc_QualityReportBill_PDA.html" />
    <Content Include="views\生产管理\报工平台功能页\Gy_ButtonList.html" />
    <Content Include="views\生产管理\报工平台功能页\LineBind_Button.html" />
    <Content Include="views\生产管理\日计划基础资料\JIT_NeedMaterPlanConfigBill_Excel.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysis.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisDetailReport.html" />
    <Content Include="views\生产管理\欠料运算\JIT_MaterialLevelShorAnalysisReport.html" />
@@ -622,7 +621,6 @@
    <Content Include="views\生产管理\生产物料清单\sc_Gy_ICBomBillEdit.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_TK.html" />
    <Content Include="views\生产管理\生产计划平台\JIT_DayPlanPlatForm_BCP.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_ShopCalendar_Excel.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_EquipmentProcessList.html" />
    <Content Include="views\生产管理\订单状态分布\Sc_OEEStatusReport.html" />
    <Content Include="views\生产管理\生产计划平台\Sc_BulkEditWorkTime.html" />
@@ -643,7 +641,6 @@
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillCloseList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillToInvalidatedList.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillWorkQty.html" />
    <Content Include="views\计划管理\工艺路线\Gy_RoutingBillimport_WorkQty.html" />
    <Content Include="views\计划管理\工艺路线\Pay_ProcPriceTypeChangeReport.html" />
    <Content Include="views\计划管理\工艺路线\Gy_MaterialTechParamBill_Excel.html" />
    <Content Include="views\计划管理\工艺路线大类\Gy_RoutingGroupEdit.html" />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,7 +7,7 @@
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html
@@ -107,7 +107,7 @@
                                    <button class="layui-btn layuiadmin-btn-order" style="" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                    </button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px; display: none;">重置</button>
                                    <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding: 0 5px;">重置</button>
                                </div>
                                <!--显示当前过滤方案-->
                                <div class="layui-inline" style="margin-left:5px;">
@@ -205,6 +205,7 @@
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container" id="toolbarDemo_ButtonSet">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>导出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Excel"><i class="layui-icon layui-icon-delete"></i>Excel导入</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_Copy" id="set_Copy"><i class="layui-icon layui-icon-form"></i>复制</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNew" id="set_AddNew"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_AddNewSub" id="set_AddNewSub"><i class="layui-icon layui-icon-file-b"></i>新增子路线</button>
@@ -389,6 +390,9 @@
                    //导出excel
                    case 'get_export':
                        get_Export();
                        break;
                    //导入
                    case 'set_Excel': set_Excel();
                        break;
                    //列设置
                    case 'set_HideColumn': get_HideColumnNoPage(HModName, sessionStorage["HUserName"], option, get_FastQuery);
@@ -1637,6 +1641,22 @@
            }
            //#endregion
            //导入
            function set_Excel() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '工艺路线列表-导入'
                    , shift: 0//弹出动画
                    , content: '../工艺路线/Gy_RoutingBillimport.html'
                    , end: function () {
                        //刷新页面,
                        get_FastQuery();
                    }
                })
            }
            //#region èŽ·å–å¯¼å‡ºæ•°æ®
            function getExportData() {
                var data;//导出的数据