1.工程项目的编辑页面，增加 工程信息 页签； 页签里 增加字段 项目类别HProjectClassID，状态，建设单位HBuildComp，地点HB...

zrg

2024-04-22 06ea27bce6337d9ca08ad4ebb447988079b91d86

1.工程项目的编辑页面，增加 工程信息 页签； 页签里 增加字段 项目类别HProjectClassID，状态，建设单位HBuildComp，地点HBuildAddress，任务编号HWorkNo，受理日期HReDate，图纸编号HPicNo，任务下达HWorkTask，项目内容HProjectNote ；
2.仓储流程的测试并完善功能； 分步式调出单-》分布式调入单 直接调拨单 （注意： 源单类型的下拉框 需要 根据数据库 表动态加载， 关联数量 要准确 ， 审核 且 未关闭 未行关闭的行 才能下推 ，关联数量超额后，要 反写 关闭 源单 ）

 WebTM/WebTM.csproj

@@ -293,8 +293,8 @@
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill_KaiBei.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBill.html" />
    <Content Include="views\品质管理\客诉处理\Crm_CustomerAppealBillList.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Add_Edit_Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_PoStockStyle.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_CusType.html" />
@@ -312,8 +312,8 @@
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectMethod.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_InspectValue.html" />
    <Content Include="views\基础资料\公用基础资料\Add_Edit_Gy_TemporaryArea.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_TaskClass.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_ProjectClass.html" />
    <Content Include="views\项目管理\基础建模\Gy_TaskClass.html" />
    <Content Include="views\项目管理\基础建模\Gy_ProjectClass.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_InspectBasis.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_AreaSet.html" />
    <Content Include="views\基础资料\公用基础资料\Gy_CusType.html" />

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Add_Edit_Kf_MoveStockBill.html

@@ -353,6 +353,8 @@
            var shijian = year + "-" + month + "-" + day;

            var allVal;
            //双击返回全局变量
            window.OptionData = {};
            //#endregion


@@ -1566,7 +1568,7 @@
                                    "HPrice": checkStatus.data[j].单价, "HMoney": checkStatus.data[j].金额, "HWHID": checkStatus.data[j].HWHID, "调入仓库": checkStatus.data[j].调入仓库, "HSCWHID": checkStatus.data[j].HSCWHID, "调出仓库": checkStatus.data[j].调出仓库,
                                    "HPOOrderInterID": checkStatus.data[j].HPOOrderInterID, "HPOOrderEntryID": checkStatus.data[j].HPOOrderEntryID, "HPOOrderBillNo": checkStatus.data[j].采购订单号,
                                    "HSeOrderInterID": checkStatus.data[j].HSeOrderInterID, "HSeOrderEntryID": checkStatus.data[j].HSeOrderEntryID, "HSeOrderBillNo": checkStatus.data[j].销售订单号,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillSubType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                })
                                j++;
                            }

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBillList.html

@@ -492,7 +492,7 @@
                    layer.confirm("确认要删除吗，删除后不能恢复", { title: "删除确认" }, function (index) {
                        $.ajax({
                            type: "GET",
                            url: GetWEBURL() + "Kf_OtherOutBill/DelteteGetOtherOutBill", //方法所在页面和方法名
                            url: GetWEBURL() + "Kf_MoveStockBill/DelteteGetMoveStockBill", //方法所在页面和方法名
                            data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
                            success: function (result) {
                                if (result.count == 1) {

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillEdit.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">
@@ -297,6 +297,8 @@
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            var allVal;
            //双击返回全局变量
            window.OptionData = {};
            //#endregion

        //#region ã€åŠ¨æ€èŽ·å–模块名称】
@@ -790,7 +792,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=Warehouse', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -825,7 +827,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=HWHSub', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1201,10 +1203,14 @@
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
        //双击返回调入仓库
        function GetGyWarehouse(data) {
            OptionData = data[0]
        }
        //双击返回调出仓库
        function GetHWHSubValue(data) {
            OptionData = data[0]
        }
    </script>
</body>
</html>

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockRequestBillList.html

@@ -251,6 +251,7 @@
                    , cols: [[
                         { type: 'checkbox', fixed: 'left', totalRowText: '合计' }
                        , { field: 'hmainid', title: '单据ID', hide: true, sort: true }
                        , { field: 'HBillSubType', title: '单据类型', hide: true, sort: true }
                        , { field: '日期', title: '日期', width: 160, sort: true }
                        , { field: '单据号', title: '单据号', width: 160, sort: true }
                        , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true, sort: true }
@@ -362,6 +363,37 @@
                });
            }

            //编辑
            function set_ShowBill() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1) {
                    var hID = data[0].hmainid.toString();
                    //if (AllowLoadData(sSubStr) != false) {//非空验证
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑直接调拨单'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: './Kf_MoveStockRequestBillEdit.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
                        , resize: false,
                        end: function () {
                            //刷新页面,
                            location.reload();
                        }
                        , cancel: function () {
                            //$(".layui-btn").removeClass("layui-btn-disabled");
                        }
                    })

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

            //删除
            function set_DeleteBill() {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/²Ö´æ¹ÜÀí/·Ö²½Ê½µ÷Èëµ¥/Fb_StepFoldinBillEdit.html

@@ -310,6 +310,8 @@
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            var allVal;
            //双击返回全局变量
            window.OptionData = {};
            //#endregion


@@ -848,7 +850,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=Warehouse', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -883,7 +885,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=HWHSub', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -988,7 +990,7 @@
                                , "HSecManagerName": data.验收
                                , "HKeeperID": data.HKeeperID
                                , "HKeeperName": data.保管员
                                , "HSourceBillType": data.源单类型
                                , "HSourceBillType": data.单据类型
                            });


@@ -999,7 +1001,7 @@
                                    "HUnitID": checkStatus.data[j].HUnitID, "计量单位": checkStatus.data[j].计量单位, "HQtyMust": checkStatus.data[j].应收数量,
                                    "HQty": checkStatus.data[j].实收数量, "HPrice": checkStatus.data[j].单价, "HBatchNo": checkStatus.data[j].批次, "HRemark": checkStatus.data[j].表体备注,
                                    "HMoney": checkStatus.data[j].金额, "HOrderPrice": checkStatus.data[j].采购金额, "HWHID": checkStatus.data[j].HWHID, "调入仓库": checkStatus.data[j].调入仓库, "HSCWHID": checkStatus.data[j].HSCWHID, "调出仓库": checkStatus.data[j].调出仓库,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                    "HSourceBillNo": checkStatus.data[j].单据号, "HSourceBillType": checkStatus.data[j].单据类型, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
                                })
                                j++;
                            }
@@ -1332,10 +1334,14 @@
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
        //双击返回调入仓库
        function GetGyWarehouse(data) {
            OptionData = data[0]
        }
        //双击返回调出仓库
        function GetHWHSubValue(data) {
            OptionData = data[0]
        }
    </script>
</body>
</html>

 WebTM/views/ÏîÄ¿¹ÜÀí/»ù´¡½¨Ä£/Add_Edit_Gy_ProjectClass.html

 WebTM/views/ÏîÄ¿¹ÜÀí/»ù´¡½¨Ä£/Add_Edit_Gy_TaskClass.html

 WebTM/views/ÏîÄ¿¹ÜÀí/»ù´¡½¨Ä£/Gy_ProjectClass.html

File was renamed from WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_ProjectClass.html
@@ -362,12 +362,12 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增地区',
                    title: '新增项目类别',
                    closeBtn: 1,
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../公用基础资料/Add_Edit_Gy_ProjectClass.html?OperationType=1&linterid=&HSouceBillType=',
                    content: '../基础建模/Add_Edit_Gy_ProjectClass.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
@@ -386,11 +386,11 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑地区'
                        , title: '编辑项目类别'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_ProjectClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , content: '../基础建模/Add_Edit_Gy_ProjectClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,
@@ -443,6 +443,17 @@
            }
            //#endregion

            //#region åŒå‡»è¿”回数据
            table.on('rowDouble(mainTable)', function (obj) {
                var data = [];
                data.push(obj.data);
                parent.GetProjectClassValue(data);
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });

            //#endregion

            //#region åå®¡æ ¸/审核数据
            function set_CheckBill(num) {
                var checkStatus = table.checkStatus('mainTable')

 WebTM/views/ÏîÄ¿¹ÜÀí/»ù´¡½¨Ä£/Gy_TaskClass.html

File was renamed from WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_TaskClass.html
@@ -362,12 +362,12 @@
                layer.open({
                    type: 2,
                    skin: 'layui-layer-rim', //加上边框
                    title: '新增地区',
                    title: '新增任务类别',
                    closeBtn: 1,
                    shift: 2,
                    area: ['100%', '100%'],
                    maxmin: true,
                    content: '../公用基础资料/Add_Edit_Gy_TaskClass.html?OperationType=1&linterid=&HSouceBillType=',
                    content: '../基础建模/Add_Edit_Gy_TaskClass.html?OperationType=1&linterid=&HSouceBillType=',
                    end: function () {
                        //刷新页面,
                        location.reload();
@@ -386,11 +386,11 @@
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '编辑地区'
                        , title: '编辑任务类别'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../公用基础资料/Add_Edit_Gy_TaskClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , content: '../基础建模/Add_Edit_Gy_TaskClass.html?OperationType=3&linterid=' + hID + '&HSouceBillType='
                        , resize: false,
                        end: function () {
                            //刷新页面,

 WebTM/views/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBill.html

@@ -69,6 +69,7 @@
                        <h1 style="text-align: center; padding: 10px 0;"><b>工程项目</b></h1>
                        <ul class="layui-tab-title" lay-filter="tab-all">
                            <li lay-id="1" style="padding:1px;" class="layui-this">基本信息</li>
                            <li lay-id="2" style="padding:1px;">工程信息</li>
                            <li lay-id="2" style="padding:1px;">其他信息</li>
                        </ul>
                        <div class="layui-tab-content">
@@ -265,6 +266,73 @@
                                            </div>
                                        </div>
                                    </div>
                                </div>
                            </div>
                            <!--工程信息-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item">
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">项目类别</label>
                                            <div class="layui-input-block" style="margin-left: 77px;">
                                                <input type="text" class="layui-input" lay-verify="HProjectClassName" name="HProjectClassName" id="HProjectClassName" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                                <input type="hidden" name="HProjectClassID" id="HProjectClassID" lay-verify="HProjectClassID" value="0">
                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchHProjectClass" id="btnSearchHProjectClass" style="padding: 0 10px;float: right;margin-right: 3px;">
                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                                </button>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">建设单位</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HBuildComp" name="HBuildComp" id="HBuildComp">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">地点</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HBuildAddress" name="HBuildAddress" id="HBuildAddress">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">任务编号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HWorkNo" name="HWorkNo" id="HWorkNo">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">受理日期</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width:180px;">
                                                <input type="date" class="layui-input" lay-verify="HReDate" name="HReDate" id="HReDate" style="padding-left: 80px;">
                                            </div>
                                           
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">图纸编号</label>
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" lay-verify="HPicNo" name="HPicNo" id="HPicNo">
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">任务下达</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width:815px;">
                                                <textarea class="layui-textarea" name="HWorkTask" id="HWorkTask" lay-verify="HWorkTask" style="height:100px"></textarea>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-inline">
                                            <label class="layui-form-label" style="width: 85px;">项目内容</label>
                                            <div class="layui-input-block" style="margin-left: 120px; width:815px;">
                                                <textarea class="layui-textarea" name="HProjectNote" id="HProjectNote" lay-verify="HProjectNote" style="height:100px"></textarea>
                                            </div>
                                        </div>
                                    </div>

                                </div>
                            </div>
                            <!--其他信息-->
@@ -501,6 +569,7 @@
                $("#HBeginDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
                $("#HReDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化项目阶段表
                get_InitGrid1();
            }
@@ -580,6 +649,14 @@
            form.on('submit(btnSearchHPayCus)', function () {
                CusType = 2;
                get_checkSearchHPayCus();
            });
            //#endregion

            //#region é€‰æ‹©é¡¹ç›®ç±»åˆ«æŒ‰é’®
            form.on('submit(btnSearchHProjectClass)', function () {
                get_checkSearchHProjectClass();


            });
            //#endregion

@@ -1226,6 +1303,34 @@
            }
            //#endregion

            //#region é¡¹ç›®ç±»åˆ«é€‰æ‹©é¡µé¢
            function get_checkSearchHProjectClass() {
                layer.open({
                    type: 2//弹窗类型
                    , skin: 'layui-layer-rim' //加上边框
                    , area: ['90%', '90%']//大小
                    , title: '项目类别表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_ProjectClass.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('请选择数据');
                        }
                        //获取数据
                        $("#HProjectClassID").val(checkStatus.data[0].HItemID);//项目类别id
                        $("#HProjectClassName").val(checkStatus.data[0].项目类别名称);//项目类别名称
                        
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                    , end: function () { }
                })
            }
            //#endregion

            //#region ç»“算方选择页面
            function get_checkSearchHPayCus() {
                var HOrgID = $("#HOrgID").val();
@@ -1452,6 +1557,15 @@
                            , "HProType": tableMain[0]["HProType"]
                            , "HRemark": tableMain[0]["HRemark"]
                            , "HOrgID": tableMain[0]["HOrgID"]
                            , "HProjectClassID": tableMain[0]["HProjectClassID"]
                            , "HProjectClassName": tableMain[0]["HProjectClassName"]
                            , "HBuildComp": tableMain[0]["HBuildComp"]
                            , "HBuildAddress": tableMain[0]["HBuildAddress"]
                            , "HWorkNo": tableMain[0]["HWorkNo"]
                            , "HReDate": tableMain[0]["HReDate"]
                            , "HPicNo": tableMain[0]["HPicNo"]
                            , "HWorkTask": tableMain[0]["HWorkTask"]
                            , "HProjectNote": tableMain[0]["HProjectNote"]
                            , "HMaker": tableMain[0]["HMaker"]
                            , "HUpdater": tableMain[0]["HUpdater"]
                            , "HChecker": tableMain[0]["HChecker"]
@@ -2448,6 +2562,11 @@
            $("#HPMEmpID").val(obj[0].HItemID);//客户id
            $("#HPMEmpName").val(obj[0].职员名称);//客户名称
        }
        //项目类别
        function GetProjectClassValue(obj) {
            $("#HProjectClassID").val(obj[0].HItemID);//项目类别id
            $("#HProjectClassName").val(obj[0].项目类别名称);//项目类别名称
        }
        //实施担当
        function GetHWorkerValue(obj) {
            $("#HWorkEmpID").val(obj[0].HItemID);//员工id

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillEdit.html

@@ -296,6 +296,8 @@
            var year = date.getFullYear();
            var shijian = year + "-" + month + "-" + day;
            var allVal;
            //双击返回全局变量
            window.OptionData = {};
            //#endregion


@@ -800,7 +802,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=Warehouse', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -818,11 +820,11 @@
                                    layer.close(index);//关闭弹窗
                                }
                             , end: function () {
                                obj.update({
                                    "HWHID": OptionData.HItemID
                                    , "调入仓库": OptionData.仓库名称
                                })
                            }
                                    obj.update({
                                        "HWHID": OptionData.HItemID
                                        , "调入仓库": OptionData.仓库名称
                                    })
                                }
                            })
                        }
                        //调出仓库
@@ -835,7 +837,7 @@
                                , shift: 2 //弹出动画
                                , area: ["90%", "90%"] //窗体大小
                                , maxmin: true //设置最大最小按钮是否显示
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html', 'yes']
                                , content: ['../../基础资料/公用基础资料/Gy_Warehouse.html?type=HWHSub', 'yes']
                                , btn: ["确定", "取消"]
                                , btn1: function (index, laero) {
                                    //按钮一  çš„回调
@@ -1139,10 +1141,14 @@
             OptionData = data
         }

           //双击返回收料仓库
         function GetGyWarehouse(data) {
             OptionData = data
         } 
           //双击返回调入仓库
        function GetGyWarehouse(data) {
             OptionData = data[0]
        }
        //双击返回调出仓库
        function GetHWHSubValue(data) {
            OptionData = data[0]
        }
    </script>
</body>
</html>

 WebTM/views/ÁìÁÏ·¢»õ/·Ö²½Ê½µ÷³öµ¥/Fb_StepFoldOutBillList.html

@@ -322,6 +322,7 @@
                        , { field: '作废人', title: '作废人', width: 125, sort: true }
                        , { field: '作废日期', title: '作废日期', width: 200, templet: "<div>{{d.作废日期 ==null ?'':layui.util.toDateString(d.作废日期, 'yyyy-MM-dd HH:mm:ss')}}</div>", sort: true }
                        , { field: '行关闭人', title: '行关闭人', width: 125, sort: true }
                        , { field: '行关闭日期', title: '行关闭日期', width: 120, templet: "<div>{{d.行关闭日期 ==null || d.行关闭日期=='' ?'':layui.util.toDateString(d.行关闭日期, 'yyyy-MM-dd')}}</div>", sort: true }
                        , { field: '关闭类型', title: '关闭类型', width: 125, sort: true }
                        , { field: '源单主内码', title: '源单主内码', width: 200, hide: true, sort: true }
                        , { field: '源单子内码', title: '源单子内码', width: 200, hide: true, sort: true }