refactor: 器具采购入库维护 器具领用出库单维护 器具领用退库单维护 locaiton.reload()部分修改为无感刷新
4个文件已修改
92 ■■■■ 已修改文件
WebTM/WebTM.csproj.user 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_Add_MouldProdBackBillList.html 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdInBillEdit.html 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdOutBillEdit.html 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user
@@ -2,9 +2,9 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\工作代码\智云迈思\MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>D:\WorkBench\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />
@@ -17,8 +17,9 @@
    <VisualStudio>
      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
        <WebProjectProperties>
          <StartPageUrl>views/user/login_pda.html</StartPageUrl>
          <StartAction>SpecificPage</StartAction>
          <StartPageUrl>
          </StartPageUrl>
          <StartAction>CurrentPage</StartAction>
          <AspNetDebugging>True</AspNetDebugging>
          <SilverlightDebugging>False</SilverlightDebugging>
          <NativeDebugging>False</NativeDebugging>
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_Add_MouldProdBackBillList.html
@@ -380,8 +380,8 @@
            set_InitGrid();
            set_CountGrid();
            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
            ColumnAddNotEditableStyle()
            ColumnHideColumnSetting()
            ColumnAddNotEditableStyle(cancelEditStyleList)
            ColumnHideColumnSetting(HideColmReg)
            // åœ¨èŽ·å–åˆ—è®¾ç½®åŽä¼šé‡ç½®option,需要重新给style赋值
            //判断操作类型
            if (OperationType == 1) {//无源新增
@@ -420,7 +420,10 @@
                    case 'set_HideColumn':
                        get_HideColumnEditAfterReload(HModName, sessionStorage["HUserName"], option, table
                            , function () {
                                location.reload();
                                let opt = [option];
                                ColumnAddNotEditableStyle(cancelEditStyleList, opt);
                                ColumnHideColumnSetting(HideColmReg, opt);
                                table.reload('mainTable', opt[0]);
                            }
                        );
                        break;
@@ -1462,25 +1465,14 @@
            }
            // ç»™ä¸å…è®¸ç¼–辑的数据添加样式
            function ColumnAddNotEditableStyle(regExp) {
            function ColumnAddNotEditableStyle(_regExp, _option) {
                let notEditableStyle = "; background: #e2e2e2;"
                let opt = option
                debugger
                for (let col of option.cols[0]) {
                    if (regExp.test(col.field) === true) {
                        col.style += notEditableStyle;
                        col.edit = null
                    }
                if (_option !== undefined) {
                    opt = _option[0]
                }
            }
            // ç»™ä¸å…è®¸ç¼–辑的数据添加样式
            function ColumnAddNotEditableStyle() {
                let notEditableStyle = "; background: #e2e2e2;"
                let opt = option
                debugger
                for (let col of option.cols[0]) {
                    if (cancelEditStyleList.test(col.field) === true) {
                    if (_regExp.test(col.field) === true) {
                        col.style += notEditableStyle;
                        col.edit = null
                    }
@@ -1488,9 +1480,13 @@
            }
            // è®¾ç½®åˆ—隐藏
            function ColumnHideColumnSetting() {
            function ColumnHideColumnSetting(_regExp, _option) {
                let opt = option
                if (_option !== undefined) {
                    opt = _option[0]
                }
                for (let col of option.cols[0]) {
                    if (HideColmReg.test(col.field) === true) {
                    if (_regExp.test(col.field) === true) {
                        col.hide = true
                    }
                }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdInBillEdit.html
@@ -460,7 +460,10 @@
                    //列设置
                    case 'set_HideColumn':
                        get_HideColumnEditAfterReload(HModName, sessionStorage["HUserName"], option, table, function () {
                            location.reload()
                            let cancelEditStyleList = new RegExp(/HMaterName|HMaterSpec|HUnitName|HQtyMust|HWHName|HSPName/i)
                            let opt = [option]
                            ColumnAddNotEditableStyle(cancelEditStyleList, opt)
                            table.reload('mainTable', opt[0])
                        })
                        break;
                }
@@ -651,7 +654,6 @@
            }
            //表头信息往来单位弹窗
            form.on('submit(HSupList)', function () {
                //debugger;
                if ($("#HSupTypeID").val() == 0 || $("#HSupTypeID").val() == null) {
                    return layer.msg('请选择往来类型');
                }
@@ -702,7 +704,6 @@
                if (linterid != "" && linterid != null) {
                    refSav = "Update";
                }
                //debugger;
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
@@ -994,8 +995,6 @@
                    , done: function (res, curr, count) {
                    }
                };
                debugger
            }
            //初始汇总信息
            function set_CountGrid() {
@@ -1657,11 +1656,13 @@
            //#endregion
            // ç»™ä¸å…è®¸ç¼–辑的数据添加样式
            function ColumnAddNotEditableStyle(regExp) {
            function ColumnAddNotEditableStyle(regExp, _option) {
                let notEditableStyle = "; background: #e2e2e2;"
                let opt = option
                debugger
                for (let col of option.cols[0]) {
                if(_option !== undefined){
                    opt = _option[0]
                }
                for (let col of opt.cols[0]) {
                    if (regExp.test(col.field) === true) {
                        col.style += notEditableStyle;
                    }
WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξֿ߲â¹ÜÀí/Sc_MouldProdOutBillEdit.html
@@ -415,8 +415,8 @@
            set_InitGrid();
            set_CountGrid();
            DisPlay_HideColumnEdit(HModName, sessionStorage["HUserName"], option, table);
            ColumnAddNotEditableStyle()
            ColumnHideColumnSetting()
            ColumnAddNotEditableStyle(cancelEditStyleList)
            ColumnHideColumnSetting(HideColmReg)
            //判断操作类型
            if (OperationType == 1) {//无源新增
                set_AddFNew();
@@ -451,7 +451,11 @@
                    case 'set_HideColumn':
                        get_HideColumnEditAfterReload(HModName, sessionStorage["HUserName"], option, table,
                            function () {
                                location.reload();
                                // è¿™é‡ŒèŽ·å–çš„option是 SetColumn.js ä¸­çš„option, ä¸Žæœ¬é¡µé¢ä¸­çš„option无关
                                let opt = [option];
                                ColumnAddNotEditableStyle(cancelEditStyleList, opt);
                                ColumnHideColumnSetting(HideColmReg, opt);
                                table.reload('mainTable', opt[0]);
                            }
                        )
                        break;
@@ -1528,12 +1532,14 @@
            //#endregion
            // ç»™ä¸å…è®¸ç¼–辑的数据添加样式
            function ColumnAddNotEditableStyle() {
            function ColumnAddNotEditableStyle(regExp, _option) {
                let notEditableStyle = "; background: #e2e2e2;"
                let opt = option
                debugger
                for (let col of option.cols[0]) {
                    if (cancelEditStyleList.test(col.field) === true) {
                if(_option !== undefined){
                    opt = _option[0]
                }
                for (let col of opt.cols[0]) {
                    if (regExp.test(col.field) === true) {
                        col.style += notEditableStyle;
                        col.edit = null
                    }
@@ -1541,9 +1547,13 @@
            }
            // è®¾ç½®åˆ—隐藏
            function ColumnHideColumnSetting() {
            function ColumnHideColumnSetting(regExp, _option) {
                let opt = option
                if(_option !== undefined){
                    opt = _option[0]
                }
                for (let col of option.cols[0]) {
                    if (HideColmReg.test(col.field) === true) {
                    if (regExp.test(col.field) === true) {
                        col.hide = true
                    }
                }