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

zrg

2024-10-10 b1a5994fefbb3244275c161a9a455191d2b467a9

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

 WebTM/WebTM.csproj

@@ -403,6 +403,7 @@
    <Content Include="views\基础资料\通用基础资料\Gy_CommonBaseData.html" />
    <Content Include="views\基础资料\隐藏列设置\Gy_GridView_Hide_New.html" />
    <Content Include="views\工资管理\定额申请\Pay_ProcPriceRequestBillCheckQuery.html" />
    <Content Include="views\工资管理\工资运算\Pay_SalaryCalculate_New.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBill.html" />
    <Content Include="views\工资管理\技能考核\HR_EmployeeSkillExamBillList.html" />
    <Content Include="views\应收管理\报表分析\Xs_SeOrderBarCodeInAndOutStockDetailReport.html" />

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云迈思\MES\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

@@ -10,7 +10,7 @@
    var WEBURL = "http://localhost:8082/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:8082/LuBaoAPI/"; */  //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://localhost/API/";             //潘浙游本地配置
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";  //奥邦

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

@@ -105,9 +105,11 @@
                }
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Web/GetProductionTeamList_Json",
                    async: true,
                    data: { "sWhere": Value },
                    //url: GetWEBURL() + "/Web/GetProductionTeamList_Json",     //原返回数据调用方法
                    url: GetWEBURL() + "/Web/GetGroupListByUser_Json",
                    async: false,
                    //data: { "sWhere": Value },
                    data: { "sWhere": Value, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        ajaxReturnData = JSON.parse(JSON.stringify(result)).data;
                        table.reload('mainTable', {

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

@@ -405,18 +405,18 @@
                    , cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: '职员代码', title: '职员代码', sort: true }
                    //    , { field: '职员名称', title: '职员名称', sort: true }
                    //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
                    //    , { field: '职员代码', title: '职员代码', sort: false }
                    //    , { field: '职员名称', title: '职员名称', sort: false }
                    //    , { field: '条码编号', title: '条码编号' }
                    //    , { field: 'HDeptID', title: 'HDeptID', hide: true }
                    //    , { field: '车间代码', title: '车间代码', sort: true }
                    //    , { field: '车间名称', title: '车间名称', sort: true }
                    //    , { field: '车间代码', title: '车间代码', sort: false }
                    //    , { field: '车间名称', title: '车间名称', sort: false }
                    //    , { field: 'HGroupID', title: 'HGroupID', hide: true }
                    //    , { field: '班组代码', title: '班组代码', sort: true }
                    //    , { field: '班组名称', title: '班组名称', sort: true }
                    //    , { field: '班组代码', title: '班组代码', sort: false }
                    //    , { field: '班组名称', title: '班组名称', sort: false }
                    //    , { field: '明细标记', title: '明细标记' }
                    //    , { field: '禁用标记', title: '禁用标记', sort: true }
                    //    , { field: '禁用标记', title: '禁用标记', sort: false }
                    //    , { field: '备注', title: '备注' }
                    //]]
                };
@@ -452,10 +452,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }

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

@@ -307,10 +307,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }

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

@@ -394,7 +394,7 @@
                    , cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
                    //    , { field: '仓库代码', title: '仓库代码' }
                    //    , { field: '仓库名称', title: '仓库名称' }
                    //    , { field: '条码编号', title: '条码编号' }
@@ -445,10 +445,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }

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

@@ -421,8 +421,8 @@
                    , cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: 'ParentID', title: 'ParentID', sort: false, hide: true }
                    //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
                    //    , { field: '工作中心代码', title: '工作中心代码' }
                    //    , { field: '工作中心名称', title: '工作中心名称' }
                    //    , { field: '组织', title: '组织' }
@@ -526,24 +526,24 @@
                                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) { //计算列  
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
                                } else if (data[i].name == '工作中心代码') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '工作中心代码'});
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '工作中心代码'});
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group.html

@@ -405,8 +405,8 @@
                    , cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: 'HDeptID', title: 'HDeptID', sort: true, hide: true }
                    //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
                    //    , { field: 'HDeptID', title: 'HDeptID', sort: false, hide: true }
                    //    , { field: '班组代码', title: '班组代码' }
                    //    , { field: '班组名称', title: '班组名称' }
                    //    , { field: '组织', title: '组织' }
@@ -500,25 +500,25 @@
                                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) { //计算列  
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
                                } else if (data[i].name == '班组代码') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '班组代码' });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '班组代码' });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }

 WebTM/views/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_Group_Add_Edit.html

@@ -77,6 +77,16 @@
                                                <input class="layui-input" name="HCompName" lay-verify="HCompName" id="HCompName">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">计件类型</label>
                                            <div class="layui-input-inline">
                                                <select name="HPayMentType" id="HPayMentType" lay-verify="HPayMentType">
                                                    <option value="个人计件">个人计件</option>
                                                    <option value="集体计件">集体计件</option>
                                                    <option value="其它" selected="selected">其它</option>
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs8 layui-inline">
                                                <label class="layui-form-label" style="width: 12.5%;">备注</label>
@@ -88,7 +98,7 @@
                                        </div>
                                        <div class="layui-row">
                                            <div class="layui-col-xs4 layui-inline">
                                                <label class="layui-form-label" >组织</label>
                                                <label class="layui-form-label">组织</label>
                                                <div class="layui-input-inline" style="margin-bottom: -15px;">
                                                    <div class="layui-form">
                                                        <div class="layui-form-item" style=" width: 375%;">
@@ -299,12 +309,13 @@
                                , "HDeptID": data.HDeptID
                                , "HHelpCode": data.助记码
                                , "HBarCodeForBase": data.条码编号
                                ,"HCompName":data.劳务单位
                                , "HCompName":data.劳务单位
                                , "HProcID": data.HProcID
                                , "HProcName": data.工序
                                , "HStopflag": data.禁用标记
                                , "HRemark": data.备注
                                , "HUSEORGID": data.HUSEORGID
                                , "HPayMentType": data.计件类型
                            });
                            layer.close(ajaxLoad);
                        } else {

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Process.html

@@ -358,7 +358,7 @@
                    //, cellMinWidth: 90
                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
                    //    , { field: '工序代码', title: '工序代码' }
                    //    , { field: '工序名称', title: '工序名称' }
                    //    , { field: '组织', title: '组织' }
@@ -470,25 +470,25 @@
                                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) { //计算列  
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
                                } else if (data[i].name == '工序代码') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '工序代码' });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '工序代码' });

                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width:120 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
                                    }
                                }
                            }

 WebTM/views/»ù´¡×ÊÁÏ/Éú²ú»ù´¡×ÊÁÏ/Gy_Source.html

@@ -394,7 +394,7 @@

                    //, cols: [[
                    //    { type: 'checkbox', fixed: 'left' }
                    //    , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                    //    , { field: 'HItemID', title: 'HItemID', sort: false, hide: true }
                    //    , { field: '生产资源代码', title: '生产资源代码' }
                    //    , { field: '生产资源名称', title: '生产资源名称' }
                    //    , { field: '组织', title: '组织' }
@@ -462,24 +462,24 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                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 });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
                                } else if (data[i].name == '生产资源代码') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '生产资源代码' });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '生产资源代码' });
                                } else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¸öÈË)/Pay_SingleBalBillList.html

@@ -862,16 +862,16 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            break;
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        case 'Int32':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                    }
                                }
                            }

 WebTM/views/¹¤×ʹÜÀí/¹¤×ʽáËãµ¥(¼¯Ìå)/Pay_GroupBalBillList.html

@@ -864,16 +864,16 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            break;
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        case 'Int32':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                    }
                                }
                            }

 WebTM/views/¹¤×ʹÜÀí/¹¤×ÊÔËËã/Pay_SalaryCalculate_New.html

New file
@@ -0,0 +1,200 @@
<!DOCTYPE html>
<html>
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>工资运算</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <script src="../../../layuiadmin/layui/layui.js"></script>
    <script src="../../../layuiadmin/Scripts/json2.js"></script>
    <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
    <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
    <script src="../../../layuiadmin/PubCustom.js"></script>

    <style type="text/css">
        input.layui-input.layui-unselect {
            padding-right: 0;
        }
    </style>
</head>
<body>
    <div class="layui-fluid">
        <div class="layui-col-md12">
            <div class="layui-card" style="padding: 1px">
                <div class="layui-card-body" style="padding: 1px;">
                    <form class="layui-form" action="" lay-filter="component-form-group">
                        <div class="layui-collapse">
                            <h1 style="text-align: center; padding: 30px 0;"><b>工资运算</b></h1>
                            <div class="layui-colla-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">班组<label style="color:red"> * </label></label>
                                    <div class="layui-input-inline">
                                        <input type="text" name="HGroupName" id="HGroupName" readonly class="layui-input" value="" style="background-color: #efefef4d; float: left; width: 150px;">
                                        <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
                                        <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Calculate" id="btn_Calculate" style="padding:0 30px">开始工资运算</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn_Cancel" id="btn_Cancel" style="padding:0 20px">退出</button>
                            </div>
                            <div class="layui-colla-item" style="height:600px;margin-top:20px;">
                                <font size="5" color="blue" id="HRemark"></font>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                    </form>
                </div>
            </div>
        </div>
    </div>
    <script type="text/javascript">
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;
            var HModName = "Pay_SalaryCalculate_New";
            var HMaker = sessionStorage["HUserName"]
            var HStockOrgID = sessionStorage["OrganizationID"]  //组织ID
            //#endregion

            //判断是否登录 æœªç™»å½•åˆ™è·³åˆ°ç™»å½•é¡µ
            if (sessionStorage.login != "login") {
                layer.confirm("登录失效，请重新登录！", {
                    icon: 4, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['重新登录']
                }, function () { window.location.href = "../../user/login.html"; });
            }

            //#region åˆå§‹åŒ–界面

            set_ClearBill();

            function set_ClearBill() {
                //获取开始日期、结束日期
                $("#HBeginDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
                $("#HEndDate").val(Pub_Format(new Date(), "yyyy-MM-dd"));
            }
            //#endregion


            //#region é€‰æ‹©ç­ç»„按钮
            form.on('submit(HGroupList)', function () {
                get_checkGroup();
            });

            function get_checkGroup() {
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim"   //加上边框
                    , title: "班组列表"         //标题
                    , closeBtn: 1               //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2                  //弹出动画
                    , area: ["90%", "90%"]      //窗体大小
                    , maxmin: true              //设置最大最小按钮是否显示
                    , content: ['../../基础资料/工资基础资料/Gy_Group.html?Type=HGroup', 'yes']
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //按钮一  çš„回调
                        var iframeWindow = window["layui-layer-iframe" + index];                //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");    //获取选中的数据

                        if (checkStatus.data.length != 1) {
                            return layer.msg("请选择一条数据");
                        }
                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        layer.close(index); //关闭弹窗  å®ƒèŽ·å–的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () {
                    }
                })
            }
            //#endregion


            //#region å¼€å§‹å·¥èµ„运算
            form.on('submit(btn_Calculate)', function (data) {
                set_Calculate(data);
            });

            function set_Calculate(data) {
                var HBeginDate = $("#HBeginDate").val();
                var HEndDate = $("#HEndDate").val();
                var HGroupID = $("#HGroupID").val();
                var HSourceBillType = "3791";   //工序出站汇报单
                if (HBeginDate == "" || HEndDate == "") {
                    layer.msg("请先选择开始日期和结束日期！", { icon: 2, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var index = layer.load();
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + '/Pay_SalaryCulateController/GetSalaryCalculate_Json',
                    async: false,    //async用于控制（false）同步和（true）异步，默认的是true，即请求默认的是异步请求
                    data: { "HBeginDate": HBeginDate, "HEndDate": HEndDate, "HGroupID": HGroupID, "HSourceBillType": HSourceBillType, "HMaker": HMaker, "HStockOrgID": HStockOrgID },
                    success: function (data) {
                        if (data.count == 1) {
                            $("#HRemark").html(data.Message);
                            layer.close(index);
                        } else {
                            layer.msg(data.Message, { icon: 2, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            layer.close(index);
                        }
                    },
                    complete: function (XHR, TS) { XHR = null },//回收资源
                    error: function (err) {
                        layer.msg('错误' + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        layer.close(index);
                    }
                });
            }
            //#endregion


            //#region é€€å‡º
            form.on('submit(btn_Cancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    Pub_Close(2);
                });
            })
            //#endregion

        });

        //以上为layui模块
        //此处方法涉及到被外部页面parent.方法名调用的必须放在Layui方法外部

        //双击返回基础资料数据    è¡¨å¤´
        function GetHGroupValue(obj)  //返回班组
        {
            $("#HGroupName").val(obj[0].班组名称);
            $("#HGroupID").val(obj[0].HItemID);
        }
    </script>
</body>
</html>

 WebTM/views/¹¤×ʹÜÀí/Òì³£¹¤Ê±ÉêÇëµ¥/Pay_ErrWorkTimesRequestBillList.html

@@ -864,13 +864,13 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            break;
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                    }
                                }
                            }

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillEdit.html

@@ -446,10 +446,10 @@
                        , { field: 'HEmpID', title: 'HEmpID', width: 100, hide: true, style: 'background-color:#efefef4d;' }
                        , { field: 'HEmpNumber', title: '职员代码', width: 100, edit: 'text', event: "HEmpNumber" }                 //F7
                        , { field: 'HEmpName', title: '职员名称', width: 100, style: 'background-color:#efefef4d;' }
                        , { field: 'HEmpRate', title: '职员系数', width: 100, edit: 'text' }
                        , { field: 'HEmpRate', title: '职员系数', width: 100, edit: 'text', event: "HEmpRate" }
                        , { field: 'HAMTimes', title: '上午工时', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HPMTimes', title: '下午工时', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HBaseTimes', title: '基本工时', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HBaseTimes', title: '基本工时', width: 100, edit: 'text', totalRow: true, event: "HBaseTimes" }
                        , { field: 'HBaseDays', title: '基本天数', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HOverTimes', title: '加班工时', width: 100, edit: 'text', totalRow: true }
                        , { field: 'HOverDays', title: '加班天数', width: 100, edit: 'text', totalRow: true }
@@ -592,8 +592,10 @@
                        }
                        $("#HGroupName").val(checkStatus.data[0].班组名称);
                        $("#HGroupID").val(checkStatus.data[0].HItemID);
                        $("#HDeptID").val(checkStatus.data[0].HDeptID);//部门代码
                        $("#HDeptName").val(checkStatus.data[0].部门名称);//部门名称
                        if (checkStatus.data[0].HDeptID != 0) {
                            $("#HDeptID").val(checkStatus.data[0].HDeptID);
                            $("#HDeptName").val(checkStatus.data[0].部门名称);
                        }
                        layer.close(index); //关闭弹窗  å®ƒèŽ·å–的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
@@ -614,6 +616,10 @@
            }

            function GetEmployee() {
                if ($("#HGroupName").val() == '') {
                    return;
                }

                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/Gy_EmployeeController/GetEmpInfoByGroup_Json",
@@ -1035,7 +1041,8 @@
                        } else {
                            obj.del();
                            option.data = table.cache["mainTable"];//将数据绑定到data上
                            table.reload(option);
                            table.cache["mainTable"].splice(rowIndex, 1);
                            table.render(option);
                            layer.close(index);
                        }
                    });
@@ -1188,9 +1195,93 @@
                                }
                            })
                        }
                        //obj.event = "";
                        return false;
                    }


                    //#region æ‰¹é‡å¡«å……
                    //数值格式校验工具
                    var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
                    var temp = "";
                    //操作行索引
                    var rowIndex = $(obj.tr).attr("data-index");

                    if (event.key == "F6") {
                        //职员系数
                        if (obj.event == "HEmpRate") {
                            var oldText = table.cache["mainTable"][rowIndex].HEmpRate;
                            var value = e.target.value; //得到修改后的值

                            //数据格式校验
                            temp = value + "";
                            if (!ref.test(temp) || temp == 0) {
                                //恢复数据到编辑前
                                option.data[rowIndex].HEmpRate = oldText;
                                table.render(option);
                                //刷新设置复选框状态
                                CheckedSet_tableSub();

                                layer.msg("所输入值必须为大于0的数字!");
                                return;
                            }


                            for (var i = rowIndex * 1; i < option.data.length; i++) {
                                //数据校验合格，重算记录
                                var HEmpRate = isNaN(value) ? 0 : value * 1;    //职员系数

                                //同步更新表格和缓存对应的值
                                option.data[i].HEmpRate = HEmpRate;
                            }
                            table.render(option);
                            //刷新设置复选框状态
                            CheckedSet_tableSub();
                        }

                        //基本工时
                        if (obj.event == "HBaseTimes") {
                            var oldText = table.cache["mainTable"][rowIndex].HBaseTimes;
                            var value = e.target.value; //得到修改后的值

                            //数据格式校验
                            temp = value + "";
                            if (!ref.test(temp) || temp == 0) {
                                //恢复数据到编辑前
                                option.data[rowIndex].HBaseTimes = oldText;
                                table.render(option);
                                //刷新设置复选框状态
                                CheckedSet_tableSub();

                                layer.msg("所输入值必须为大于0的数字!");
                                return;
                            }


                            for (var i = rowIndex * 1; i < option.data.length; i++) {
                                //数据校验合格，重算记录
                                var HBaseTimes = isNaN(value) ? 0 : value * 1;                                  //基本工时
                                var HAMTimes = HBaseTimes / 2;                                                  //上午工时
                                var HPMTimes = HBaseTimes / 2;                                                  //下午工时
                                var HPayMoney = isNaN(option.data[i].HPayMoney) ? 0 : option.data[i].HPayMoney; //小时工资
                                var HMoney = HPayMoney * HBaseTimes;                                            //工资=小时工资*基本工时

                                //同步更新表格和缓存对应的值
                                option.data[i].HBaseTimes = HBaseTimes;
                                option.data[i].HAMTimes = HAMTimes;
                                option.data[i].HPMTimes = HPMTimes;
                                option.data[i].HMoney = HMoney;
                            }
                            table.render(option);
                            //刷新设置复选框状态
                            CheckedSet_tableSub();
                        }

                        obj.event = "";
                        return false;
                    }

                    //#endregion
                })
            }
            //#endregion
@@ -1226,7 +1317,7 @@
                        }

                        //数据校验合格，重算记录
                        var HAMTimes = isNaN(value) ? 0 : value;                            //上午工时
                        var HAMTimes = isNaN(value) ? 0 : value * 1;                        //上午工时
                        var HPMTimes = isNaN(obj.data.HPMTimes) ? 0 : obj.data.HPMTimes;    //下午工时
                        var HBaseTimes = Number(HPMTimes) + Number(HAMTimes);               //基本工时=上午工时+下午工时
                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //小时工资
@@ -1259,7 +1350,7 @@
                        }

                        //数据校验合格，重算记录
                        var HPMTimes = isNaN(value) ? 0 : value;                            //下午工时
                        var HPMTimes = isNaN(value) ? 0 : value * 1;                        //下午工时
                        var HAMTimes = isNaN(obj.data.HAMTimes) ? 0 : obj.data.HAMTimes;    //上午工时
                        var HBaseTimes = Number(HPMTimes) + Number(HAMTimes);               //基本工时=上午工时+下午工时
                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //小时工资
@@ -1269,6 +1360,40 @@
                        obj.update({
                            HPMTimes: HPMTimes
                            , HBaseTimes: HBaseTimes
                            , HMoney: HMoney
                        });
                        table.render(option);
                        //刷新设置复选框状态
                        CheckedSet_tableSub();
                        break;
                    case "HBaseTimes":        //基本工时
                        //数据格式校验
                        temp = value + "";
                        if (!ref.test(temp) || temp == 0) {
                            //恢复数据到编辑前
                            obj.update({
                                HBaseTimes: oldText
                            });
                            table.render(option);
                            //刷新设置复选框状态
                            CheckedSet_tableSub();

                            layer.msg("所输入值必须为大于0的数字!");
                            return;
                        }

                        //数据校验合格，重算记录
                        var HBaseTimes = isNaN(value) ? 0 : value * 1;                      //基本工时
                        var HAMTimes = HBaseTimes / 2;                                      //上午工时
                        var HPMTimes = HBaseTimes / 2;                                      //下午工时
                        var HPayMoney = isNaN(obj.data.HPayMoney) ? 0 : obj.data.HPayMoney; //小时工资
                        var HMoney = HPayMoney * HBaseTimes;                                //工资=小时工资*基本工时

                        //同步更新表格和缓存对应的值
                        obj.update({
                            HBaseTimes: HBaseTimes
                            , HAMTimes: HAMTimes
                            , HPMTimes: HPMTimes
                            , HMoney: HMoney
                        });
                        table.render(option);
@@ -1292,7 +1417,7 @@
                        }

                        //数据校验合格，重算记录
                        var HPayMoney = isNaN(value) ? 0 : value;                               //小时工资
                        var HPayMoney = isNaN(value) ? 0 : value * 1;                           //小时工资
                        var HBaseTimes = isNaN(obj.data.HBaseTimes) ? 0 : obj.data.HBaseTimes;  //基本工时
                        var HMoney = HPayMoney * HBaseTimes;                                    //工资=小时工资*基本工时

@@ -1413,8 +1538,10 @@
        {
            $("#HGroupName").val(obj[0].班组名称);
            $("#HGroupID").val(obj[0].HItemID);
            $("#HDeptID").val(obj[0].HDeptID);//部门代码
            $("#HDeptName").val(obj[0].部门名称);//部门名称
            if (obj[0].HDeptID != 0) {
                $("#HDeptID").val(obj[0].HDeptID);
                $("#HDeptName").val(obj[0].部门名称);
            }
        }
        //双击返回基础资料数据    åˆ—表
        function GetHEmpListValue(data)  //返回职员

 WebTM/views/¹¤×ʹÜÀí/¿¼Çڻ㱨µ¥/Pay_WorkTimesBillList.html

@@ -858,16 +858,16 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
                                            break;
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        case 'Int32':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140, totalRow: true });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 140 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
                                    }
                                }
                            }

 WebTM/views/Ä£Öξ߹ÜÀí/Ä£Öξ߹ÜÀí/Gy_BarCodeBillList.html

@@ -839,6 +839,11 @@
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                            }

                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
                            var HBillType = "条码主档";
                            Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            option.data = [[]]

 WebTM/views/Éú²ú¹ÜÀí/Éú²úͶÁϵ¥/Sc_PPBomBillList.html

@@ -200,21 +200,27 @@
                                </div>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <div class="layui-inline" style="width: 100%;">
                            <div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                            </div>
                            <div id="page" style="position:relative;bottom:0;"></div>
                        </div>
                        
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>确认</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>驳回</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成送货单</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>预览</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_HideColumn"><i class="layui-icon layui-icon-form"></i>列设置</button>
@@ -245,6 +251,8 @@
                , soulTable = layui.soulTable
            var sWhere = "";
            var option = [];
            var page = 1;//分页数据
            var size = 50;
            var HModName = "Sc_PPBomBillList";
            //#endregion
            var titleData = ["hmainid", "HDeptID", "HMaterID", "HUnitID", "hsubid", "hmaterid2", "hunitid2", "HWHID", "HSPID"];//不需要显示的字段 å¯æ‰©å±•
@@ -257,13 +265,22 @@

            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });

            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                //清空过滤条件
                set_ClearQuery();
                if (page != 1) {
                    $("#page a:eq(1)").get(0).click();//点击分页栏第一页
                } else {
                    get_FastQuery();
                }
            });

            //重新同步按钮
@@ -401,14 +418,13 @@
            //#endregion

            //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法
             //#region æ­¤é¡µé¢æ‰€æœ‰çš„方法

            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                //初始化表格
                set_InitGrid();
                //查询
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                //初始化日期间隔、开始日期、结束日期
                setSelect_HInitTimeCycle();
                //若日期间隔不为 ä»»æ„é—´éš”，则禁用开始日期与结束日期的选择
@@ -430,10 +446,10 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , height: 'full-180'
                    , page: false
                    , cellMinWidth: 90
                    , totalRow: true
                    , totalRow: false
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
@@ -481,8 +497,30 @@
                        , { field: '计划模式', title: '计划模式', sort: true }
                    ]]
                };
                optionPage = {
                    elem: 'page', //注意，这里的 page æ˜¯ ID，不用加 # å·
                    count: 10000, //数据总数，从服务端得到
                    limit: 50,
                    limits: [50, 500, 5000, 50000],
                    layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
                    jump: function (obj, first) {
                        //console.log(obj)
                        //obj包含了当前分页的所有参数，比如：
                        //console.log(obj.curr); //得到当前页，以便向服务端请求对应页的数据。
                        //console.log(obj.limit); //得到每页显示的条数

                        //首次不执行
                        if (!first) {
                            //do something
                            page = obj.curr;
                            size = obj.limit;
                            get_FastQuery();
                        }
                    }
                }
                laypage.render(optionPage);
            }
            //#endregion  ç›‘听网格表体事件
            //#region  ç›‘听网格表体事件
            table.on('tool(mainTable)', function (obj) {
                var data = obj.data;

@@ -585,6 +623,70 @@
                });
            }

            //#region åˆ†é¡µæŸ¥è¯¢
            function get_DisplayPage(sWhere) {
                //var wait = layer.load();//遮罩
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/Sc_PPBomBill/page',
                    type: "GET",
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],"page": page, "size": size },
                    success: function (data1) {
                        option.limit = size;//改变表格页大小
                        if (data1.code == 1) {
                            optionPage.count = data1.count;//改变列表数据总数
                            var data = [];
                            var col = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
                                }
                            }


                            option.cols = [col];
                            option.data = data1.data;
                            ins = table.render(option);
                            laypage.render(optionPage);
                            //刷新表格数据
                            DisPlay_HideColumn();

                            layer.close(ajaxLoad);
                            if ($("#ColName option").length < 1) {
                                ColFilter();
                            }
                            //layer.alert("查询成功", { icon: 1 });
                        } else {
                            //option.data = [[]]
                            //table.render(option);
                            layer.close(ajaxLoad);
                            layer.alert(data1.code + data1.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(ajaxLoad);
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                });
            }
            //#endregion

            // å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery() {
                var HDate = $("#HBeginDate").val();//开始日期
@@ -612,19 +714,19 @@
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            com = "like''%" + ColContent + "%''";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            com = "like''%" + ColContent + "''";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            com = "like''" + ColContent + "%''";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            com = "not like''%" + ColContent + "%''";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            com = "" + Comparator + "''" + ColContent + "''";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
@@ -634,19 +736,19 @@
                    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;
@@ -655,55 +757,55 @@
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            com2 = "like''%" + ColContent2 + "%''";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            com2 = "like''%" + ColContent2 + "''";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            com2 = "like''" + ColContent2 + "%''";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            com2 = "not like''%" + ColContent2 + "%''";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            com2 = "" + Comparator + "''" + ColContent + "''";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                if (HDate) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= '" + HDate + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) >= ''" + HDate + "''";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= '" + HDate1 + "'";
                    sWhere += " and CONVERT(varchar(100),日期, 23) <= ''" + HDate1 + "''";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                    sWhere += " and å•æ®å· like ''%" + HBillNo + "%''";
                }
                if (HDeptID) {
                    sWhere += " and éƒ¨é—¨ like '%" + HDeptID + "%'";
                    sWhere += " and éƒ¨é—¨ like ''%" + HDeptID + "%''";
                }
                if (MaterialCode) {
                    sWhere += " and ç‰©æ–™ä»£ç  like '%" + MaterialCode + "%'";
                    sWhere += " and ç‰©æ–™ä»£ç  like ''%" + MaterialCode + "%''";
                }
                if (MaterialName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + MaterialName + "%'";
                    sWhere += " and ç‰©æ–™åç§° like ''%" + MaterialName + "%''";
                }
                if (SpecificationModel) {
                    sWhere += " and è§„格型号 like '%" + SpecificationModel + "%'";
                    sWhere += " and è§„格型号 like ''%" + SpecificationModel + "%''";
                }
                if (HSourceBillNo) {
                    sWhere += " and æºå•å•å· like '%" + HSourceBillNo + "%'";
                    sWhere += " and æºå•å•å· like ''%" + HSourceBillNo + "%''";
                }
                if (Warehouse) {
                    sWhere += " and å‘货仓库 like '%" + Warehouse + "%'";
                    sWhere += " and å‘货仓库 like ''%" + Warehouse + "%''";
                }
                if (Hmaker) {
                    sWhere += " and åˆ¶å•äºº like '%" + Hmaker + "%'";
                    sWhere += " and åˆ¶å•äºº like ''%" + Hmaker + "%''";
                }
                get_Display(sWhere);
                get_DisplayPage(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

@@ -1006,7 +1108,7 @@
            }

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
            table.on('row(mainTablemainTable)', function (obj) {
            table.on('row(mainTable)', function (obj) {
                //选中行改变颜色
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserList.html

@@ -283,6 +283,8 @@
                        , { field: 'hmainid', title: '单据ID', hide: true }
                        , { field: '用户编码', title: '用户编码' }
                        , { field: '用户名称', title: '用户名称' }
                        , { field: '用户类型', title: '用户类型' }
                        , { field: '对应班组', title:'对应班组'  }
                        , { field: '对应职员', title: '对应职员' }
                        , { field: '对应保管', title: '对应保管' }
                        , { field: '对应验收', title: '对应验收' }

 WebTM/views/ϵͳ¹ÜÀí/Óû§¹ÜÀí/Xt_UserListEdit.html

@@ -332,7 +332,6 @@
            var OperationType = 1;//操作类型
            var closeType = 2;  //关闭类型
        } else {
            debugger;
            var OperationType = params[params[0]];//操作类型
            linterid = params[params[1]];//源单id
            var HSouceBillType = params[params[2]];//源单类型

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

@@ -917,7 +917,7 @@
                                data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
                            }
                            //在列表左边添加勾选框
                            col.push({ type: 'checkbox', fixed: 'left' });
                            col.push({ type: 'checkbox', fixed: 'left', totalRowText: '合计'  });
                            for (var i = 0; i < data.length; i++) {
                                // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
                                if ($.inArray(data[i].name, titleData) > -1) {
@@ -926,11 +926,18 @@
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'long':
                                        case 'Int32':
                                        case 'Int64':
                                        case 'double':
                                        case 'Decimal':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
                                            break;
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
                                    }
                                }
                            }
@@ -1451,7 +1458,10 @@
                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 2; i++) {
                                var dataCols = dataCol[i].split('|');
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ѳ¼ì¼Ç¼µ¥/QC_Add_Edit_PatrolProcCheckOtherill.html

@@ -211,8 +211,8 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">判断结论</label>
                                            <div class="layui-input-block">
                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="合格" checked>
                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="不合格">
                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="合格" >
                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="不合格" checked>
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
@@ -1526,6 +1526,8 @@
                                , "HBatchNo": data.批号
                                , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
                                , "HProcID": data.HProcID   
                                , "HProcName": data.HProcName
                            });
                            $("input[name=HLastResult][value=true]").prop("checked", data.判定结论 === "合格");
                            $("input[name=HLastResult][value=false]").prop("checked", data.判定结论 === "不合格");
@@ -1864,7 +1866,7 @@
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"] == null ? 0 : data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].上限值, "HDownLimit": + data[i].下限值, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数 == null ? 0 : data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数 == null ? 0 : data[i].拒绝数,
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "0", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
@@ -2270,7 +2272,7 @@
                        , { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值'  }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true }
@@ -2409,10 +2411,10 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
            }           

 WebTM/views/ÖÊÁ¿¹ÜÀí/¹¤Ðò¼ìÑéµ¥/QC_ProcessCheckBill.html

@@ -208,8 +208,8 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">判断结论</label>
                                            <div class="layui-input-block">
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="合格" checked>
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="不合格">
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="true" title="合格" >
                                                <input type="radio" name="HCheckerResult" id="HCheckerResult" value="false" title="不合格" checked>
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
@@ -645,7 +645,6 @@
                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="1">
                    <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo">
                    <input type="hidden" name="HProcID" id="HProcID" value="1">
                </form>
            </div>
        </div>
@@ -1485,7 +1484,13 @@
                                , "HBatchNo": data.批号
                                , "HTakeSampleCheckBillID": data.HTakeSampleCheckBillID
                                , "HTakeSampleCheckBillNo": data.HTakeSampleCheckBillNo
                                , "HProcID": data.HProcID
                                , "HProcName": data.HProcName
                            });

                            $("input[name=HCheckerResult][value=true]").prop("checked", data.判定结论 === "合格");
                            $("input[name=HCheckerResult][value=false]").prop("checked", data.判定结论 === "不合格");
                            form.render();
                            data = result.data;
                            //子表  èµ‹å€¼
                            var rowdata = [];
@@ -1898,7 +1903,7 @@
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": + data[i].上限值, "HDownLimit": + data[i].下限值, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数,
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
@@ -2219,7 +2224,7 @@
                        //, { field: 'HQCStd', title: '检验标准', edit: 'text' }
                        , { field: 'HUnit', title: '单位', edit: 'text' }
                        , { field: 'HQCNote', title: '检验记录', edit: 'text' }
                        , { field: 'HInspectVal', title: '检验值' }
                        , { field: 'HInspectVal', title: '检验值', edit: 'text' }
                        , { field: 'HUpLimit', title: '上限值' }
                        , { field: 'HDownLimit', title: '下限值' }
                        , { field: 'HMax', title: '最大值', edit: 'text', totalRow: true}

 WebTM/views/ÖÊÁ¿¹ÜÀí/¿â´æ¼ìÑéµ¥/QC_Add_Edit_StockCheckBill.html

@@ -1418,6 +1418,10 @@
                    layer.msg("检验员未选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                if ($("#HBatchNo").val() == "") {
                    layer.msg("批次号不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }
                var sSubTable = table.cache['mainTable'];
                for (var i = 0; i < sSubTable.length; i++) {
                    if (!sSubTable[i].HQCCheckItemID) {
@@ -2386,10 +2390,10 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
            }           

 WebTM/views/ÖÊÁ¿¹ÜÀí/¼ìÑé·½°¸µ¥/QC_CheckProjectList.html

@@ -33,15 +33,21 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">检验方案名称</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HQCCheckProjectName" id="HQCCheckProjectName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">开始日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate1" id="HDate1">
                                        <input type="date" class="layui-input" name="HDate1" id="HDate1">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label">结束日期</label>
                                    <div class="layui-input-block">
                                        <input type="text" class="layui-input" name="HDate2" id="HDate2">
                                        <input type="date" class="layui-input" name="HDate2" id="HDate2">
                                    </div>
                                </div>
                                <div class="layui-inline">
@@ -295,6 +301,10 @@
                var HBillNo = $("#HBillNo").val();
                var HDate1 = $("#HDate1").val();
                var HDate2 = $("#HDate2").val();
                var HQCCheckProjectName = $("#HQCCheckProjectName").val();
                if (HQCCheckProjectName) {
                    sWhere += " and æ£€éªŒæ–¹æ¡ˆåç§° like '%" + HQCCheckProjectName + "%'";
                }
                if (HBillNo) {
                    sWhere += " and å•æ®å· like '%" + HBillNo + "%'";
                }

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_InspectionFormReport.html

@@ -682,7 +682,7 @@

                option_ZXT_Avg = {
                    title: {
                        text: '平均值',
                        text: 'x̄管制图',
                        left: 'center'
                    },
                    grid: {
@@ -741,7 +741,7 @@

                option_ZXT_Diff = {
                    title: {
                        text: '差值',
                        text: 'R管制图',
                        left: 'center'
                    },
                    grid: {

 WebTM/views/ÖÊÁ¿¹ÜÀí/³µ¼ä×Լ쵥/QC_Add_Edit_WorkSelfCheckBill.html

@@ -150,9 +150,13 @@
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1">
                                            <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="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly value="1">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">工序</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HProcID" id="HProcID" value="0">
                                            </div>
                                        </div>
                                    </div>
@@ -733,7 +737,7 @@
                $("#HInterID").val("");
                $("#HBillNo").val("");
                $('#btn-AddNew').addClass("layui-btn-disabled").attr("disabled", true);//有源单时新增按钮禁用
                $('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//有源单时生产资源按钮禁用
                //$('#btnSearchSource').addClass("layui-btn-disabled").attr("disabled", true);//有源单时生产资源按钮禁用
                $('#btnSearchICMOBill').addClass("layui-btn-disabled").attr("disabled", true);//有源单时任务单号按钮禁用
                $('#btnSearchMater').addClass("layui-btn-disabled").attr("disabled", true);//有源单时产品内码按钮禁用
                $('#btnSearchProcExch').addClass("layui-btn-disabled").attr("disabled", true);//有源单时流转卡号按钮禁用
@@ -1035,6 +1039,45 @@
                }
            });
            //#endregion

            //表头信息工序
            form.on('submit(btnHProc)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '工序列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../基础资料/生产基础资料/Gy_Process.html', 'yes'],
                    btn: ['确定', '取消']
                    , btn1: function (index, layero) {

                        //按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#HProcName").val(checkStatus.data[0].工序名称);
                        $("#HProcID").val(checkStatus.data[0].HItemID);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                        get_ICMOBillStatusList();
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });

            //退出按钮
            form.on('submit(btn-Exit)', function (data) {
@@ -1504,6 +1547,8 @@
                                , "HShiftsID": data.HShiftsID
                                , "HShiftsName": data.班次名称
                                , "HErrTreatment": data.异常临时处理方案
                                , "HProcID": data.HProcID
                                , "HProcName": data.HProcName
                            });
                            $("input[name=HLastResult][value=true]").prop("checked", data.判定结论 === "合格");
                            $("input[name=HLastResult][value=false]").prop("checked", data.判定结论 === "不合格");
@@ -2031,6 +2076,7 @@
                        }
                        $("#HSourceName").val(checkStatus.data[0].生产资源名称);
                        $("#HSourceID").val(checkStatus.data[0].HItemID);
                        get_ICMOBillStatusList();
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -2343,10 +2389,10 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
            }           
@@ -3535,6 +3581,45 @@
            }          
            //#endregion

            //根据生产资源或者 å·¥åº æŸ¥è¯¢ç”Ÿäº§å·¥å•ä¿¡æ¯
            function get_ICMOBillStatusList() {
                var sWhere = "";
                var HProcID = $("#HProcID").val();
                var HSourceID = $("#HSourceID").val();
                var HProcExchInterID = $("#HProcExchInterID").val();

                if (HProcID != "0") {
                    sWhere += " and HProcID=" + HProcID;
                }
                if (HSourceID != "0") {
                    sWhere += " and HSourceID=" + HSourceID
                }

                sWhere += " and HSourceInterID=" + HProcExchInterID;

                $.ajax({
                    url: GetWEBURL() + "/CheckBill/GetICMOBillStatusList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            $("#HProcID").val(result.data[0]["HProcID"]);
                            $("#HProcName").val(result.data[0]["工序"]);
                            $("#HSourceID").val(result.data[0]["HSourceID"]);
                            $("#HSourceName").val(result.data[0]["生产资源"]);

                        } else {
                            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                    },
                    error: function (err) {
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                })
            }


            //#region ã€éšè—æ£€æµ‹å€¼å­—段】
            function IsHide(HAnalysisMethod_Value) {
                if (HAnalysisMethod_Value == 1) { //如果选中【定性分析】，则隐藏定量、其他分析

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_Add_Edit_FirstPieceCheckBill.html

@@ -214,8 +214,8 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">判断结论</label>
                                            <div class="layui-input-block">
                                                <input type="radio" name="HLastResult" id="HLastResult" value="true" title="合格" checked>
                                                <input type="radio" name="HLastResult" id="HLastResult" value="false" title="不合格">
                                                <input type="radio" name="HLastResult"  value="true" title="合格" >
                                                <input type="radio" name="HLastResult"  value="false" title="不合格" checked>
                                            </div>
                                        </div>
                                        <div class="layui-inline" id="hidediv1" style="margin-left:20px;">
@@ -1274,7 +1274,7 @@
                                shift: 2,
                                area: ['90%', '90%'],
                                maxmin: true,
                                content: ['../../基础资料/公用基础资料/Gy_InspectInstruMentList.html', 'yes'],
                                content: ['../../基础资料/公用基础资料/Gy_InspectInstruMent.html', 'yes'],
                                btn: ['确定', '取消']
                                , btn1: function (index, layero) {

@@ -1527,6 +1527,8 @@
                                , "HICMOEntryID": data.HICMOEntryID
                                , "HMaterID": data.HMaterID
                                , "HMaterName": data.物料名称
                                , "HProcID": data.HProcID
                                , "HProcName": data.HProcName
                                , "HProcExchQty": data.HProcExchQty
                                , "HProcExchBillNo": data.HProcExchBillNo
                                , "HProcExchInterID": data.HProcExchInterID
@@ -1589,7 +1591,7 @@
                            for (var i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器": data[i].检验仪器, "HQCStd": data[i].检验标准,
                                        "HQCCheckItemID": data[i].HQCCheckItemID, "检验项目代码": data[i].检验项目代码, "检验项目": data[i].检验项目名称, "HInspectInstruMentID": data[i].HInspectInstruMentID, "检验仪器": data[i].检验仪器名称, "HQCStd": data[i].检验标准,
                                        "HUnit": data[i].单位名称, "HQCNote": data[i].检验记录, "HResult": data[i].结论 == "合格" ? 1 : 2,
                                        "HMax": data[i].最大值, "HMin": data[i].最小值, "HAvg": data[i].平均值, "HRemark": data[i].表体备注,
                                        "HAnalysisMethod": data[i].分析方法 == "定性分析" ? 1 : (data[i].分析方法 == "定量分析" ? 2 : 3), "HKeyInspect": data[i].重点检查 == "否" ? false : true,
@@ -1952,7 +1954,7 @@
                                    {
                                        "HQCCheckItemID": data[i]["HQCCheckItemID"], "检验项目代码": data[i].检验项目代码, "检验项目": data[i]["检验项目"], "HInspectInstruMentID": data[i]["HInspectInstruMentID"], "检验仪器": data[i]["检验仪器"], "HQCStd": data[i]["HQCStd"], "HUnit": data[i]["单位名称"], "HQCNote": "", "HAnalysisMethod": data[i]["分析方法"], "HResult": data[i]["默认结论"],
                                        "HMax": "", "HMin": "", "HAvg": "", "HRemark": "", "HKeyInspect": data[i]["重点检查"] == 1 ? true : false, "HStatus": 0, "HSampleSchemeID": data[i]["HSampleSchemeID"], "HUnitID": data[i]["HUnitID"],
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit": '', "HDownLimit": '', "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HInspectVal": '', "HTargetVal": '', "HUpLimit":  + data[i].上限值 , "HDownLimit": + data[i].下限值, "HUpOffSet": '', "HDownOffSet": '', "HSampleDamageQty": "0",
                                        "HSampleSchemeName": data[i].抽样方案名称, "HSampleQty": data[i].样本量, "HAcceptQty": data[i].允许数, "HInspectionLevel": data[i].检验水平, "HRejectQty": data[i].拒绝数,
                                        "HStrictness": data[i].严格度, "HSampleUnRightQty": "", "HAQL": data[i].AQL, "HSamplingType": data[i].抽样类型
                                    }
@@ -2423,7 +2425,7 @@

                //选择的select对象值；
                var selectValue = data.value;
                if (selectValue == 1) {
                if (selectValue == "1") {
                    selectValue = "合格"
                    $("#HInspectResultToSee").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
                    $("#HInspectResultToSee2").css("background-color", "#CEE3F2");//改变检验结果输入框背景颜色
@@ -2454,12 +2456,12 @@
                }
                if (HQty > 0) {
                    document.querySelectorAll("[name='HLastResult']")[0].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + false + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value='false']").prop("checked", "true"); //添加选择属性
                } else {
                    document.querySelectorAll("[name='HLastResult']")[1].removeAttribute('checked'); //删除选择属性
                    $("input:radio[name=HLastResult][value=" + true + "]").attr("checked", "true"); //添加选择属性
                    $("input:radio[name=HLastResult][value='true']").prop("checked", "true"); //添加选择属性
                }
                form.render('radio');
                form.render("radio");
            }

            ////行选择处理（检验结果）-- å¤‡ä»½
@@ -3769,8 +3771,10 @@
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (result) {
                        if (result.count == 1) {
                            $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
                            $("#HTakeSampleCheckBillNo").val(result.data[0]["单据号"]);
                            if (result.data.length > 0) {
                                $("#HTakeSampleCheckBillID").val(result.data[0]["hmainid"]);
                                $("#HTakeSampleCheckBillNo").val(result.data[0]["单据号"]);
                            }
                        } 
                    },
                    error: function (err) {

 WebTM/views/ÖÊÁ¿¹ÜÀí/Ê×¼þ¼ìÑéµ¥/QC_FirstPieceCheckBillList2.html

@@ -460,9 +460,10 @@
            //#region æŸ¥è¯¢
            function RoadHBillNo(sqlWhere) {
                var ajaxLoad = layer.load();
                sqlWhere+=" order by å•æ®å· desc "
                $.ajax({
                    //h_v_QC_FirstPieceCheckBill
                    url: GetWEBURL() + '/QC_FirstPieceCheckBill/QC_FirstPieceCheckBillList',
                    url: GetWEBURL() + '/QC_FirstPieceCheckBillMain/QC_FirstPieceCheckBillMainList',
                    type: "GET",
                    async: false,
                    data: { "sWhere": sqlWhere, "user": sessionStorage["HUserName"] },

 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_CollectionOfSingleProductDefects.html

@@ -359,8 +359,8 @@
                    layer.msg("条形码不能为空！")
                    return;
                } else {
                    if (HBarCode.length != 29) {
                        layer.alert("子件条码长度不为29位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                    if (HBarCode.length != 29 && HBarCode.length != 50) {
                        layer.alert("子件条码长度不为29位或50位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        return;
                    }


 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemBGA.html

@@ -387,8 +387,8 @@
                        layer.msg("条形码不能为空！")
                        return;
                    } else {
                        if (HBarCode.length != 29) {
                            layer.alert("子件条码长度不为29位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        if (HBarCode.length != 29 && HBarCode.length != 50) {
                            layer.alert("子件条码长度不为29位或50位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }


 WebTM/views/³µ¼ä¹ÜÀí/µ¥Æ·¹ýÕ¾/Cj_ProcessItemStationPlatform.html

@@ -338,8 +338,8 @@
                        layer.msg("条形码不能为空！")
                        return;
                    } else {
                        if (HBarCode.length != 29) {
                            layer.alert("子件条码长度不为29位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                        if (HBarCode.length != 29 && HBarCode.length != 50) {
                            layer.alert("子件条码长度不为29位或50位!", { icon: 5, btn: ['退出'], time: 100000, offset: 't' });
                            return;
                        }


 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -458,19 +458,19 @@
                                if ($.inArray(data[i].name, "") > -1) {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                } else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '单据号' });
                                }
                                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 });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }
@@ -600,13 +600,13 @@
                    }
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: 'hmainid', title: 'hmainid', sort: false, hide: true }
                        , { field: '任务单', title: '任务单', width: 125 }
                        , { field: '单据号', title: '单据号', width: 190 }
                        , { field: '制单人', title: '制单人' }
                        , { field: '工序流转卡号', title: '工序流转卡号', width: 125 }
                        , { field: 'HProcID', title: 'HProcID', hide: true }
                        , { field: '流水号', title: '流水号', sort: true }
                        , { field: '流水号', title: '流水号', sort: false }
                        , { field: '当前工序代码', title: '当前工序代码', width: 125 }
                        , { field: '当前工序', title: '当前工序' }
                        , { field: 'HMaterID', title: 'HMaterID', hide: true }
@@ -1732,10 +1732,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
                                    }
                                }
                            }
@@ -1812,13 +1812,13 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == '数量' || data[i].name == '出站数量' || data[i].name == '报废数量' || data[i].name == '取样数量' || data[i].name == '工时') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                            }                                            
                                    }
                                }
@@ -2132,6 +2132,9 @@
                                if (item.规格型号.length > 0) {  // å‡è®¾å­—段名为field
                                    item.规格型号 = item.规格型号.replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                }
                                if (item.产品名称.length > 0) {  // å‡è®¾å­—段名为field
                                    item.产品名称 = item.产品名称.replace(/[\r\n]+/g, '');  // å°†æ¢è¡Œç¬¦æ›¿æ¢ä¸ºç©ºå­—符串
                                }
                            });

                            table.exportFile(ins.config.id, option.data, "xls");

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

@@ -102,6 +102,7 @@
        th {
            width: 70px;
            text-align: left;
            font-size: 17px;
        }
    </style>
</head>

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

@@ -520,7 +520,11 @@

            //查询未派工的流转卡
            function get_Display2(sWhere) {
                sWhere += " and ç”Ÿäº§èµ„源 is null  and HBillSubType<>'SUB'";
                sWhere += " and ç”Ÿäº§èµ„源 is null  and HBillSubType<>'SUB' and å·¥åº<>'转工序' ";
                if ($("#HDeptName").val() != "") {
                    sWhere += " and éƒ¨é—¨='" + $("#HDeptName").val() + "'";
                }

                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_ProcessExchangeBillList_PG',

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

@@ -345,6 +345,12 @@
                                                <input type="text" class="layui-input" name="HMaterModel" id="HMaterModel" style="float: left;">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">原料批次</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs3 layui-inline">
@@ -573,12 +579,7 @@
                                                <input type="text" class="layui-input" name="HICMOEntryID" id="HICMOEntryID" value="0" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">原料批次</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMateOutBatchNo" id="HMateOutBatchNo" style="background-color:#efefef4d;" readonly>
                                            </div>
                                        </div>
                                       
                                        <div class="layui-col-xs3 layui-inline">
                                            <label class="layui-form-label">材质</label>
                                            <div class="layui-input-inline">
@@ -2066,11 +2067,11 @@
                        layer.msg("第" + indexRow + "行，工序不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    if (!sSubTable[i].HCenterID) {
                        var indexRow = i + 1;
                        layer.msg("第" + indexRow + "行，工作中心不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
                    //if (!sSubTable[i].HCenterID) {
                    //    var indexRow = i + 1;
                    //    layer.msg("第" + indexRow + "行，工作中心不能为空！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    //    return;
                    //}
                    if (sSubTable[i].HSupFlag == "true") {
                        if (!sSubTable[i].HSupID) {
                            var indexRow = i + 1;

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

@@ -385,7 +385,7 @@
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆä¸»è¡¨ï¼‰
            var titleData = ["HEntryID", "HWorkShopID", "HMaterID", "HSupID", "HPRDORGID", "HEquipMentID", "hsubid", "HICMOEntryID", "HDeptID", "hmainid", "hicmointerid", "HICMOInterID", "HMaterID2", "HUnitID", "HBillType", "HRoutingBillID", "HAuxUnit", "生产车间代码", "生产车间", "材质", "成品编号", "版本", "总装图号", "图号版本", "子件代码", "子件名称", "子件规格", "委外加工单位代码", "委外加工单位", "设备名称", "设备代码", "原料批次", "补料标记", "项目编号", "主要材料", "关键材料", "产品CODE", "客户简称", "客户要求材料成分", "产品名称2", "客户名称", "生产备注", "重要提示", "原材料编号A", "原材料编号B", "原材料编号C", "原材料编号D", "原材料内码A", "原材料内码B", "原材料内码C", "原材料内码D", "日计划工单号", "客户编码", "芯体规格型号", "芯体物料代码", "源单客户代码", "HEmpID", "HCusID","HBillSubType"];
             //不需要显示的字段 å¯æ‰©å±• ï¼ˆå·¥è‰ºæµç¨‹ï¼‰
            var titleData2 = ["工序号", "出站报废关联数量", "HProcID", "工序代码", "HBackProc", "加工说明", "模具编号", "HCenterID", "工作中心代码", "HDeptID", "加工车间代码", "加工车间", "HGroupID", "班组代码", "班组", "HWorkerID", "操作工代码f", "操作工", "HSourceID", "生产资源代码", "生产资源", "计划数量", "hmainid", "单据号", "hicmointerid", "任务单号", "HICMOEntryID", "HWorkShopID", "生产车间代码", "生产车间", "HMaterID", "产品代码", "产品名称", "规格型号", "HUnitID", "单位代码", "单位", "生产数量", "计划开工日期", "计划完工日期", "摘要", "内部单据号", "委外订单内码", "委外订单子内码", "委外订单号", "HSupID", "供应商", "供应商代码", "表头备注", "HBillType", "isEntrust", "时间单位", "工序计划加工时间", "子计划开工日期", "子计划完工日期", "实际开工日期", "实际完工日期", "开工余量天数", "开工余量固数", "上道固定天数", "生产周期", "加工单价", "最后汇报日期", "加工费用金额", "末道工序", "首道工序", "行关闭人", "关闭类型", "流转卡数量", "委外工单数量", "不合格数量", "超额比例", "良率", "累计良率", "图纸编号", "本工序确认记录", "源单主内码", "源单子内码", "源单单号", "源单类型", "汇报数量", "HEntryID", "hsubid", "HPRDORGID", "组织", "HOrderProcNO"];
            var titleData2 = ["工序号", "出站报废关联数量", "HProcID", "工序代码", "HBackProc", "加工说明", "模具编号", "HCenterID", "工作中心代码", "HDeptID", "加工车间代码", "加工车间", "HGroupID", "班组代码", "班组", "HWorkerID", "操作工代码", "操作工", "HSourceID", "计划数量", "hmainid", "单据号", "hicmointerid", "任务单号", "HICMOEntryID", "HWorkShopID", "生产车间代码", "生产车间", "HMaterID", "产品代码", "产品名称", "规格型号", "批号", "HUnitID", "单位代码", "单位", "生产数量", "计划开工日期", "计划完工日期", "摘要", "内部单据号", "委外订单内码", "委外订单子内码", "委外订单号", "HSupID", "供应商", "供应商代码", "表头备注", "HBillType", "isEntrust", "时间单位", "工序计划加工时间", "子计划开工日期", "子计划完工日期", "实际开工日期", "实际完工日期", "开工余量天数", "开工余量固数", "上道固定天数", "生产周期", "加工单价", "最后汇报日期", "加工费用金额", "末道工序", "首道工序", "行关闭人", "关闭类型", "流转卡数量", "委外工单数量", "不合格数量", "超额比例", "良率", "累计良率", "图纸编号", "本工序确认记录", "源单主内码", "源单子内码", "源单单号", "源单类型", "汇报数量", "HEntryID", "hsubid", "HPRDORGID", "组织", "HOrderProcNO"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆå™¨å…·æ¸…单）
            var titleData3 = ["HEntryID", "HMouldID", "HMaterID", "HUnitID", "hmainid","hicmointerid"];
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆå·¥è‰ºå‚数清单）
@@ -897,10 +897,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 120 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 120 });
                                    }
                                }
                            }
@@ -975,10 +975,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }
@@ -1068,10 +1068,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }
@@ -1197,10 +1197,10 @@
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200 });
                                    }
                                }
                            }
@@ -1272,7 +1272,7 @@
                    //    , { field: '打印次数', title: '打印次数' }
                    //    , { field: '类型', title: '类型' }
                    //    , {
                    //        field: '日期', title: '日期', width: 120, sort: true, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>"
                    //        field: '日期', title: '日期', width: 120, sort: false, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>"
                    //    }
                    //    , { field: '订单跟踪号', title: '订单跟踪号', width: 120 }
                    //    , { field: '单据号', title: '单据号', width: 190 }
@@ -1375,7 +1375,7 @@
                        //, { field: '工作中心', title: '工作中心' }
                        //, { field: '计划数量', title: '计划数量' }
                        //, { field: 'hmainid', title: 'hmainid', hide: true }
                        //, { field: '日期', title: '日期', sort: true }
                        //, { field: '日期', title: '日期', sort: false }
                        //, { field: '单据号', title: '单据号', width: 150 }
                        //, { field: 'hicmointerid', title: 'hicmointerid', hide: true }
                        //, { field: '任务单号', title: '任务单号', width: 100 }
@@ -1498,22 +1498,22 @@
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //隐藏id列
                                }
                                //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 });
                                //    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, totalRow: true, width: 120 });
                                //}
                                else if (data[i].name == '单据号') {
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '单据号' });
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, event: '单据号' });
                                }
                                else {
                                    switch (data[i].Type) {
                                        //int
                                        case 'DateTime':
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == '生产数量' || data[i].name == '流转卡数量' || data[i].name == '入库数量' || data[i].name == '累计进站数量' || data[i].name == '累计合格出站数量' || data[i].name == '累计报废数量' || data[i].name == '累计不良数量' || data[i].name == '末道工序出站数量') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200});
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 200});
                                            }
                                    }
                                }

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò½øÕ¾½ÓÊÕµ¥/Cj_StationInBill.html

@@ -252,48 +252,6 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产资源2</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产资源3</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产资源4</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">生产资源5</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="ProductionResources-BT" id="ProductionResources-BT" style="width: 40px; padding: 0 10px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">进站时间</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HStationInTime" id="HStationInTime" style="background-color:#efefef4d;" readonly>

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

@@ -58,89 +58,7 @@
                                </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: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" 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="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="ColContent" id="ColContent">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" class="ForFilteringSchemes" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <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>
                                                <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="ColContent1" id="ColContent1">
                                        </div>
                                    </div>

                                    <div class="layui-row" style=" margin-top: 10px; margin-left: 70px;">
                                        <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" class="ForFilteringSchemes" lay-filter="Comparator2" 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>
@@ -227,7 +145,7 @@
                get_FastQuery();
                //DisPlay_HideColumn();

                ColFilter();
                //ColFilter();
            }

            //初始化表格

 WebTM/views/ÁìÁÏ·¢»õ/ÊÕÁÏÈë¿â/Kf_ReciveBill_Fast_TK.html

@@ -244,7 +244,7 @@
                $.ajax({
                    url: GetWEBURL() + "/POStockInBillList/AuditPOInStockBillPost_TianKang",
                    type: "Post",
                    data: { "msg": JSON.stringify(sSubStr) },
                    data: { "HInterID": HInterID, "FID": option.data[0].FID },
                    success: function (result) {
                        if (result.code == "1") {
                            layer.msg("审核成功", {