1

duhe

2024-03-06 9752930859075dc5eb490151b7c9e16100dc51a8

1

 WebTM/WebTM.csproj

@@ -479,6 +479,7 @@
    <Content Include="views\质量管理\质量报表\QC_ProductQtyWarningReport.html" />
    <Content Include="views\质量管理\质量报表\QC_QualityTraceabilityReport.html" />
    <Content Include="views\质量管理\质量报表\QC_ProdBadReasonStatistics_Sum.html" />
    <Content Include="views\质量管理\首件检验单\MES_ColorRecordBillList_PDA.html" />
    <Content Include="views\车间管理\单品过站\BadQueryReport.html" />
    <Content Include="views\质量管理\首件检验单\QC_Add_Edit_FirstPieceCheckBill - å¤åˆ¶.html" />
    <Content Include="views\车间管理\单品过站\Cj_CollectionOfSingleProductDefects.html" />

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -3,9 +3,9 @@
    //var WEBURL = "http://192.168.16.80:8011/";          //办公室服务器
    //var WEBURL = "http://localhost:8081/SWEAPI/";       //ch本地*/
    //var WEBURL = "http://61.164.86.218:8099/ABAPI/";
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost/API/";             //颜晓军本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨乐本地配置
    //var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    var WEBURL = "http://localhost:8082/API/";    //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";    //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/";  //陈雯静本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //余思杰本地配置

 WebTM/views/index_Mobile.html

@@ -231,6 +231,12 @@
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="质量管理/首件检验单/MES_ColorRecordBillList_PDA.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              å¯¹è‰²è®°å½•å•åˆ—表
                          </a>
                      </dd>
                      <dd>
                          <a href="车间管理/工序流转/MES_Sc_ProcessExchangeBillMain_Note_PDA.html" target="main_self_frame" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              æŒ‡å¼•å¡å˜æ›´å•

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

@@ -370,6 +370,13 @@
                                        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 });
                                            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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -386,6 +393,7 @@
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , totalRow: true
                                , cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    soulTable.render(this);

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

@@ -312,6 +312,13 @@
                                        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 });
                                            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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -327,6 +334,7 @@
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , page: true
                                , totalRow: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , done: function (res, curr, count) {

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

@@ -323,6 +323,13 @@
                                        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;
                                        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;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }
@@ -339,6 +346,7 @@
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , totalRow: true
                                //, cellMinWidth: 90
                                , done: function (res, curr, count) {
                                    soulTable.render(this);

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

@@ -336,6 +336,13 @@
                                        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 });
                                            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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -353,6 +360,7 @@
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                                , totalRow: true
                                , done: function (res, curr, count) {
                                    soulTable.render(this);
                                }

 WebTM/views/Éú²ú¹ÜÀí/¼´Ê±¿â´æ/JIT_InventoryList.html

@@ -142,6 +142,7 @@
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , done: function (res, curr, count) {
@@ -162,7 +163,7 @@
                    , { field: '单位编码', title: '单位编码', sort: true }
                    , { field: '单位名称', title: '单位名称', sort: true }
                    , { field: '批号', title: '批号', sort: true }
                    , { field: '可用库存量', title: '可用库存量', sort: true }
                    , { field: '可用库存量', title: '可用库存量', sort: true, totalRow: true }
                    , { field: '组织编码', title: '组织编码', sort: true }
                    , { field: '组织名称', title: '组织名称', sort: true }
                    , { field: '货主类型', title: '货主类型', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²»Á¼²É¼¯/Sc_QualityReportStepBillList.html

@@ -216,6 +216,7 @@
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
@@ -228,7 +229,7 @@
                        //, { field: '日期', title: '日期' }
                        , { field: '单据号', title: '单据号', width: 165, sort: true }
                        , { field: '计量单位', title: '计量单位', sort: true }
                        , { field: '数量', title: '数量', sort: true }
                        , { field: '数量', title: '数量', sort: true, totalRow: true}
                        , { field: '职员', title: '职员', sort: true }
                        //, { field: '物料代码', title: '物料代码' , sort: true}
                        , { field: '物料名称', title: '物料名称', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ICMOBillQualityStatus_TmpList.html

@@ -223,6 +223,13 @@
                                    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 });
                                        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 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
@@ -233,6 +240,7 @@
                            , toolbar: '#toolbarDemo'
                            , height: 'full-50'
                            , page: true //开启分页
                            , totalRow: true
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , cols: [col]

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ICMOBillWorkQtyStatus_TmpList.html

@@ -223,6 +223,13 @@
                                    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 });
                                        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 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                }
@@ -232,6 +239,7 @@
                            elem: '#mainTable'
                            , toolbar: '#toolbarDemo'
                            , height: 'full-50'
                            , totalRow: true
                            , page: true //开启分页
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/²úÁ¿»ã±¨/Sc_ProductReportStepBillList_Web.html

@@ -313,6 +313,7 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]                   
                    , cols: [[
@@ -394,7 +395,7 @@
                        , { field: 'HProcID', title: 'HProcID', width: 200, hide: true, sort: true }
                        , { field: 'HProcNumber', title: '工序代码', width: 200, sort: true }
                        , { field: 'HProcName', title: '工序名称', width: 200, sort: true }
                        , { field: '汇报数量', title: '汇报数量', width: 200, sort: true }
                        , { field: '汇报数量', title: '汇报数量', width: 200, sort: true, totalRow: true }
                        , { field: '生产订单号', title: '生产订单号', width: 200, sort: true }
                        , { field: 'HICMOInterID', title: '生产订单主ID', width: 200, hide: true, sort: true }
                        , { field: '源单单号', title: '源单单号', width: 200, sort: true }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í£¹¤/Sc_MESStopStepWorkBillList.html

@@ -305,6 +305,7 @@
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
@@ -392,8 +393,8 @@
                        , { field: 'HProcID', title: 'HProcID', hide: true, sort: true }
                        , { field: '工序代码', title: '工序代码', sort: true }
                        , { field: '工序名称', title: '工序名称', sort: true }
                        , { field: '任务单数量', title: '任务单数量', sort: true }
                        , { field: '计划数量', title: '计划数量', sort: true }
                        , { field: '任务单数量', title: '任务单数量', sort: true, totalRow: true }
                        , { field: '计划数量', title: '计划数量', sort: true, totalRow: true}
                        , { field: '开始停工时间', title: '开始停工时间', templet: "<div>{{d.开始停工时间 ==null ?'':layui.util.toDateString(d.开始停工时间, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                        , { field: '结束停工时间', title: '结束停工时间', templet: "<div>{{d.结束停工时间 ==null ?'':layui.util.toDateString(d.结束停工时间, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                        , { field: 'HSourceID', title: 'HSourceID', hide: true, sort: true }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í깤/Sc_MESEndStepWorkBillList.html

@@ -324,6 +324,7 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_MESBeginStepWorkBillList.html

@@ -335,6 +335,7 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·µ¹¤/Sc_MESReturnStepWorkBillList.html

@@ -225,6 +225,7 @@
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/·À´í/Sc_MaterToSourceStepBillList.html

@@ -207,6 +207,7 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {

 WebTM/views/Éú²ú¹ÜÀí/ÌáÁϼƻ®/JIT_LiftMaterPlaBillnList.html

@@ -203,6 +203,7 @@
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , done: function (res, curr, count) {
@@ -233,7 +234,7 @@
                    , { field: '主表采购组织', title: '采购组织', sort: true }
                    , { field: '供应商名称', title: '供应商', sort: true }
                    , { field: '源单单号', title: '生产订单号', sort: true }
                    , { field: '数量', title: '数量', sort: true }
                    , { field: '数量', title: '数量', sort: true, totalRow: true }
                    , { field: '计量单位', title: '计量单位', sort: true }
                    , { field: '物料名称', title: '物料名称', sort: true }
                    , { field: '物料代码', title: '物料代码', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/ÌáÁϼƻ®/JIT_LiftMaterPlanBillEdit.html

@@ -311,6 +311,7 @@
                , limit: 500 //每页默认显示的数量
                , cellMinWidth: 120
                , height: 'full-270'
                , totalRow: true
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号', totalRow: true }
@@ -322,11 +323,11 @@
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: 'HUnitIDName', title: '计量单位', edit: 'text', event: "HUnitID" }
                    , { field: 'HErpClsID', title: '物料属性', templet: '#HErpClsID' }//list
                    , { field: 'HQty', title: '数量', edit: 'text' }
                    , { field: 'HQty', title: '数量', edit: 'text', totalRow: true }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { field: 'HPURCHASEORGID', title: '采购组织', templet: "#HPURCHASEORGIDSub" }
                    , { field: 'HStatus', title: '状态', templet: '#HStatus' }//list
                    , { field: 'HFixleadTime', title: '提前期', edit: 'text' }
                    , { field: 'HFixleadTime', title: '提前期', edit: 'text', totalRow: true}
                    , { field: 'HDayPlanBillNo', title: '日计划工单编号', edit: 'text' }
                    , { field: 'HSourceInterID', title: '日计划工单FID', edit: 'text' }
                    , { field: 'HSourceEntryID', title: '日计划工单FENTRYID', width: 200, edit: 'text' }
@@ -335,7 +336,7 @@
                    , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
                    , { field: 'HWorkShopIDName', title: '生产车间', edit: 'text', event: "HWorkShopID" }
                    , { field: 'HDayPlanDate', title: '工单生产日期', width: 200, event: 'HDayPlanDate' }//date
                    , { field: 'HRelationQty1', title: '可用采购数量', edit: 'text' }
                    , { field: 'HRelationQty1', title: '可用采购数量', edit: 'text', totalRow: true }
                    , { field: 'HPOOrderInterID', title: '采购订单内码', edit: 'text' }
                    , { field: 'HPOOrderEntryID', title: '采购订单子内码', edit: 'text' }
                    , { field: 'HPOOrderBillNo', title: '采购订单号', edit: 'text' }
@@ -348,12 +349,12 @@
                    , { field: 'HCloseTypeSub', title: '是否手工关闭', templet: "#HCloseTypeSub" }//ck
                    , { field: 'HCloseMan', title: '行关闭', width: 200, edit: 'text' }
                    , { field: 'HEntryCloseDate', title: '行关闭日期', width: 200, event: 'HEntryCloseDate' }//date
                    , { field: 'HSendQty', title: '送货单数量', edit: 'text' }
                    , { field: 'HReciveQty', title: '收料数量', edit: 'text' }
                    , { field: 'HSendQty', title: '送货单数量', edit: 'text', totalRow: true }
                    , { field: 'HReciveQty', title: '收料数量', edit: 'text', totalRow: true }
                    , { field: 'HCloseStatus', title: '关闭状态', templet: "#HCloseStatus" }//ck
                    , { field: 'HRemoveQty', title: '转移数量', edit: 'text' }
                    , { field: 'HRemoveQty', title: '转移数量', edit: 'text', totalRow: true}
                    , { field: 'HSeOrderBillNo', title: '销售订单号', edit: 'text' }
                    , { field: 'HUnReciveQty', title: '未收料数量', edit: 'text' }
                    , { field: 'HUnReciveQty', title: '未收料数量', edit: 'text', totalRow: true}
                    , { field: 'HPOOrderBillDate', title: '采购订单单据日期', event: "HPOOrderBillDate", width: 200 }//date
                    , { field: 'HPOOrderBillDeliveryDate', title: '采购订单交货日期', event: "HPOOrderBillDeliveryDate", width: 200 } // date
                    , { field: 'HPOOrderBillRemark', title: '采购订单摘要', edit: 'text' }

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBillList.html

@@ -193,6 +193,7 @@
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , totalRow: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
@@ -236,14 +237,14 @@
                    , { field: '物料代码', title: '物料代码', sort: true }
                    , { field: '规格型号', title: '规格型号', sort: true }
                    , { field: 'JIT物料分类', title: 'JIT物料分类', sort: true }
                    , { field: 'JIT拉动安全库存量', title: 'JIT拉动安全库存量', sort: true }
                    , { field: 'JIT物料需求供货周期', title: 'JIT物料需求供货周期', sort: true }
                    , { field: 'JIT提货批量', title: 'JIT提货批量', sort: true }
                    , { field: 'JIT提货批量对应周期', title: 'JIT提货批量对应周期', sort: true }
                    , { field: 'JIT供货提前期', title: 'JIT供货提前期', sort: true }
                    , { field: 'JIT到货前置期', title: 'JIT到货前置期', sort: true }
                    , { field: 'JIT拉动安全库存量', title: 'JIT拉动安全库存量', sort: true, totalRow: true }
                    , { field: 'JIT物料需求供货周期', title: 'JIT物料需求供货周期', sort: true, totalRow: true}
                    , { field: 'JIT提货批量', title: 'JIT提货批量', sort: true, totalRow: true }
                    , { field: 'JIT提货批量对应周期', title: 'JIT提货批量对应周期', sort: true, totalRow: true }
                    , { field: 'JIT供货提前期', title: 'JIT供货提前期', sort: true, totalRow: true }
                    , { field: 'JIT到货前置期', title: 'JIT到货前置期', sort: true, totalRow: true}
                    , { field: 'JIT送货方式', title: 'JIT送货方式', sort: true }
                    , { field: 'JIT送货控制天数', title: 'JIT送货控制天数', sort: true }
                    , { field: 'JIT送货控制天数', title: 'JIT送货控制天数', sort: true, totalRow: true}
                ]]
            };
        }

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Cg_PODemandPlanConfigBill_Add.html

@@ -138,6 +138,7 @@
                , toolbar: '#toolbarDemo'
                , limit: 500 //每页默认显示的数量
                , cellMinWidth: 120
                , totalRow: true
                , height: 'full-170'
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
@@ -150,14 +151,14 @@
                    , { field: 'HMaterName', title: '物料名称' }
                    , { field: 'HMaterModel', title: '规格型号'}
                    , { field: 'HJITMaterGroup', title: 'JIT物料分类', edit: 'text' }
                    , { field: 'HJITSafeStock', title: 'JIT拉动安全库存量', edit: 'text', width: 200 }
                    , { field: 'HJITMaterDemand', title: 'JIT物料需求供货周期', edit: 'text', width:200}
                    , { field: 'HJITBatchQty', title: 'JIT提货批量', edit: 'text' }
                    , { field: 'HDeliveryPeriod', title: 'JIT提货批量对应周期（天）', edit: 'text', width: 200}
                    , { field: 'HLeadTime', title: 'JIT供货提前期（天）', edit: 'text', width: 200 }
                    , { field: 'HLeadTime_Sec', title: 'JIT到货前置期（天）', edit: 'text', width: 200}
                    , { field: 'HJITSafeStock', title: 'JIT拉动安全库存量', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HJITMaterDemand', title: 'JIT物料需求供货周期', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HJITBatchQty', title: 'JIT提货批量', edit: 'text', totalRow: true}
                    , { field: 'HDeliveryPeriod', title: 'JIT提货批量对应周期（天）', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HLeadTime', title: 'JIT供货提前期（天）', edit: 'text', width: 200, totalRow: true }
                    , { field: 'HLeadTime_Sec', title: 'JIT到货前置期（天）', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HDeliveryMode', title: 'JIT送货方式', edit: 'text' }
                    , { field: 'HDeliveryDaysCtrl', title: 'JIT送货控制天数', edit: 'text', width: 200 }
                    , { field: 'HDeliveryDaysCtrl', title: 'JIT送货控制天数', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/Gy_WorkWarehouseBill_Add.html

@@ -169,6 +169,7 @@
                , limit: 500 //每页默认显示的数量
                , cellMinWidth: 120
                , height: 'full-170'
                , totalRow: true
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
                    , { type: 'numbers', title: '序号', totalRow: true }

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/JIT_NeedMaterPlanConfigBillList.html

@@ -189,6 +189,7 @@
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , done: function (res, curr, count) {
@@ -231,14 +232,14 @@
                    , { field: '物料代码', title: '物料代码', sort: true }
                    , { field: '规格型号', title: '规格型号', sort: true }
                    , { field: 'JIT物料分类', title: 'JIT物料分类', sort: true }
                    , { field: 'JIT拉动安全库存量', title: 'JIT拉动安全库存量', sort: true }
                    , { field: 'JIT物料需求供货周期', title: 'JIT物料需求供货周期', sort: true }
                    , { field: 'JIT提货批量', title: 'JIT提货批量', sort: true }
                    , { field: 'JIT提货批量对应周期', title: 'JIT提货批量对应周期', sort: true }
                    , { field: 'JIT供货提前期', title: 'JIT供货提前期', sort: true }
                    , { field: 'JIT到货前置期', title: 'JIT到货前置期', sort: true }
                    , { field: 'JIT拉动安全库存量', title: 'JIT拉动安全库存量', sort: true, totalRow: true}
                    , { field: 'JIT物料需求供货周期', title: 'JIT物料需求供货周期', sort: true, totalRow: true}
                    , { field: 'JIT提货批量', title: 'JIT提货批量', sort: true, totalRow: true}
                    , { field: 'JIT提货批量对应周期', title: 'JIT提货批量对应周期', sort: true, totalRow: true }
                    , { field: 'JIT供货提前期', title: 'JIT供货提前期', sort: true, totalRow: true }
                    , { field: 'JIT到货前置期', title: 'JIT到货前置期', sort: true, totalRow: true}
                    , { field: 'JIT送货方式', title: 'JIT送货方式', sort: true }
                    , { field: 'JIT送货控制天数', title: 'JIT送货控制天数', sort: true }
                    , { field: 'JIT送货控制天数', title: 'JIT送货控制天数', sort: true, totalRow: true}
                ]]
            };
        }

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®»ù´¡×ÊÁÏ/JIT_NeedMaterPlanConfigBill_Add.html

@@ -170,6 +170,7 @@
                , toolbar: '#toolbarDemo'
                , limit: 500 //每页默认显示的数量
                , cellMinWidth: 120
                , totalRow: true
                , height: 'full-170'
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
@@ -182,14 +183,14 @@
                    , { field: 'HMaterName', title: '物料名称' }
                    , { field: 'HMaterModel', title: '规格型号'}
                    , { field: 'HJITMaterGroup', title: 'JIT物料分类', edit: 'text' }
                    , { field: 'HJITSafeStock', title: 'JIT拉动安全库存量', edit: 'text', width: 200 }
                    , { field: 'HJITMaterDemand', title: 'JIT物料需求供货周期', edit: 'text', width:200}
                    , { field: 'HJITBatchQty', title: 'JIT提货批量', edit: 'text' }
                    , { field: 'HDeliveryPeriod', title: 'JIT提货批量对应周期（天）', edit: 'text', width: 200}
                    , { field: 'HLeadTime', title: 'JIT供货提前期（天）', edit: 'text', width: 200 }
                    , { field: 'HLeadTime_Sec', title: 'JIT到货前置期（天）', edit: 'text', width: 200}
                    , { field: 'HJITSafeStock', title: 'JIT拉动安全库存量', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HJITMaterDemand', title: 'JIT物料需求供货周期', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HJITBatchQty', title: 'JIT提货批量', edit: 'text', totalRow: true }
                    , { field: 'HDeliveryPeriod', title: 'JIT提货批量对应周期（天）', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HLeadTime', title: 'JIT供货提前期（天）', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HLeadTime_Sec', title: 'JIT到货前置期（天）', edit: 'text', width: 200, totalRow: true}
                    , { field: 'HDeliveryMode', title: 'JIT送货方式', edit: 'text' }
                    , { field: 'HDeliveryDaysCtrl', title: 'JIT送货控制天数', edit: 'text', width: 200 }
                    , { field: 'HDeliveryDaysCtrl', title: 'JIT送货控制天数', edit: 'text', width: 200, totalRow: true }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo' }
                ]]

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/MaterialShorAnalysisReport.html

@@ -160,9 +160,9 @@
            columns.push({ field: 'FNUMBER', title: '物料编码', sort: true });
            columns.push({ field: 'HMaterName', title: '物料名称', sort: true });
            columns.push({ field: 'HMaterModel', title: '物料规格', sort: true });
            columns.push({ field: '在途数量', title: '在途数量' });
            columns.push({ field: '在途数量', title: '在途数量', totalRow: true });
            columns.push({ field: 'CountHQty', title: '合计', sort: true });
            columns.push({ field: 'FBASEQTY', title: '即时库存数量', sort: true });
            columns.push({ field: 'FBASEQTY', title: '即时库存数量', sort: true, totalRow: true});
            //获取两个月期之间的相差
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//开始时间
            var time2 = Date.parse(new Date($("#HENDDATE").val()));//结束时间
@@ -178,7 +178,7 @@

            var k = 0;//收集循环次数
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
@@ -201,6 +201,7 @@
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportMOMaterReadysBillList.html

@@ -180,6 +180,7 @@
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false
@@ -199,17 +200,17 @@
                    , { field: '产品名称', title: '产品名称', sort: true }
                    , { field: '产品规格型号', title: '产品规格型号', sort: true }
                    , { field: '日计划日期', title: '日计划日期', templet: "<div>{{d.日计划日期 ==null ?'':layui.util.toDateString(d.日计划日期, 'yyyy-MM-dd')}}</div>", sort: true }
                    , { field: '日计划数量', title: '日计划数量', sort: true }
                    , { field: '日计划数量', title: '日计划数量', sort: true, totalRow: true}
                    , { field: '物料编码', title: '物料编码', sort: true }
                    , { field: '物料名称', title: '物料名称', sort: true }
                    , { field: '物料规格型号', title: '物料规格型号', sort: true }
                    , { field: '计划发料数量', title: '计划发料数量', sort: true }
                    , { field: '齐套数量', title: '齐套数量', sort: true }
                    , { field: '缺料数量', title: '缺料数量', sort: true }
                    , { field: '可用数量', title: '可用数量', sort: true }
                    , { field: '即时库存数量', title: '即时库存数量', sort: true }
                    , { field: '占用数量', title: '占用数量', sort: true }
                    , { field: '领用占用数量', title: '领用占用数量', sort: true }
                    , { field: '计划发料数量', title: '计划发料数量', sort: true, totalRow: true }
                    , { field: '齐套数量', title: '齐套数量', sort: true, totalRow: true}
                    , { field: '缺料数量', title: '缺料数量', sort: true, totalRow: true }
                    , { field: '可用数量', title: '可用数量', sort: true, totalRow: true }
                    , { field: '即时库存数量', title: '即时库存数量', sort: true, totalRow: true }
                    , { field: '占用数量', title: '占用数量', sort: true, totalRow: true }
                    , { field: '领用占用数量', title: '领用占用数量', sort: true, totalRow: true}
                    , { field: '有无采购订单', title: '有无采购订单', sort: true }
                ]]
            };

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportPODemandPlanBillList.html

@@ -208,7 +208,7 @@
            columns.push({ field: '采购员', title: '采购员', sort: true});
            columns.push({ field: '物料代码', title: '物料编码', sort: true});
            columns.push({ field: '计量单位名称', title: '计量单位', sort: true});
            columns.push({ field: 'TQSUM', title: '提料拖期数量', sort: true});
            columns.push({ field: 'TQSUM', title: '提料拖期数量', sort: true, totalRow: true});
         
            //获取两个月期之间的相差
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//开始时间
@@ -225,7 +225,7 @@

            var k = 0;//收集循环次数
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true })
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
@@ -251,6 +251,7 @@
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , loading: false

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportPODemandPlanBillList_S.html

@@ -189,7 +189,7 @@
            //columns.push({ field: '采购员', title: '采购员' });
            columns.push({ field: 'FNUMBER', title: '物料编码', sort: true});
            columns.push({ field: '计量单位名称', title: '计量单位', sort: true});
            columns.push({ field: 'TQSUM', title: '提料拖期数量', sort: true});
            columns.push({ field: 'TQSUM', title: '提料拖期数量', sort: true, totalRow: true});
            //获取两个月期之间的相差
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//开始时间
            var time2 = Date.parse(new Date($("#HENDDATE").val()));//结束时间
@@ -205,7 +205,7 @@

            var k = 0;//收集循环次数
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true})
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
@@ -232,6 +232,7 @@
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , totalRow: true
                , loading: false
                , cols: [columns]
                , done: function (res, curr, count) {

 WebTM/views/Éú²ú¹ÜÀí/Èռƻ®±¨±í/ReportWorkDemandPlanBillList.html

@@ -172,7 +172,7 @@
            columns.push({ field: 'HSeOrderBillNo', title: '需求单号', sort: true});
            columns.push({ field: '物料代码', title: '物料编码', sort: true});
            columns.push({ field: '计量单位名称', title: '计量单位', sort: true});
            columns.push({ field: 'TQSUM', title: '要料拖期数量', sort: true});
            columns.push({ field: 'TQSUM', title: '要料拖期数量', sort: true, totalRow: true});
            //获取两个月期之间的相差
            var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//开始时间
            var time2 = Date.parse(new Date($("#HENDDATE").val()));//结束时间
@@ -188,7 +188,7 @@

            var k = 0;//收集循环次数
            for (var j = 0; j <= (Days - k); j++) {
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70 })
                columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 70, totalRow: true})
                //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                if (MM == 12 && (HBEGINDATE + j) == 31) {
                    yyyy += 1;
@@ -214,6 +214,7 @@
                , page: true
                , cellMinWidth: 90
                , limit: 50
                , totalRow: true
                , limits: [50, 500, 5000, 20000]
                , loading: false
                , cols: [columns]

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillEdit.html

@@ -538,6 +538,7 @@
                    , toolbar: '#toolbarDemo'
                    , limit: 500
                    , height: 500
                    , totalRow: true
                    , loading: false
                    , cols: [[ //表头
                        { type: 'checkbox', totalRowText: '合计行' }
@@ -555,7 +556,7 @@
                        , { field: 'HDeptName', title: '生产车间', edit: 'text', event: "HDeptID" }//f7
                        , { field: 'HUnitID', title: 'HUnitID', hide: true }
                        , { field: 'HUnitName', title: '计量单位', edit: 'text', event: "HUnitID" }//f7
                        , { field: 'HQty', title: '数量', edit: 'text' }
                        , { field: 'HQty', title: '数量', edit: 'text', totalRow: true }
                        , { field: 'HSTATUS', title: '业务状态', templet: "#HSTATUS" }
                        , { field: 'HPlanBeginDate', title: '计划开工日期', event: 'HPlanBeginDate' }
                        , { field: 'HPlanEndDate', title: '计划完工日期', event: 'HPlanEndDate' }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -586,7 +586,7 @@
                        , { field: '业务员', title: '业务员', sort: true }
                        , { field: 'HWidth', title: '门幅', sort: true }
                        , { field: '规格型号', title: '规格型号', sort: true }
                        , { field: '生产任务单数量', title: '生产订单数量', totalRow: true, sort: true }
                        , { field: '生产任务单数量', title: '生产订单数量', totalRow: true, sort: true, totalRow: true }
                        , { field: '计量单位', title: '计量单位', sort: true }
                        , { field: '是否下推生成流转卡', title: '是否下推生成流转卡', sort: true }
                        , { field: '是否取库存', title: '是否取库存', sort: true }
@@ -594,7 +594,7 @@
                        , { field: '制单日期', title: '制单日期', sort: true }
                        , { field: '状态', title: '状态', sort: true }
                        //, { field: '计量单位代码', title: '计量单位代码', width: 115 }
                        , { field: 'HAuxQty', title: '辅数量', sort: true }
                        , { field: 'HAuxQty', title: '辅数量', sort: true, totalRow: true }
                        , { field: 'HAuxUnitName', title: '辅助单位', sort: true }
                        , { field: '计划开工日期', title: '计划开工日期', sort: true }
                        , { field: '计划完工日期', title: '计划完工日期', sort: true }
@@ -611,10 +611,10 @@
                        , { field: '生产车间', title: '生产车间', sort: true }
                        , { field: '包装标识代码', title: '包装标识代码', sort: true }
                        , { field: '包装标识', title: '包装标识', sort: true }
                        , { field: '齐套数量', title: '齐套数量', sort: true }
                        , { field: '计划生产数量', title: '计划生产数量', sort: true }
                        , { field: '关联数量', title: '关联数量', sort: true }
                        , { field: '未关联数量', title: '未关联数量', sort: true }
                        , { field: '齐套数量', title: '齐套数量', sort: true, totalRow: true }
                        , { field: '计划生产数量', title: '计划生产数量', sort: true, totalRow: true}
                        , { field: '关联数量', title: '关联数量', sort: true, totalRow: true}
                        , { field: '未关联数量', title: '未关联数量', sort: true, totalRow: true }
                        , { field: '表头备注', title: '表头备注', sort: true }
                        //, { field: '作废人', title: '作废人', hide: true }
                        //, { field: '作废日期', title: '作废日期', hide: true }
@@ -623,7 +623,7 @@
                        , { field: '销售订单号', title: '销售订单号', sort: true }
                        , { field: '销售物料名称', title: '销售物料名称', sort: true }
                        , { field: '包装方式', title: '包装方式', sort: true }
                        , { field: '销售数量', title: '销售数量', sort: true }
                        , { field: '销售数量', title: '销售数量', sort: true, totalRow: true }
                        , { field: '销售订单联系人', title: '销售订单联系人', sort: true }
                        , { field: '业务状态', title: '业务状态', sort: true }
                        //, { field: '订单跟踪号', title: '订单跟踪号', sort: true, width: 120, hide: true }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú°ü×°µ¥/Sc_PackUnionBill.html

@@ -349,12 +349,20 @@
                    else {
                        switch (data[i].Type) {
                            //int
                            //case 'Int32':
                            //    cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 100 };
                            //    break;
                            ////Decimal
                            //case 'Decimal':
                            //    cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };
                            //    break;
                            case 'long':
                            case 'Int32':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 100 };
                                break;
                            //Decimal
                            case 'Int64':
                            case 'double':
                            case 'Decimal':
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };
                                cols_arr[0][i + 1] = {
                                    field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true };
                                break;
                            default:
                                cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 };

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¹¤Î»/Gy_SourceWorkStationSetList.html

@@ -230,6 +230,13 @@
                                        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 });
                                            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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -244,6 +251,7 @@
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , totalRow: true
                                , limits: [500, 2000, 5000, 50000]
                                , limit: 500
                                , cellMinWidth: 90

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

@@ -307,6 +307,7 @@
                    , height: 'full-50'
                    , page: true
                    , cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
@@ -328,7 +329,7 @@
                        , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
                        , { field: '主表计量单位代码', title: '主表计量单位代码', sort: true }
                        , { field: '主表计量单位', title: '主表计量单位', sort: true }
                        , { field: '生产数量', title: '生产数量', sort: true }
                        , { field: '生产数量', title: '生产数量', sort: true, totalRow: true}
                        , { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
                        , { field: 'hmaterid2', title: 'hmaterid2', hide: true, sort: true }
                        , { field: '物料代码', title: '物料代码', sort: true }
@@ -337,8 +338,8 @@
                        , { field: 'hunitid2', title: 'hunitid2', hide: true, sort: true }
                        , { field: '计量单位代码', title: '计量单位代码', sort: true }
                        , { field: '计量单位', title: '计量单位', sort: true }
                        , { field: '数量', title: '数量', sort: true }
                        , { field: '损耗率', title: '损耗率', sort: true }
                        , { field: '数量', title: '数量', sort: true, totalRow: true}
                        , { field: '损耗率', title: '损耗率', sort: true, totalRow: true}
                        , { field: 'HWHID', title: 'HWHID', hide: true, sort: true }
                        , { field: '仓库代码', title: '仓库代码', sort: true }
                        , { field: '仓库', title: '仓库', sort: true }

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

@@ -160,6 +160,7 @@
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , totalRow: true
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);
@@ -174,8 +175,8 @@
                        , { field: '物料代码', title: '物料代码', sort: true }
                        , { field: '物料名称', title: '物料名称', width: 150, sort: true }
                        , { field: '规格型号', title: '规格型号', sort: true }
                        , { field: '数量', title: '数量', sort: true }
                        , { field: '件数', title: '件数', sort: true }
                        , { field: '数量', title: '数量', sort: true, totalRow: true }
                        , { field: '件数', title: '件数', sort: true, totalRow: true}
                        , { field: '领料单号', title: '领料单号', sort: true }
                        , { field: '用料清单号', title: '用料清单号', sort: true }
                        , { field: '生产订单号', title: '生产订单号', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_InventoryAgeReport.html

@@ -168,6 +168,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , height: 'full-70'
                };
@@ -203,6 +204,13 @@
                                        case 'DateTime':
                                            col.push({ field: data[i].name, 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;
                                        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;
                                        default:
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú±¨±í/Sc_ProdOrderPickingStatusReport.html

@@ -199,6 +199,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , cellMinWidth: 120
                    , totalRow: true
                    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , height: 'full-70'
                };
@@ -237,6 +238,13 @@
                                        case 'DateTime':
                                            col.push({ field: data[i].name, 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;
                                        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;
                                        default:
                                            col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈռƻ®¹¤µ¥/JIT_DayPlanBillList.html

@@ -235,6 +235,7 @@
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , done: function (res, curr, count) {
@@ -256,7 +257,7 @@
                    , { field: '规格型号', title: '规格型号', sort: true }
                    , { field: 'HUnitID', title: 'HUnitID', hide: true, sort: true }
                    , { field: '计量单位', title: '计量单位', sort: true }
                    , { field: '订单需求数量', title: '订单需求数量', sort: true }
                    , { field: '订单需求数量', title: '订单需求数量', sort: true, totalRow: true }
                    , { field: '销售订单号', title: '销售订单号', sort: true }
                    , { field: 'HDeptID', title: 'HDeptID', hide: true, sort: true }
                    , { field: '部门', title: '部门', hide: true, sort: true }
@@ -272,14 +273,14 @@
                    , { field: '生产资源', title: '生产资源', sort: true }
                    , { field: '订单等级', title: '订单等级', sort: true }
                    , { field: '生产组织', title: '生产组织', sort: true }
                    , { field: '销售订单数量', title: '销售订单数量', sort: true }
                    , { field: '销售订单数量', title: '销售订单数量', sort: true, totalRow: true }
                    , { field: '日计划生产日期', title: '日计划生产日期', sort: true }
                    , { field: '子日计划数量', title: '日计划数量', sort: true }
                    , { field: '汇报完成数量', title: '汇报完成数量', sort: true }
                    , { field: '子日计划数量', title: '日计划数量', sort: true, totalRow: true }
                    , { field: '汇报完成数量', title: '汇报完成数量', sort: true, totalRow: true }
                    , { field: '编制日期', title: '编制日期', sort: true }
                    , { field: '未排数量', title: '未排数量', sort: true }
                    , { field: '关闭数量', title: '关闭数量', sort: true }
                    , { field: '日计划数量总量', title: '日计划数量总量', sort: true }
                    , { field: '未排数量', title: '未排数量', sort: true, totalRow: true }
                    , { field: '关闭数量', title: '关闭数量', sort: true, totalRow: true }
                    , { field: '日计划数量总量', title: '日计划数量总量', sort: true, totalRow: true }
                    , { field: '生产订单明细行号', title: '生产订单明细行号', sort: true }
                    , { field: '日计划用料清单单号', title: '日计划用料清单单号', sort: true }
                    , { field: '审核人', title: '审核人', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_Add_ICMOReportBillList.html

@@ -893,8 +893,8 @@
                    , { field: 'HWorkerid', title: 'HWorkerid', edit: 'text', width: 100, hide: true }
                    , { field: 'HWorkerCode', title: '操作员代码', edit: 'text', event: 'HWorkerCode', width: 100 }
                    , { field: 'HWorkerName', title: '操作员名称', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '生产数量', edit: 'text', width: 100 }
                    , { field: 'HBadQty', title: '不良数量', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '生产数量', edit: 'text', width: 100, totalRow: true }
                    , { field: 'HBadQty', title: '不良数量', edit: 'text', width: 100, totalRow: true }
                    , { field: 'HICMOBillNo', title: '生产订单', edit: 'text', width: 100 }
                    , { field: 'HICMOInterID', title: '生产订单内码', edit: 'text', width: 100, hide: true }
                    , { field: 'HICMOEntryID', title: '生产订单子内码', edit: 'text', width: 100, hide: true }
@@ -913,6 +913,7 @@
                    , toolbar: '#toolbarDemo'
                    , page: false
                    , cellMinWidth: 120
                    , totalRow: true
                    , height: 500
                    , cols: [columns]
                    , done: function (res, curr, count) {
@@ -933,8 +934,8 @@
                    , { field: 'HWorkerid', title: 'HWorkerid', edit: 'text', width: 100, hide: true }
                    , { field: 'HWorkerCode', title: '操作员代码', edit: 'text', event: 'HWorkerCode', width: 100 }
                    , { field: 'HWorkerName', title: '操作员名称', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '生产数量', edit: 'text', width: 100 }
                    , { field: 'HBadQty', title: '不良数量', edit: 'text', width: 100 }
                    , { field: 'HQty', title: '生产数量', edit: 'text', width: 100, totalRow: true}
                    , { field: 'HBadQty', title: '不良数量', edit: 'text', width: 100, totalRow: true}
                    , { field: 'HICMOBillNo', title: '生产订单', edit: 'text', width: 100 }
                    , { field: 'HRemark', title: '表体备注', edit: 'text', width: 100 }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
@@ -943,6 +944,7 @@
                    id: 'mainTable_prodReport'
                    , elem: '#mainTable_prodReport'
                    , page: true
                    , totalRow: true
                    , limit: 1000
                    , limits: [500, 1000, 1500, 2000, 3000]
                    , cellMinWidth: 120

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú»ã±¨µ¥/Sc_ICMOReportBillList.html

@@ -392,7 +392,7 @@
                    , { field: 'hunitid', title: 'hunitid', hide: true, width: 200, sort: true }
                    , { field: '计量单位代码', title: '计量单位代码', width: 200, sort: true }
                    , { field: '计量单位', title: '计量单位', width: 200, sort: true }
                    , { field: '生产数量', title: '生产数量', width: 200, sort: true }
                    , { field: '生产数量', title: '生产数量', width: 200, sort: true, totalRow: true }
                    , { field: '生产任务单号', title: '生产任务单号', width: 200, sort: true }
                    , { field: '表体备注', title: '表体备注', width: 200, sort: true }
                    , { field: '制单人', title: '制单人', width: 200, sort: true }

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÎïÁÏÇåµ¥/sc_Gy_ICBomBillMainList.html

@@ -196,6 +196,7 @@
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
@@ -204,7 +205,7 @@
                    }
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true, sort: true }
                        , { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '单据号', title: '单据号', hide: true, sort: true }
                        , { field: '日期', title: '日期', width: 200, templet: "<div>{{d.日期 ==null ?'':layui.util.toDateString(d.日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '源单单号', title: '源单单号', width: 160, sort: true }
@@ -217,8 +218,8 @@
                        , { field: 'hunitid', title: 'hunitid', width: 200, hide: true, sort: true }
                        , { field: '计量单位代码', title: '计量单位代码', width: 200, sort: true }
                        , { field: '计量单位', title: '计量单位', width: 115, sort: true }
                        , { field: '用量', title: '用量', width: 200, sort: true }
                        , { field: '净用量', title: '净用量', width: 200, sort: true }
                        , { field: '用量', title: '用量', width: 200, sort: true, totalRow: true}
                        , { field: '净用量', title: '净用量', width: 200, sort: true, totalRow: true}
                        , { field: '工序代码', title: '工序代码', width: 125, sort: true }
                        , { field: '工序', title: '工序', width: 125, sort: true }
                        , { field: '制单人', title: '制单人', width: 125, sort: true }

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/Sc_ICMOSortBillList.html

@@ -194,6 +194,7 @@
                , height: 'full-110'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , done: function (res, curr, count) {
@@ -211,15 +212,15 @@
                    , { field: '产品代码', title: '产品代码', sort: true}
                    , { field: '产品名称', title: '产品名称', sort: true}
                    , { field: '单位名称', title: '单位名称', sort: true}
                    , { field: '本日计划', title: '本日计划', sort: true}
                    , { field: '本日计划', title: '本日计划', sort: true, totalRow: true}
                    , { field: '备料状态', title: '备料状态', sort: true}
                    , { field: '仓库确认', title: '仓库确认', sort: true}
                    , { field: '仓库确认时间', title: '仓库确认时间', sort: true}
                    , { field: '执行确认', title: '执行确认', sort: true}
                    , { field: '执行确认时间', title: '执行确认时间', sort: true}
                    , { field: '本日完工', title: '本日完工', sort: true}
                    , { field: '总计划数', title: '总计划数', sort: true}
                    , { field: '完工数', title: '完工数', sort: true}
                    , { field: '本日完工', title: '本日完工', sort: true, totalRow: true}
                    , { field: '总计划数', title: '总计划数', sort: true, totalRow: true}
                    , { field: '完工数', title: '完工数', sort: true, totalRow: true}
                    , { field: '完工标记', title: '完工标记', sort: true}
                    , { field: '优先级', title: '优先级', sort: true}
                ]]

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¼Æ»®Æ½Ì¨/Sc_WorkBillMonthPlan.html

@@ -312,6 +312,13 @@
                                        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 });
                                            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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -322,6 +329,7 @@
                                , toolbar: '#toolbarDemo'
                                , height: 350
                                , page: true //开启分页
                                , totalRow: true
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , cols: [col]
@@ -383,6 +391,13 @@
                                        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 });
                                            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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -393,6 +408,7 @@
                                , toolbar: '#toolbarDemo1'
                                , height: 350
                                , page: true //开启分页
                                , totalRow: true
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , cols: [col]

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¶©µ¥±ä¸üµ¥/Sc_ICMOChangeBillList.html

@@ -288,6 +288,7 @@
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , totalRow: true
                    , page: true
                    //, cellMinWidth: 90
                    , limit: 50
@@ -325,6 +326,13 @@
                                        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;
                                        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;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                    }

 WebTM/views/Éú²ú¹ÜÀí/×é×°µ¥/Sc_GroupOrderBillList.html

@@ -285,6 +285,7 @@
                    , page: true
                    , cellMinWidth: 90
                    , limit: 50
                    , totalRow: true
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);

 WebTM/views/Éú²ú¹ÜÀí/ÒªÁϼƻ®/JIT_NeedMaterPlanBillEdit.html

@@ -280,6 +280,7 @@
                , toolbar: '#toolbarDemo'
                , limit: 500 //每页默认显示的数量
                , cellMinWidth: 120
                , totalRow: true
                , height: 'full-270'
                , cols: [[ //表头
                    { type: 'checkbox', totalRowText: '合计行' }
@@ -292,30 +293,30 @@
                    , { field: 'HUnitID', title: 'HUnitID', hide: true }
                    , { field: 'HUnitIDName', title: '计量单位', edit: 'text', event: "HUnitID" }
                    , { field: 'HErpClsID', title: '物料属性', templet: '#HErpClsID' }//list
                    , { field: 'HQty', title: '数量', edit: 'text' }
                    , { field: 'HQty', title: '数量', edit: 'text', totalRow: true}
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { field: 'HProdORGID', title: '生产组织', templet: "#HProdORGIDSub" }
                    , { field: 'HStatus', title: '状态', templet: '#HStatus' }//list
                    , { field: 'HFixleadTime', title: '提前期', edit: 'text' }
                    , { field: 'HFixleadTime', title: '提前期', edit: 'text', totalRow: true}
                    , { field: 'HSourceInterID', title: '日计划工单FID', edit: 'text' }
                    , { field: 'HSourceEntryID', title: '日计划工单FENTRYID', width: 200, edit: 'text' }
                    , { field: 'HSourceBillNo', title: '生产订单号', edit: 'text' }
                    , { field: 'HSourceBillType', title: '源单类型', edit: 'text' }
                    , { field: 'HDayPlanDate', title: '工单生产日期', width: 200, event: 'HDayPlanDate' }//date
                    , { field: 'HRelationQty', title: '关联数量', edit: 'text' }
                    , { field: 'HRelationQty', title: '关联数量', edit: 'text', totalRow: true}
                    , { field: 'HICMOInterID', title: '生产订单内码', edit: 'text' }
                    , { field: 'HICMOEntryID', title: '生产订单子内码', edit: 'text' }
                    , { field: 'HICMOBillSEQ', title: '生产订单行号', edit: 'text' }
                    , { field: 'HCloseMan', title: '行关闭', width: 200, edit: 'text' }
                    , { field: 'HEntryCloseDate', title: '行关闭日期', width: 200, event: 'HEntryCloseDate' }//date
                    , { field: 'HCloseTypeSub', title: '是否手工关闭', templet: "#HCloseTypeSub" }//ck
                    , { field: 'HReciveQty', title: '入库数量', edit: 'text' }
                    , { field: 'HReciveQty', title: '入库数量', edit: 'text', totalRow: true }
                    , { field: 'HCloseStatus', title: '关闭状态', templet: "#HCloseStatus" }//ck
                    , { field: 'HRemoveQty', title: '转移数量', edit: 'text' }
                    , { field: 'HRemoveQty', title: '转移数量', edit: 'text', totalRow: true }
                    , { field: 'HSeOrderBillNo', title: '销售订单号', edit: 'text' }
                    , { field: 'HICMOEmpID', title: 'HICMOEmpID', hide: true }
                    , { field: 'HICMOEmpIDName', title: '生产订单制单人', edit: 'text', event: "HICMOEmpID" }
                    , { field: 'HUnReciveQty', title: '未收料数量', edit: 'text' }
                    , { field: 'HUnReciveQty', title: '未收料数量', edit: 'text', totalRow: true}
                    , { field: 'HICMOBillDate', title: '生产订单单据日期', event: "HICMOBillDate", width: 200 }//date
                    , { field: 'HICMOBillDeliveryDate', title: '生产订单交货日期', event: "HICMOBillDeliveryDate", width: 200 } // date
                    , { field: 'HICMOBillRemark', title: '生产订单摘要', edit: 'text' }

 WebTM/views/Éú²ú¹ÜÀí/ÒªÁϼƻ®/JIT_NeedMaterPlanBillList.html

@@ -182,6 +182,7 @@
                , toolbar: '#toolbarDemo'
                , height: 'full-50'
                , page: true
                , totalRow: true
                , cellMinWidth: 90
                , limit: 50
                , limits: [50, 500, 5000, 20000]
@@ -212,7 +213,7 @@
                    , { field: '主生产组织', title: '生产组织', sort: true }
                    , { field: '车间名称', title: '生产车间', sort: true }
                    , { field: '源单单号', title: '生产订单号', sort: true }
                    , { field: '数量', title: '数量', sort: true }
                    , { field: '数量', title: '数量', sort: true, totalRow: true}
                    , { field: '计量单位', title: '计量单位', sort: true }
                    , { field: '物料名称', title: '物料名称', sort: true }
                    , { field: '物料代码', title: '物料代码', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/ÆëÌ×·ÖÎö/JIT_CompleteDetailList.html

@@ -220,6 +220,7 @@
                , height: 'full-50'
                , page: true
                , cellMinWidth: 90
                , totalRow: true
                , limit: 50
                , limits: [50, 500, 5000, 20000]
                , cols: [[
@@ -237,16 +238,16 @@
                    , { field: '物料编码', title: '物料编码', sort: true }
                    , { field: '物料名称', title: '物料名称', sort: true }
                    , { field: '生产资源', title: '生产资源', sort: true }
                    , { field: '计划发料数量', title: '计划发料数量', sort: true }
                    , { field: '计划发料数量', title: '计划发料数量', sort: true, totalRow: true }
                    , { field: '齐套状态', title: '齐套状态', sort: true }
                    , { field: '齐套数量', title: '齐套数量', sort: true }
                    , { field: '缺料数量', title: '缺料数量', sort: true }
                    , { field: '采购在途', title: '采购在途' }
                    , { field: '生产未入库', title: '生产未入库' }
                    , { field: '领料占用数量', title: '领料占用数量', sort: true }
                    , { field: '可用数量', title: '可用数量', sort: true }
                    , { field: '占用数量', title: '占用数量', sort: true }
                    , { field: '单位用量', title: '单位用量', sort: true }
                    , { field: '齐套数量', title: '齐套数量', sort: true, totalRow: true }
                    , { field: '缺料数量', title: '缺料数量', sort: true, totalRow: true }
                    , { field: '采购在途', title: '采购在途', totalRow: true }
                    , { field: '生产未入库', title: '生产未入库', totalRow: true }
                    , { field: '领料占用数量', title: '领料占用数量', sort: true, totalRow: true }
                    , { field: '可用数量', title: '可用数量', sort: true, totalRow: true }
                    , { field: '占用数量', title: '占用数量', sort: true, totalRow: true}
                    , { field: '单位用量', title: '单位用量', sort: true, totalRow: true }
                    , { field: '齐套分析计算时间', title: '齐套分析计算时间', sort: true }
                    , { field: '生产车间ID', title: '生产车间ID', hide: true, sort: true }
                    , { field: '生产车间编码', title: '生产车间编码', sort: true }

 WebTM/views/Éú²ú¹ÜÀí/ÆëÌ×·ÖÎö/JIT_CompleteMaterlDetailList.html

@@ -230,6 +230,13 @@
                                    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 });
                                        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 });
                                        break;
                                    default:
                                        col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                }
@@ -242,6 +249,7 @@
                            , height: 'full-50'
                            , page: true
                            , cellMinWidth: 90
                            , totalRow: true
                            , limit: 50
                            , limits: [50, 500, 5000, 20000]
                            , done: function (res, curr, count) {

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

@@ -510,6 +510,7 @@
                elem: '#mainTable'
                , toolbar: '#toolbarDemo'
                , limit: 500 //每页默认显示的数量
                , totalRow: true
                //, cellMinWidth: 120
                , height: 400
                , cols: [[ //表头
@@ -540,7 +541,7 @@
                    //, { field: 'HPicNum', title: '图纸编号', edit: 'text' }
                    //, { field: 'HTimeUnit', title: '时间单位', edit: 'text' }
                    //, { field: 'HUnitTime', title: '运行时间', edit: 'text' }
                    , { field: 'HWorkQty', title: '加工数量', edit: 'text' }//默认
                    , { field: 'HWorkQty', title: '加工数量', edit: 'text', totalRow: true }//默认

                    //, { field: 'HQCSchemeID_Fst', title: '首件检验方案ID', hide: true }//f7
                    //, { field: 'HQCSchemeNumber_Fst', title: '首件检验方案代码', edit: 'text', event: "HQCSchemeNumber_Fst",width:125 }

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

@@ -288,6 +288,7 @@
                    , page: true
                    //, cellMinWidth: 90
                    , limit: 50
                    , totalRow: true
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);

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

@@ -287,6 +287,7 @@
                    , height: 550
                    , page: true
                    //, cellMinWidth: 90
                    , totalRow: true
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
@@ -373,6 +374,13 @@
                                        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>"});
                                            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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
@@ -434,6 +442,13 @@
                                        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 });
                                            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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
                                    }
@@ -446,6 +461,7 @@
                                , toolbar: '#toolbarDemo2'
                                , cols: [col]
                                , data: data1.data
                                , totalRow: true
                                , height: 550
                                , page: true
                                //, cellMinWidth: 90

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

@@ -275,6 +275,7 @@
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , page: true
                    , totalRow: true
                    //, cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]

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

@@ -288,6 +288,7 @@
                    , page: true
                    //, cellMinWidth: 90
                    , limit: 50
                    , totalRow: true
                    , limits: [50, 500, 5000, 20000]
                    , done: function (res, curr, count) {
                        soulTable.render(this);

 WebTM/views/É豸¹ÜÀí/Sb_Add_EqpConkBookBillList.html

@@ -459,7 +459,7 @@
                                , "HManagerName": data.负责人             //负责人名称
                                , "HEquipID": data.HEquipID               //设备ID
                                , "HEquipName": data.设备名称             //设备名称
                                , "HConkTypeID": data.HEquipID            //故障类别ID
                                , "HConkTypeID": data.HConkTypeID            //故障类别ID
                                , "HConkTypeName": data.故障类别          //故障类别
                                , "HConkBeginDate": formatDate(data.发生日期) //故障发生日期
                                , "HExplanation": data.故障描述           //摘要

 WebTM/views/É豸¹ÜÀí/Sb_EqpMaintenanceBill_PDA.html

@@ -116,7 +116,7 @@
                    <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
                        <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">新增</button>
                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">清空</button>-->
                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">保存</button>
                        <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">保存</button>
                        <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                    </div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -192,7 +192,17 @@
                                                <textarea name="HExplanation" id="HExplanation" placeholder="请输入内容" class="layui-textarea"></textarea>
                                            </td>
                                        </tr>
                                        <tr style="display:none;">
                                        <tr>
                                            <th>源单类型</th>
                                            <td class="bz_td">
                                                <select name="HMainSourceBillType" lay-filter="HMainSourceBillType" id="HMainSourceBillType">
                                                    <option value="设备维修登记单" selected="selected">设备维修登记单</option>
                                                    <option value="手工录入">手工录入</option>
                                                    <option value="设备维修派工单">设备维修派工单</option>
                                                </select>
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>故障登记单</th>
                                            <td class="bz_td">
                                                <input type="text" name="HMainSourceBillNo" class="layui-input" id="HMainSourceBillNo" placeholder="选择故障登记单" style="background-color:#efefef4d;">
@@ -216,6 +226,15 @@
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>时间单位</th>
                                            <td class="bz_td">
                                                <select name="HCycleUnit" lay-filter="aihao" id="HCycleUnit" style="border-radius: 50px;">
                                                    <option value="小时">小时</option>
                                                    <option value="天">天</option>
                                                </select>
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>设备名称</th>
                                            <td class="bz_td">
                                                <input type="text" name="HBarName" class="layui-input LineHeight" id="HBarName" style="border-radius: 50px;background-color:#EDEDED;" readonly>
@@ -233,7 +252,7 @@
                                            <td class="bz_td">
                                                <input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                            </td>
                                        </tr>                                       
                                        </tr>
                                    </tbody>
                                </table>
                            </div>
@@ -334,7 +353,7 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                ,laydate = layui.laydate
                , laydate = layui.laydate
                , element = layui.element;

            //#region æ—¥æœŸæ—¶é—´é€‰æ‹©å™¨
@@ -385,7 +404,7 @@
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HExplanation": "", "HRemark": ""};
                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -411,15 +430,15 @@

            $("#HDeptID").val(sessionStorage["HDeptID"]);               //部门ID
            $("#HDeptName").val(sessionStorage["HDept"]);               //部门
            //$("#HEmpID").val(sessionStorage["HBillerID"]);              //维修人ID
            //$("#HEmpName").val(sessionStorage["HUserName"]);            //维修人
            $("#HEmpID").val(sessionStorage["HKeeperID"]);              //维修人ID
            $("#HEmpName").val(sessionStorage["HKeeper"]);            //维修人
            $("#HManagerID").val(sessionStorage["HManagerID"]);         //责任人ID
            $("#HManagerName").val(sessionStorage["HManagerName"]);     //责任人
            $("#HMaker").val(sessionStorage["HUserName"]);     //创建人
            //模治具条码是否扫描标记
            var HProcExchBillNoFlag = false;

            


            //条形码回车方法
            $('#HBarCode').on('keydown', function (event) {
@@ -484,12 +503,17 @@

            //提交
            form.on('submit(Saver)', function (data) {//提交
                option.data = [{ "HRepairID": $("#HRepairID").val(), "HRepairCode": "", "HRepairName": "", "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": "", "HRepairExplanation": $("#HExplanation").val(), "HRemark": "", "HEmpID": $("#HEmpID").val(), "HSourceInterID": $("#HMainSourceInterID").val(), "HSourceEntryID": $("#HMainSourceEntryID").val(), "HSourceBillNo": $("#HMainSourceBillNo").val()  }];
                table.render(option);
                //var tableData = data.field;
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var oMain = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = oMain + ';' + sSubStr;

                if (AllowLoadData(sSubStr)) {
                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//保存按钮禁用

                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sb_PDA_EqpRepairWorkBill/SaveGetEqpRepairWorkBillList",
@@ -503,7 +527,7 @@
                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.close(index);
                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//保存按钮启用
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
@@ -526,7 +550,7 @@
                // æ¸…空表单 ï¼ˆâ€œformData”是表单的id）
                $("#formData")[0].reset();
                layui.form.render();
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HExplanation": "", "HRemark": "" }];
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": $("#HRemark").val(), "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                table.render(option);

                $("#HBarCode").focus();
@@ -548,7 +572,7 @@
                $("#HMaker").val(sessionStorage["HUserName"]);     //创建人
            })

             //#region é€€å‡ºæŒ‰é’®
            //#region é€€å‡ºæŒ‰é’®
            form.on('submit(Cancel)', function () {
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    Pub_Close(2);
@@ -754,8 +778,12 @@
                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
                    , { field: 'HManagerCode', title: '负责人代码', edit: 'text', event: "HManagerCode" }
                    , { field: 'HManagerName', title: '负责人', edit: 'text' }
                    , { field: 'HExplanation', title: '维修要求', edit: 'text' }
                    , { field: 'HRepairExplanation', title: '维修要求', edit: 'text' }
                    , { field: 'HRemark', title: '备注', event: "", edit: 'text' }
                    , { field: 'HEmpID', title: 'HEmpID', edit: 'text', hide: true }
                    , { field: 'HSourceInterID', title: '源单内码', edit: 'text', hide: true }
                    , { field: 'HSourceEntryID', title: '源单子内码', edit: 'text', hide: true }
                    , { field: 'HSourceBillNo', title: '源单单号', edit: 'text', hide: true }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ];
                option = {
@@ -772,7 +800,7 @@

                    }
                };
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HExplanation": "", "HRemark": "" }];
                option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "", "HEmpID": 0, "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                table.render(option);
            }
            //增加一行
@@ -864,6 +892,11 @@
            }
            //非空验证
            function AllowLoadData(sSubStr) {
                if ($("#HManagerID").val() == 0) {
                    layer.msg("负责人没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                    layer.msg("没有设备明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
@@ -901,10 +934,16 @@
                    success: function (result) {
                        if (result.count == 1) {
                            var data = result.data[0];
                            $("#HEquipID").val(data.HItemID);
                            $("#HEquipID").val(data.HInterID);
                            $("#HBarName").val(data.HName);
                            $("#HBarSpec").val(data.HModel);
                            $("#HBarModel").val(data.HModel2);
                            $("#HManagerID").val(data.HRepairEmpID);
                            $("#HManagerName").val(data.负责人);
                            $("#HMainSourceBillNo").val(data.故障登记单);
                            $("#HMainSourceInterID").val(data.故障登记单ID);
                            $("#HMainSourceEntryID").val(data.故障登记单子ID);
                            
                            $("#HQty").val(1);
                            $("#HBarCode").attr("readonly", "readonly");//条形码只读
                            $("#HBarCode").css("background-color", "#efefef4d");

 WebTM/views/É豸¹ÜÀí/Sb_EquipConkBookBill_PDA.html

@@ -61,7 +61,7 @@
                    <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
                        <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">新增</button>
                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">清空</button>-->
                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">保存</button>
                        <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">保存</button>
                        <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                    </div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -88,6 +88,14 @@
                                                <input type="text" name="HConkTypeName" class="layui-input" id="HConkTypeName" placeholder="选择故障类别" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HConkTypeID" id="HConkTypeID" value="0" autocomplete="off" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ConkType" id="ConkType" style="font-weight:bolder">...</button>
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>故障原因</th>
                                            <td class="bz_td">
                                                <input type="text" name="HConkReasonName" class="layui-input" id="HConkReasonName" placeholder="选择故障原因" style="background-color:#efefef4d;">
                                                <input type="hidden" name="HConkReasonID" id="HConkReasonID" value="0" autocomplete="off" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="ConkReason" id="ConkReason" style="font-weight:bolder">...</button>
                                            </td>
                                        </tr>
                                        <tr>
@@ -124,7 +132,7 @@
                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0" autocomplete="off" class="layui-input">
                                                <button type="button" lay-submit="" class="layui-btn layui-col-xs2 bz_btu" lay-filter="HEmp" id="HEmp" style="font-weight:bolder">...</button>
                                            </td>
                                        </tr>                                       
                                        </tr>
                                        <tr>
                                            <th>负责人</th>
                                            <td class="bz_td">
@@ -234,7 +242,7 @@
                    <!--隐藏字段-->
                    <input type="hidden" name="lngBillKey" id="lngBillKey">
                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey">

                    <table class="layui-hide" id="mainTable" lay-filter="mainTable" hidden></table>
                </form>
            </div>
        </div>
@@ -252,14 +260,14 @@
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                ,laydate = layui.laydate
                , laydate = layui.laydate
                , element = layui.element;

            //#region æ—¥æœŸæ—¶é—´é€‰æ‹©å™¨
            laydate.render({
                elem: '#HConkBeginDate'
                , type: 'datetime'
            });           
            });
            laydate.render({
                elem: '#HDate'
                , type: 'datetime'
@@ -293,13 +301,34 @@
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });


            var option = {
                elem: '#mainTable'
                , height: 500
                //,url: '/demo/table/user/' //数据接口
                , page: false //开启分页
                , cols: [[ //表头
                    { type: 'checkbox', fixed: 'left', totalRowText: '合计行' }
                    , { templet: '#xuhao', title: '序号', sort: true, fixed: 'left', event: "qwe" }
                    , { field: 'HConkReasonID', title: 'HConkReasonID', edit: 'text', hide: true }
                    , { field: 'HConkReasonCode', title: '故障原因代码', edit: 'text', event: "HConkReasonCode" }
                    , { field: 'HConkReasonName', title: '故障原因名称', edit: 'text' }
                    , { field: 'HConkExplanation', title: '故障原因描述', edit: 'text' }
                    , { field: 'HManagerID', title: 'HManagerID', edit: 'text', hide: true }
                    , { field: 'HManagerCode', title: '负责人代码', edit: 'text', event: "HManagerCode" }
                    , { field: 'HManagerName', title: '负责人名称', edit: 'text' }
                    , { field: 'HRemark', title: '备注', event: "", edit: 'text' }
                    , { fixed: 'right', title: '操作', toolbar: '#barDemo', width: 150 }
                ]]
            };
            //#endregion

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": ""};
                var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRepairExplanation": "", "HRemark": "" };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -398,12 +427,17 @@

            //提交
            form.on('submit(Saver)', function (data) {//提交
                //var tableData = data.field;               
                option.data = [{ "HConkReasonID": $("#HConkReasonID").val(), "HConkReasonCode": "", "HConkReasonName": $("#HConkReasonName").val(), "HConkExplanation": $("#HExplanation").val(), "HManagerID": $("#HManagerID").val(), "HManagerCode": "", "HManagerName": $("#HManagerName").val(), "HRemark": "  " }];
                table.render(option);

                //var tableData = data.field;
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var oMain = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = oMain + ';' + sSubStr + ";" + sessionStorage["HUserName"] + ";" + 1;
                if (AllowLoadData(sSubStr)) {
                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//保存按钮禁用

                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sb_EqpRepairWorkBill/SaveGetEqpConkBookBillList",
@@ -417,7 +451,7 @@
                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.close(index);
                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//保存按钮启用
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
@@ -462,14 +496,14 @@
                $("#HMaker").val(sessionStorage["HUserName"]);     //创建人
            })

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

            //故障类别
            form.on('submit(ConkType)', function () {
                //页面层-自定义
@@ -492,6 +526,44 @@
                        }
                        $("#HConkTypeName").val(checkStatus.data[0].故障类别);
                        $("#HConkTypeID").val(checkStatus.data[0].hitemid);
                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
                        //按钮【按钮二】的回调
                        //return false å¼€å¯è¯¥ä»£ç å¯ç¦æ­¢ç‚¹å‡»è¯¥æŒ‰é’®å…³é—­
                    },
                    end: function () {

                    },
                    success: function (layero, index) {

                    }
                });
            });
            
            //故障原因
            form.on('submit(ConkReason)', function () {
                //页面层-自定义
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '故障原因列表',
                    closeBtn: 1,
                    shift: 2,
                    area: ['90%', '90%'],
                    maxmin: true,
                    content: ['../../views/PublicPage/FaultReasonInformation.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('请选择数据');
                        }
                        $("#HConkReasonName").val(checkStatus.data[0].HName);
                        $("#HConkReasonID").val(checkStatus.data[0].HItemID);

                        layer.close(layer.index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) {
@@ -815,6 +887,16 @@
            }
            //非空验证
            function AllowLoadData(sSubStr) {
                if ($("#HManagerID").val() == 0) {
                    layer.msg("负责人没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                if ($("#HConkTypeID").val() == 0) {
                    layer.msg("故障类别没有选择！", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return;
                }

                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                    layer.msg("没有设备明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
@@ -856,6 +938,8 @@
                            $("#HBarName").val(data.HName);
                            $("#HBarSpec").val(data.HModel);
                            $("#HBarModel").val(data.HModel2);
                            $("#HManagerID").val(data.HRepairEmpID);
                            $("#HManagerName").val(data.负责人);                            
                            $("#HQty").val(1);
                            $("#HBarCode").attr("readonly", "readonly");//条形码只读
                            $("#HBarCode").css("background-color", "#efefef4d");

 WebTM/views/É豸¹ÜÀí/Sb_EquipDotCheckBill_PDA.html

@@ -70,7 +70,7 @@
        }
        /*明细行复选框居中*/
        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
            margin-left: 35%;
            margin-left: 15%;
        }
    </style>
</head>
@@ -86,7 +86,7 @@
                    <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
                        <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">新增</button>
                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">清空</button>-->
                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">保存</button>
                        <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">保存</button>
                        <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                    </div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -165,8 +165,40 @@
                                                <input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>点检计划</th>
                                            <td class="bz_td">
                                                <input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                                <input type="hidden" name="HPlanInterID" class="layui-input LineHeight" id="HPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                                <input type="hidden" name="HPlanEntryID" class="layui-input LineHeight" id="HPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                            </td>
                                        </tr>
                                    </tbody>
                                </table>
                            </div>
                            <div class="layui-tab-item">
                                <div class="layui-inline" style="margin-bottom:5px;">
                                    <label class="layui-form-label" style="width:100px;">设备点检规程</label>
                                    <div class="layui-input-inline">
                                        <input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                        <input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;display:none;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增行</button>
                                    </div>
                                </script>
                                <script type="text/html" id="xuhao">
                                    {{d.LAY_TABLE_INDEX+1}}
                                </script>
                                <script type="text/html" id="barDemo">
                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
                                </script>
                            </div>
                            <div class="layui-tab-item">
                                <table style="width:80%;">
@@ -222,35 +254,11 @@
                                    </tbody>
                                </table>
                            </div>
                            <div class="layui-tab-item">
                                <div class="layui-inline" style="margin-bottom:5px;">
                                    <label class="layui-form-label" style="width:100px;">设备点检规程</label>
                                    <div class="layui-input-inline">
                                        <input type="hidden" name="HEquipDotCheckRuleInterID" id="HEquipDotCheckRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
                                        <input type="text" name="HEquipDotCheckRuleInterNo" id="HEquipDotCheckRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterist" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增行</button>
                                    </div>
                                </script>
                                <script type="text/html" id="xuhao">
                                    {{d.LAY_TABLE_INDEX+1}}
                                </script>
                                <script type="text/html" id="barDemo">
                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
                                </script>
                            </div>
                        </div>
                        <ul class="layui-tab-title">
                            <li class="layui-this">基本信息</li>
                            <li>其他信息</li>
                            <li>明细信息</li>
                            <li>其他信息</li>
                        </ul>
                    </div>
                    <!--隐藏字段-->
@@ -328,13 +336,26 @@
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });

            //当前所在页签
            var cur_title = "基本信息";
            var HCheckNum = 0;
            //监听当前处于哪一个页签，传 HModName å€¼
            element.on('tab(TabTest)', function (data) {
                cur_title = data.elem.context.innerText;
                if (cur_title == "明细信息") {
                    HCheckNum++;
                }
            })

            //#endregion

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" };
                var NewRow = { "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
               
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -406,7 +427,7 @@
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    parent.layui.admin.events.closeThisTabs(); //关闭页签
                });
            })            
            })

            //提交
            form.on('submit(Saver)', function (data) {//提交
@@ -414,7 +435,10 @@
                var oMain = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = oMain + ';' + sSubStr;

                if (AllowLoadData(sSubStr)) {
                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//保存按钮禁用

                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sb_PDA_EquipDotCheckBill/SaveGetEquipDotCheckBillList",
@@ -428,7 +452,7 @@
                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.close(index);
                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//保存按钮启用
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
@@ -451,7 +475,7 @@
                // æ¸…空表单 ï¼ˆâ€œformData”是表单的id）
                $("#formData")[0].reset();
                layui.form.render();
                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": ""}];
                table.render(option);

                $("#HBarCode").focus();
@@ -564,17 +588,18 @@
                                var BYData = result;//
                                var rowdate1 = layui.table.cache["mainTable"];
                                var data = result.data;
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                                table.render(option);

                                if (BYData.data.length != 0)  //表体数据为空时
                                {
                                    buttonArr = [];//清空数组

                                    for (var i = 0; i < BYData.data.length; i++) {
                                        var checkrow = {
                                            "HDotCheckItemID": data[i].HDotCheckItemID, "HDotCheckCode": data[i].HDotCheckCode, "HDotCheckItem": data[i].HDotCheckItem,
                                            "HDotCheckPart": data[i].HDotCheckPart, "HClaim": rowdate1[i].HClaim, "HManagerID": data[i].HManagerID, "HManagerCode": data[i].HManagerCode,
                                            "HManagerName": data[i].HManagerName
                                            "HManagerName": data[i].HManagerName, "HSourceInterID": data[i].点检计划ID, "HSourceEntryID": data[i].点检计划子ID, "HSourceBillNo": data[i].点检计划单
                                        };
                                        buttonArr.push(checkrow);  //将之前的数据存储
                                    }
@@ -584,7 +609,7 @@
                                }
                            }
                            else {
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "" }];
                                option.data = [{ "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                                table.render(option);
                                layer.alert("该设备暂无默认点检记录", { icon: 5 });
                            }
@@ -598,9 +623,9 @@
            function set_InitGrid() {
                //表头
                columns = [
                    { type: 'checkbox' }
                    , { templet: '#xuhao', title: '序号', sort: true, event: "qwe", width: 80 }
                    , { field: 'HDotCheckResult', title: '点检结果', templet: '#HDotCheckResult' }
                    //{ type: 'checkbox' }
                    { templet: '#xuhao', title: '序号', event: "qwe", width: 45 }
                    , { field: 'HDotCheckResult', title: '结果', templet: '#HDotCheckResult', width: 55 }
                    , { field: 'HDotCheckItemID', title: '点检项目ID', edit: 'text', hide: true }
                    , { field: 'HDotCheckCode', title: '点检项目代码', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
                    , { field: 'HDotCheckItem', title: '点检项目', edit: 'text', event: "" }
@@ -610,22 +635,26 @@
                    , { field: 'HManagerCode', title: '负责人代码', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
                    , { field: 'HManagerName', title: '负责人名称', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { field: 'HSourceInterID', title: '源单内码', edit: 'text', hide: true }
                    , { field: 'HSourceEntryID', title: '源单子内码', edit: 'text', hide: true}
                    , { field: 'HSourceBillNo', title: '源单单号', edit: 'text', hide: true}
                    , { title: '操作', toolbar: '#barDemo', width: 80 }
                ];
                option = {
                    id: 'mainTable'
                    , elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    //, toolbar: '#toolbarDemo'
                    , page: false
                    , cellMinWidth: 100
                    , height: 500
                    , limit: 100
                    , height: 'full-205'
                    , cols: [columns]
                    , done: function (res, curr, count) {

                    }
                };

                option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "" }];
                option.data = [{ "HDotCheckResult": false, "HDotCheckItemID": 0, "HDotCheckCode": "", "HDotCheckItem": "", "HDotCheckPart": "", "HClaim": "", "HManagerID": 0, "HManagerCode": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                table.render(option);
            }
            //增加一行
@@ -663,13 +692,23 @@
            }
            //数据验证
            function AllowLoadData(sSubStr) {
                if ($("#HEquipName").val() == '') {
                if (HCheckNum < 1) {
                    layer.msg("请到 æ˜Žç»†ä¿¡æ¯ é¡µç­¾ä¸­æ ¸å¯¹è¿‡ä¸€æ¬¡ä¿¡æ¯åŽå†ç‚¹å‡»ä¿å­˜æŒ‰é’®", { icon: 5, btn: ['确认'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }

                if ($("#HBarName").val() == '') {
                    layer.msg("设备没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                //判断物料明细项

                if ($("#HEquipDotCheckRuleInterID").val() == 0 || $("#HEquipDotCheckRuleInterNo").val() == '') {
                    layer.msg("点检规程为空", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                //判断明细项
                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                    layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    layer.msg("没有点检项目明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
@@ -733,23 +772,28 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetItemByEquipFile",
                    type: "GET",
                    data: { "EquipProjectID": $("#HEquipID").val(), "Type": "DJ" },
                    data: { "EquipProjectID": $("#HEquipID").val(), "Type": "DJ", "HDate": $("#HBeginDate").val() },
                    success: function (result) {
                        var data = result.data;
                        $("#HEquipDotCheckRuleInterID").val(data[0].点检规程ID);
                        $("#HEquipDotCheckRuleInterNo").val(data[0].点检规程单号);
                        var rowdata = [];
                        for (let i = 0; i < data.length; i++) {
                            rowdata.push(
                                {
                                    "HDotCheckResult": data[i].默认结论, "HDotCheckItemID": data[i].点检项目ID, "HDotCheckCode": data[i].点检项目代码, "HDotCheckItem": data[i].点检项目名称,
                                    "HDotCheckPart": data[i].点检部位, "HClaim": data[i].具体要求, "HManagerID": data[i].负责人ID, "HManagerCode": data[i].负责人代码,
                                    "HManagerName": data[i].负责人名称
                                }
                            );
                        if (result.code == 1) {
                            var data = result.data;
                            $("#HEquipDotCheckRuleInterID").val(data[0].点检规程ID);
                            $("#HEquipDotCheckRuleInterNo").val(data[0].点检规程单号);
                            $("#HPlanNo").val(data[0].点检计划单);
                            $("#HPlanInterID").val(data[0].点检计划ID);
                            $("#HPlanEntryID").val(data[0].点检计划子ID);
                            var rowdata = [];
                            for (let i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HDotCheckResult": data[i].默认结论, "HDotCheckItemID": data[i].点检项目ID, "HDotCheckCode": data[i].点检项目代码, "HDotCheckItem": data[i].点检项目名称,
                                        "HDotCheckPart": data[i].点检部位, "HClaim": data[i].具体要求, "HManagerID": data[i].负责人ID, "HManagerCode": data[i].负责人代码,
                                        "HManagerName": data[i].负责人名称, "HSourceInterID": data[i].点检计划ID, "HSourceEntryID": data[i].点检计划子ID, "HSourceBillNo": data[i].点检计划单
                                    }
                                );
                            }
                            option.data = rowdata;
                            table.render(option);
                        }
                        option.data = rowdata;
                        table.render(option);
                    }
                })
            }

 WebTM/views/É豸¹ÜÀí/Sb_EquipMaintainBill_PDA.html

@@ -70,7 +70,7 @@
        }
        /*明细行复选框居中*/
        .layui-table-cell .layui-form-checkbox[lay-skin="primary"] {
            margin-left: 35%;
            margin-left: 15%;
        }
    </style>
</head>
@@ -86,7 +86,7 @@
                    <div class="layui-form-item" style="margin: 1% 2%;text-align: right;">
                        <button type="button" lay-submit="" lay-filter="Add" class="layui-btn layui-btn-radius">新增</button>
                        <!--<button type="button" lay-submit="" lay-filter="" class="layui-btn layui-btn-radius">清空</button>-->
                        <button type="button" lay-submit="" lay-filter="Saver" class="layui-btn layui-btn-radius">保存</button>
                        <button type="button" lay-submit="" lay-filter="Saver" id="Saver" class="layui-btn layui-btn-radius">保存</button>
                        <button type="button" lay-submit="" lay-filter="Cancel" class="layui-btn layui-btn-radius layui-btn-danger">退出</button>
                    </div>
                    <div class="layui-tab layui-tab-card" lay-filter="TabTest">
@@ -165,8 +165,40 @@
                                                <input type="text" name="HBarModel" class="layui-input LineHeight" id="HBarModel" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                            </td>
                                        </tr>
                                        <tr>
                                            <th>保养计划</th>
                                            <td class="bz_td">
                                                <input type="text" name="HPlanNo" class="layui-input LineHeight" id="HPlanNo" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                                <input type="hidden" name="HEquipMaintainPlanInterID" class="layui-input LineHeight" id="HEquipMaintainPlanInterID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                                <input type="hidden" name="HEquipMaintainPlanEntryID" class="layui-input LineHeight" id="HEquipMaintainPlanEntryID" style="border-radius: 50px;background-color:#EDEDED;" readonly>
                                            </td>
                                        </tr>
                                    </tbody>
                                </table>
                            </div>
                            <div class="layui-tab-item">
                                <div class="layui-inline" style="margin-bottom:5px;">
                                    <label class="layui-form-label" style="width:100px;">设备保养规程</label>
                                    <div class="layui-input-inline">
                                        <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="0" style="float:left;width:150px;">
                                        <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;display:none;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增行</button>
                                    </div>
                                </script>
                                <script type="text/html" id="xuhao">
                                    {{d.LAY_TABLE_INDEX+1}}
                                </script>
                                <script type="text/html" id="barDemo">
                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
                                </script>
                            </div>
                            <div class="layui-tab-item">
                                <table style="width:80%;">
@@ -222,35 +254,11 @@
                                    </tbody>
                                </table>
                            </div>
                            <div class="layui-tab-item">
                                <div class="layui-inline" style="margin-bottom:5px;">
                                    <label class="layui-form-label" style="width:100px;">设备保养规程</label>
                                    <div class="layui-input-inline">
                                        <input type="hidden" name="HEquipMaintainRuleInterID" id="HEquipMaintainRuleInterID" class="layui-input" value="" style="float:left;width:150px;">
                                        <input type="text" name="HEquipMaintainRuleInterNo" id="HEquipMaintainRuleInterNo" class="layui-input" value="" style="float:left;width:150px;" readonly="readonly">
                                        <button type="button" lay-submit="" class="layui-btn layui-btn-primary" lay-filter="HEquipDotCheckRuleInterList" style="width:40px;">
                                            <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                        </button>
                                    </div>
                                </div>
                                <table class="" id="mainTable" lay-filter="mainTable"></table>
                                <script type="text/html" id="toolbarDemo">
                                    <div class="layui-btn-container">
                                        <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>增行</button>
                                    </div>
                                </script>
                                <script type="text/html" id="xuhao">
                                    {{d.LAY_TABLE_INDEX+1}}
                                </script>
                                <script type="text/html" id="barDemo">
                                    <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">删除</a>
                                </script>
                            </div>
                        </div>
                        <ul class="layui-tab-title">
                            <li class="layui-this">基本信息</li>
                            <li>其他信息</li>
                            <li>明细信息</li>
                            <li>其他信息</li>
                        </ul>
                    </div>
                    <!--隐藏字段-->
@@ -328,13 +336,20 @@
                    $("#HBillNo").val(d.data[0].HBillNo);
                }
            });

            //当前所在页签
            var cur_title = "基本信息";
            //监听当前处于哪一个页签，传 HModName å€¼
            element.on('tab(TabTest)', function (data) {
                cur_title = data.elem.context.innerText;
            })
            //#endregion

            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var NewRow = { "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" };
                var NewRow = { "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" };
                switch (obj.event) {
                    //新增一行
                    case 'btn-AddLine': btnAddLine(NewRow);
@@ -409,12 +424,14 @@
            })

            //提交
            form.on('submit(Saver)', function (data) {//提交
            form.on('submit(Saver)', function (data) {//提交                
                data.field.HMaker = sessionStorage["HUserName"];//制单人
                var oMain = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = oMain + ';' + sSubStr;
                if (AllowLoadData(sSubStr)) {
                    $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);//保存按钮禁用

                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + "/Sb_PDA_EquipMaintainBill/SaveGetEquipMaintainBillList",
@@ -428,7 +445,7 @@
                                $('#Saver').addClass("layui-btn-disabled").attr("disabled", true);
                            }
                            else {
                                layer.close(index);
                                $('#Saver').removeClass("layui-btn-disabled").attr("disabled", false);//保存按钮启用
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                        },
@@ -451,7 +468,7 @@
                // æ¸…空表单 ï¼ˆâ€œformData”是表单的id）
                $("#formData")[0].reset();
                layui.form.render();
                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                table.render(option);

                $("#HBarCode").focus();
@@ -598,9 +615,9 @@
            function set_InitGrid() {
                //表头
                columns = [
                    { type: 'checkbox' }
                    , { templet: '#xuhao', title: '序号', sort: true, event: "qwe", width: 80 }
                    , { field: 'HMaintainResult', title: '保养结果', templet: '#HMaintainResult' }
                    //{ type: 'checkbox' }
                    { templet: '#xuhao', title: '序号', event: "qwe", width: 45 }
                    , { field: 'HMaintainResult', title: '结果', templet: '#HMaintainResult', width:55 }
                    , { field: 'HMaintainItemID', title: '保养项目ID', edit: 'text', hide: true }
                    , { field: 'HMaintainNumber', title: '保养项目代码', edit: 'text', event: "HDotCheckCode", width: 115, hide: true }
                    , { field: 'HMaintainItem', title: '保养项目', edit: 'text', event: "" }
@@ -610,22 +627,26 @@
                    , { field: 'HManagerNumber', title: '负责人代码', edit: 'text', event: 'HManagerCode', width: 150, hide: true }
                    , { field: 'HManagerName', title: '负责人名称', edit: 'text' }
                    , { field: 'HRemark', title: '备注', edit: 'text' }
                    , { field: 'HSourceInterID', title: '源单内码', edit: 'text', hide: true }
                    , { field: 'HSourceEntryID', title: '源单子内码', edit: 'text', hide: true }
                    , { field: 'HSourceBillNo', title: '源单单号', edit: 'text', hide: true }
                    , { title: '操作', toolbar: '#barDemo', width: 80 }
                ];
                option = {
                    id: 'mainTable'
                    , elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    //, toolbar: '#toolbarDemo'
                    , page: false
                    , cellMinWidth: 100
                    , height: 500
                    , limit: 100
                    , height: 'full-205'
                    , cols: [columns]
                    , done: function (res, curr, count) {

                    }
                };

                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "" }];
                option.data = [{ "HMaintainResult": false, "HMaintainItemID": 0, "HMaintainNumber": "", "HMaintainItem": "", "HMaintainPart": "", "HClaim": "", "HManagerID": 0, "HManagerNumber": "", "HManagerName": "", "HRemark": "", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": "" }];
                table.render(option);
            }
            //增加一行
@@ -663,13 +684,24 @@
            }
            //数据验证
            function AllowLoadData(sSubStr) {
                if ($("#HEquipName").val() == '') {
                if (cur_title != '明细信息') {
                    layer.msg("请选择到 æ˜Žç»†ä¿¡æ¯ é¡µç­¾ï¼Œæ ¸å¯¹ä¿å…»ä¿¡æ¯åŽï¼Œåœ¨æ˜Žç»†ä¿¡æ¯é¡µç­¾ä¸­ç‚¹å‡»ä¿å­˜æŒ‰é’®", { icon: 5, btn: ['确认'], time: 10000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }

                if ($("#HBarName").val() == '') {
                    layer.msg("设备没有选择", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }

                if ($("#HEquipMaintainRuleInterID").val() == 0 || $("#HEquipMaintainRuleInterNo").val() == '') {
                    layer.msg("保养规程为空", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }

                //判断物料明细项
                if (typeof (sSubStr) == "undefined" || sSubStr == "" || sSubStr == "[]") {
                    layer.msg("没有物料明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    layer.msg("没有保养项目明细记录", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    return false;
                }
                if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
@@ -733,24 +765,29 @@
                $.ajax({
                    url: GetWEBURL() + "/Web/GetItemByEquipFile",
                    type: "GET",
                    data: { "EquipProjectID": $("#HEquipID").val(), "Type": "BY" },
                    data: { "EquipProjectID": $("#HEquipID").val(), "Type": "BY", "HDate": $("#HBeginDate").val() },
                    success: function (result) {
                        var data = result.data;
                        $("#HEquipMaintainRuleInterID").val(data[0].保养规程ID);
                        $("#HEquipMaintainRuleInterNo").val(data[0].保养规程单号);
                        var rowdata = [];
                        for (let i = 0; i < data.length; i++) {
                            rowdata.push(
                                {
                                    "HMaintainResult": data[i].默认结论, "HMaintainItemID": data[i].保养项目ID, "HMaintainNumber": data[i].保养项目代码, "HMaintainItem": data[i].保养项目名称,
                                    "HMaintainPart": data[i].保养部位, "HClaim": data[i].具体要求, "HManagerID": data[i].负责人ID, "HManagerNumber": data[i].负责人代码,
                                    "HManagerName": data[i].负责人名称, "HRemark": ""
                                }
                            );
                        }
                        if (result.count == 1) {
                            var data = result.data;
                            $("#HEquipMaintainRuleInterID").val(data[0].保养规程ID);
                            $("#HEquipMaintainRuleInterNo").val(data[0].保养规程单号);
                            $("#HPlanNo").val(data[0].保养计划单);
                            $("#HEquipMaintainPlanInterID").val(data[0].保养计划ID);
                            $("#HEquipMaintainPlanEntryID").val(data[0].保养计划子ID);
                            var rowdata = [];
                            for (let i = 0; i < data.length; i++) {
                                rowdata.push(
                                    {
                                        "HMaintainResult": data[i].默认结论, "HMaintainItemID": data[i].保养项目ID, "HMaintainNumber": data[i].保养项目代码, "HMaintainItem": data[i].保养项目名称,
                                        "HMaintainPart": data[i].保养部位, "HClaim": data[i].具体要求, "HManagerID": data[i].负责人ID, "HManagerNumber": data[i].负责人代码,
                                        "HManagerName": data[i].负责人名称, "HRemark": "", "HSourceInterID": data[i].保养计划ID, "HSourceEntryID": data[i].保养计划子ID, "HSourceBillNo": data[i].保养计划单
                                    }
                                );
                            }

                        option.data = rowdata;
                        table.render(option);
                            option.data = rowdata;
                            table.render(option);
                        }                       
                    }
                })
            }

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

New file
@@ -0,0 +1,426 @@
<!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>
    <script src="../../../layuiadmin/zgqCustom/zgqCustom.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">
                            <div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 30px;">日期</label>
                                    <input type="date" class="layui-input" id="HBeginDate" style="width:110px;" placeholder="yyyy-MM-dd">
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width:5px">-</label>
                                </div>
                                <div class="layui-inline">
                                    <input type="date" class="layui-input" id="HEndDate" style="width:110px;" placeholder="yyyy-MM-dd">
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 60px;">流转卡号</label>
                                    <div class="layui-input-block" style="margin-left: 90px;">
                                        <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:120px">
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                </button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                            </div>
                        </div>
                        <table class="" id="mainTable" lay-filter="mainTable"></table>
                        <script type="text/html" id="toolbarDemo">
                            <div class="layui-btn-container">
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btnDel"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                            </div>
                        </script>
                    </form>
                </div>
            </div>
        </div>
    </div>

    <script>
        layui.config({
            base: '../../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index', //主入口模块
        }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {

            //#region å…¬å…±å˜é‡
            var $ = layui.$
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element
                , laypage = layui.laypage
                , laydate = layui.laydate
                , util = layui.util
            //查询条件
            var sWhere = "";
            var option = [];
            var HModName = "MES_ColorRecordBillList_PDA";

            //#endregion

            //#region è¿›å…¥é¡µé¢æ—¢åŠ è½½

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

            set_ClearBill();

            //#endregion

            //#region ç‚¹å‡»äº‹ä»¶åŒ…括on form事件等
            //头工具栏事件
            table.on('toolbar(mainTable)', function (obj) {
                switch (obj.event) {
                    //审核
                    case 'btnCheck': btnCheck(1);
                        break;
                    //反审核
                    case 'btnAdutCheck': btnCheck(2);
                        break;
                    //删除
                    case 'btnDel': btnDel();
                        break;
                    //退出
                    case 'btn-exit': Pub_Close(2);
                        break;
                    //隐藏列设置
                    case 'HideColumn':
                        get_HideColumn();
                        break;
                };
            });
            //重置按钮
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });
            //查询按钮
            form.on('submit(btnSearch)', function (data) {
                get_FastQuery();
            });

            //行监听事件-单击
            table.on('row(mainTable)', function (obj) {
                var flag = !obj.tr.find(':checkbox:first').prop('checked');
                obj.tr.find(':checkbox').prop('checked', flag);
                if (flag) {
                    obj.tr.find('.layui-form-checkbox').addClass('layui-form-checked');  //设置复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:#ceedfa;color:black" });//改变当前tr背景颜色和字体颜色
                } else {
                    obj.tr.find('.layui-form-checkbox').removeClass('layui-form-checked');//取消复选框选中样式
                    $(obj.tr.selector).attr({ "style": "background:" });//取消当前tr颜色
                }
                //mainTable ä¸ºè¡¨æ ¼ID   æ³¨æ„æ­¤å¤„如果ID不正确将导致你在监听复选框时获取不到你选择的数据，前面的只是添加或删除选中未选中样式以及设置背景色，字体颜色
                layui.each(table.cache.mainTable, function (i, l) {
                    if (obj.tr.index() == l.LAY_TABLE_INDEX) {
                        l.LAY_CHECKED = flag;
                    }
                });
            });
            //#endregion

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

            //初始化界面
            function set_ClearBill() {
                //初始化时间
                $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));

                //加载数据到网格
                get_FastQuery();
                DisPlay_HideColumn();
            }

            //列明显示下拉框
            function ColFilter() {
                var Organization = '<option  value="0" selected="selected" ></option>';
                for (var i = 1; i < option.cols[0].length; i++) {
                    if (option.cols[0][i].hide != true) {
                        Organization += '<option  style="color:blue;" value="' + option.cols[0][i].field + '">' + option.cols[0][i].field + '</option>';
                    }
                }
                $("#ColName").empty();
                $("#ColName").append(Organization);
                form.render('select');
            }


            //加载网格
            function get_Display(sWhere) {
                //动态列-缓存列表
                $.ajax({
                    url: GetWEBURL() + "/ColorRecord/ColorRecordList",
                    type: "GET",
                    async: false,
                    data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
                    success: function (data1) {

                        if (data1.count == 1) {

                            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 ($.inArray(data[i].name, "") > -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 });
                                            break;
                                        default:
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true });
                                    }
                                }
                            }
                           
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cellMinWidth: 120
                                , page: true
                                , limit: 50
                                , limits: [50, 500, 5000, 20000]
                                , height: 'full-70'
                                , totalRow: false //开启合计
                                , cols: [col]
                                , data: data1.data
                            };
                            table.render(option);

                            if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
                                ColFilter();
                            }                          
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                })
            }

            //快速过滤
            function get_FastQuery() {
                var HBeginDate = $("#HBeginDate").val();//下达日期 å¼€å§‹æ—¥æœŸ
                var HEndDate = $("#HEndDate").val();//结束日期
               

                if (HBeginDate != "" && HEndDate != "") {
                    sWhere += " and æ—¥æœŸ between '" + HBeginDate + "' and '" + HEndDate + "' ";
                }                            

                get_Display(sWhere);
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //重置过滤条件
            function set_ClearQuery() {
                //初始化时间
                $("#HBeginDate").val(Format(new Date() - 1000 * 60 * 60 * 24 * 30, "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HMaterNumber").val("");
                $("#HBillNo").val("");
                $("#HProductName").val("");
                $("#HProductModel").val("");
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                ColFilter();
                sWhere = "";
            }           

            //删除
            function btnDel() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hmainid = data[0].hmainid;
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
                        $.ajax({
                            url: GetWEBURL() + '/ColorRecord/DelColorRecordBill',
                            type: "GET",
                            data: { "lngBillKey": hmainid, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                console.log('gouba' + result);
                                if (result.count == 1) {
                                    layer.msg(result.Message, { icon: 1 }, function () {
                                        // å¾—到frame索引
                                        var index = layer.getFrameIndex(window.name);
                                        //关闭当前frame
                                        layer.close(wait);
                                        //修改为功后刷新界面
                                        get_FastQuery();
                                    });
                                } else {
                                    layer.alert(result.code + result.Message, { icon: 5 });
                                    layer.close(wait);
                                }
                            }, error: function () {
                                layer.alert("接口请求失败!", { icon: 5 });
                                layer.close(wait);
                            }
                        });
                    })

                }
                else {
                    layer.msg('请选择一行数据删除！');
                }

            }

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";
                for (var i = 1; i < option.cols[0].length; i++) {
                    colName += option.cols[0][i]["title"] + ",";
                }

                colName = encodeURI(colName.substring(0, colName.length - 1));//对 URI è¿›è¡Œç¼–码
                layer.open({
                    type: 2
                    , skin: "layui-layer-rim" //加上边框
                    , title: "隐藏列设置"  //标题
                    , closeBtn: 1  //窗体右上角关闭 çš„ æ ·å¼
                    , shift: 2 //弹出动画
                    , area: ["50%", "90%"] //窗体大小
                    , maxmin: true //设置最大最小按钮是否显示
                    , content: ['../../基础资料/隐藏列设置/Gy_GridView_Hide.html?HModName=' + HModName + '&colName=' + colName, "yes"]
                    , btn: ["确定", "取消"]
                    , btn1: function (index, laero) {
                        //刷新表格数据
                        DisPlay_HideColumn();
                        //更新表格缓存的数据
                        layer.close(index);//关闭弹窗
                    }
                })
            }

            //显示列数据
            function DisPlay_HideColumn() {

                $.ajax({
                    url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
                    type: "GET",
                    data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
                    success: function (data1) {
                        if (data1.data.length != 0) {

                            var dataCol = [];//数据库查询出的列数据
                            var titleData = ["hmainid","HMaterID"];//不需要显示的字段 å¯æ‰©å±•

                            dataCol = data1.data[0].HGridString.split(',');

                            for (var i = 0; i < option.cols[0].length - 1; i++) {
                                if (dataCol[i]) {
                                    var dataCols = dataCol[i].split('|');
                                }
                                //隐藏列
                                if (dataCols[1] == 1) {
                                    option.cols[0][i + 1]["hide"] = true;
                                }
                                //设置内容字体大小
                                if (data1.data[0].HFontSize != 0) {
                                    option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
                                } else {
                                    option.cols[0][i + 1]["style"] = "font-size:100%";
                                }
                                //设置列宽
                                if (dataCols[3] > 0) {
                                    option.cols[0][i + 1]["width"] = dataCols[3];
                                }
                                //显示列
                                if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
                                    option.cols[0][i + 1]["hide"] = false;
                                }
                                //字体所在位置(å·¦ å±…中 å³)
                                switch (dataCols[2]) {
                                    case "L":
                                        option.cols[0][i + 1]["align"] = "left";
                                        break;
                                    case "M":
                                        option.cols[0][i + 1]["align"] = "center";
                                        break;
                                    case "R":
                                        option.cols[0][i + 1]["align"] = "right";
                                        break;
                                }
                            }

                            //取消冻结列
                            for (var i = 1; i < option.cols[0].length - 1; i++) {
                                if (option.cols[0][i]["fixed"] != null) {
                                    option.cols[0][i]["fixed"] = null;
                                }
                                else {
                                    break;
                                }
                            }
                            //冻结列
                            if (data1.data[0].HFixCols != 0) {
                                for (var i = 0; i < data1.data[0].HFixCols; i++) {
                                    if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
                                        data1.data[0].HFixCols += 1;
                                    }
                                    option.cols[0][i + 1]["fixed"] = "left";
                                }
                            }
                            table.render(option);
                        } else {
                            table.render(option);
                        }
                    }, error: function () {
                        layer.alert("接口请求失败!", { icon: 5 });
                    }
                })
            }

            //#endregion
        });
    </script>
</body>
</html>

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

@@ -134,7 +134,7 @@
                                                    <input type="text" name="HICMOBillNo" class="layui-input set_height" id="HICMOBillNo" placeholder="生产订单号" style="border-radius: 50px;background-color:#efefef4d;" readonly>
                                                    <input type="hidden" name="HICMOInterID" id="HICMOInterID" value="0" autocomplete="off" class="layui-input set_height">
                                                    <input type="hidden" name="HICMOEntryID" id="HICMOEntryID" value="0" autocomplete="off" class="layui-input set_height">
</tr>
                                            </tr>
                                            <tr>
                                                <th>指引卡</th>
                                                <td class="bz_td">
@@ -180,7 +180,7 @@
                                            </tr>
                                        </tbody>
                                    </table>
                                </div>   
                                </div>
                                <div class="layui-tab-item">
                                    <div class="layui-inline" style="margin-bottom:5px;">
                                        <label class="layui-form-label" style="width:100px;">检验方案</label>
@@ -287,6 +287,9 @@
                    <input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
                    <input type="hidden" name="eventType" id="eventType" value="Add">
                    <input type="hidden" name="HMainInterID" id="HMainInterID" value="0">
                    <input type="hidden" name="HMainSourceInterID" id="HMainSourceInterID" value="0">
                    <input type="hidden" name="HMainSourceEntryID" id="HMainSourceEntryID" value="0">
                    <input type="hidden" name="HMainSourceBillNo" id="HMainSourceBillNo" value="0">
                </form>
            </div>
        </div>
@@ -398,7 +401,7 @@
                }
            })
        });
      

        //选择计量单位
        form.on('submit(BtnHUnit)', function () {//生产资源
            layer.open({
@@ -614,9 +617,9 @@
                }
            })
        }
              

        function txtHBarCode_KeyDown(HBarCode) {
            //检查扫描的条码是否为纯数字，如果是纯数字，目前默认判断为 "工序进站接收单号" 
            //检查扫描的条码是否为纯数字，如果是纯数字，目前默认判断为 "工序进站接收单号"
            var result = /^\d+$/.test(HBarCode)
            if (result == true) {
                HBarCode = HBarCode.slice(0, 0) + 'GXJZ' + HBarCode.slice(0)
@@ -663,7 +666,10 @@
                                    "HProcName": data.工序,
                                    "HProcID": data.HProcID,
                                    "HQCSchemeID": data.检验方案ID,
                                    "HQCSchemeName": data.检验方案名称
                                    "HQCSchemeName": data.检验方案名称,
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": data.hsubid,
                                    "HMainSourceBillNo": data.单据号,
                                });
                                //获取检验方案/检验项目信息
                                get_CheckItem();
@@ -691,10 +697,14 @@
                                    "HProcName": data.当前工序,
                                    "HProcID": data.HProcID,
                                    "HQCSchemeID": data.检验方案ID,
                                    "HQCSchemeName": data.检验方案名称
                                    "HQCSchemeName": data.检验方案名称,
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": 0,
                                    "HMainSourceBillNo": data.单据号,
                                });
                                //获取检验方案/检验项目信息
                                get_CheckItem();
                                HProcExchBillNoFlag = true;
                                break;
                            case "MO00":
                                form.val("formData", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
@@ -708,17 +718,21 @@
                                    "HMaterName": data.产品名称,
                                    "HMaterNumber": data.产品代码,
                                    "HMaterModel": data.规格型号,
                                    "HPRDORGID": data.组织,
                                    "HPRDORGName": data.组织名称,
                                    "HPRDORGID": 0,//data.组织,
                                    "HPRDORGName": '',//data.组织名称,
                                    "HUnitID": data.hunitid,
                                    "HUnitName": data.计量单位,
                                    "HProcName": data.当前工序,
                                    "HProcID": data.HProcID,
                                    "HQCSchemeID": data.检验方案ID,
                                    "HQCSchemeName": data.检验方案名称
                                    "HQCSchemeName": data.检验方案名称,
                                    "HMainSourceInterID": data.hmainid,
                                    "HMainSourceEntryID": data.hsubid,
                                    "HMainSourceBillNo": data.单据号,
                                });
                                //获取检验方案/检验项目信息
                                get_CheckItem();
                                HProcExchBillNoFlag = true;
                                break;
                        }
                        layer.close(index);

 WebTM/views/²É¹º¹ÜÀí/ÍËÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBackBillList.html

@@ -344,6 +344,7 @@
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HMaker").val(sessionStorage["HUserName"]);
                $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HInterID").val("0");
                $("#HBillNo").val("");
                $.ajax({

 WebTM/views/ÏúÊÛ¹ÜÀí/ÆäËûÓ¦¸¶µ¥/YF_PayMentOtherBillMain.html

@@ -97,7 +97,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">汇率<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" step="background-color: #efefef4d;" readonly>
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
                                            </div>
                                        </div>   
                                    </div>
@@ -130,7 +130,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">不含税金额</label>
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HMoney" id="HMoney"  value="0"  autocomplete="off" >
                                                <input type="text" class="layui-input" name="HMoney" id="HMoney" style="background-color: #efefef4d;" value="0"  autocomplete="off" readonly >
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -405,10 +405,14 @@
                    var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                    var HRelSumMoney = HMoney * (1 + HTaxRate);    //总金额

                    $("#HSumMoney").val(HRelSumMoney);
                    //$("#HSumMoney").val(HRelSumMoney);
                
                });
                //#endregion


              


                //#region ç¨ŽçŽ‡å¤±ç„¦äº‹ä»¶
                var oldHTaxRate = "";                          //修改前的值
@@ -428,22 +432,24 @@

                    //输入的税率，
                    var HTaxRate = newHTaxRate * 1; //税率
                    var HMoney = $("#HMoney").val() * 1;      //税率
                    var HSumMoney= HMoney * (1 + HTaxRate);    //总金额

                    $("#HSumMoney").val(HSumMoney);
                    var HSumMoney = $("#HSumMoney").val() * 1;      //单据金额
                    var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));    //不含税金额
                    
                    $("#HMoney").val(HMoney);

                });
                //#endregion

                //#region æ€»é‡‘额失焦事件
                  ///不含税金额= å«ç¨Žé‡‘额/（100+税率）/100

                //#region å•æ®é‡‘额失焦事件
                var oldHSumMoney = "";                          //修改前的值
                var newHSumMoney = "";                          //修改后的值

                $("#HSumMoney").on('focus', function (data) {
                    oldHSumMoney = $("#HSumMoney").val() * 1;   //不含税金额文本框获取焦点时获取修改前的值
                    oldHSumMoney = $("#HSumMoney").val() * 1;   //单据金额文本框获取焦点时获取修改前的值
                }).on('blur', function (data) {
                    newHSumMoney = $("#HSumMoney").val();       //不含税金额文本框失焦时获取修改后的值
                    newHSumMoney = $("#HSumMoney").val();       //单据金额文本框失焦时获取修改后的值
                    if (newHSumMoney!=0) {
                        //判断输入的金额是否合法
                        var ref = /^\d+(\.\d+)?$/;          //非负数正则表达式
@@ -456,7 +462,7 @@
                        //输入的总金额合法，重算不含税金额
                        var HSumMoney = newHSumMoney * 1;                    //不含税金额
                        var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                        var HMoney = HSumMoney / (1 + HTaxRate);    //不含税金额
                        var HMoney = HSumMoney / (100 + HTaxRate)/100;    //不含税金额

                        $("#HMoney").val(HMoney);
                    }

 WebTM/views/ÏúÊÛ¹ÜÀí/ÆäËûÓ¦ÊÕµ¥/YS_ReceiveOtherBillMain.html

@@ -97,7 +97,7 @@
                                        <div class="layui-inline">
                                            <label class="layui-form-label">汇率<label style="color:red"> * </label></label>
                                            <div class="layui-input-inline">
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" step="background-color: #efefef4d;" readonly>
                                                <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color: #efefef4d;" readonly>
                                            </div>
                                        </div>   
                                    </div>
@@ -403,7 +403,7 @@
                    //输入的不含税金额合法，重
                    var HMoney = newHMoney * 1; //算总金额                       //不含税金额
                    var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                    var HRelSumMoney = HMoney * (1 + HTaxRate);    //总金额
                    var HRelSumMoney = HMoney * (1 + (HTaxRate * 0.01) );    //总金额

                    $("#HSumMoney").val(HRelSumMoney);
                
@@ -429,7 +429,7 @@
                    //输入的税率，
                    var HTaxRate = newHTaxRate * 1; //税率
                    var HMoney = $("#HMoney").val() * 1;      //税率
                    var HSumMoney= HMoney * (1 + HTaxRate);    //总金额
                    var HSumMoney = HMoney * (1 + (HTaxRate * 0.01));    //总金额

                    $("#HSumMoney").val(HSumMoney);

@@ -456,7 +456,7 @@
                        //输入的总金额合法，重算不含税金额
                        var HSumMoney = newHSumMoney * 1;                    //不含税金额
                        var HTaxRate = $("#HTaxRate").val() * 1;      //税率
                        var HMoney = HSumMoney / (1 + HTaxRate);    //不含税金额
                        var HMoney = HSumMoney / (1 + (HTaxRate * 0.01));    //不含税金额

                        $("#HMoney").val(HMoney);
                    }

 WebTM/views/ÏúÊÛ¹ÜÀí/·¢»õ֪ͨµ¥/Add_Edit_Xs_SeOutStockBillList.html

@@ -65,7 +65,7 @@
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID" value="0">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -157,6 +157,16 @@
                                                <input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">选单号</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="" id="" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;"   readonly>
                                                
                                                <button type="button" lay-submit="" class="layui-btn" lay-filter="XDHList" id="XDHList" style="width:40px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                                </button>
                                            </div>
@@ -396,7 +406,8 @@

            var rowdata = [{
                "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": "0", "发货仓库": "",
                "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
                "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
                "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
            }];

            // åˆå§‹åŒ–ç•Œ
@@ -409,7 +420,8 @@
                //新增行表格数据
                var NewRow = {
                    "HMaterID": 0, "物料代码": "", "物料名称": "", "规格型号": "", "HUnitID": 0, "计量单位": "", "HWHID": "0", "发货仓库": "",
                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""
                    "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": "",
                    "HSourceBillNo": 0, "HSourceBillType": 0, "HSourceInterID": 0, "HSourceEntryID": 0,
                };
                switch (obj.event) {
                    case 'btn-AddLine':
@@ -588,6 +600,62 @@
                }
            });
            //#endregion

            //#region è¡¨å¤´ä¿¡æ¯é€‰æ‹©å•æ®å¼¹çª—
            form.on('submit(XDHList)', function () {

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

                        if (checkStatus.data.length == 0) {
                            return layer.msg("请至少选择一条数据!");
                        }
                        //layer.alert("你已选择" + checkStatus.data.length + "条数据");
                        //获取销售订单代码
                        var ProcessNumber = [];
                        for (var i = 0; i < checkStatus.data.length; i++) {
                            ProcessNumber.push(checkStatus.data[i]);
                        }
                        for (var i = 0; i < ProcessNumber.length; i++) {
                            option.data.push({
                                "HMaterID": checkStatus.data[i].HMaterID
                                , "物料代码": checkStatus.data[i].物料代码
                                , "物料名称": checkStatus.data[i].物料名称
                                , "规格型号": checkStatus.data[i].规格型号
                                , "HUnitID": checkStatus.data[i].HUnitID
                                , "计量单位": checkStatus.data[i].计量单位
                                ,"HWHID": "0"
                                , "发货仓库": ""
                                , "HQty": "0", "HPrice": "0", "HMoney": "0", "HRemark": ""

                                , "HSourceBillNo": checkStatus.data[i].单据号
                                , "HSourceBillType": checkStatus.data[i].HBillType
                                , "HSourceInterID": checkStatus.data[i].hmainid
                                , "HSourceEntryID": checkStatus.data[i].hsubid
                            })
                        }
                        table.render(option);
                        layer.close(index);//关闭弹窗
                    }

                });
            });
            //#endregion


            //#endregion


@@ -613,6 +681,10 @@
                    , cols: [[ //子表
                        { type: 'checkbox', totalRowText: '合计行' }
                        , { type: 'numbers', title: '序号', width: 100, totalRow: true }
                        , { type: 'HSourceBillNo', title: '源单号', width: 100, hide: true }//源单号
                        , { field: 'HSourceBillType', title: '源单类型', width: 100, hide: true }//源单类型
                        , { type: 'HSourceInterID', title: '源单主内码', width: 100, hide: true }//源单主内码
                        , { field: 'HSourceEntryID', title: '源单子内码', width: 100, hide: true }//源单子内码
                        , { field: 'HMaterID', title: 'HMaterID', width: 100, hide: true }
                        , { field: '物料代码', title: '物料代码', width: 150, edit: 'text', event: "HMaterID" }//f7
                        , { field: '物料名称', title: '物料名称', width: 150, }
@@ -697,6 +769,10 @@
                                    {
                                        "HMaterID": subdata[i].HMaterID, "物料代码": subdata[i].物料代码, "物料名称": subdata[i].物料名称, "规格型号": subdata[i].规格型号, "HUnitID": subdata[i].HUnitID, "计量单位": subdata[i].计量单位,
                                        "HWHID": subdata[i].HWHID, "发货仓库": subdata[i].发货仓库, "HQty": subdata[i].数量, "HPrice": subdata[i].单价, "HMoney": subdata[i].金额, "HRemark": subdata[i].表体备注
                                        , "HSourceBillNo": subdata[i].源单单号,    //源单号
                                        "HSourceBillType": subdata[i].源单类型,   //源单类型
                                        "HSourceInterID": subdata[i].源单主内码,   //源单主内码
                                        "HSourceEntryID": subdata[i].源单子内码     //源单子内码
                                    }
                                )
                            }