1

wangbin

2024-06-06 5d647968d2802f0bcc3bf4f423359866c6d5db3b

1

 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>D:\编码\发布\layui</PublishUrl>
    <WebPublishMethod>FileSystem</WebPublishMethod>
    <SiteUrlToLaunchAfterPublish />
  </PropertyGroup>

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

Diff too large

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\GIT仓库\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\编码\1\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -9,7 +9,7 @@
   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: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/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Sc_MouldMaintainRuleBillList.html

@@ -122,7 +122,6 @@
                        <script type="text/html" id="xuhao1">
                            {{d.LAY_TABLE_INDEX+1}}
                        </script>

                    </form>
                </div>
            </div>

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/sc_ICOMReport.html

@@ -111,7 +111,7 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>

@@ -124,7 +124,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" class="ForFilteringSchemes" style="width:190px;">
                                            <select name="Comparator1" id="Comparator1" class="ForFilteringSchemes" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
@@ -143,33 +143,7 @@
                                        </div>
                                    </div>

                                    <!--<div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" class="ForFilteringSchemes" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" class="ForFilteringSchemes" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>-->
                                
                                </div>
                            </div>
                        </div>
@@ -338,9 +312,7 @@
                $("#ColName1").append(Organization);
                form.render('select');

                //$("#ColName2").empty();
                //$("#ColName2").append(Organization);
                //form.render('select');
               
            }


@@ -419,24 +391,24 @@
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期
                var HMaterNumber = $("#HMaterNumber").val();//物料代码
                var HMaterNumber = $("#HMaterNumber").val();//产品代码
                var HBillNo = $("#HBillNo").val();          //单据号
                var HProductName = $("#HProductName").val();//产品名称
                var HProductModel = $("#HProductModel").val();//产品规格
                var HProductModel = $("#HProductModel").val();//规格型号


                sWhere = " and æ—¥æœŸ between ''" + HBeginDate + "'' and ''" + HEndDate + "'' ";

                if (HMaterNumber != "") {
                    sWhere += " and ç‰©æ–™ä»£ç =''" + HMaterNumber + "'' ";
                    sWhere += " and äº§å“ä»£ç =''" + HMaterNumber + "'' ";
                }

                if (HBillNo != "") {
                    sWhere += " and ç”Ÿäº§è®¢å•å·=''" + HBillNo + "'' ";
                    sWhere += " and å•æ®å·=''" + HBillNo + "'' ";
                }

                if (HProductName != "") {
                    sWhere += " and ç‰©æ–™åç§°=''" + HProductName + "'' ";
                    sWhere += " and äº§å“åç§°=''" + HProductName + "'' ";
                }

                if (HProductModel != "") {
@@ -452,10 +424,7 @@
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();

                //var ColName2 = $("#ColName2").val();//复选框
                //var Comparator2 = $("#Comparator2").val()
                //var ColContent2 = $("#ColContent2").val();

        
                //拼接任一字段过滤查询条件
                var com = "";
                if (ColName != 0 && Comparator != 0) {
@@ -482,46 +451,25 @@
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            com1 = "like''%" + ColContent1 + "%''";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            com1 = "like''%" + ColContent1 + "''";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            com1 = "like''" + ColContent1 + "%''";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            com1 = "not like''%" + ColContent1 + "%''";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            com1 = "" + Comparator1 + "''" + ColContent1 + "''";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }

                //if (ColName2 != 0 && Comparator2 != 0) {
                //    var com2 = "";
                //    switch (Comparator2) {
                //        case "7":
                //            com2 = "like'%" + ColContent2 + "%'";
                //            break;
                //        case "8":
                //            com2 = "like'%" + ColContent2 + "'";
                //            break;
                //        case "9":
                //            com2 = "like'" + ColContent2 + "%'";
                //            break;
                //        case "10":
                //            com2 = "not like'%" + ColContent2 + "%'";
                //            break;
                //        default:
                //            com2 = "" + Comparator2 + "'" + ColContent2 + "'";
                //            break;
                //    }
                //    sWhere += " and " + ColName2 + " " + com2;
                //}
            
                
             
                //根据用户过滤用户关联客户的记录
                sWhere += getSWhereByHUser();

@@ -547,9 +495,6 @@
                $("#ColName1").val("0");
                $("#Comparator1").val("0");

                //$("#ColContent2").val("");
                //$("#ColName2").val("0");
                //$("#Comparator2").val("0");
                ColFilter();
                sWhere = "";
            }