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

zzr99

2021-12-17 48b564781aa3d20e0d644b5d026067fd8bfc8c99

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

 WebTM/views/index.html

@@ -304,14 +304,14 @@
                                    </dl>
                                </dd>
                                <dd>
                                    <a>汇报管理</a>
                                    <a>汇报管理(工序)</a>
                                    <dl class="layui-nav-child">
                                        <dd><a lay-href="生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html">生产汇报单</a></dd>
                                        <dd><a lay-href="生产管理/生产汇报单/Sc_ICMOReportBillList.html">生产汇报单维护</a></dd>
                                        <dd><a lay-href="">产量汇报单null</a></dd>
                                        <dd><a lay-href="生产管理/产量汇报单/Sc_ProductReportBillList_Web.html">产量汇报单维护</a></dd>
                                        <dd><a lay-href="生产管理/质量汇报单/Sc_QualityReportBill.html">质量汇报单</a></dd>
                                        <dd><a lay-href="生产管理/质量汇报单/Sc_QualityReportBillList.html">质量汇报单维护</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/产量汇报/Sc_ProductReportStepBillList_Web.html">产量汇报单维护</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/不良采集/Sc_QualityReportStepBill.html">质量汇报单</a></dd>
                                        <dd><a lay-href="生产管理/报工台工序/不良采集/Sc_QualityReportStepBillList.html">质量汇报单维护</a></dd>
                                    </dl>
                                </dd>
                                <dd>

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

@@ -409,7 +409,7 @@
            function set_EditFromGrid(linterid)
            {
                $.ajax({
                    url: GetWEBURL() + "Xt_User/EditUser",
                    url: GetWEBURL() + "/Xt_User/EditUser",
                    type: "GET",
                    data: {
                        "HID": linterid

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Add_Edit_Cg_POInStockBillList.html

@@ -474,14 +474,37 @@
                        //console.log(d.data);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HDate").val(shijian);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HInterID").val();
                    }
                });
            }
            else {//如果修改则走下面 new
                RoadBillMain(hID);
                /* RoadBillSub(linterid);*/
                RoadBillMain(linterid);
                 //RoadBillSub(linterid);
            }
            //日期格式化
            function formatDate(date) {
                var d = new Date(date),
                    month = '' + (d.getMonth() + 1),
                    day = '' + d.getDate(),
                    year = d.getFullYear();

                if (month.length < 2) month = '0' + month;
                if (day.length < 2) day = '0' + day;

                return [year, month, day].join('-');
            }
            //退出
            form.on('submit(Exit)', function (data) {
                if (linterid == undefined) {
                    //关闭页签
                    Pub_Close(2);
                }
                else {
                    //关闭页签
                    Pub_Close(1);
                }
            });
            //#region ä¿å­˜æ–¹æ³•
            function set_SaveBill(data) {

@@ -513,6 +536,7 @@
            }
            //#endregion


            function get_checkEmp() {
                layer.open({
                    type: 2//弹窗类型

 WebTM/views/²É¹º¹ÜÀí/ÊÕÁÏ֪ͨµ¥/Cg_POInStockBillList.html

@@ -91,6 +91,8 @@
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>新增</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>编辑</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                                <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>审核</button>-->
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>反审核</button>
                                <button type="button" class="layui-btn layui-btn-sm" lay-event="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>
                            </div>
@@ -162,12 +164,13 @@
                    , cols: [[
                        { type: 'checkbox', fixed: 'left' }
                       ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
                        , { field: '日期', title: '日期', width: 150 }
                        , { field: '单据号', title: '单据号' }
                        , { field: '日期', title: '日期', width: 120 }
                        , { field: '单据号', title: '单据号', width: 150 }
                        , { field: '单据状态', title: '单据状态' ,width: 100}
                        , { field: 'HBillType', title: 'HBillType', hide: true }
                        , { field: 'HSupID', title: 'HSupID', width: 120, hide: true }
                        , { field: '供应商代码', title: '供应商代码', width: 150 }
                        , { field: '供应商', title: '供应商', width: 250 }
                        , { field: '供应商代码', title: '供应商代码', width: 120 }
                        , { field: '供应商', title: '供应商', width: 150 }
                        , { field: '交货地点', title: '交货地点' }
                        , { field: 'HCurID', title: 'HCurID', width: 120, hide: true }
                        , { field: '币别代码', title: '币别代码' }
@@ -338,10 +341,48 @@
                    //退出按钮
                    case 'get_Exit': Pub_Close(2);
                        break;
                    case 'btn-DeAudit':
                        DeAudit();
                        break;
                };
            });

            function DeAudit(){
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (checkStatus.data.length === 1)
                {
                    var InterID = data[0].hmainid.toString();
                    //逻辑删除方法
                    $.ajax({
                        type: "GET",
                        url: GetWEBURL() + "Cg_POInStockBill/DeAuditPOInStockBill", //方法所在页面和方法名
                        data: { "HInterID": InterID },
                        success: function (result) {
                            if (result.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.alert(result.code + result.Message, { icon: 5 });
                            }
                        },
                        error: function () {
                            layer.alert("接口请求失败!", { icon: 5 });
                        }
                    });
                }
                else
                {
                    layer.msg('请选择一行数据删除！');
                }
            }
            //#region å¿«é€Ÿè¿‡æ»¤
            function get_FastQuery(table, option) {
                var HDate = $("#HBeginDate").val();//开始日期

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -44,8 +44,10 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">单据类型</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" value="生产汇报单" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
                                            <input type="text" value="生产订单" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" value="3710" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">
                                            <!--<input type="text" value="生产汇报单" name="HBillTypeCHN" id="HBillTypeCHN" lay-verify="HBillTypeCHN" autocomplete="off" class="layui-input" readonly>
                                            <input type="hidden" value="3711" name="HBillType" id="HBillType" lay-verify="HBillType" autocomplete="off" class="layui-input">-->
                                            <!--<select name="HBillType" id="HBillType">
                                                <option value="3711">生产汇报单</option>
                                            </select>-->