zzr99
2021-12-25 015b016d9075ba6fd913290e2251f26757e305f4
盘点分析报表
13个文件已修改
2个文件已删除
2 文件已重命名
3787 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/JFTM.pubxml.user 2052 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index.html 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/index_Mobile.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_FastList.html 206 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_ClassTimePrj.html 399 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/基础资料/公用基础资料/Gy_ClassTimePrj.html 314 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillEdit.html 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/工资管理/核算方式/Gy_ClassTimePrjSubBillList.html 40 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_Fast.html 74 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/销售出库/Kf_SellOutBill_FastList.html 164 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_FastList.html 244 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_Fast.html 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/验收入库/产品入库/Kf_ProductInBill_FastList.html 162 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/Properties/PublishProfiles/JFTM.pubxml.user
Diff too large
WebTM/WebTM.csproj
@@ -125,13 +125,11 @@
    <Content Include="views\ReportHtml.html" />
    <Content Include="views\test\testRenderAutomationList.html" />
    <Content Include="views\仓存管理\仓库调拨\Kf_MoveStockStepOutBill_Fast.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrjSub.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderBackInfo.html.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_OrderLev.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_WorkType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrjSub.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Pay_PeriodInfoSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkPayType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkType.html" />
@@ -144,8 +142,6 @@
    <Content Include="views\基础资料\公用基础资料\Gy_Employee_Add_Edit_.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipType.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_EquipTypeEdit.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ClassTimePrj.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_WorkCenter_Add_Edit.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_MouldType.html" />
    <Content Include="views\基础资料\公用基础资料\grf\b.grf" />
@@ -662,8 +658,10 @@
    <Content Include="views\工资管理\工资结算单%28其他%29\Pay_OtherBalBillList.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillEdit.html" />
    <Content Include="views\工资管理\工资结算单%28集体%29\Pay_GroupBalBillList.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillEdit.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjBillEdit.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjBillList.html" />
    <Content Include="views\工资管理\核算方式\Gy_ClassTimePrjSubBillList.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillEdit.html" />
    <Content Include="views\工资管理\班组职员清单\Gy_GroupEmpBillList.html" />
    <Content Include="views\工资管理\考勤汇报单\Pay_WorkTimesBillEdit.html" />
WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\智云MES\Lay-Ui\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>D:\项目\LayUI\MESWMS-LayUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>
WebTM/views/index.html
@@ -631,6 +631,7 @@
                                    <a>核算方式</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="工资管理/核算方式/Gy_ClassTimePrjBillList.html">核算方式</a></dd>
                                        <dd><a lay-href="工资管理/核算方式/Gy_ClassTimePrjSubBillList.html">核算记录</a></dd>
                                    </dl>
                                </dd>
                                <dd>
@@ -761,8 +762,6 @@
                                        <dd><a lay-href="基础资料/公用基础资料/Xt_ORGANIZATIONSList.html">组织列表</a></dd>
                                        <dd><a lay-href="基础资料/公用基础资料/Gy_Unit.html">计量单位列表</a></dd>
                                        <dd><a lay-href="基础资料/公用基础资料/Gy_Currency.html">货币列表</a></dd>
                                        <dd><a lay-href="基础资料/公用基础资料/Gy_ClassTimePrj.html">核算方式</a></dd>
                                        <dd><a lay-href="基础资料/公用基础资料/Gy_ClassTimePrjSub.html">核算记录</a></dd>
                                        <dd><a lay-href="基础资料/公用基础资料/Pay_PeriodInfoSet.html">月度设置</a></dd>
                                        <dd><a lay-href="基础资料/销售基础资料/Gy_Customer.html">客户列表</a></dd>
                                        <dd><a lay-href="基础资料/采购基础资料/Gy_Supplier.html">供应商列表</a></dd>
WebTM/views/index_Mobile.html
@@ -432,9 +432,9 @@
                          </a>
                      </dd>
                      <dd>
                          <a lay-href="" style="color: aqua;">
                          <a lay-href="领料发货/领料出库/Kf_MateOutBill_FastList.html" style="color: aqua;">
                              <img src="../layuiadmin/myicon/单据录制.svg" alt="单据录制" style="width:25px;height:25px;margin-right: 5px;" />
                              ç”Ÿäº§é¢†æ–™ç¼“存列表null
                              ç”Ÿäº§é¢†æ–™ç¼“存列表
                          </a>
                      </dd>
                      <dd>
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html
@@ -50,8 +50,8 @@
                                                <option value="3720">生产任务单-投料</option>
                                                <!--<option value="1201">委外订单-投料</option>
                                                <option value="1402">发货通知单</option>
                                                <option value="1234">下架通知单</option>
                                                <option value="1243">调拨申请单</option>-->
                                                <option value="1234">下架通知单</option>-->
                                                <option value="1243">调拨申请单</option>
                                            </select>
                                            <!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
                                        </div>
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_FastList.html
@@ -67,6 +67,9 @@
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">刷新</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">撤销</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">退出</button>
                                </div>
                                <div class="layui-col-xs2">
@@ -145,7 +148,7 @@
                , shade: 0.6 //遮罩透明度
                , maxmin: false //允许全屏最小化
                , anim: 0 //0-6的动画形式,-1不开启
                , content: ['../../仓库调拨/仓库调拨/Kf_MoveStockBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
                , content: ['../../仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
                // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + JSON.stringify(data), 'yes']
                // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + rows, 'yes']
                , resize: false
@@ -156,88 +159,130 @@
        });
        form.on('submit(cmdRefresh)', function () {//刷新
            var sBillType = '1207'
            table.render({
                elem: '#dj-table'
                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }),
                table.render({
                    elem: '#yd-table'
                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                    , toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                    , cols: [[
                          { type: 'radio' }
                        { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 80 }
                        , { field: 'HBillNo', title: '单据号', width: 80 }
                        , { field: 'HMaker', title: '制单人', width: 100 }
                        , { field: 'HMakeDate', title: '制单日期', width: 100 }
                        , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                        , { field: 'HMaterName', title: '物料名称', width: 100 }
                        , { field: 'HMaterModel', title: '规格型号', width: 100 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                        , { field: 'HOrgID', title: '组织', width: 100 }
                    ]]
                      , height: 500
                      , done: function () {
                          layer.closeAll("loading");
                      }
            });
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                })
        });
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1207'
            $.ajax(
                {
                    type: "Get",
                    url: GetWEBURL() + "/Web/Rescind_Json",
                    async: true,
                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        }
                        else {
                            layer.msg(data.Message, { icon: 2 });
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                });
        });
        form.on('submit(cmdDelete)', function () {//删除
            var checkStatus = table.checkStatus('dj-table')
            , data = checkStatus.data;
            // console.log(data);
            // var sInterID = $('#HInterID').val()
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            //var sMaterID = data[0].HMaterID
            //var sBillType = $('#HBillType').val()
            //var sAuxPropID = data[0].HAuxPropID
            ////var sMTONo = data[0].HMTONo
            //var sMTONo = 0
            //var sSourceInterID = data[0].HSourceInterID
            //var sSourceEntryID = data[0].HSourceEntryID
            $.ajax(
               {
                   type: "Get",
                   url: GetWEBURL() + "/Web/Delete_Json",
                   async: true,
                   data: { "sHInterID": sInterID },
                   dataType: "json",
                   success: function (data) {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                           //layer.msg(data.Message, { icon: 1 });
                           table.render({
                               elem: '#dj-table'
                               , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                               , cellMinWidth: 80
                               , toolbar: '#toolbarDemo'
                               , where: { HBillType: '1207', sWhere: '' }
                               , cols: [[
                                   { type: 'radio' }
                                , { field: 'HInterID', title: '单据内码', width: 80 }
                                , { field: 'HBillNo', title: '单据号', width: 80 }
                                , { field: 'HMaker', title: '制单人', width: 100 }
                                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                                , { field: 'HQty', title: '数量', width: 100 }
                                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                                , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                               ]]
                         , height: 500
                           })
                       }
                       else {
                           layer.msg(data.Message, { icon: 2 });
                       }
                   },
                   error: function (err) {
                       layer.msg('错误' + err, {
                           icon: 5,
                           time: 20000
                       }, function () {
                           //do something
                       });
                   }
               });
                {
                    type: "Get",
                    url: GetWEBURL() + "/ProductInBillList/Delete_Json",
                    async: true,
                    data: { "sHInterID": sInterID },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†,
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        }
                        else {
                            layer.msg(data.Message, { icon: 2 });
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                });
        });
        
       
@@ -245,9 +290,9 @@
        var sBillType = '1207'
                table.render({
                    elem: '#dj-table'
                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                    , url: GetWEBURL() + '/Web/chanpinruk'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                    , cols: [[
                          { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 80 }
@@ -263,7 +308,32 @@
                      , done: function () {
                          layer.closeAll("loading");
                      }
    })
                })
        //已上传列表
        table.render({
            elem: '#yd-table'
            , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
            , toolbar: '#toolbarDemo'
            , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            , cols: [[
                { type: 'radio' }
                , { field: 'HInterID', title: '单据内码', width: 80 }
                , { field: 'HBillNo', title: '单据号', width: 80 }
                , { field: 'HMaker', title: '制单人', width: 100 }
                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                , { field: 'HMaterName', title: '物料名称', width: 100 }
                , { field: 'HMaterModel', title: '规格型号', width: 100 }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                , { field: 'HOrgID', title: '组织', width: 100 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        })
        //刷新明细页签
        table.render({
            elem: '#mx-table' 
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_ClassTimePrj.html
File was deleted
WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_ClassTimePrj.html
File was deleted
WebTM/views/¹¤×ʹÜÀí/ºËË㷽ʽ/Gy_ClassTimePrjSubBillEdit.html
File was renamed from WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Add_Edit_Gy_ClassTimePrjSub.html
@@ -43,8 +43,9 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">所属组</label>
                                <div class="layui-input-inline">
                                    <input type="text" name="hparentName" id="hparentName" class="layui-input" value="" style="float:left;width:150px;">
                                    <input type="hidden" name="hparentid" id="hparentid" class="layui-input" value="" style="float:left;width:150px;">
                                    <input type="text" name="HEntryName" id="HEntryName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                    <input type="hidden" name="HEntryID" id="HEntryID" class="layui-input" value="" style="float:left;width:150px;">
                                    <input type="hidden" name="HInterID" id="HInterID" value="0">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="hparent-BT" style="width:40px;">
                                        <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
                                    </button>
@@ -67,19 +68,19 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">总金额</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HSumMoney" lay-verify="HSumMoney" id="HSumMoney" style="background-color:#efefef4d;" readonly>
                                    <input class="layui-input" name="HSumMoney" lay-verify="HSumMoney" id="HSumMoney" value="0" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">总基数</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HSumWorkTimes" lay-verify="HSumWorkTimes" id="HSumWorkTimes" style="background-color:#efefef4d;" readonly>
                                    <input class="layui-input" name="HSumWorkTimes" lay-verify="HSumWorkTimes" id="HSumWorkTimes" value="0" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">平均工资</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HOldRate" lay-verify="HOldRate" id="HOldRate" style="background-color:#efefef4d;" readonly>
                                    <input class="layui-input" name="HOldRate" lay-verify="HOldRate" id="HOldRate" value="0" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                        </div>
@@ -87,13 +88,13 @@
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">日平均工资</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HDayRate" lay-verify="HDayRate" id="HDayRate" style="background-color:#efefef4d;" readonly>
                                    <input class="layui-input" name="HDayRate" lay-verify="HDayRate" id="HDayRate" value="0" style="background-color:#efefef4d;" readonly>
                                </div>
                            </div>
                            <div class="layui-col-xs4 layui-inline">
                                <label class="layui-form-label">修正平均工资</label>
                                <div class="layui-input-inline">
                                    <input class="layui-input" name="HRate" lay-verify="HRate" id="HRate" >
                                    <input class="layui-input" name="HRate" lay-verify="HRate" value="0" id="HRate" >
                                </div>
                            </div>
                           
@@ -146,15 +147,15 @@
            }
            //判断操作类型
            if (OperationType == 1) {//无源单新增
                $("#HItemID").val(0);
                $("#HInterID").val(0);
            }
            else if (OperationType == 3) {//编辑
                $("#HItemID").val(linterid);//修改时主表ID
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
            }
            else if (OperationType == 4) {//浏览
                $("#HItemID").val(linterid);//
                $("#HInterID").val(linterid);//
                //编辑状态时,根据内码,获取信息并写入界面
                RoadBillMain(linterid);
                $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//保存后加载数据时保存按钮禁用
@@ -217,13 +218,11 @@
                            //    $("input[name='checkboxHStopflag'][value='" + IsHStopflag + "']").attr("checked", true);
                            //}
                            form.val("component-form-group", { //formTest å³ class="layui-form" æ‰€åœ¨å…ƒç´ å±žæ€§ lay-filter="" å¯¹åº”的值
                                "HItemID": data.HItemID
                                , "HName": data.HName
                                , "HNumber": data.月度核算记录代码
                                "HInterID": data.HInterID
                                , "HEntryID": data.HEntryID
                                , "HEntryName": data.月度核算记录名称
                                , "HYear": data.会计年份
                                , "HPeriod": data.会计月份
                                , "hparentName": data.组名称
                                , "hparentid": data.组代码
                                , "HSumMoney": data.总金额
                                , "HSumWorkTimes": data.总基数
                                , "HOldRate": data.平均工资
@@ -258,8 +257,8 @@
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { icon: 1 });
                            $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
                            //保存后浏览
                            //ReRoadBillMain();
                            var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                            parent.layer.close(index); //再执行关闭
                        }
                        else {
                            layer.alert(data.Message, { icon: 5 });
@@ -292,8 +291,8 @@
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        $("#hparentName").val(checkStatus.data[0].HName);
                        $("#hparentid").val(checkStatus.data[0].HItemID);
                        $("#HEntryName").val(checkStatus.data[0].HName);
                        $("#HEntryID").val(checkStatus.data[0].HItemID);
                        //$("#HDeptNumber").val(checkStatus.data[0].HNumber);
                        layer.close(index); //它获取的始终是最新弹出的某个层,值是由layer内部动态递增计算的
                    }
WebTM/views/¹¤×ʹÜÀí/ºËË㷽ʽ/Gy_ClassTimePrjSubBillList.html
File was renamed from WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_ClassTimePrjSub.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
    <title>核算记录设置</title>
    <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">
@@ -24,7 +24,7 @@
                        <div class="layui-collapse">
                            <div class="layui-colla-item">
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">月度核算记录代码</label>
                                    <label class="layui-form-label" style="width: 85px;">核算记录代码</label>
                                    <div class="layui-input-block" style="margin-left: 120px;">
                                        <input type="text" class="layui-input" name="HNumber" id="HNumber">
                                    </div>
@@ -45,6 +45,7 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>刷新</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>退出</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="get_AddGZD"><i class="layui-icon layui-icon-logout"></i>生成工资单</button>
                            </div>
                        </script>
                    </form>
@@ -103,6 +104,9 @@
                        break;
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break
                    //生成工资单
                    case 'get_AddGZD': get_AddGZD();
                        break;
                };
@@ -144,13 +148,14 @@
                    , cellMinWidth: 90
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                        , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
                        , { field: 'HParentID', title: 'HParentID', sort: true, hide: true }
                        , { field: '月度核算记录代码', title: '月度核算记录代码', width: 150 }
                        , { field: 'HInterID', title: 'HInterID', sort: true, hide: true }
                        , { field: 'HEntryID', title: 'HEntryID', sort: true, hide: true }
                        //, { field: '月度核算记录代码', title: '月度核算记录代码', width: 150 }
                        //, { field: '月度核算记录名称', title: '月度核算记录名称', width: 150 }
                        , { field: '会计年份', title: '会计年份',width: 120 }
                        , { field: '会计月份', title: '会计月份' }
                        , { field: '组代码', title: '组代码' }
                        , { field: '组名称', title: '组名称', width: 190 }
                        , { field: '组代码', title: '组代码', width: 150 }
                        , { field: '组名称', title: '组名称', width: 150 }
                        , { field: '总金额', title: '总金额' }
                        , { field: '总基数', title: '总基数' }
                        , { field: '平均工资', title: '平均工资' }
@@ -224,24 +229,26 @@
                    , area: ['100%', '100%']
                    , title: '核算记录-新增'
                    , shift: 0//弹出动画
                    , content: '../公用基础资料/Add_Edit_Gy_ClassTimePrjSub.html?OperationType=1&linterid=&HSouceBillType='
                    , content: '../核算方式/Gy_ClassTimePrjSubBillEdit.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#endregion
            //#region ç¼–辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var HInterID = data[0].HitemID;
                    var HInterID = data[0].HInterID;
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '核算记录-编辑'
                        , shift: 0//弹出动画
                        , content: '../公用基础资料/Add_Edit_Gy_ClassTimePrjSub.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
                        , content: '../核算方式/Gy_ClassTimePrjSubBillEdit.html?OperationType=3&linterid=' + HInterID + '&HSouceBillType='
                    })
                } else {
                    layer.msg('请选择一行数据编辑!');
@@ -254,7 +261,7 @@
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var ItemID = data[0].HItemID.toString();
                    var ItemID = data[0].HInterID.toString();
                    layer.confirm("确认要删除吗,删除后不能恢复", { title: "删除确认" }, function (index) {
                        var wait = layer.load();
                        //逻辑删除方法
@@ -290,7 +297,16 @@
            }
            //#endregion
            function get_AddGZD() {
                layer.open({
                    type: 2
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['100%', '100%']
                    , title: '核算记录-新增'
                    , shift: 0//弹出动画
                    , content: '../核算方式/Gy_ClassTimePrjSubBillEdit.html?OperationType=1&linterid=&HSouceBillType='
                })
            }
            //#region åˆ·æ–°
            function get_Refresh() {
                set_ClearQuery();
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html
@@ -369,7 +369,7 @@
        
            
            function  RoadBillMain(linterid)//加载表头-----不会走
            function  RoadBillMain(linterid)//加载表头
            {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -381,16 +381,16 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HWHID").val(d.data[0].HWhID);
                        $("#HStockPlaceID").val(d.data[0].HSPID);
                        $("#HKeeperID").val(d.data[0].HKeeperID);
                        $("#HSecManagerID").val(d.data[0].HSecManagerID);
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HStockPlaceID").val(d.data[0].HSPID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
                        RoadSup();
                    }
                })
            }
            function RoadSup()//根据源单类型及源单号 åŠ è½½å®¢æˆ·-----不会走
            function RoadSup()//根据源单类型及源单号 åŠ è½½å®¢æˆ·
            {
                //var sInterID = $("#HInterID").val()
                var HSourceBillNo = $('#HSourceBillNo').val()
@@ -426,48 +426,36 @@
                }
            }
            function RoadBillSub(linterid)//加载表体-----不会走
            function RoadBillSub(linterid)//加载表体
            {
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + 'SellOut/SellOutDetaiNew',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.list[0];
                            table.render(option);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index0);
                        layer.alert("接口请求失败!", { icon: 5 });
                var sInterID = $("#HInterID").val();
                table.render({
                    elem: '#wl-table'
                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
                    , toolbar: '#toolbarDemo'
                    , where: { HBillID: sInterID, HBillType: '1205', sWhere: '' }
                    , cols: [[
                        { type: 'radio' }
                        , { field: 'HQty', title: '数量', width: 150 }
                        , { field: 'HQtyMust', title: '应收数量', width: 150 }
                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                        , { field: 'HMaterName', title: '物料名称', width: 150 }
                        , { field: 'HMaterModel', title: '规格型号', width: 150 }
                        , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                        , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                        , { field: 'HBatchNo', title: '批次', width: 150 }
                    ]]
                    // , data: [linterid]
                    // , page: true
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                });
                //table.render({
                //    elem: '#wl-table'
                //    , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                //    , cellMinWidth: 80
                //    , toolbar: '#toolbarDemo'
                //    , where: { HBillID: linterid, HBillType: '1205', sWhere: '' }
                //    , cols: [[
                //        { type: 'radio' }
                //    , { field: 'HQty', title: '数量', width: 80 }
                //    , { field: 'HQtyMust', title: '应收数量', width: 80 }
                //    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                //    , { field: 'HMaterName', title: '物料名称', width: 100 }
                //    , { field: 'HMaterModel', title: '规格型号', width: 100 }
                //    , { field: 'HSourceInterID', title: '源单主内码', width: 100 }
                //    , { field: 'HSourceEntryID', title: '源单子内码', width: 100 }
                //    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                //    , { field: 'HBatchNo', title: '批次', width: 100 }
                //    , { field: 'HAuxPropID', title: '辅助属性', width: 100 }
                //    , { field: 'HMTONo', title: '计划跟踪号', width: 100 }
                //    ]]
                //    //, height: 500
                //})
            }
             
            //动态加载源单类型列表 new
WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_FastList.html
@@ -132,29 +132,51 @@
            })
        });
        form.on('submit(cmdRefresh)', function () {//编辑
            var sBillType = '1205'
        form.on('submit(cmdRefresh)', function () {//刷新
            table.render({
                elem: '#dj-table'
                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }),
                table.render({
                    elem: '#yd-table'
                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                    , toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                    , cols: [[
                          { type: 'radio' }
                        { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 80 }
                        , { field: 'HBillNo', title: '单据号', width: 80 }
                        , { field: 'HMaker', title: '制单人', width: 100 }
                        , { field: 'HMakeDate', title: '制单日期', width: 100 }
                        , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                        , { field: 'HMaterName', title: '物料名称', width: 100 }
                        , { field: 'HMaterModel', title: '规格型号', width: 100 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                        , { field: 'HOrgID', title: '组织', width: 100 }
                    ]]
                      , height: 500
                      , done: function () {
                          layer.closeAll("loading");
                      }
            });
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                })
        });
@@ -175,7 +197,7 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
@@ -199,75 +221,69 @@
        });
        form.on('submit(cmdDelete)', function () {//删除
            var checkStatus = table.checkStatus('dj-table')
            , data = checkStatus.data;
            // console.log(data);
            // var sInterID = $('#HInterID').val()
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            //var sMaterID = data[0].HMaterID
            //var sBillType = $('#HBillType').val()
            //var sAuxPropID = data[0].HAuxPropID
            ////var sMTONo = data[0].HMTONo
            //var sMTONo = 0
            //var sSourceInterID = data[0].HSourceInterID
            //var sSourceEntryID = data[0].HSourceEntryID
            $.ajax(
               {
                   type: "Get",
                   url: GetWEBURL() + "/Web/Delete_Json",
                   async: true,
                   data: { "sHInterID": sInterID },
                   dataType: "json",
                   success: function (data) {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                           layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                               // å¾—到frame索引
                               var index = layer.getFrameIndex(window.name);
                               //关闭当前frame
                               layer.close(index);
                               //修改为功后刷新界面
                               window.location.reload();
                       }
                       else {
                           layer.msg(data.Message, { icon: 2 });
                       }
                   },
                   error: function (err) {
                       layer.msg('错误' + err, {
                           icon: 5,
                           time: 20000
                       }, function () {
                           //do something
                       });
                   }
               });
                {
                    type: "Get",
                    url: GetWEBURL() + "/ProductInBillList/Delete_Json",
                    async: true,
                    data: { "sHInterID": sInterID },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†,
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        }
                        else {
                            layer.msg(data.Message, { icon: 2 });
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                });
        });
        
       
        
        var sBillType = '1205'
                table.render({
                    elem: '#dj-table'
                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                    , cols: [[
                          { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 80 }
                        , { field: 'HBillNo', title: '单据号', width: 80 }
                        , { field: 'HMaker', title: '制单人', width: 100 }
                        , { field: 'HMakeDate', title: '制单日期', width: 100 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                        ]]
                      , height: 500
                      , done: function () {
                          layer.closeAll("loading");
                      }
                })
        table.render({
            elem: '#dj-table'
            , url: GetWEBURL() + '/Web/chanpinruk'
            , toolbar: '#toolbarDemo'
            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            , cols: [[
                { type: 'radio' }
                , { field: 'HInterID', title: '单据内码', width: 80 }
                , { field: 'HBillNo', title: '单据号', width: 80 }
                , { field: 'HMaker', title: '制单人', width: 100 }
                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        })
        //已上传列表
        var
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html
@@ -293,24 +293,26 @@
        function RoadBillSub(linterid)//加载表体
        {
            $("#HInterID").val(linterid);//修改时主表ID
            //编辑加载数据
            var sInterID = $("#HInterID").val();
            table.render({
                elem: '#wl-table'
                , url: GetWEBURL() + '/MateOutBill/DisBillEntryList_Webs_New_Json'
                //, cellMinWidth: 80
                //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
                , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
                , toolbar: '#toolbarDemo'
                , where: { HBillID: linterid, HBillType: '1204', sWhere: '' }
                , where: { HBillID: sInterID, HBillType: '1204', sWhere: '' }
                , cols: [[
                  { type: 'radio' }
                , { field: 'HSNO', title: '序号', width: 60 }
                , { field: 'HQty', title: '数量', width: 80 }
                , { field: 'HQtyMust', title: '应收数量', width: 80 }
                , { field: 'HMaterName', title: '物料名称', width: 90 }
                , { field: 'HMaterNumber', title: '物料代码', width: 90 }
                , { field: 'HMaterModel', title: '规格型号', width: 90 }
                , { field: 'HSourceInterID', title: '源单主内码', width: 90 }
                , { field: 'HSourceEntryID', title: '源单子内码', width: 90 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 90 }
                , { field: 'HBatchNo', title: '批次', width: 90 }
                    { type: 'radio' }
                    , { field: 'HQty', title: '数量', width: 150 }
                    , { field: 'HQtyMust', title: '应发数量', width: 150 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                    , { field: 'HMaterName', title: '物料名称', width: 150 }
                    , { field: 'HMaterModel', title: '规格型号', width: 150 }
                    , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                    , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                    , { field: 'HBatchNo', title: '批次', width: 150 }
                ]]
                // , data: [linterid]
                // , page: true
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_FastList.html
@@ -67,6 +67,9 @@
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRefresh">刷新</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdRescind">撤销</button>
                                </div>
                                <div class="layui-col-xs2">
                                    <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">退出</button>
                                </div>
                                <div class="layui-col-xs2">
@@ -129,115 +132,184 @@
            })
        });
        form.on('submit(cmdRefresh)', function () {//编辑
            var sBillType = '1204'
        form.on('submit(cmdRefresh)', function () {//刷新
            table.render({
                elem: '#dj-table'
                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                , url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }),
                table.render({
                    elem: '#yd-table'
                    , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                    , toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                    , cols: [[
                          { type: 'radio' }
                        { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 80 }
                        , { field: 'HBillNo', title: '单据号', width: 80 }
                        , { field: 'HMaker', title: '制单人', width: 100 }
                        , { field: 'HMakeDate', title: '制单日期', width: 100 }
                        , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                        , { field: 'HMaterName', title: '物料名称', width: 100 }
                        , { field: 'HMaterModel', title: '规格型号', width: 100 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                        , { field: 'HOrgID', title: '组织', width: 100 }
                    ]]
                      , height: 500
                      , done: function () {
                          layer.closeAll("loading");
                      }
            });
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                })
        });
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1204'
            $.ajax(
                {
                    type: "Get",
                    url: GetWEBURL() + "/Web/Rescind_Json",
                    async: true,
                    data: { "sHInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        }
                        else {
                            layer.msg(data.Message, { icon: 2 });
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                });
        });
        form.on('submit(cmdDelete)', function () {//删除
            var checkStatus = table.checkStatus('dj-table')
            , data = checkStatus.data;
            // console.log(data);
            // var sInterID = $('#HInterID').val()
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            //var sMaterID = data[0].HMaterID
            //var sBillType = $('#HBillType').val()
            //var sAuxPropID = data[0].HAuxPropID
            ////var sMTONo = data[0].HMTONo
            //var sMTONo = 0
            //var sSourceInterID = data[0].HSourceInterID
            //var sSourceEntryID = data[0].HSourceEntryID
            $.ajax(
               {
                   type: "Get",
                   url: GetWEBURL() + "/Web/Delete_Json",
                   async: true,
                   data: { "sHInterID": sInterID },
                   dataType: "json",
                   success: function (data) {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                           //layer.msg(data.Message, { icon: 1 });
                           table.render({
                               elem: '#dj-table'
                               , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                               , cellMinWidth: 80
                               , toolbar: '#toolbarDemo'
                               , where: { HBillType: '1204', sWhere: '' }
                               , cols: [[
                                   { type: 'radio' }
                                , { field: 'HInterID', title: '单据内码', width: 80 }
                                , { field: 'HBillNo', title: '单据号', width: 80 }
                                , { field: 'HMaker', title: '制单人', width: 100 }
                                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                                , { field: 'HQty', title: '数量', width: 100 }
                                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                                , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                               ]]
                         , height: 500
                           })
                       }
                       else {
                           layer.msg(data.Message, { icon: 2 });
                       }
                   },
                   error: function (err) {
                       layer.msg('错误' + err, {
                           icon: 5,
                           time: 20000
                       }, function () {
                           //do something
                       });
                   }
               });
                {
                    type: "Get",
                    url: GetWEBURL() + "/ProductInBillList/Delete_Json",
                    async: true,
                    data: { "sHInterID": sInterID },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†,
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            });
                        }
                        else {
                            layer.msg(data.Message, { icon: 2 });
                        }
                    },
                    error: function (err) {
                        layer.msg('错误' + err, {
                            icon: 5,
                            time: 20000
                        }, function () {
                            //do something
                        });
                    }
                });
        });
        
       
        
        var sBillType = '1204'
                table.render({
                    elem: '#dj-table'
                    , url: GetWEBURL() + '/Web/DisBillEntryList_Mate_Webs_Json'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                    , cols: [[
                          { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 80 }
                        , { field: 'HBillNo', title: '单据号', width: 80 }
                        , { field: 'HMaker', title: '制单人', width: 100 }
                        , { field: 'HMakeDate', title: '制单日期', width: 100 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                        ]]
                      , height: 500
                      , done: function () {
                          layer.closeAll("loading");
                      }
    })
        table.render({
            elem: '#dj-table'
            , url: GetWEBURL() + '/Web/chanpinruk'
            , toolbar: '#toolbarDemo'
            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            , cols: [[
                { type: 'radio' }
                , { field: 'HInterID', title: '单据内码', width: 80 }
                , { field: 'HBillNo', title: '单据号', width: 80 }
                , { field: 'HMaker', title: '制单人', width: 100 }
                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        })
        //已上传列表
        table.render({
            elem: '#yd-table'
            , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
            , toolbar: '#toolbarDemo'
            , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            , cols: [[
                { type: 'radio' }
                , { field: 'HInterID', title: '单据内码', width: 80 }
                , { field: 'HBillNo', title: '单据号', width: 80 }
                , { field: 'HMaker', title: '制单人', width: 100 }
                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                , { field: 'HMaterName', title: '物料名称', width: 100 }
                , { field: 'HMaterModel', title: '规格型号', width: 100 }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                , { field: 'HOrgID', title: '组织', width: 100 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        })
        //刷新明细页签
        table.render({
            elem: '#mx-table'
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html
@@ -339,10 +339,10 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HWHID").val(d.data[0].HWhID);
                        $("#HStockPlaceID").val(d.data[0].HSPID);
                        $("#HKeeperID").val(d.data[0].HKeeperID);
                        $("#HSecManagerID").val(d.data[0].HSecManagerID);
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HStockPlaceID").val(d.data[0].HSPID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
                        //$("#HSecManagerID").val(d.data[0].HSecManagerID);
                    }
                })
            }
@@ -352,20 +352,30 @@
            {
                $("#HInterID").val(linterid);//修改时主表ID
                //编辑加载数据
                $.ajax({
                    url: GetWEBURL() + 'ProdIn/ProdInDetaiNew',
                    type: "GET",
                    data: { "HInterID": linterid },
                    success: function (result) {
                        if (result.count == 1) {
                            option.data = result.list[0];
                            table.render(option);
                        } else {
                            layer.alert(result.code + result.Message, { icon: 5 });
                        }
                    }, error: function () {
                        layer.close(index0);
                        layer.alert("接口请求失败!", { icon: 5 });
                var sInterID = $("#HInterID").val();
                table.render({
                    elem: '#wl-table'
                    //, url: 'http://61.130.49.162:9090/WMSAPI///ProductIn/DisBillEntryList_Webs_Json'
                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Webs_Json'
                    , toolbar: '#toolbarDemo'
                    , where: { HBillID: sInterID, HBillType: '1202', sWhere: '' }
                    , cols: [[
                          { type: 'radio' }
                        , { field: 'HQty', title: '数量', width: 150 }
                        , { field: 'HQtyMust', title: '应收数量', width: 150 }
                        , { field: 'HMaterNumber', title: '物料代码', width: 150 }
                        , { field: 'HMaterName', title: '物料名称', width: 150 }
                        , { field: 'HMaterModel', title: '规格型号', width: 150 }
                        , { field: 'HSourceInterID', title: '源单主内码', width: 150 }
                        , { field: 'HSourceEntryID', title: '源单子内码', width: 150 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 150 }
                        , { field: 'HBatchNo', title: '批次', width: 150 }
                    ]]
                    // , data: [linterid]
                    // , page: true
                    , height: 500
                    , done: function () {
                        layer.closeAll("loading");
                    }
                });
            }
WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_FastList.html
@@ -93,11 +93,11 @@
        index: 'lib/index' //主入口模块
    }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
        var $ = layui.$
        , admin = layui.admin
        , layer = layui.layer
        , table = layui.table
        , form = layui.form
        , element = layui.element;
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
        //清空界面  new
        //动态加载源单类型列表 new
@@ -137,8 +137,45 @@
        form.on('submit(cmdModify)', function () {
            //var checkStatus = table.checkStatus('dj-table')
            //    , data = checkStatus.data;
            //var sInterID = data[0].HInterID
            //var sBillNo = data[0].HBillNo
            //var sBillType = '1202'
            //$.ajax({
            //    url: GetWEBURL() + "/ProductIn/ProductInTempList_Modify",
            //    type: "GET",
            //    data: { "sInterID": sInterID, "sBillNo": sBillNo, "sBillType": sBillType },
            //    success: function (result) {
            //        if (result.count == 1) {
            //            layer.open({
            //                type: 2
            //                , area: ['100%', '100%']
            //                , title: '产品入库单'
            //                , shade: 0.6 //遮罩透明度
            //                , maxmin: false //允许全屏最小化
            //                , anim: 0 //0-6的动画形式,-1不开启
            //                , content: ['../../验收入库/产品入库/Kf_ProductInBill_Fast.html?linterid=' + data[0].HInterID, 'yes']
            //                // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + JSON.stringify(data), 'yes']
            //                // , content: ['../../views/WarM/KF_POInStockBill.html?linterid=' + rows, 'yes']
            //                , resize: false
            //                , cancel: function () {
            //                    $(".layui-btn").removeClass("layui-btn-disabled");
            //                }
            //            })
            //        }
            //        else {
            //            layer.msg(result.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
            //        }
            //    }
            //        })
            //      }
            ////ajaxLabelData = data;
            ////layer.alert(rows);
            var checkStatus = table.checkStatus('dj-table')
                     , data = checkStatus.data;
                , data = checkStatus.data;
            //ajaxLabelData = data;
            //layer.alert(rows);
            layer.open({
@@ -157,30 +194,73 @@
                }
            })
        });
        var option = {
            elem: '#dj-table'
            //, url: GetWEBURL() + '/ProductIn/DisBillEntryList_Json'
            , toolbar: '#toolbarDemo'
            , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
            , cols: [[
                { type: 'radio' }
                , { field: 'HInterID', title: '单据内码', width: 80 }
                , { field: 'HBillNo', title: '单据号', width: 80 }
                , { field: 'HMaker', title: '制单人', width: 100 }
                , { field: 'HMakeDate', title: '制单日期', width: 100 }
                , { field: 'HQty', title: '数量', width: 100 }
                , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                , { field: 'HSourceBillType', title: '源单类型', width: 100 }
            ]]
            , height: 500
            , done: function () {
                layer.closeAll("loading");
            }
        }
        // url: GetWEBURL() + '/Web/chanpinruk',
        form.on('submit(cmdRefresh)', function () {//刷新
            var sBillType = '1202'
            table.render({
                elem: '#dj-table'
                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Mate_Webs_Json'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                    , cols: [[
                          { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 80 }
                        , { field: 'HBillNo', title: '单据号', width: 80 }
                        , { field: 'HMaker', title: '制单人', width: 100 }
                        , { field: 'HMakeDate', title: '制单日期', width: 100 }
                        , { field: 'HQty', title: '数量', width: 100 }
                        , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                        , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                        , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                    ]]
                      , height: 500
                      , done: function () {
                          layer.closeAll("loading");
                      }
            });
                ,url: GetWEBURL() + '/Web/chanpinruk'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HRedBlueFlag', title: '红蓝字', width: 100 }
                    , { field: 'HSourceBillType', title: '源单类型', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            }),
            table.render({
                elem: '#yd-table'
                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }
                    , { field: 'HMakeDate', title: '制单日期', width: 100 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 100 }
                    , { field: 'HMaterName', title: '物料名称', width: 100 }
                    , { field: 'HMaterModel', title: '规格型号', width: 100 }
                    , { field: 'HQty', title: '数量', width: 100 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 100 }
                    , { field: 'HOrgID', title: '组织', width: 100 }
                ]]
                , height: 500
                , done: function () {
                    layer.closeAll("loading");
                }
            })
        });
@@ -190,7 +270,7 @@
                , data = checkStatus.data;
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1205'
            var sBillType = '1202'
            $.ajax(
                {
                    type: "Get",
@@ -200,14 +280,15 @@
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                            layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                                // å¾—到frame索引
                                var index = layer.getFrameIndex(window.name);
                                //关闭当前frame
                                layer.close(index);
                                //修改为功后刷新界面
                                window.location.reload();
                            }
                            });
                        }
                       else {
                            layer.msg(data.Message, { icon: 2 });
                        }
@@ -229,16 +310,7 @@
        form.on('submit(cmdDelete)', function () {//删除
            var checkStatus = table.checkStatus('dj-table')
            , data = checkStatus.data;
            // console.log(data);
            // var sInterID = $('#HInterID').val()
            var sInterID = data[0].HInterID
            //var sMaterID = data[0].HMaterID
            //var sBillType = $('#HBillType').val()
            //var sAuxPropID = data[0].HAuxPropID
            ////var sMTONo = data[0].HMTONo
            //var sMTONo = 0
            //var sSourceInterID = data[0].HSourceInterID
            //var sSourceEntryID = data[0].HSourceEntryID
            $.ajax(
               {
                   type: "Get",
@@ -247,14 +319,15 @@
                   data: { "sHInterID": sInterID },
                   dataType: "json",
                   success: function (data) {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                           layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
                       if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†,
                           layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
                               // å¾—到frame索引
                               var index = layer.getFrameIndex(window.name);
                               //关闭当前frame
                               layer.close(index);
                               //修改为功后刷新界面
                               window.location.reload();
                           });
                       }
                       else {
                           layer.msg(data.Message, { icon: 2 });
@@ -276,9 +349,9 @@
        var sBillType = '1202'
                table.render({
                    elem: '#dj-table'
                    , url: GetWEBURL() + '/ProductIn/DisBillEntryList_Mate_Webs_Json'
                    , url: GetWEBURL() + '/Web/chanpinruk'
                    ,toolbar: '#toolbarDemo'
                    , where: { HBillType: sBillType,sWhere:''}
                    , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"]}
                    , cols: [[
                          { type: 'radio' }
                        , { field: 'HInterID', title: '单据内码', width: 80 }
@@ -298,14 +371,13 @@
        //已上传列表
        var
            table.render({
                elem: '#yd-table'
                , url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
                , toolbar: '#toolbarDemo'
                , where: { HBillType: sBillType, HMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
                , cols: [[
                    { type: 'radio' }
                      { type: 'radio' }
                    , { field: 'HInterID', title: '单据内码', width: 80 }
                    , { field: 'HBillNo', title: '单据号', width: 80 }
                    , { field: 'HMaker', title: '制单人', width: 100 }