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

ch

2022-07-07 0c5d279d7e87f0bfff4408dde8ef53667c31e8c7

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

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

@@ -102,7 +102,7 @@
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">主管</label>
                                            <label class="layui-form-label">职员</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
                                                <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
@@ -113,27 +113,27 @@
                                        </div>
                                    </div>
                                    <!--<div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">源单类型</label>
                                            <div class="layui-input-inline">
                                                <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
                                                    <option value="产品入库单">产品入库单</option>
                                                    <option value="产品入库单(红单)">产品入库单(红单)</option>
                                                    <option value="调拨单">调拨单</option>
                                                    <option value="生产任务单">生产任务单</option>
                                                    <option value="工序汇报单">工序汇报单</option>
                                                    <option value="生产汇报单">生产汇报单</option>
                                                    <option value="手工录入">手工录入</option>
                                                </select>
                                            </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="Box2" id="Box2" autocomplete="off">
                                            </div>
                                        </div>
                                    </div>-->
        <div class="layui-col-xs4 layui-inline">
            <label class="layui-form-label">源单类型</label>
            <div class="layui-input-inline">
                <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
                    <option value="产品入库单">产品入库单</option>
                    <option value="产品入库单(红单)">产品入库单(红单)</option>
                    <option value="调拨单">调拨单</option>
                    <option value="生产任务单">生产任务单</option>
                    <option value="工序汇报单">工序汇报单</option>
                    <option value="生产汇报单">生产汇报单</option>
                    <option value="手工录入">手工录入</option>
                </select>
            </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="Box2" id="Box2" autocomplete="off">
            </div>
        </div>
    </div>-->
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">工资类型</label>
@@ -157,6 +157,15 @@
                                                <textarea placeholder="请输入维备注" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
                                            </div>
                                        </div>
                                    </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4 layui-inline">
                                            <label class="layui-form-label">总金额</label>
                                            <div class="layui-input-inline">
                                                <input type="text" name="HSumMoney" id="HSumMoney" readonly class="layui-input" value="" style="float:left;width:150px;">
                                            </div>
                                        </div>
                                        
                                    </div>
                                </div>
                                <!--制单信息-->
@@ -722,6 +731,7 @@
                                , "HCloseDate": data.关闭日期
                                , "HUpDateDate": data.修改日期
                                , "HDeleteDate": data.作废日期
                                , "HSumMoney": data.总金额
                            });

                        } else {

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

@@ -159,6 +159,7 @@
                        , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
                        , { field: 'HEmpNumber', title: '职员代码', width: 180 }
                        , { field: 'HEmpName', title: '职员', width: 125 }
                        , { field: '总金额', title: '总金额', width: 125 }
                        , { field: 'HPayID', title: 'HPayID', width: 200, hide: true }
                        //, { field: '工资代码', title: '工资代码', width: 180 }
                        , { field: '工资类型', title: '工资类型', width: 125 }