Merge branch 'master' of http://121.37.232.241:10101/r/DIXWeb

duan

2024-08-21 22bd5bc1ce2b49284cc2f042c7f4f48619fcf85b

 src/DIXWeb.Web/Areas/GlobalM/Controllers/Workflow/BillController.cs

@@ -50,6 +50,10 @@
            return View();
        }

        public ActionResult StartDIXQuality() {
            return View();
        }

        public ActionResult InspectDetail(int InspectBookId = 0,int ShowBtn = 0)
        {
            //<input id="tbxInspectBookId" readonly="readonly" value='@ViewData["InspectBookId"]' />
@@ -59,9 +63,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();
        }

@@ -105,7 +111,8 @@


        public ActionResult GetInspectBook(string InspectObjectCode, DateTime TimeBegin,DateTime TimeEnd,int Status,string filterType, int rows, int page) {
            object obj = this._billBusiness.GetInspectBook(InspectObjectCode,TimeBegin, TimeEnd, Status, rows, page, filterType);
            UserInfo ui = Util.SessionHelper.Session["UserInfo"] as UserInfo;
            object obj = this._billBusiness.GetInspectBook(InspectObjectCode,TimeBegin, TimeEnd, Status, rows, page, filterType, ui.Id);
            return Json(obj);
        }