wtt
2024-05-28 7383e38eae7a852f35d6749f6b12e6406f789fed
采购订单单据号列超链接
8个文件已修改
4301 ■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 4242 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/销售合同/Add_Edit_Xs_ContractBillList.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/销售管理/销售合同/Xs_ContractBillList.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
    <LastUsedPlatform>Any CPU</LastUsedPlatform>
    <PublishProvider>FileSystem</PublishProvider>
    <PublishUrl>D:\网站发布\智云MESWMS\LAYUI</PublishUrl>
    <PublishUrl>G:\issWeb\网站发布\LAYUI</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/WebTM.csproj
@@ -391,12 +391,16 @@
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBill.html" />
    <Content Include="views\车间管理\防错验证\Qc_PreventErrMouldCheckBillList.html" />
    <Content Include="views\车间管理\报表分析\Kf_PressurizedWaterNoOutReport.html" />
    <Content Include="views\采购管理\采购合同\Add_Edit_Cg_ContractBillList.html" />
    <Content Include="views\采购管理\采购合同\Cg_ContractBillList.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderReceiveDaySumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderReceiveSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POInStockBillSumReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POMaterialPriceReport.html" />
    <Content Include="views\采购管理\采购报表\Cg_POOrderBillProcessSumReport.html" />
    <Content Include="views\销售管理\销售合同\Add_Edit_Xs_ContractBillList.html" />
    <Content Include="views\销售管理\销售合同\Xs_ContractBillList.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ColorClass.html" />
@@ -1449,7 +1453,6 @@
    <Content Include="views\模治具管理\器具点检规程单\Sc_MouldDotCheckRuleBillList.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillEdit.html" />
    <Content Include="views\模治具管理\器具维修派工单\Sc_MouldRepairSendWorkBillList.html" />
    <Content Include="views\模治具管理\模具处理出库单\Sc_MouldScrapOutBill_PDA.html" />
    <Content Include="views\模治具管理\模具寿命调整单\Sc_MouldLifeChangeBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制入库单\Sc_MouldRepairInBill_PDA.html" />
    <Content Include="views\模治具管理\模具改制出库单\Sc_MouldRepairOutBill_PDA.html" />
@@ -2483,6 +2486,7 @@
    <Folder Include="Files\" />
    <Folder Include="views\仓存管理\调拨单核对\" />
    <Folder Include="views\仓存管理\调拨单稽核\" />
    <Folder Include="views\模治具管理\模具处理出库单\" />
  </ItemGroup>
  <PropertyGroup>
    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
WebTM/WebTM.csproj.user
@@ -2,7 +2,7 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,8 +8,8 @@
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:81/API/";    //王彬本地配置
    /*var WEBURL = "http://localhost:8083/API/";  //陈雯静本地配置*/
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    /*var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";    //余思杰本地配置(安瑞)
    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW
WebTM/views/²É¹º¹ÜÀí/²É¹º¶©µ¥/Cg_POOrderBillList.html
@@ -410,6 +410,8 @@
                        break;
                };
            });
            //表格点击事件
            //重新同步按钮
            form.on('submit(btnResCnz)', function (data) {
@@ -421,6 +423,31 @@
                set_ClearQuery();
            });
            table.on('tool(mainTable)' , function (obj) {
                var data = obj.data;
                console.log(data);
                if (obj.event == '单据号') {
                    var linterid = data.hmainid.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑' + HPageTitle
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式,-1不开启
                        , content: './Cg_POOrderBillEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&closeType=1'
                        , resize: false,
                        end: function () {
                            get_FastQuery(table, option);
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })
                }
            });
            //获取组织
            function Organ() {
                //获取登录页组织列
@@ -504,7 +531,7 @@
                    $('#HEndDate').prop('disabled', false);
                }
            });
            //#endregion
            //#region æ­¤é¡µé¢æ‰€æœ‰æ–¹æ³•
            function set_ClearBill() {
@@ -553,7 +580,7 @@
                        { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                        ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '日期', title: '日期', width: 120, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>" }
                        , { field: '单据号', title: '单据号', width: 150}
                        , { field: '单据号', title: '单据号', width: 150, }
                        , { field: '状态', title: '状态', width: 100, sort: true }
                        , { field: 'HBillType', title: 'HBillType', hide: true, sort: true }
                        , { field: '行状态', title: '行状态', width: 125, sort: true }
@@ -660,6 +687,7 @@
                //        m["width"] = colWidth[x];
                //    });
                //}
            }
            //加载网格
            function get_Display(sWhere) {
@@ -670,7 +698,7 @@
                    data: { "sWhere": sWhere  , "user": sessionStorage["HUserName"]},
                    success: function (data1) {
                        if (data1.count == 1) {
                            var data = [];
                            var data = [];//列字段数据
                            var col = [];
                            var totalArray = ["数量", "关联数量", "未关联数量", "打印条码数量", "未打印条码数量","实收数量","金额"];
                            //给空的数组赋值
@@ -684,9 +712,11 @@
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                } else {
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event:'单据号' });
                                }else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛºÏͬ/Add_Edit_Xs_ContractBillList.html
@@ -1081,8 +1081,7 @@
                                }
                            })
                        }
                        //货币(TODO æœ‰bug在弹出框排序以后确定,选中元素还是原来位置的(需要在货币资料与计量单位资料中设置排序代码如物料页面))
                        //TODO ä¸Žè´§å¸å’Œè®¡é‡å•位原页面需要设置双击事件
                        //货币
                        if (obj.event == "HCurID") {
                            layer.open({
                                type: 2//弹窗类型
WebTM/views/ÏúÊÛ¹ÜÀí/ÏúÊÛºÏͬ/Xs_ContractBillList.html
@@ -572,7 +572,7 @@
                    //逻辑删除方法
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        if (data[0].审核人 == null || data[0].审核人 == '' ) {
                        if (data[0].状态 == "创建" ) {
                            $.ajax({
                                type: "GET",
                                url: GetWEBURL() + "/Xs_ContractBill/DeltetXs_ContractBill", //方法所在页面和方法名