aa
ahai
2023-06-01 fb75897480d735baf8739e6d27e0c3b042bd7881
aa
4个文件已修改
26 ■■■■ 已修改文件
src/DIXWeb.Web/Areas/GlobalM/Controllers/Workflow/BillController.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/DIXWeb.Web/Areas/GlobalM/Views/Bill/InspectFalseDetail.cshtml 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/DIXWeb.Web/Scripts/Bill/BillInspectFinished.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/DIXWeb.Web/Scripts/Bill/PartialInspectFalseDetail.js 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/DIXWeb.Web/Areas/GlobalM/Controllers/Workflow/BillController.cs
@@ -59,9 +59,11 @@
            return PartialView();
        }
        public ActionResult InspectFalseDetail(int InspectBookId = 0)
        public ActionResult InspectFalseDetail(int InspectBookId = 0, int ShowBtn = 0)
        {
            ViewData["InspectBookId"] = InspectBookId;
            ViewData["RoleNameString"] = Util.SessionHelper.Session["RoleNameString"].ToString();
            ViewData["ShowBtn"] = ShowBtn;
            return PartialView();
        }
src/DIXWeb.Web/Areas/GlobalM/Views/Bill/InspectFalseDetail.cshtml
@@ -46,5 +46,7 @@
</style>
<script src="~/Scripts/Bill/PartialInspectFalseDetail.js"></script>
<input id="tbxInspectBookId" readonly="readonly" value='@ViewData["InspectBookId"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />
<input id="RoleNameStringInspectFalseDetail" readonly="readonly" value='@ViewData["RoleNameString"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />
<input id="ShowBtnInspectFalseDetail" readonly="readonly" value='@ViewData["ShowBtn"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />
<table id="tabPartialInspectFalseDetail"></table>
src/DIXWeb.Web/Scripts/Bill/BillInspectFinished.js
@@ -218,7 +218,7 @@
        var rows = $('#tabBillInspectFinishedTable').datagrid('getSelections');
        if (rows.length != 1) { show('查看表单只能选择一行!'); return; }
        var BookId = rows[0].Id
        var param = { InspectBookId: BookId };
        var param = { InspectBookId: BookId, ShowBtn: 1  };
        var data = ajaxSame('../../GlobalM/Bill/InspectFalseDetail', param, 'post', 'html');
        $('#processBillInspectFinished').empty();
src/DIXWeb.Web/Scripts/Bill/PartialInspectFalseDetail.js
@@ -6,6 +6,11 @@
    var bookId = $('#tbxInspectBookId').val();
    var $table = $('#tabPartialInspectFalseDetail');
    var $tr = $('');
    var roleNameStr = $('#RoleNameStringInspectFalseDetail').val();
    var showBtn = $('#ShowBtnInspectFalseDetail').val();
    var showIndex1 = roleNameStr.indexOf('单据修改者');
    var showIndex2 = roleNameStr.indexOf('流程发起角色');
    $.ajax({
        url: '../../GlobalM/Bill/GetInspectDetailByBookId',
        data: { BookId: bookId, FilterType: 'FALSE'  },
@@ -15,7 +20,11 @@
        success: function (data) {
            if (data.Code == 200) {
                $table.empty();
                $tr = $('<thead><tr><td>序号</td><td>点检项</td><td>基准</td><td>结果</td><td>结果</td><td>NG原因</td><td>改善?</td><td>对策</td><td>次数</td><td>时间</td><td>点检人</td><td>图片</td><td>修改</td></tr></thead>');
                var titleTd = '';
                if ((showIndex1 > 0 || showIndex2 > 0) && showBtn == '1') {
                    titleTd = '<td>备注</td>';
                }
                $tr = $('<thead><tr><td>序号</td><td>点检项</td><td>基准</td><td>结果</td><td>结果</td><td>NG原因</td><td>改善?</td><td>对策</td><td>次数</td><td>时间</td><td>点检人</td><td>图片</td>' + titleTd + '</tr></thead>');
                $table.append($tr);
                for (var i in data.rows) {
                    var detail = data.rows[i];
@@ -25,7 +34,10 @@
                    } else {
                        bgColor = 'class="bgWhite" ';
                    }
                    var btnTd = '';
                    if ((showIndex1 > 0 || showIndex2 > 0) && showBtn == '1') {
                        btnTd = '<td><button onclick="setDataPartialInspectFalseDetail(this);">数据<span class="spanHidden">' + detail.InspectReckId + '</span></button><button onclick="setImgPartialInspectFalseDetail(this);">图片<span class="spanHidden">' + detail.InspectReckId + '</span></button></td>';
                    }
                    $tr = $('<tbody><tr ' + bgColor + '>' +
                        '<td style="width:4%;">' + detail.InspectItemId + '</td>' +
                        '<td style="width:10%;">' + detail.InspectItemName + '</td>' +
@@ -41,7 +53,7 @@
                        '<td style="width:8%;">' + detail.InspectOperator + '</td>' +
                        '<td style="width:4%;">' + (detail.ImgCount > 0 ? '<button onclick="selImgPartialInspectFalseDetail(this);">检测<span class="spanHidden">' + detail.ImgString + '</span></button>' : '') + '</td>' +
                        '<td><button onclick="setDataPartialInspectFalseDetail(this);">数据<span class="spanHidden">' + detail.InspectReckId + '</span></button><button onclick="setImgPartialInspectFalseDetail(this);">图片<span class="spanHidden">' + detail.InspectReckId + '</span></button></td>' +
                        btnTd +
                        '</tr ></tbody > ');
                    $table.append($tr);
                }