Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

llj

2025-12-08 d3f660435a70a6ce1b728739db9e32934a52fe7f

Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

 WebTM/Vlog/webapi20251204.txt

New file
@@ -0,0 +1,35 @@
2025/12/4 9:49:39 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222439)

2025/12/4 9:49:42 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2025/12/4 9:49:42 ReportDataSet:1

2025/12/4 11:01:51 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222435)

2025/12/4 11:01:51 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2025/12/4 11:01:51 ReportDataSet:1

2025/12/4 11:30:23 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222435)

2025/12/4 11:30:23 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2025/12/4 11:30:23 ReportDataSet:1

2025/12/4 11:30:34 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(102119)

2025/12/4 11:30:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2025/12/4 11:30:34 ReportDataSet:1

2025/12/4 14:59:33 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222435)

2025/12/4 14:59:33 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2025/12/4 14:59:33 ReportDataSet:1

2025/12/4 15:00:26 æ‰“印sql:select * from h_v_IF_EmployeeList where HItemID in(222435)

2025/12/4 15:00:26 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;

2025/12/4 15:00:26 ReportDataSet:1

 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:\GitHub\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ProjectFiles</ProjectView>
    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
    <NameOfLastUsedPublishProfile>C:\Users\19858\Desktop\智云迈思\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
    <Use64BitIISExpress />
    <IISExpressSSLPort />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -4,14 +4,15 @@
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    /*var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //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:8082/API/";    //张瑞广本地配置
    var WEBURL = "http://localhost:81/API/"    //翁涛涛本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    /*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/  //余思杰本地配置
    //var WEBURL = "http://localhost:81/API/";            // é™ˆé•å“²æœ¬åœ°é…ç½®*/
     var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置
   /*  var WEBURL = "http://localhost:8082/LuBaoAPI/";  //李林俊本地配置*/
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦
    //var WEBURL = "http://10.1.4.155/API/";            //江丰客户NEW

 WebTM/views/WMSɨÂëÄ£¿é/ÕÒ»õÉϼܵ¥/Kf_MaterialUpperBill_PDA.html

@@ -103,7 +103,7 @@
                                            </div>
                                            <div class="layui-col-xs9">
                                                <div class="layui-col-xs10">
                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();">
                                                    <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" onkeyup="value=value.replace(/\s+/g,'')" autocomplete="off" class="layui-input" onfocus="this.select();" readonly>
                                                </div>
                                                <!--<div class="layui-col-xs2" style="float: right;">
                                                    <button type="button" lay-submit="" lay-filter="HSourceBillNo-BT" class="layui-btn" id="HSourceBillNo-BT" style="width: 45px; margin-left: -5px;padding-left:12px">OK</button>
@@ -342,7 +342,7 @@
                table.render(LowerListOption);

                //光标默认在条码位置上
                var pFocus = $("#HSourceBillNo");
                var pFocus = $("#HBarCode");
                pFocus.select();
                pFocus.focus();     //获取光标
            }
@@ -929,7 +929,11 @@
                        success: function (result) {
                            if (result.count == 1) {
                                playSound_OK();

                                if (sBarCode.startsWith("GXLX")) {
                                    $("#HMainSourceBillNo").val(sBarCode);
                                    $("#HSourceBillNo").val(sBarCode);
                                }
                                
                                if (HSourceFlag != true) {
                                    HSourceFlag = true;
                                }

 WebTM/views/grf/Ö°Ô±±êÇ©.grf

New file
@@ -0,0 +1,151 @@
Object Report
    Version='6.8.2.2'
    Title='你的报表标题'
    PrintAsDesignPaper=F
    Object Font
        Name='宋体'
        Size=105000,0
        Weight=400
        Charset=134
    End
    Object Printer
        Size=256
        Width=9.7
        Height=6
        LeftMargin=0.1
        TopMargin=0
        RightMargin=0.1
        BottomMargin=0
    End
    Object DetailGrid
        CenterView=T
        Object Border
            Object Pen
                Width=1.5
            End
        End
        Object Recordset
            Items Field
                Item
                    Name='职员名称'
                End
                Item
                    Name='职员代码'
                End
                    End
    End
    Items Column
        Item
            Name='标签宽度'
            Width=9.7
            FixedWidth=T
        End
    End
Object ColumnContent
    Height=5.3975
    Items ColumnContentCell
        Item
            Column='标签宽度'
            FreeCell=T
            Items Control
                Item
                    Type=FreeGrid
                    Name='FreeGrid1'
                    Left=0.396875
                    Top=0.211667
                    Object Border
                        Styles=[DrawLeft|DrawTop|DrawRight|DrawBottom]
                    End
                    ColumnCount=2
                    RowCount=2
                    Items FreeGridColumn
                        Item[1]
                            Width=3.99521
                            FixedWidth=T
                        End
                        Item[2]
                            Width=4.6
                            FixedWidth=T
                        End
                                    End
                Items FreeGridRow
                    Item[1]
                        Height=2.5
                    End
                    Item[2]
                        Height=2.5
                    End
                            End
            Items FreeGridCell
                Item[1,1]
                    Object Font
                        Name='宋体'
                        Size=142500,0
                        Bold=T
                        Charset=134
                    End
                    TextAlign=MiddleCenter
                    Text='[#职员代码#]'
                End
                Item[1,2]
                    FreeCell=T
                    Items Control
                        Item
                            Type=Barcode
                            Name='Barcode1'
                            Left=0.211667
                            Top=0.211667
                            Width=4.18042
                            Height=4.78896
                            BarcodeType=QRCode
                            CaptionPosition=None
                            Text='[#条码编号#]'
                        End
                                    End
                RowSpan=2
            End
            Item[2,1]
                Object Font
                    Name='宋体'
                    Size=142500,0
                    Bold=T
                    Charset=134
                End
                TextAlign=MiddleCenter
                Text='[#职员名称#]'
            End
            End
End
End
End
End
End
Object ColumnTitle
    Height=0
    Items ColumnTitleCell
        Item
            GroupTitle=F
            Column='标签宽度'
            TextAlign=MiddleCenter
            PaddingLeft=0
            PaddingRight=0
            PaddingTop=0
            PaddingBottom=0
        End
    End
End
End
Items ReportHeader
    Item
        Name='ReportHeader1'
        Height=0.211667
        RepeatOnPage=T
    End
End
Items ReportFooter
    Item
        Name='ReportFooter1'
        Height=0
    End
End
End

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_Car.html

@@ -114,8 +114,18 @@
                                            <label class="layui-form-label">车辆行驶证照片</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HCarCardIDPic"
                                                    name="HCarCardIDPic">
                                                    style="color: blue;cursor: default;" name="HCarCardIDPic" readonly>
                                            </div>
                                            <button type="button" lay-submit="" class="layui-btn"
                                                id="HCarCardIDPic-BT-ChooseFile"
                                                lay-filter="HCarCardIDPic-BT-ChooseFile" style="width:6rem;">
                                                é€‰æ‹©æ–‡ä»¶
                                            </button>
                                            <button type="button" lay-submit="" class="layui-btn"
                                                id="HCarCardIDPic_BT_UploadFile"
                                                lay-filter="HCarCardIDPic_BT_UploadFile" style="width:6rem;">
                                                ä¸Šä¼ æ–‡ä»¶
                                            </button>
                                        </div>
                                        <div class="layui-inline layui-col-xs4">
                                            <label class="layui-form-label">车辆年检日期</label>
@@ -131,7 +141,7 @@
                                            <label class="layui-form-label">车辆照片</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" id="HCarPric" name="HCarPric"
                                                    readonly>
                                                    style="color: blue;cursor: default;" readonly>
                                            </div>
                                            <button type="button" lay-submit="" class="layui-btn"
                                                id="HCarPric-BT-ChooseFile" lay-filter="HCarPric-BT-ChooseFile"
@@ -139,7 +149,7 @@
                                                é€‰æ‹©æ–‡ä»¶
                                            </button>
                                            <button type="button" lay-submit="" class="layui-btn"
                                                id="HCarPric-BT-UploadFile" lay-filter="HCarPric-BT-UploadFile"
                                                id="HCarPric_BT_UploadFile" lay-filter="HCarPric_BT_UploadFile"
                                                style="width:6rem;">
                                                ä¸Šä¼ æ–‡ä»¶
                                            </button>
@@ -470,7 +480,10 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        
                        debugger
                        $("#HCarTypeName").val(checkStatus.data[0]['车型名称'])
                        $("#HCarTypeID").val(checkStatus.data[0]['HItemID'])

                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
@@ -487,6 +500,117 @@
                set_CheckBill(data);
            });

            // è½¦è¾†è¡Œé©¶è¯ç…§ç‰‡ä¸Šä¼ 
            form.on('submit(HCarCardIDPic_BT_UploadFile)', function (data) {
                // æ–‡ä»¶ä¸Šä¼ å‰åˆ¤æ–­æ˜¯å¦å¡«å†™è½¦ç‰Œå·ï¼Œä¸å¡«å†™æ— æ³•ä¸Šä¼ æ–‡ä»¶
                if (!$("#HNumber").val()) {
                    layer.alert("还未填写车牌号，无法上传图片!", { icon: 5 });
                    return false
                }
                if (!(uploadFiles.HCarCardIDPic)) {
                    layer.alert("车辆行驶证文件为空，无法上传!", { icon: 5 });
                    return false
                }

                var ajaxLoad = layer.load();

                var formData = new FormData();
                formData.append("file", uploadFiles.HCarCardIDPic, uploadFiles.HCarCardIDPic.name);
                formData.append("HNumber", $("#HNumber").val());
                formData.append("HPrefix", "/HCarCardIDPic");
                formData.append("HUserName", sessionStorage['HUserName']);

                $.ajax({
                    url: GetWEBURL() + "/Gy_Car/Gy_Car_UploadFile",
                    type: 'POST',
                    data: formData,
                    processData: false,
                    contentType: false,
                    dataType: 'json',
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.alert("错误:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    },
                    compelete: function () {
                        layer.close(ajaxLoad)
                    }
                },
                )

            })

            // è½¦è¾†ç…§ç‰‡ä¸Šä¼ 
            form.on('submit(HCarPric_BT_UploadFile)', function (data) {
                // æ–‡ä»¶ä¸Šä¼ å‰åˆ¤æ–­æ˜¯å¦å¡«å†™è½¦ç‰Œå·ï¼Œä¸å¡«å†™æ— æ³•ä¸Šä¼ æ–‡ä»¶
                if (!$("#HNumber").val()) {
                    layer.alert("还未填写车牌号，无法上传图片!", { icon: 5 });
                    return false
                }
                if (!(uploadFiles.HCarPric)) {
                    layer.alert("车牌照片文件为空，无法上传!", { icon: 5 });
                    return false
                }

                var formData = new FormData();
                formData.append("file", uploadFiles.HCarPric, uploadFiles.HCarPric.name);
                formData.append("HNumber", $("#HNumber").val());
                formData.append("HPrefix", "/HCarPric");
                formData.append("HUserName", sessionStorage['HUserName']);

                $.ajax({
                    url: GetWEBURL() + "/Gy_Car/Gy_Car_UploadFile",
                    type: 'POST',
                    data: formData,
                    processData: false,
                    contentType: false,
                    dataType: 'json',
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.alert("错误:" + err, { icon: 5 });
                        console.log("Reason" + sMainStr);
                    },
                    compelete: function () {
                        layer.close(ajaxLoad)
                    }
                },
                )
            })


            //#region å±•ç¤ºå›¾ç‰‡é¢„览 é€šè¿‡layui自定义事件
            layui.onevent('showImageReview', 'click(showImageReview)', function (data) {
                layer.photos({
                    photos: {
                        "title": data.name,
                        "start": 0,
                        "data": [
                            {
                                "alt": data.name,
                                "pid": 1,
                                "src": data.src,
                            },
                        ]
                    }
                });
            });
            //#endregion 

            //#endregion

@@ -546,7 +670,7 @@
                    url: '', // ä¸Šä¼ æŽ¥å£
                    auto: false,
                    // multiple: true,
                    bindAction: '#HCarPric-BT-UploadFile',
                    // bindAction: '#HCarPric-BT-UploadFile',
                    autoPreview: false,
                    choose: function (obj) {
                        // é€‰æ‹©æ–‡ä»¶åŽï¼Œå°†æ–‡ä»¶è§£æžä¸ºbase64图片格式，通过超链接文本预览图片
@@ -554,7 +678,69 @@
                            console.log(index); // å¾—到文件索引
                            console.log(file); // å¾—到文件对象
                            console.log(result); // å¾—到文件base64编码，比如图片

                            // å°†æ–‡ä»¶ä¿å­˜åˆ°æœ¬åœ°ç¼“存，等待上传
                            uploadFiles.HCarPric = file
                            // base64格式图片作为预览项输出到输入框中
                            $("#HCarPric").val(file.name)
                            $("#HCarPric").css("cursor", "pointer")
                            $("#HCarPric").closest("div").click(function () {
                                console.log("触发了点击事件")
                                layui.event('showImageReview', 'click(showImageReview)', {
                                    name: file.name,
                                    src: result,
                                });
                            })

                        })
                    },
                    before: function (obj) {
                        // æ–‡ä»¶ä¸Šä¼ å‰åˆ¤æ–­æ˜¯å¦å¡«å†™è½¦ç‰Œå·ï¼Œä¸å¡«å†™æ— æ³•ä¸Šä¼ æ–‡ä»¶
                        if (!$("#HNumber").val()) {
                            layer.alert("还未填写车牌号，无法上传图片!", { icon: 5 });
                            return false
                        }
                    },
                    done: function (res) {
                        layer.msg('上传成功');
                        console.log(res)
                    }
                });
                upload.render({
                    elem: '#HCarCardIDPic-BT-ChooseFile',
                    url: '', // ä¸Šä¼ æŽ¥å£
                    auto: false,
                    // multiple: true,
                    // bindAction: '#HCarCardIDPic_BT_UploadFile',
                    autoPreview: false,
                    choose: function (obj) {
                        // é€‰æ‹©æ–‡ä»¶åŽï¼Œå°†æ–‡ä»¶è§£æžä¸ºbase64图片格式，通过超链接文本预览图片
                        obj.preview(function (index, file, result) {
                            console.log(index); // å¾—到文件索引
                            console.log(file); // å¾—到文件对象
                            console.log(result); // å¾—到文件base64编码，比如图片

                            // å°†æ–‡ä»¶ä¿å­˜åˆ°æœ¬åœ°ç¼“存，等待上传
                            uploadFiles.HCarCardIDPic = file
                            // base64格式图片作为预览项输出到输入框中
                            $("#HCarCardIDPic").val(file.name)
                            $("#HCarCardIDPic").css("cursor", "pointer")
                            $("#HCarCardIDPic").closest("div").click(function () {
                                console.log("触发了点击事件")
                                layui.event('showImageReview', 'click(showImageReview)', {
                                    name: file.name,
                                    src: result,
                                });
                            })

                        })
                    },
                    before: function (obj) {
                        // æ–‡ä»¶ä¸Šä¼ å‰åˆ¤æ–­æ˜¯å¦å¡«å†™è½¦ç‰Œå·ï¼Œä¸å¡«å†™æ— æ³•ä¸Šä¼ æ–‡ä»¶
                        if (!$("#HNumber").val()) {
                            layer.alert("还未填写车牌号，无法上传图片!", { icon: 5 });
                            return false
                        }
                    },
                    done: function (res) {
                        layer.msg('上传成功');
@@ -597,7 +783,7 @@
                                "HCarTypeID": data.车型,
                                "HCarTypeName": data.车型名称 || "",
                                "HCarPric": data.车辆照片,
                                "HCarCardIDPic": data.车辆行驶照片,
                                "HCarCardIDPic": data.车辆行驶证照片,
                                "HCompID": data.HCompID,
                                "HCompName": data.所属公司,
                                "HModel": data.车辆型号,
@@ -614,6 +800,32 @@
                                "HModifyEmp": data.修改人,
                                "HModifyTime": data.修改时间 ? util.toDateString(data.修改时间, 'yyyy-MM-dd') : ""
                            });

                            // èŽ·å–服务器基地址
                            var apiIndex = GetWEBURL().indexOf("/API/");
                            var filePath = GetWEBURL().slice(0, apiIndex) + "/"
                            if (data['车辆照片']) {
                                $("#HCarPric").css("cursor", "pointer")
                                $("#HCarPric").closest("div").click(function () {
                                    console.log("触发了点击事件")
                                    layui.event('showImageReview', 'click(showImageReview)', {
                                        name: data.车辆照片,
                                        src: filePath + 'Files/Gy_Car/' + data["车牌号"] + "/HCarPric/" + data['车辆照片'],
                                    });
                                })
                            }

                            if (data['车辆行驶证照片']) {
                                $("#HCarCardIDPic").css("cursor", "pointer")
                                $("#HCarCardIDPic").closest("div").click(function () {
                                    console.log("触发了点击事件")
                                    layui.event('showImageReview', 'click(showImageReview)', {
                                        name: data['车辆行驶证照片'],
                                        src: filePath + 'Files/Gy_Car/' + data["车牌号"] + "/HCarCardIDPic/" + data['车辆行驶证照片'],
                                    });
                                })
                            }

                            layer.close(ajaxLoad);
                        } else {
                            layer.close(ajaxLoad);
@@ -634,7 +846,7 @@
                    //逻辑审核方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "/Gy_Source/AuditGy_Source", //方法所在页面和方法名
                        url: GetWEBURL() + "/Gy_Car/AuditGy_Car", //方法所在页面和方法名
                        data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                        success: function (result) {
                            if (result.count == 1) {
@@ -654,6 +866,8 @@
                    });
                })
            }



            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {
@@ -718,10 +932,14 @@
        }

        function GetHCar(data) {
            debugger
            $("#HParentID").val(data[0]["hmainid"])
            $("#HParentName").val(data[0]["车辆名称"])
        }

        function GetHCarType(data) {
            $("#HCarTypeName").val(data[0]['车型名称'])
            $("#HCarTypeID").val(data[0]['HItemID'])
        }
    </script>
</body>


 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_CarList.html

@@ -419,17 +419,29 @@

            //双击表格事件
            table.on('rowDouble(mainTable)', function (obj) {
                if (window.top == window.self) {
                    // éžIFrame页面执行代码
                // IFrame页面执行代码
                var data = [];
                data.push(obj.data);
                var index = parent.layer.getFrameIndex(window.name);
                if(!index){
                    // éžå¼¹å‡ºå±‚页面
                    var linterid = data[0].HItemID.toString();
                    layer.open({
                        type: 2,
                        area: ['100%', '100%'],
                        title: '车辆-编辑',
                        shift: 0,
                        content: '../公用基础资料/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
                        end: function () {
                            // å¼¹çª—关闭后刷新表格数据，不刷新整个页面
                            get_Refresh();
                        }
                    })

                    return
                }

                // IFrame页面执行代码
                var data = [];
                data.push(obj.data);
                parent.GetHCar(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);

            })
@@ -507,7 +519,7 @@
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
                    //    , { field: '生产资源代码', title: '生产资源代码' }
                    //    , { field: '车牌号', title: '车牌号' }
                    //    , { field: '生产资源名称', title: '生产资源名称' }
                    //    , { field: '组织', title: '组织' }
                    //    , { field: '条码编号', title: '条码编号' }
@@ -543,8 +555,8 @@
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;

                //生产资源代码
                if (obj.event == '生产资源代码') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '生产资源代码'。如果等于，则执行if循环
                //车牌号
                if (obj.event == 'onCarNumberClickHandler') {                  //检查 obj.event æ˜¯å¦ç­‰äºŽå­—符串 '车牌号'。如果等于，则执行if循环
                    var linterid = data.HItemID.toString();    //声明变量linterid ä¸º data.hmainid
                    layer.open({                //使用 layer的open打开弹出 å±‚ 
                        type: 2                         //表示弹出层的内容是一个 iframe
@@ -554,7 +566,7 @@
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../生产基础资料/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='  //设置 iframe çš„ URL，URL ä¸­åŒ…含了查询参数，来调用所需要的值
                        , content: '../公用基础资料/Add_Edit_Gy_Car.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='  //设置 iframe çš„ URL，URL ä¸­åŒ…含了查询参数，来调用所需要的值
                        , resize: false,  //是否允许用户调整弹出大小
                        end: function () {  //当关闭时调用
                            get_FastQuery(table, option);
@@ -592,10 +604,10 @@
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) { //计算列  
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
                                } else if (data[i].name == '生产资源代码') {
                                } else if (data[i].name == '车牌号') {
                                    col.push({
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '生产资源代码', templet: function (d) {
                                            return '<span style="color: blue;">' + d.生产资源代码 + '</span>'
                                        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '车牌号', templet: function (d) {
                                            return '<span style="color: blue;">' + d.车牌号 + '</span>'
                                        }, style: 'cursor: pointer;'
                                    });
                                } else {
@@ -704,16 +716,16 @@
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        default:
                                            //if (data[i].name === '条码编号') {
                                            //    col.push({
                                            //        field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
                                            //        templet: function (d) {
                                            //            return '<span style="color: blue;" lay-unrow >' + d.条码编号 + '</span>'
                                            //        }, style: 'cursor: pointer;', event: 'onHBarCodeClickHandler'
                                            //    });
                                            //} else {
                                            if (data[i].name === '车牌号') {
                                                col.push({
                                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200,
                                                    templet: function (d) {
                                                        return '<span style="color: blue;" lay-unrow >' + d.车牌号 + '</span>'
                                                    }, style: 'cursor: pointer;', event: 'onCarNumberClickHandler'
                                                });
                                            } else {
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                        //}
                                        }
                                    }
                                }
                            }

 WebTM/views/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_CarTypeList.html

@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">

<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>车型维护</title>
@@ -16,6 +17,7 @@
    <script src="../../../layuiadmin/PubCustom.js"></script>

</head>

<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
@@ -41,28 +43,36 @@
                                        <input type="text" class="layui-input" name="HName" id="HName">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                <button class="layui-btn layuiadmin-btn-order" 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">重置</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit=""
                                    lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" lay-filter="ColName" style="width:190px;">
                                                <select name="ColName" id="ColName" lay-filter="ColName"
                                                    style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator" style="width:190px;">
                                            <select name="Comparator" id="Comparator" lay-filter="Comparator"
                                                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="<=">
                                                    <=< /option>
                                                <option value="<">
                                                    << /option>
                                                <option value="<>">
                                                    <>
                                                </option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
@@ -70,7 +80,8 @@
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent" id="ColContent">
                                            <input type="text" class="layui-input" value="" name="ColContent"
                                                id="ColContent">
                                        </div>
                                    </div>
                                </div>
@@ -225,6 +236,34 @@
            });
            //#endregion

            //#region åŒå‡»è¿”回数据
            //双击表格事件
            table.on('rowDouble(mainTable)', function (obj) {
                // IFrame页面执行代码
                var data = [];
                data.push(obj.data);
                var index = parent.layer.getFrameIndex(window.name);
                if (!index) {
                    // éžå¼¹å‡ºå±‚页面
                    var linterid = data[0].HItemID.toString();
                    layer.open({
                        type: 2,
                        area: ['100%', '100%'],
                        title: '车型-编辑',
                        shift: 0,
                        content: '../../基础资料/基础资料/Gy_CarTypeEdit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=',
                        end: function () {
                            // å¼¹çª—关闭后刷新表格数据，不刷新整个页面
                            get_Refresh();
                        }
                    })
                    return
                }
                parent.GetHCarType(data);
                parent.layer.close(index);

            })

            //#endregion

            //#region æœ¬é¡µé¢è¢«è°ƒç”¨çš„所有方法
@@ -326,7 +365,7 @@
                    }
                });
            }
//#endregion
            //#endregion
            //#endregion

            //#region å¿«é€Ÿè¿‡æ»¤
@@ -436,7 +475,7 @@
                        $.ajax({
                            url: GetWEBURL() + 'Gy_CarType/delete',
                            type: "GET",
                            data: { "HInterID": ItemID, "user": sessionStorage["HUserName"]},
                            data: { "HInterID": ItemID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
@@ -719,4 +758,5 @@
    </script>

</body>

</html>

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

@@ -2764,8 +2764,56 @@
                        //setTableByHMater(obj, data);
                    }
                })
                //工作中心下拉搜索框
                tableSelect.render({
                    elem: 'td[data-field="工作中心代码"] .layui-table-edit',
                    searchKey: '工作中心代码,工作中心名称',
                    sWhere: " ",//table搜索sWhere条件
                    ajaxSelect: function (sWhere) {
                        var data = '';
                        $.ajax({
                            url: GetWEBURL() + '/Gy_WorkCenter/list',
                            type: "GET",
                            data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                            async: false,
                            success: function (data1) {
                                if (data1.count == 1) {
                                    data = data1.data
                                }
                            },
                            error: function () {
                                layer.alert('获取列表失败！', { icon: 15, title: '通信错误' });
                            }
                        });
                        return data;
                    },//设置前端分页时可以设置的
                    table: {
                        cols: [[
                            { type: 'radio', fixed: 'left' },
                            { field: 'HItemID', title: 'HItemID', hide: true },
                            { field: '工作中心代码', title: '工作中心代码' },
                            { field: '工作中心名称', title: '工作中心名称' },
                        ]],
                        page: true,
                        limit: 5,
                        //limits: [5]
                    },
                    done: function (elem, data) {
                        $(".layui-table-edit").blur();//单元格失去焦点
                        obj.update({
                            "工作中心": data.data[0]["工作中心名称"]
                            , "HCenterID": data.data[0]["HItemID"]
                            , "工作中心代码": data.data[0]["工作中心代码"]
                        })
                        
                        table.render(option);



                        //setTableByHMater(obj, data);
                    }
                })

            }

            //编辑 é¡µé¢èµ‹å€¼

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾_СÎÀ/Cj_ProcessItemStationPlatform_KeyElement.html

@@ -91,7 +91,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;" id="BT_HProcExchBillNo">工序流转卡</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;">
                                                <input type="text" class="layui-input" name="HProcExchBillNo" lay-verify="HProcExchBillNo" id="HProcExchBillNo" value="" style="background-color:#efefef4d;" autocomplete="off">
                                                <input type="hidden" class="layui-input" name="HProcExchInterID" lay-verify="HProcExchInterID" id="HProcExchInterID" value="0">
                                                <input type="hidden" class="layui-input" name="HProcExchEntryID" lay-verify="HProcExchEntryID" id="HProcExchEntryID" value="0">
                                            </div>

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת/MES_StationOutBill_PDA.html

@@ -207,7 +207,7 @@
                                            <tr>
                                                <th>操作员</th>
                                                <td class="bz_td">
                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="操作员代码" autocomplete="off" class="layui-input" style="border-radius: 50px;">
                                                    <input type="text" name="HEmpNumber" id="HEmpNumber" value="" placeholder="操作员代码" autocomplete="off" class="layui-input" style="border-radius: 50px;" onclick="this.select()">
                                                    <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu layui-btn-radius" lay-filter="QueDin_CZY" style="line-height: 30px;">确定</button>
                                                </td>
                                                <td class="bz_td">