关闭其它优化

wtt

2024-10-24 af927cc4dce912ff07aff3656c4e6c911747bbee

关闭其它优化

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>C:\Users\86130\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -8,7 +8,7 @@
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    /*var WEBURL = "http://localhost/API/";*/    //潘浙游本地配置  
    var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/"; */  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -318,7 +318,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭人</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="hcloser" id="hcloser" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -338,7 +338,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">关闭日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="" id="" style="background-color:#efefef4d;" readonly>
                                                <input type="text" class="layui-input" name="hclosedate" id="hclosedate" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -824,7 +824,12 @@
            });
            //禁用其它
            form.on('submit(set_closeOtherRoute)', function (data) {
                set_closeOtherRoute(data);
                if ($("#hcloser").val != '') {
                    layer.alert("单据已被关闭无法关闭其它!", { icon: 5 });
                } else {
                    set_closeOtherRoute(data);
                }
                
            });

            //审核
@@ -2268,6 +2273,8 @@
                            , "hupdatedate": d.data[0].修改日期 == null ? "" : Format(new Date(d.data[0].修改日期), "yyyy-MM-dd")
                            , "hdeleteman": d.data[0].作废人
                            , "hdeletedate": d.data[0].作废日期 == null ? "" : Format(new Date(d.data[0].作废日期), "yyyy-MM-dd")
                            , "hcloser": d.data[0].关闭人
                            , "hclosedate": d.data[0].关闭日期 == null ? "" : Format(new Date(d.data[0].关闭日期), "yyyy-MM-dd")
                        });

                        //子表  èµ‹å€¼

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillCloseList.html

@@ -700,7 +700,7 @@
                    //从别的页面打开传入Hmaterid值，设置物料过滤
                    sWhere += " and HMaterID = " + HMaterID;
                    //从别的页面打开设置关闭
                    sWhere += " and hmainid!=" + HInterID + " and å·¥è‰ºåç§° = ''" + HName.toString() + "''";
                    sWhere += " and hmainid!=" + HInterID + " and å·¥è‰ºåç§° = ''" + HName.toString() + "''" + "and å®¡æ ¸äºº!=''''";
                } else {
                    //不是从别的页面打开
                    var HMaterID2 = $("#HMaterID").val();

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -1238,7 +1238,7 @@
            function set_closeOtherRoute() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                if (checkStatus.data.length === 1 && checkStatus.data[0]["审核人"]=="") {
                    var hmainid = data[0].hmainid.toString();
                    var HName = data[0]["工艺名称"].toString();
                    var HMaterID = data[0]["HMaterID"].toString();
@@ -1287,7 +1287,7 @@
                        }
                    })
                } else {
                    layer.msg('请选择一行数据查看！');
                    layer.msg('请选择一行未被关闭的数据查看！');
                }
            }
            //#endregion