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

duan

2023-06-01 e2db3297ea91ade7bf4a53c5cd4e92ea51396862

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

 src/DIXPadWPF/App.config

@@ -17,7 +17,7 @@
  </appSettings>
  <connectionStrings>
    <add name="DIX" connectionString="data source=43.98.48.159;initial catalog=DIX;Pooling=true;Max Pool Size=100;Min Pool Size=0;integrated security=false;persist security info=True;User ID=developer;Password=p@d201908" providerName="System.Data.EntityClient"/>
    <add name="MySQLDIX" connectionString="Host=43.98.47.112;Port=3306;Database=DIX;Protocol=TCP;Compress=false;Pooling=true; 
    <add name="MySQLDIX" connectionString="Host=43.98.47.105;Port=3306;Database=DIX;Protocol=TCP;Compress=false;Pooling=true; 
                                                                         AllowLoadLocalInfile=true;ConnectionLifetime=0;UserID=root;Password=p@ssw0rd;" providerName="MySql.Data.MySqlClient"/>
  </connectionStrings>
  <entityFramework>

 src/DIXPadWPF/DIXPadInspectItemPage.xaml

@@ -97,7 +97,8 @@
                                              IsReadOnly="True"
                                              HeadersVisibility="Column"  
                                              ColumnHeaderHeight="40"
                                              SelectionMode="Single" >
                                              SelectionMode="Single"
                                              EnableRowVirtualization ="False">
            <DataGrid.ColumnHeaderStyle>
                <Style TargetType="DataGridColumnHeader">
                    <Setter Property="VerticalContentAlignment" Value="Center"></Setter>

 src/DIXPadWPF/DIXPadInspectItemPage.xaml.cs

@@ -173,14 +173,12 @@
                    InitnspectObjectItem(mpcObject.Id, ids);
                    lbInspectTimes.Content = Inspecttimesstr;
                    SetNGColor(ids);
                    SetColor();
                }
                //备用，显示备用按钮，点击备用按钮，所有项目都OK
                else if (statusid == 2)
                {
                    InitnspectObjectItem(mpcObject.Id, mpcObject.InspectObjectStatusId);
                    lbInspectTimes.Content = Inspecttimesstr;
                    SetColor();
                    btnbackup.Visibility = Visibility.Visible;
                }
                //通常设备
@@ -188,7 +186,6 @@
                {
                    InitnspectObjectItem(mpcObject.Id, mpcObject.InspectObjectStatusId);
                    lbInspectTimes.Content = Inspecttimesstr;
                    SetColor();
                }
            }
            else if (Code == "Update")
@@ -212,7 +209,6 @@
                        SetNGColor(ids);
                    }
                }
                SetColor();
                SetstatusColor();
            }
            else
@@ -241,10 +237,8 @@
                        SetNGColor(ids);
                    }
                }
                SetColor();
                SetstatusColor();
            }
           
        }
        public void InitnspectbackupObjectItem(int InspectObjectID)
        {
@@ -1627,6 +1621,7 @@
            this.DataSourceVM = new InsepctItemShowViewModel(sp);
            PdtDataGrid.ItemsSource = null;
            PdtDataGrid.ItemsSource = this.DataSourceVM.InspectItemList;
            SetColor();
        }
        public void SetColor()
        {
@@ -1636,7 +1631,7 @@
                showstr = this.DataSourceVM.InspectItemList[i].showstr;
                if (showstr == "LightGray")
                {
                    DataGridRow rowContainer = (DataGridRow)PdtDataGrid.ItemContainerGenerator.ContainerFromIndex(i);
                    var rowContainer = this.PdtDataGrid.ItemContainerGenerator.ContainerFromIndex(i) as DataGridRow;
                    if (rowContainer == null)
                    {
                        PdtDataGrid.UpdateLayout();
@@ -1849,23 +1844,23 @@
                            {
                                if (lspc[i].Code == "update")
                                {
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = double.Parse(lspc[i].NoRadioContent), NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = x, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = double.Parse(lspc[i].NoRadioContent), NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                }
                                else if (lspc[i].Code == "updup")
                                {
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = double.Parse(lspc[i].NoRadioContent), NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge("NG"), Inspecttimes = times, ReInspecttimes = x, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = double.Parse(lspc[i].NoRadioContent), NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge("NG"), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                    datalist.Add(sst);
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = lspc[i].ReLimit, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = x + 1, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                    sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = lspc[i].ReLimit, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes+1, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                }
                            }
                            else
                            {
                                sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = 0, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = x, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                                sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].YesRadioContent, Limit = 0, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                            }
                        }
                        else if (lspc[i].NoIsChecked)
                        {
                            sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].NoRadioContent, Limit = 0, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = x, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                            sst = new MySQLInspectItem() { InspectObjectID = lspc[i].InspectObjectID, InspectItemID = lspc[i].InspectItemID, CheckType = lspc[i].NoRadioContent, Limit = 0, NGReason = lspc[i].NGReason, DealDetial = lspc[i].DealDetial, IsImproved = lspc[i].IsImproved, Totaljudge = GetJudge(lspc[i].Judge), Inspecttimes = times, ReInspecttimes = lspc[i].ReInspectTimes, imgstring = lspc[i].imgstring, isbackup = lspc[i].isbackup };
                        }
                        datalist.Add(sst);
                    }
@@ -1875,11 +1870,11 @@
                    }
                    else
                    {
                        List<MySQLInspectItem> mylist = ReContactList(datalist);
                        rm = MBIZ.clearolddata(mylist[0].InspectObjectID, mylist[0].Inspecttimes, createtime);
                        //List<MySQLInspectItem> mylist = ReContactList(datalist);
                        rm = MBIZ.clearolddata(datalist[0].InspectObjectID, datalist[0].Inspecttimes, createtime);
                        if (rm.Count > 0)
                        {
                            rmg = MBIZ.SaveInspectObjectItem(mylist, GetUserInfo.UserNo, dt, "update");
                            rmg = MBIZ.SaveInspectObjectItem(datalist, GetUserInfo.UserNo, dt, "update");
                            if (rmg.Count > 0)
                            {
                                foreach (KeyValuePair<int, List<ImageModel>> item in imagedic)
@@ -1889,7 +1884,7 @@
                                        rmgs = MBIZ.SaveImgString(item.Value[i].SN, item.Value[i].ImgString, item.Value[i].Id, "update");
                                    }
                                }
                                MBIZ.TransferJudge(mylist, GetUserInfo.UserNo,dt);
                                MBIZ.TransferJudge(datalist, GetUserInfo.UserNo,dt);
                                if (Code == "new")
                                {
                                    DixPadInspect dp = new DixPadInspect();

 src/DIXWeb.Business/GlobalM/InspectBaseBusiness.cs

@@ -19,7 +19,7 @@
        }
        public DataTable GetDataList(string tableName)
        {
            string sql = " SELECT * FROM [DIX]."+tableName;
            string sql = " SELECT * FROM [DIX]."+tableName +" order by id asc";
            var table = GetDataTableWithSql(sql);
            return table;
        }
@@ -45,13 +45,13 @@
        {
            List<ImageModel> myimagelist = new List<ImageModel>();
            ImageModel myimage;
              string sql = " SELECT Id,ImgString FROM [DIX].[biz].[ItemImg] where SN='" + sn + "'";
              string sql = " SELECT ImgId,ImgString FROM [DIX].[biz].[ItemImg] where SN='" + sn + "'";
            var table = GetDataTableWithSql(sql);
            if (table != null || table.Rows.Count > 0)
            {
                for (int i = 0;i<table.Rows.Count;i++)
                {
                    int id = Convert.ToInt32(table.Rows[i]["Id"].ToString());
                    int id = Convert.ToInt32(table.Rows[i]["ImgId"].ToString());
                    string img = table.Rows[i]["ImgString"].ToString();
                    myimage = new ImageModel() { Id = id, SN = sn, ImgString = img };
                    myimagelist.Add(myimage);

 src/DIXWeb.Business/GlobalM/StatementBusiness.cs

@@ -1,6 +1,7 @@
using DIXWeb.DAL;
using DIXWeb.Entity.Statement;
using DIXWeb.Entity.Workflow;
using DIXWeb.Util.Helper;
using System;
using System.Collections.Generic;
using System.Data;
@@ -161,7 +162,7 @@
                    paramList[index_yMaxHumidity].Direction = ParameterDirection.Output;
                    paramList[index].Direction = ParameterDirection.Output;

                    List<TransitionDiagram> list = db.Database.SqlQuery<TransitionDiagram>("exec dbo.zp_GetTDTest @IspectObjectId,@TimeBegin,@TimeEnd,@pageIndex,@pageSize,@yMinTemperature output,@yMaxTemperature output,@yMinHumidity output,@yMaxHumidity output,@Total output ", paramList).ToList();
                    List<TransitionDiagram> list = db.Database.SqlQuery<TransitionDiagram>("exec dbo.zp_GetTD @IspectObjectId,@TimeBegin,@TimeEnd,@pageIndex,@pageSize,@yMinTemperature output,@yMaxTemperature output,@yMinHumidity output,@yMaxHumidity output,@Total output ", paramList).ToList();
                    receive.rows = list;

                    yMinTemperature = paramList[index_yMinTemperature].Value.ToString();
@@ -174,8 +175,8 @@
                    List<int> xAxisList = objArr[0] as List<int>;
                    List<string> lineNameList = objArr[1] as List<string>;
                    List<string> xAxisStrList = objArr[2] as List<string>;
                    receive.Extend = GetEChartsTemperature(list, xAxisList, lineNameList, xAxisStrList, yMinTemperature,yMaxTemperature);//转换
                    receive.Extend1 = GetEChartsHumidity(list, xAxisList, lineNameList, xAxisStrList,yMinHumidity,yMaxHumidity);//转换
                    receive.Extend = GetEChartsTemperature(list, xAxisList, lineNameList, xAxisStrList, yMinTemperature, yMaxTemperature);//转换
                    receive.Extend1 = GetEChartsHumidity(list, xAxisList, lineNameList, xAxisStrList, yMinHumidity, yMaxHumidity);//转换

                    receive.Code = 200;
                    receive.Message = "SUCCESS";
@@ -221,7 +222,7 @@
            return receive;
        }

        private ECharts GetEChartsTemperature(List<TransitionDiagram> list, List<int> xAxisList, List<string> lineNameList, List<string> xAxisStrList,string yMin,string yMax)
        private ECharts GetEChartsTemperature(List<TransitionDiagram> list, List<int> xAxisList, List<string> lineNameList, List<string> xAxisStrList, string yMin, string yMax)
        {
            ECharts record = new ECharts();
            record.yMin = yMin;
@@ -250,7 +251,7 @@
                record.EChartsSeriesArr[index].data = TemperatureArr;
                record.EChartsSeriesArr[index].ShowDesc = 0;
                index++;
            } 
            }
            record.EChartsSeriesArr[index] = new EChartsSeries();
            record.EChartsSeriesArr[index].InspectObjectName = "温度上限";
            string[] TemperatureMaxArr = list.Select(x => x.TemperatureMax).ToArray<string>();
@@ -341,6 +342,66 @@
            return new object[] { xAxisList, lineNameList, xAxisStrList };
        }

        public Receive GetItemNameByObjectCode(string InspectObjectCode)
        {
            Receive receive = new Receive();
            try
            {
                Dictionary<string, object> dictIn = new Dictionary<string, object>();
                dictIn.Add("@InspectObjectCode", InspectObjectCode);
                DataTable table = new DBHelper().GetDataTable("dbo.zp_GetItemNameByObjectCode", dictIn);
                
                receive.Code = 200;
                receive.Message = table.Rows[0][0].ToString();
            }
            catch (Exception ex)
            {
                receive.Code = 500;
                receive.Message = ex.Message;
            }
            return receive;
        }

        public Receive GetObjectInspectDetail(string InspectObjectCode, DateTime TimeBegin, DateTime TimeEnd, int page = 1, int rows = 200)
        {
            Receive receive = new Receive();
            try
            {
                Dictionary<string, object> dictIn = new Dictionary<string, object>();
                List<string> dictOutAttr = new List<string>();
                dictIn.Add("@InspectObjectCode", InspectObjectCode);
                dictIn.Add("@TimeBegin", TimeBegin);
                dictIn.Add("@TimeEnd", TimeEnd);
                dictIn.Add("@PageIndex", page);
                dictIn.Add("@PageSize", rows);
                dictOutAttr.Add("@Total");
                dictOutAttr.Add("@colNameArrStr");
                object[] result = new DBHelper("DIX").GetDataTableWithOutPut("dbo.zp_GetObjectInspectDetail", dictIn, dictOutAttr);
                Dictionary<string, object> dictOut = result[1] as Dictionary<string, object>;
                string totalStr = dictOut["@Total"].ToString();
                if (string.IsNullOrEmpty(totalStr))
                {
                    receive.Code = 404;
                    receive.Message = "未查询到数据";
                    return receive;
                }
                receive.total = int.Parse(totalStr);
                if (receive.total <= 0)
                {
                    receive.Code = 404;
                    receive.Message = "未查询到数据";
                    return receive;
                }
                receive.Code = 200;
                receive.rows = new DataHelper().ToDataList(result[0] as DataTable);
                receive.Extend = dictOut["@colNameArrStr"].ToString();
            }
            catch (Exception ex)
            {
                receive.Code = 500;
                receive.Message = ex.Message;
            }
            return receive;
        }
    }
}

 src/DIXWeb.Business/MySQLBiz/MySQLInspectBaseBiz.cs

@@ -57,13 +57,13 @@
        {
            List<ImageModel> myimagelist = new List<ImageModel>();
            ImageModel myimage;
            string sql = " SELECT Id,ImgString FROM dix.itemimg where SN='" + sn + "'";
            string sql = " SELECT ImgId,ImgString FROM dix.itemimg where SN='" + sn + "'";
            var table = Service.GetDataTableWithSql(sql);
            if (table != null || table.Rows.Count > 0)
            {
                for (int i = 0; i < table.Rows.Count; i++)
                {
                    int id = Convert.ToInt32(table.Rows[i]["Id"].ToString());
                    int id = Convert.ToInt32(table.Rows[i]["ImgId"].ToString());
                    string img = table.Rows[i]["ImgString"].ToString();
                    myimage = new ImageModel() { Id = id, SN = sn, ImgString = img };
                    myimagelist.Add(myimage);

 src/DIXWeb.Business/Power/UserBusiness.cs

@@ -356,7 +356,7 @@
            return receive;
        }

        public Receive Insert(UserInfo record)
        public Receive Insert(UserInfo record,int CreateUserId)
        {
            Receive receive = new Receive();
            try
@@ -366,32 +366,14 @@

                using (DBContext db = new DBContext())
                {
                    record.Password = password;
                    record.CreateTime = DateTime.Now;
                    record.CreateUserId = 1;
                    record.ChangeTime = DateTime.Now;
                    record.ChangeUserId = 1;

                    record.Tel = "0000-0000-000";
                    record.Email = "xxx@Sony.com";
                    record.Address = "XXXXX";
                    record.IdCard = "000000000000000000";
                    record.MobilePhone = "00000000000";
                    record.BirthDay = new DateTime(1900, 1, 1);
                    record.Sex = 1;
                    record.Marriage = 0;
                    record.MaxEducation = "";
                    record.EndSchool = "";
                    record.IsEnable = 1;
                    record.HireDate = DateTime.Now;
                    record.QuitDate = DateTime.Now;

                    db.UserInfo.Add(record);
                    db.SaveChanges();
                    System.Data.SqlClient.SqlParameter[] paramList = new System.Data.SqlClient.SqlParameter[] {
                        new System.Data.SqlClient.SqlParameter("@UserNo", record.UserNo),
                        new System.Data.SqlClient.SqlParameter("@UserName", record.UserName),
                        new System.Data.SqlClient.SqlParameter("@Password", password),
                        new System.Data.SqlClient.SqlParameter("@CreateUserId", CreateUserId)
                    };
                    receive = db.Database.SqlQuery<Receive>("exec dbo.sys_AddUser @UserNo,@UserName,@Password,@CreateUserId ", paramList).FirstOrDefault();
                }
                receive.total = 1;
                receive.Code = 200;
                receive.Message = "SUCCESS";
            }
            catch (Exception ex)
            {
@@ -481,6 +463,31 @@
            return receive;
        }

        public string GetUserRoleNameStr(string UserCode)
        {
            System.Text.StringBuilder sb = new System.Text.StringBuilder();
            try
            {
                List<UserRoleInfo> list = new List<UserRoleInfo>();
                using (DBContext db = new DBContext())
                {
                    System.Data.SqlClient.SqlParameter[] paramList = new System.Data.SqlClient.SqlParameter[] {
                        new System.Data.SqlClient.SqlParameter("@UserCode", UserCode),
                    };
                    list = db.Database.SqlQuery<UserRoleInfo>("exec dbo.p_GetUserRoleInfo @UserCode ", paramList).ToList();
                }
                for (int i = 0; i < list.Count; i++)
                {
                    sb.Append("," + list[i].RoleName);
                }
            }
            catch (Exception ex)
            {
                sb.Append(ex.Message);
            }
            return sb.ToString();
        }

        public Receive UpdateUserStatu(string UserCode ,int UserStatu)
        {
            Receive receive = new Receive();

 src/DIXWeb.Business/Workflow/BillBusiness.cs

@@ -129,7 +129,7 @@
            return record;
        }

        public Receive GetInspectBook(DateTime TimeBegin, DateTime TimeEnd, int Status, int rows, int page,string filterType )
        public Receive GetInspectBook(string InspectObjectCode, DateTime TimeBegin, DateTime TimeEnd, int Status, int rows, int page,string filterType )
        {
            int Total = 0;
            Receive record = new Receive();
@@ -138,6 +138,7 @@
                using (DBContext db = new DBContext())
                {
                    System.Data.SqlClient.SqlParameter[] paramList = new System.Data.SqlClient.SqlParameter[] {
                        new System.Data.SqlClient.SqlParameter("@InspectObjectCode", InspectObjectCode),
                        new System.Data.SqlClient.SqlParameter("@TimeBegin", TimeBegin),
                        new System.Data.SqlClient.SqlParameter("@TimeEnd", TimeEnd),
                        new System.Data.SqlClient.SqlParameter("@Status", Status),
@@ -148,7 +149,7 @@
                    };
                    int index = paramList.Length - 1;
                    paramList[index].Direction = ParameterDirection.Output;
                    record.rows = db.Database.SqlQuery<ReceiveInspectBook>("exec biz.p_getInspectBook @TimeBegin,@TimeEnd,@Status,@pageSize,@pageIndex,@FilterType,@Total output ", paramList).ToList();
                    record.rows = db.Database.SqlQuery<ReceiveInspectBook>("exec biz.p_getInspectBook @InspectObjectCode,@TimeBegin,@TimeEnd,@Status,@pageSize,@pageIndex,@FilterType,@Total output ", paramList).ToList();
                    record.total = int.Parse(paramList[index].Value.ToString());
                }
                record.Code = 200;

 src/DIXWeb.Util/Helper/DataHelper.cs

@@ -63,5 +63,29 @@
            }
            return list;
        }

        public List<Dictionary<string, string>> ToDataList(DataTable dt)
        {
            List<Dictionary<string, string>> resultList = new List<Dictionary<string, string>>();
            List<string> titleList = new List<string>();
            Dictionary<string, string> titleDict = new Dictionary<string, string>();
            for (int i = 0; i < dt.Columns.Count; i++)
            {
                titleList.Add(dt.Columns[i].ToString());
                if (!titleDict.ContainsKey(dt.Columns[i].ToString())) titleDict.Add(dt.Columns[i].ToString(), "");
            }
            for (int i = 0; i < dt.Rows.Count; i++)
            {
                DataRow row = dt.Rows[i];
                for (int j = 0; j < titleList.Count; j++)
                {
                    titleDict[titleList[j]] = row[titleList[j]].ToString();
                }
                resultList.Add(titleDict.Copy(0, titleList.Count).ToDictionary(x => x.Key.ToString(), x => x.Value.ToString()));
            }
            titleDict.Clear();
            titleDict = null;
            return resultList;
        }
    }
}

 src/DIXWeb.Web/Areas/GlobalM/Controllers/Organize/UserController.cs

@@ -153,7 +153,8 @@
        #region 基础增删改查
        public ActionResult Insert(UserInfo record)
        {
            Receive receive = this._userBusiness.Insert(record);
            UserInfo ui = Util.SessionHelper.Session["UserInfo"] as UserInfo;
            Receive receive = this._userBusiness.Insert(record, ui.Id);
            return Json(receive);
        }
        public ActionResult Delete(int Id)

 src/DIXWeb.Web/Areas/GlobalM/Controllers/StatementController.cs

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

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

        public ActionResult GetInspectObjectType()
        {
@@ -84,5 +88,18 @@
            Receive receive = this._statementBusiness.GetNeedCheckDetail(InspectTypeId, InspectObjectTypeId, Attention, page, rows);
            return Json(receive);
        }

        public ActionResult GetItemNameByObjectCode(string InspectObjectCode)
        {
            Receive receive = this._statementBusiness.GetItemNameByObjectCode(InspectObjectCode);
            return Json(receive);
        }

        public ActionResult GetObjectInspectDetail(string InspectObjectCode,DateTime TimeBegin, DateTime TimeEnd, int page = 1, int rows = 200)
        {
            Receive receive = this._statementBusiness.GetObjectInspectDetail(InspectObjectCode, TimeBegin, TimeEnd, page, rows);
            return Json(receive);
        }

    }
}

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

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

        public ActionResult InspectDetail(int InspectBookId = 0)
        public ActionResult InspectDetail(int InspectBookId = 0,int ShowBtn = 0)
        {
            //<input id="tbxInspectBookId" readonly="readonly" value='@ViewData["InspectBookId"]' />
            ViewData["InspectBookId"] = InspectBookId;
            ViewData["RoleNameString"] = Util.SessionHelper.Session["RoleNameString"].ToString();
            ViewData["ShowBtn"] = ShowBtn;
            return PartialView();
        }

@@ -102,8 +104,8 @@
        }


        public ActionResult GetInspectBook(DateTime TimeBegin,DateTime TimeEnd,int Status,string filterType, int rows, int page) {
            object obj = this._billBusiness.GetInspectBook(TimeBegin, TimeEnd, Status, rows, page, filterType);
        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);
            return Json(obj);
        }


 src/DIXWeb.Web/Areas/GlobalM/Views/Bill/BillInspectFinished.cshtml

@@ -26,7 +26,7 @@
                <a id="btnBillInspectFinishedSearch" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-search'">查询</a>
                <a id="btnBillInspectFinishedProcess" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-filter'">审批履历</a>
                <a id="btnBillInspectFinishedDetail" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-more'">表单详情</a>
                <a id="btnBillInspectFinishedUpdateNote" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-more'">修改履历</a>
                <a id="btnBillInspectFinishedUpdateNote" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-more'">备注履历</a>
            </td>
        </tr>
    </table>

 src/DIXWeb.Web/Areas/GlobalM/Views/Bill/BillUpdate.cshtml

@@ -13,11 +13,10 @@
    &nbsp;&nbsp;至&nbsp;&nbsp;
    <input name="timeEnd" style="width:120px;" type="text" class="some_class" />
    &nbsp;&nbsp;&nbsp;&nbsp;
    状态：<input type="radio" name="StatuSubmit" value="0" />未提交&nbsp;&nbsp;<input type="radio" name="StatuSubmit" value="1" />已提交
    设备编号：<input name="code" style="width:120px;" type="text" />
    &nbsp;&nbsp;&nbsp;&nbsp;
    <a id="btnBillUpdateSearch" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-search'">查询</a>
    <a id="btnBillUpdateProcess" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-filter'">审批履历</a>
    <a id="btnBillUpdateDetail" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-more'">表单详情</a>
    <a id="btnBillUpdateUpdateNote" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-more'">修改履历</a>
</div>


 src/DIXWeb.Web/Areas/GlobalM/Views/Bill/InspectDetail.cshtml

@@ -8,11 +8,11 @@
        .PartialTable thead td {
            background-color: deepskyblue;
            color: white;
            font-weight: bold;
            font-size: large;
            font-size:larger;
            font-weight:bolder;
        }
        .PartialTable tbody td {
            font-size: larger;
            font-size: inherit;
        }
        .PartialTable td {
            border-right: 1px solid black;
@@ -36,8 +36,15 @@
        height:0px;
        overflow:hidden;
    }
    .tdHidden {
        width: 0px;
        height: 0px;
        overflow: hidden;
    }
</style>
<script src="~/Scripts/Bill/PartialInspectDetail.js"></script>
<input id="tbxInspectBookId" readonly="readonly" value='@ViewData["InspectBookId"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />
<input id="RoleNameStringInspectDetail" readonly="readonly" value='@ViewData["RoleNameString"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />
<input id="ShowBtnInspectDetail" readonly="readonly" value='@ViewData["ShowBtn"]' style="overflow:hidden;width:0px;height:0px;border:none;display:block;" />

<table id="tabPartialInspectDetail"></table>

 src/DIXWeb.Web/Areas/GlobalM/Views/Bill/InspectFalseDetail.cshtml

@@ -10,12 +10,12 @@
        .PartialTable thead td {
            background-color: deepskyblue;
            color: white;
            /*font-weight: bold;
            font-size: large;*/
            font-size: larger;
            font-weight: bolder;
        }

        .PartialTable tbody td {
            font-size: smaller;
            font-size: inherit;
        }

        .PartialTable td {

 src/DIXWeb.Web/Areas/GlobalM/Views/Bill/StartDIX.cshtml

@@ -10,6 +10,8 @@
<div id="divStartDIXWhere">
    <a id="btnStartDIXSubmit" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-ok'">提交审批</a>
    &nbsp;&nbsp;&nbsp;&nbsp;
    设备编号：<input name="code" style="width:120px;" type="text" />
    &nbsp;&nbsp;&nbsp;&nbsp;
    点检日期：
    <input name="timeBegin" style="width:140px;" type="text" class="some_class" />
    &nbsp;&nbsp;至&nbsp;&nbsp;

 src/DIXWeb.Web/Areas/GlobalM/Views/Bill/StartDIXFireControl.cshtml

@@ -10,6 +10,8 @@
<div id="divStartFCDIXWhere">
    <a id="btnStartFCDIXSubmit" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-ok'">提交审批</a>
    &nbsp;&nbsp;&nbsp;&nbsp;
    设备编号：<input name="code" style="width:120px;" type="text" />
    &nbsp;&nbsp;&nbsp;&nbsp;
    点检日期：
    <input name="timeBegin" style="width:140px;" type="text" class="some_class" />
    &nbsp;&nbsp;至&nbsp;&nbsp;

 src/DIXWeb.Web/Areas/GlobalM/Views/Statement/ObjectInspectDetail.cshtml

New file
@@ -0,0 +1,47 @@

@{
    ViewBag.Title = "ObjectInspectDetail";
    Layout = "~/Views/Shared/_Layout_List.cshtml";
}
<script src="~/Scripts/Statement/ObjectInspectDetail.js"></script>


<table id="tabOIDSearch">
    <tr>
        <td class="tabTitle">设备编码：</td>
        <td class="tabCBB">
            <input id="searchOIDInspectObjectCode" type="text" style="width:120px;" />
            &nbsp;&nbsp;&nbsp;&nbsp;
        </td>
        <td class="tabTitle">时间区间：</td>
        <td class="tabTime" colspan="2">
            <input id="searchOIDtimeBegin" style="width:120px;" type="date" />
            &nbsp;&nbsp;至&nbsp;&nbsp;
            <input id="searchOIDtimeEnd" style="width:120px;" type="date" />
            &nbsp;&nbsp;&nbsp;&nbsp;
        </td>
        <td class="tabButton">
            &nbsp;&nbsp;&nbsp;&nbsp;
            <a id="btnOIDSearch" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-search'">搜索</a>
            &nbsp;&nbsp;&nbsp;&nbsp;
        </td>
        <td></td>
        <td></td>
    </tr>
</table>
<table id="tabOIDTable" class="easyui-datagrid"></table>


<style type="text/css">
    #tabOIDSearch td {
        padding: 5px 0px 5px 0px;
    }

    select {
        width: 115px;
        background-color: white;
        text-align: center;
    }
</style>



 src/DIXWeb.Web/Areas/GlobalM/Views/WorkList/InRepair.cshtml

@@ -9,8 +9,6 @@
<div id="searchInRepairToolBar">
    <a id="btnInRepairAgree" class="easyui-linkbutton hidden" href="#" data-options="iconCls:'icon-ok'">审批同意</a>
    <a id="btnInRepairRefuse" class="easyui-linkbutton hidden" href="#" data-options="iconCls:'icon-no'">审批拒绝</a>
    <a id="btnInRepairProcess" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-filter'">审批履历</a>
    <a id="btnInRepairDetail" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-more'">表单详情</a>
    &nbsp;&nbsp;&nbsp;&nbsp;
    <input id="searchInRepairCode" type="text" style="" class="easyui-textbox" data-options="prompt:'编号'" />
    <a id="btnInRepairSearch" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-search'">搜索</a>
@@ -20,7 +18,6 @@
<div id="showInRepair" style="height:240px;">
    <table id="InRepairTable" class="easyui-datagrid"></table>
</div>
<div id="processInRepair"></div>
<div id="controlInRepair">
    <table class="tab">
        <tr>
@@ -54,7 +51,7 @@
    <div style="clear:both"></div>
</div>
<div id="detailInRepair"></div>

<div id="processInRepair"></div>

<div id="InRepairDialog" style="width:99%;margin:auto;"></div>


 src/DIXWeb.Web/Areas/GlobalM/Views/WorkList/MyApproved.cshtml

@@ -7,9 +7,6 @@
<script src="~/Scripts/Workflow/MyApproved.js"></script>

<div id="searchMyApprovedToolBar">
    <a id="btnMyApprovedProcess" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-filter'">审批履历</a>
    <a id="btnMyApprovedDetail" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-more'">表单详情</a>
    &nbsp;&nbsp;&nbsp;&nbsp;
    <input id="searchMyApprovedCode" type="text" style="" class="easyui-textbox" data-options="prompt:'编号'" />
    <a id="btnMyApprovedSearch" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-search'">搜索</a>
    <a id="btnMyApprovedClear" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-clear'">清除</a>
@@ -18,8 +15,9 @@
<div id="showMyApproved" style="height:240px;">
    <table id="MyApprovedTable" class="easyui-datagrid"></table>
</div>
<div id="processMyApproved"></div>

<div id="detailMyApproved"></div>
<div id="processMyApproved"></div>




 src/DIXWeb.Web/Areas/GlobalM/Views/WorkList/MyNeedDealt.cshtml

@@ -9,7 +9,6 @@
    <a id="btnMyNeedDealtAgree" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-ok'">审批同意</a>
    <a id="btnMyNeedDealtRefuse" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-no'">审批拒绝</a>
    <a id="btnMyNeedDealtProcess" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-filter'">审批履历</a>
    <a id="btnMyNeedDealtDetail" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-more'">表单详情</a>
    &nbsp;&nbsp;&nbsp;&nbsp;
    <input id="searchMyNeedDealtCode" type="text" style="" class="easyui-textbox" data-options="prompt:'编号'" />
    <a id="btnMyNeedDealtSearch" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-search'">搜索</a>
@@ -19,7 +18,7 @@
<div id="showMyNeedDealt" style="height:240px;">
    <table id="MyNeedDealtTable" class="easyui-datagrid"></table>
</div>
<div id="processMyNeedDealt"></div>

<div id="controlMyNeedDealt">
    <textarea id="MyNeedDealtRemark" style="width:100%;"></textarea>
    <a id="btnMyNeedDealtKeepControl" style="float:left;" class="easyui-linkbutton" href="#" data-options="iconCls:'icon-save'">保存草稿</a>
@@ -31,7 +30,7 @@
    <div style="clear:both"></div>
</div>
<div id="detailMyNeedDealt"></div>

<div id="processMyNeedDealt"></div>

<div id="MyNeedDealtDialog" style="width:99%;margin:auto;"></div>


 src/DIXWeb.Web/Controllers/HomeController.cs

@@ -25,6 +25,7 @@
    public class HomeController : BaseMvcController
    {
        HomeBusiness _homeBus { get; } = new HomeBusiness();
        UserBusiness _userBusiness = new UserBusiness();

        #region 视图功能

@@ -172,15 +173,17 @@
                Response.Cookies["UserNo"].Expires = DateTime.Now.AddDays(30);
                Response.Cookies["Password"].Value = password;
                Response.Cookies["Password"].Expires = DateTime.Now.AddDays(30);
            } 
            }
            else
            {
                Response.Cookies["UserNo"].Expires = DateTime.Now.AddSeconds(-1);
                Response.Cookies["Password"].Expires = DateTime.Now.AddSeconds(-1);
            }  
            }

            Util.SessionHelper.Session["UserId"] = ui.Id;
            Util.SessionHelper.Session["UserInfo"] = ui;
            Util.SessionHelper.Session["OrgList"] = "";// new OrgInfoController().GetOrganizationByUserNo(ui.UserNo);//保存组织
            Util.SessionHelper.Session["RoleNameString"] = _userBusiness.GetUserRoleNameStr(UserNo);
            Util.SessionHelper.Session["UserNo"] = ui.UserNo;
        }


 src/DIXWeb.Web/DIXWeb.Web.csproj

@@ -805,6 +805,7 @@
    <Content Include="Areas\GlobalM\Views\Bill\ReckUpdateHistory.cshtml" />
    <Content Include="Areas\GlobalM\Views\Bill\StartDIXFireControl.cshtml" />
    <Content Include="Areas\GlobalM\Views\Bill\InspectFalseDetail.cshtml" />
    <Content Include="Areas\GlobalM\Views\Statement\ObjectInspectDetail.cshtml" />
    <None Include="Scripts\jquery-1.10.2.intellisense.js" />
    <Content Include="Scripts\Download\TwoDCodeView.js" />
    <Content Include="Scripts\echarts.common.min.js" />
@@ -818,6 +819,7 @@
    <Content Include="Scripts\Organize\User\Search.js" />
    <Content Include="Scripts\resize.js" />
    <Content Include="Scripts\Statement\InspectCheckedSelect.js" />
    <Content Include="Scripts\Statement\ObjectInspectDetail.js" />
    <Content Include="Scripts\Statement\TransitionDiagram.js" />
    <Content Include="Scripts\TimePluggable\jquery.datetimepicker.css" />
    <Content Include="Scripts\TimePluggable\jquery.datetimepicker.full.min.js" />

 src/DIXWeb.Web/Scripts/Bill/BillUpdate.js

@@ -95,9 +95,11 @@
        onCheck: function (index, row) {
            var selectedList = $('#selectBillUpdateSelected').val();
            var oldStr = ',' + row.Id;
            
            if (isContainsArr(selectedList, oldStr, ',')) return;//当包含字串时，不再新增
            selectedList = selectedList + oldStr;
            $('#selectBillUpdateSelected').val(selectedList);
            
        },
        onUncheck: function (index, row) {
            var selectedList = $('#selectBillUpdateSelected').val();
@@ -123,6 +125,9 @@
                if (isContainsArr(selectedList, oldStr, ',')) selectedList = arrStrRemoveStr(selectedList, oldStr, ',');
            }
            $('#selectBillUpdateSelected').val(selectedList);
        },
        onSelect: function (rowIndex,rowData) {
            GetBillUpdateInspectReck();
        },
    });
}
@@ -190,20 +195,6 @@
            alert(data.Message);
        }
    });
    //点击表单详细
    $('#btnBillUpdateDetail').click(function () {
        var rows = $('#tabBillUpdateTable').datagrid('getSelections');
        if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
        var BookId = rows[0].Id
        var param = { InspectBookId: BookId };
        var data = ajaxSame('../../GlobalM/Bill/InspectDetail', param, 'post', 'html');

        $('#processBillUpdate').empty();
        $('#detailBillUpdate').empty();

        $('#detailBillUpdate').append(data);
    });

    //点击修改履历
    $('#btnBillUpdateUpdateNote').click(function () {
        var rows = $('#tabBillUpdateTable').datagrid('getSelections');
@@ -216,6 +207,7 @@
}
function getBillUpdateSearchParam() {
    var $div = $('div#divBillUpdateWhere');
    var code = $div.find('input[name=code]').first().val();
    var timeBegin = $div.find('input[name=timeBegin]').first().val();
    var timeEnd = $div.find('input[name=timeEnd]').first().val();
    if (timeBegin != '') {
@@ -228,13 +220,8 @@
    } else {
        timeEnd = '1900/01/01 00:00:00';
    }
    var status = -1;
    $div.find('input[name=StatuSubmit]').each(function (index, element) {
        if ($(element).is(':checked')) {
            status = $(element).val();
        }
    });
    var param = { TimeBegin: timeBegin, TimeEnd: timeEnd, Status: status, filterType: 'all' }
    var status = 0;//只查询未提交的单据
    var param = { InspectObjectCode: code ,TimeBegin: timeBegin, TimeEnd: timeEnd, Status: status, filterType: 'all' }
    return param;
}

@@ -282,4 +269,18 @@
            result = data;
        },
    });
}


function GetBillUpdateInspectReck() {
    var rows = $('#tabBillUpdateTable').datagrid('getSelections');
    if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
    var BookId = rows[0].Id
    var param = { InspectBookId: BookId, ShowBtn:1 };
    var data = ajaxSame('../../GlobalM/Bill/InspectDetail', param, 'post', 'html');

    $('#processBillUpdate').empty();
    $('#detailBillUpdate').empty();

    $('#detailBillUpdate').append(data);
}

 src/DIXWeb.Web/Scripts/Bill/PartialInspectDetail.js

@@ -6,6 +6,12 @@
    var bookId = $('#tbxInspectBookId').val();
    var $table = $('#tabPartialInspectDetail');
    var $tr = $('');
    
    var roleNameStr = $('#RoleNameStringInspectDetail').val();
    var showBtn = $('#ShowBtnInspectDetail').val();
    var showIndex1 = roleNameStr.indexOf('单据修改者');
    var showIndex2 = roleNameStr.indexOf('流程发起角色');
    
    $.ajax({
        url: '../../GlobalM/Bill/GetInspectDetailByBookId',
        data: { BookId: bookId, FilterType:'TRUE' },
@@ -15,7 +21,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,23 +35,27 @@
                    } else {
                        bgColor = 'class="bgWhite" ';
                    }
                    

                    var btnTd = '';
                    if ((showIndex1 > 0 || showIndex2 > 0) && showBtn == '1') {
                        btnTd = '<td><button onclick="setDataPartialInspectDetail(this);">数据<span class="spanHidden">' + detail.InspectReckId + '</span></button><button onclick="setImgPartialInspectDetail(this);">图片<span class="spanHidden">' + detail.InspectReckId + '</span></button></td>';
                    }
                    $tr = $('<tbody><tr ' + bgColor + '>' +
                        '<td>' + detail.InspectItemId + '</td>' +
                        '<td>' + detail.InspectItemName + '</td>' +
                        '<td>' + (detail.CheckType == '数值' ? detail.CheckType + '/' + detail.LowLimit + '-' + detail.TopLimit : detail.CheckType) + '</td>' +
                        '<td>' + (detail.CheckType == '数值' ? detail.Result : (detail.Judge != '1' ?'×':'√')) + '</td>' +
                        '<td>' + (detail.Judge == '1' ? '<span>OK</span>' : '<span style="color:red;font-weight:bold;">NG</span>') + '</td>' +
                        '<td>' + detail.NGReason + '</td>' +
                        '<td>' + (detail.Judge == '1' ?"":(detail.DealInScene == '1' ? '是' : '否')) + '</td>' +
                        '<td>' + detail.Answer + '</td>' +
                        '<td style="width:4%;">' + detail.InspectItemId + '</td>' +
                        '<td style="width:10%;">' + detail.InspectItemName + '</td>' +
                        '<td style="width:8%;">' + (detail.CheckType == '数值' ? detail.CheckType + '/' + detail.LowLimit + '-' + detail.TopLimit : detail.CheckType) + '</td>' +
                        '<td style="width:8%;">' + (detail.CheckType == '数值' ? detail.Result : (detail.Judge != '1' ?'×':'√')) + '</td>' +
                        '<td style="width:4%;">' + (detail.Judge == '1' ? '<span>OK</span>' : '<span style="color:red;font-weight:bold;">NG</span>') + '</td>' +
                        '<td style="width:8%;">' + detail.NGReason + '</td>' +
                        '<td style="width:7%;">' + (detail.Judge == '1' ?"":(detail.DealInScene == '1' ? '是' : '否')) + '</td>' +
                        '<td style="width:8%;">' + detail.Answer + '</td>' +
                        
                        '<td>' + detail.TimeIndex + '</td>' +
                        '<td>' + toDateStr(detail.CreateTime) + '</td>' +
                        '<td>' + detail.InspectOperator + '</td>' +
                        '<td style="width:4%;">' + detail.TimeIndex + '</td>' +
                        '<td style="width:16%;">' + toDateStr(detail.CreateTime) + '</td>' +
                        '<td style="width:8%;">' + detail.InspectOperator + '</td>' +
                        
                        '<td>' + (detail.ImgCount > 0 ? '<button onclick="selImgPartialInspectDetail(this);">检测图片<span class="spanHidden">' + detail.ImgString + '</span></button>' : '') + '</td>' +
                        '<td><button onclick="setDataPartialInspectDetail(this);">数据<span class="spanHidden">' + detail.InspectReckId + '</span></button><button onclick="setImgPartialInspectDetail(this);">图片<span class="spanHidden">' + detail.InspectReckId + '</span></button></td>' +
                        btnTd +
                        '</tr ></tbody > ');
                    $table.append($tr);
                }
@@ -79,29 +93,29 @@
    for (var i = 0; i < tdLen; i++) {
        if (i == 3) {
            if (checkType == '√/×') {
                var $select3 = $('<select style="text-align:center;background-color:white;"><option ' + (resultValue == '√' ? 'selected="selected"' : '') + ' value="1">√</option><option ' + (resultValue == '×' ? 'selected="selected"' : '') + ' value="0">×</option></select>')
                $tdNew = $('<td style="text-align:center;"></td>');
                var $select3 = $('<select style="width:60%;text-align:center;background-color:white;"><option ' + (resultValue == '√' ? 'selected="selected"' : '') + ' value="1">√</option><option ' + (resultValue == '×' ? 'selected="selected"' : '') + ' value="0">×</option></select>')
                $tdNew = $('<td></td>');
                $tdNew.append($select3);
            } else {
                var $input3 = $('<input type="number" value="' + resultValue + '" style="text-align:center;" />');
                $tdNew = $('<td style="text-align:center;"></td>');
                var $input3 = $('<input type="number" value="' + resultValue + '" style="width:60%;text-align:center;" />');
                $tdNew = $('<td></td>');
                $tdNew.append($input3);
            }
        } else if (i == 4) {
            $tdNew = $('<td></td>');
        } else if (i == 5) {
            $tdNew = $('<td style="text-alias:center;"><input type="text" style="text-align:center;" value="' + $($tr).find('td').eq(i).text() + '" /></td>');
            $tdNew = $('<td><input type="text" style="width:80%;text-align:center;" value="' + $($tr).find('td').eq(i).text() + '" /></td>');
        } else if (i == 6) {
            var $select6 = $('<select style="text-align:center;background-color:white;"><option selected="selected" value="0">否</option><option value="1">是</option></select>')
            $tdNew = $('<td style="text-align:center;"></td>');
            $tdNew = $('<td></td>');
            $tdNew.append($select6);
        } else if (i == 7) {
            $tdNew = $('<td><input type="text" style="text-align:center;" value="' + $($tr).find('td').eq(i).text() + '" /></td>');
            $tdNew = $('<td><input type="text" style="width:80%;text-align:center;" value="' + $($tr).find('td').eq(i).text() + '" /></td>');
        } else if (i == 9) {
            $tdNew = $('<td></td>');
        } else if (i == tdLen - 1) {
            var $button = $('<button onclick="keepDataPartialInspectDetail(this);">保存<span class="spanHidden">' + InspectReckId + '</span></button><button onclick="cancelDataPartialInspectDetail(this);">取消</button>');
            $tdNew = $('<td style="text-align:center;"></td>');
            $tdNew = $('<td></td>');
            $tdNew.append($button);
        } else {
            $tdNew = $('<td><span>' + $($tr).find('td').eq(i).text()+'</span></td>');
@@ -117,7 +131,7 @@
    var tdLen = $($tr).find('td').length;

    var $trNew = $('<tr style="background-color:lightblue;"></tr>');
    var $tdNew1 = $('<td colspan="' + (tdLen - 1)+'"></td>');
    var $tdNew1 = $('<td style="width:89%;" colspan="' + (tdLen - 1)+'"></td>');
    var $tdNew2 = $('<td></td>');
    for (var i = 0; i < 6; i++) {
        var $file = $('<input type="file" name=""  style="width:16%;" />');
@@ -159,6 +173,7 @@
        console.info(param);
        var data = ajaxSame('../../GlobalM/Bill/UpdateInspectReck', param, 'post', 'json');
        if (data.Code == 200) {
            reloadParentTablePartialInspectDetail();
            $(obj).parent('td').parent('tr').remove();
            initPartialInspectDetailTab();
        } else {
@@ -210,4 +225,9 @@

function cancelDataPartialInspectDetail(obj) {
    $(obj).parent('td').parent('tr').remove();
}

function reloadParentTablePartialInspectDetail() {
    //var $btn = $('#btnBillInspectFinishedSearch', window.parent.document);
    $('#btnBillUpdateSearch').click();
}

 src/DIXWeb.Web/Scripts/Bill/StartDIX.js

@@ -179,6 +179,7 @@
}
function getStartDIXSearchParam() {
    var $div = $('div#divStartDIXWhere');
    var code = $div.find('input[name=code]').first().val();
    var timeBegin = $div.find('input[name=timeBegin]').first().val();
    var timeEnd = $div.find('input[name=timeEnd]').first().val();
    if (timeBegin != '') {
@@ -197,7 +198,7 @@
            status = $(element).val();
        }
    });
    var param = { TimeBegin: timeBegin, TimeEnd: timeEnd, Status: status, filterType: 'electricity' }
    var param = { InspectObjectCode: code,TimeBegin: timeBegin, TimeEnd: timeEnd, Status: status, filterType: 'electricity' }
    return param;
}


 src/DIXWeb.Web/Scripts/Bill/StartFCDIX.js

@@ -180,6 +180,7 @@
}
function getStartFCDIXSearchParam() {
    var $div = $('div#divStartFCDIXWhere');
    var code = $div.find('input[name=code]').first().val();
    var timeBegin = $div.find('input[name=timeBegin]').first().val();
    var timeEnd = $div.find('input[name=timeEnd]').first().val();
    if (timeBegin != '') {
@@ -198,7 +199,7 @@
            status = $(element).val();
        }
    });
    var param = { TimeBegin: timeBegin, TimeEnd: timeEnd, Status: status, filterType:'fire' }
    var param = { InspectObjectCode: code,TimeBegin: timeBegin, TimeEnd: timeEnd, Status: status, filterType:'fire' }
    return param;
}


 src/DIXWeb.Web/Scripts/Organize/User/Index.js

@@ -119,6 +119,7 @@
                var data = { UserNo: code, UserName: name, Password: psd };
                var url = '/User/Insert';
                var result = dialogClickKeepJson(url, data);
                debugger;
                if (result.Code == 200) {
                    clearUserForm();//清除选项
                    $('#UserDialogInsert').dialog({ closed: true, });

 src/DIXWeb.Web/Scripts/Statement/ObjectInspectDetail.js

New file
@@ -0,0 +1,112 @@
var dataOIDECharts = [];

$(function () {
    initOIDHeight()
    initOIDTime();
    initOIDClick();
});

function initOIDHeight(){
    var pageHeight = $('#page', window.parent.document).height();
    var whereHeight = $('#tabOIDSearch').height();
    var showHeight = parseInt(pageHeight) - parseInt(whereHeight);
    debugger;
    $('#tabOIDTable').css({ "width": "100%", "height": showHeight + "px" });
}

function initOIDTime() {
    var date = new Date();
    var year = date.getFullYear();
    var month = date.getMonth() + 1;
    var day = date.getDate();
    var dateBeginStr = year + '-' + (month >= 10 ? '' : '0') + month + '-01';
    var dateEndStr = year + '-' + (month >= 10 ? '' : '0') + month + '-' + (day >= 10 ? '' : '0') + day;
    $('#searchOIDtimeBegin').val(dateBeginStr);
    $('#searchOIDtimeEnd').val(dateEndStr);
}


function initOIDTable() {
    initOIDHeight();
    $('#tabOIDTable').empty();
    var param = getOIDSearchParam();
    console.info(param);
    var data = ajaxSame('../../GlobalM/Statement/GetItemNameByObjectCode', param, 'POST', 'JSON');
    if (data.Code != 200) {
        alert(data.Message);
        return;
    }
    var columns = getColumnsOID(data.Message);
    debugger;
    $('#tabOIDTable').datagrid({
        singleSelect: true,
        url: '../../GlobalM/Statement/GetObjectInspectDetail',
        singleSelect: true,
        queryParams: param,
        idField: 'InspectBookId',
        animate: true,
        pagination: true,
        rownumbers: true,
        pagePosition: 'bottom',
        pageSize: 100,
        pageNumber: 1,
        fitColumns: true,
        columns: columns,
        pageList: [20, 50, 100, 200, 500, 1000, 10000],
        //toolbar: '#tabOIDSearch',
        loadFilter: function (data) {
            if (data.Code == 200) {
                return data;
            } else {
                alert(data.Message);
                return null;
            }
        },
    });
}
function getColumnsOID(colArr) {
    var title = [
        { field: "InspectBookId", title: "InspectBookId", hidden: true, },
        { field: "InspectObjectCode", title: "编号",},
        { field: "InspectTime", title: "点检时间", },
        {
            field: "Judge", title: "点检结果", formatter: function (value, row, index) {
                if (value == 'OK') {
                    return '<span style="color:green;">OK</span>';
                } else if (value == 'NG') {
                    return '<span style="color:red;">NG</span>';
                }
            }  },
    ];
    var arr = colArr.split(',');
    for (var i = 0; i < arr.length; i++) {
        title.push({ field: arr[i] + '_Value', title: arr[i], });
        title.push({ field: arr[i] + '_CheckType', title: '基准', });
        title.push({
            field: arr[i] + '_Judge', title: '判定', formatter: function (value, row, index) {
                if (value == 'OK') {
                    return '<span style="color:green;">OK</span>';
                } else if (value == 'NG') {
                    return '<span style="color:red;">NG</span>';
                }
            } });
    }
    return [title];
}

function initOIDClick() {

    //点击查询按钮
    $('#btnOIDSearch').click(function () {
        initOIDTable();
    });

}
function getOIDSearchParam() {
    var timeBegin = $('#searchOIDtimeBegin').val();
    var timeEnd = $('#searchOIDtimeEnd').val();
    var InspectObjectCode = $('#searchOIDInspectObjectCode').val();
    var param = { InspectObjectCode: InspectObjectCode, TimeBegin: timeBegin, TimeEnd: timeEnd }
    return param;
}


 src/DIXWeb.Web/Scripts/Workflow/InRepair.js

@@ -60,6 +60,9 @@
                alert(data.Message);
            }
        },
        onSelect: function (rowIndex, rowData) {
            GetInRepairInspectReck();
        },
    });
}

@@ -148,68 +151,6 @@
                alert(data.Message);
            }
        }
    });
    //点击流程履历
    $('#btnInRepairProcess').click(function () {
        var rows = $('#InRepairTable').datagrid('getSelections');
        if (rows.length != 1) { show('查看流程履历只能选择一行！'); return; }
        var BillId = rows[0].Id
        var param = { BillId: BillId };
        var data = ajaxSame('../../GlobalM/WorkList/GetBillProcess', param, 'post', 'json');
        if (data.Code == 200) {
            //加载履历到dialog上
            var $table = $('<table style="font-weight:bolder;width:100%;"></table>');
            var $tr = $('');
            var $td = $('');
            for (var i in data.rows) {
                //创建tr
                if (data.rows[i].ActionType == 0) {
                    $tr = $('<tr style="background-color:gray;color:black;"></tr>');
                } else if (data.rows[i].ActionType == 1) {
                    $tr = $('<tr style="background-color:green;color:white;"></tr>');
                }
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].NodeName + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].OrderNo + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].UserNo + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].UserName + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].RoleName + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].Remark + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + (data.rows[i].AppendixUrl == "" ? '' : '<a href="' + data.rows[i].AppendixUrl +'" target="_blank">附件</a>') + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].ApproveTimeStr + '</td>');
                $tr.append($td);
                //将tr添加到表格
                $table.append($tr);
            }

            $('#processInRepair').empty();
            $('#controlInRepair').hide();
            $('#detailInRepair').empty();

            $('#processInRepair').append($table);
        } else {
            alert(data.Message);
        }
    });
    //点击表单详细
    $('#btnInRepairDetail').click(function () {
        var rows = $('#InRepairTable').datagrid('getSelections');
        if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
        var BookId = rows[0].BookId
        var param = { InspectBookId: BookId };
        var data = ajaxSame('../../GlobalM/Bill/InspectDetail', param, 'post', 'html');

        $('#processInRepair').empty();
        $('#controlInRepair').show();
        $('#detailInRepair').empty();

        $('#detailInRepair').append(data);
    });
    //保存草稿
    $('#btnInRepairKeepControl').click(function () {
@@ -317,4 +258,58 @@
            result = data;
        },
    });
}

function GetInRepairInspectReck() {
    var rows = $('#InRepairTable').datagrid('getSelections');
    if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
    var BookId = rows[0].BookId
    var param = { InspectBookId: BookId, ShowBtn: 0  };
    var data = ajaxSame('../../GlobalM/Bill/InspectDetail', param, 'post', 'html');

    $('#processInRepair').empty();
    $('#controlInRepair').show();
    $('#detailInRepair').empty();

    $('#detailInRepair').append(data);

    var BillId = rows[0].Id
    var param = { BillId: BillId };
    var data = ajaxSame('../../GlobalM/WorkList/GetBillProcess', param, 'post', 'json');
    if (data.Code == 200) {
        //加载履历到dialog上
        var $table = $('<table style="font-weight:bolder;width:100%;"></table>');
        var $tr = $('');
        var $td = $('');
        for (var i in data.rows) {
            //创建tr
            if (data.rows[i].ActionType == 0) {
                $tr = $('<tr style="background-color:gray;color:black;"></tr>');
            } else if (data.rows[i].ActionType == 1) {
                $tr = $('<tr style="background-color:green;color:white;"></tr>');
            }
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].NodeName + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].OrderNo + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].UserNo + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].UserName + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].RoleName + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].Remark + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + (data.rows[i].AppendixUrl == "" ? '' : '<a href="' + data.rows[i].AppendixUrl + '" target="_blank">附件</a>') + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].ApproveTimeStr + '</td>');
            $tr.append($td);
            //将tr添加到表格
            $table.append($tr);
        }
        
        $('#processInRepair').append($table);
    } else {
        alert(data.Message);
    }
}

 src/DIXWeb.Web/Scripts/Workflow/MyApproved.js

@@ -43,6 +43,17 @@
                }
            },
            {
                title: '单据类型', width: 130, field: 'BillTypeId', formatter: function (value, row, index) {
                    if (value == 1) {
                        return '<span>OK单据</span>';
                    } else if (value == 2) {
                        return '<span style="color:red;font-weight:bold;">NG单据</span>';
                    } else if (value == 3) {
                        return '<span style="color:gray;">维修单</span>';
                    }
                }
            },
            {
                title: '审批时间', width: 200, field: 'CreateTime', formatter: function (value, row, index) {
                    return toDateStr(value);
                }
@@ -57,6 +68,9 @@
                alert(data.Message);
            }
        },
        onSelect: function (rowIndex, rowData) {
            GetMyApprovedInspectReck();
        },
    });
}

@@ -70,69 +84,6 @@
    $('#btnMyApprovedClear').click(function () {
        $('#searchMyApprovedCode').textbox('setValue', '');
    });
    //点击流程履历
    $('#btnMyApprovedProcess').click(function () {
        var rows = $('#MyApprovedTable').datagrid('getSelections');
        if (rows.length != 1) { show('查看流程履历只能选择一行！'); return; }
        var BillId = rows[0].Id
        var param = { BillId: BillId };
        var data = ajaxSame('../../GlobalM/WorkList/GetBillProcess', param, 'post', 'json');
        if (data.Code == 200) {
            //加载履历到dialog上

            var $table = $('<table style="font-weight:bolder;width:100%;"></table>');
            var $tr = $('');
            var $td = $('');
            for (var i in data.rows) {
                //创建tr
                if (data.rows[i].ActionType == 0) {
                    $tr = $('<tr style="background-color:gray;color:black;"></tr>');
                } else if (data.rows[i].ActionType == 1) {
                    $tr = $('<tr style="background-color:green;color:white;"></tr>');
                } else if (data.rows[i].ActionType == -1) {
                    $tr = $('<tr style="background-color:red;color:white;"></tr>');
                }
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].NodeName + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].OrderNo + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].UserNo + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].UserName + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].RoleName + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].Remark + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + (data.rows[i].AppendixUrl == "" ? '' : '<a href="' + data.rows[i].AppendixUrl + '" target="_blank">附件</a>') + '</td>');
                $tr.append($td);
                $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].ApproveTimeStr + '</td>');
                $tr.append($td);
                //将tr添加到表格
                $table.append($tr);
            }

            $('#processMyApproved').empty();
            $('#detailMyApproved').empty();

            $('#processMyApproved').append($table);
        } else {
            alert(data.Message);
        }
    });
    //点击表单详细
    $('#btnMyApprovedDetail').click(function () {
        var rows = $('#MyApprovedTable').datagrid('getSelections');
        if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
        var BookId = rows[0].BookId
        var param = { InspectBookId: BookId };
        var data = ajaxSame('../../GlobalM/Bill/InspectDetail', param, 'post', 'html');

        $('#processMyApproved').empty();
        $('#detailMyApproved').empty();

        $('#detailMyApproved').append(data);
    });
}

//重新加载表格
@@ -141,3 +92,59 @@
        Code: $('#searchMyApprovedCode').textbox('getValue'),
    });
}

function GetMyApprovedInspectReck() {
    $('#processMyApproved').empty();
    $('#detailMyApproved').empty();
    
    var rows = $('#MyApprovedTable').datagrid('getSelections');
    if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
    var BookId = rows[0].BookId
    var param = { InspectBookId: BookId, ShowBtn: 0  };
    var data = ajaxSame('../../GlobalM/Bill/InspectDetail', param, 'post', 'html');
    
    $('#detailMyApproved').append(data);

    var BillId = rows[0].Id
    var param = { BillId: BillId };
    var data = ajaxSame('../../GlobalM/WorkList/GetBillProcess', param, 'post', 'json');
    if (data.Code == 200) {
        //加载履历到dialog上

        var $table = $('<table style="font-weight:bolder;width:100%;"></table>');
        var $tr = $('');
        var $td = $('');
        for (var i in data.rows) {
            //创建tr
            if (data.rows[i].ActionType == 0) {
                $tr = $('<tr style="background-color:gray;color:black;"></tr>');
            } else if (data.rows[i].ActionType == 1) {
                $tr = $('<tr style="background-color:green;color:white;"></tr>');
            } else if (data.rows[i].ActionType == -1) {
                $tr = $('<tr style="background-color:red;color:white;"></tr>');
            }
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].NodeName + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].OrderNo + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].UserNo + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].UserName + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].RoleName + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].Remark + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + (data.rows[i].AppendixUrl == "" ? '' : '<a href="' + data.rows[i].AppendixUrl + '" target="_blank">附件</a>') + '</td>');
            $tr.append($td);
            $td = $('<td style="padding:6px;text-align:center;">' + data.rows[i].ApproveTimeStr + '</td>');
            $tr.append($td);
            //将tr添加到表格
            $table.append($tr);
        }
        
        $('#processMyApproved').append($table);
    } else {
        alert(data.Message);
    }
}

 src/DIXWeb.Web/Scripts/Workflow/MyNeedDealt.js

@@ -68,6 +68,9 @@
                alert(data.Message);
            }
        },
        onSelect: function (rowIndex, rowData) {
            GetMyNeedDealtInspectReck();
        },
    });
}

@@ -170,20 +173,6 @@
            alert(data.Message);
        }
    });
    //点击表单详细
    $('#btnMyNeedDealtDetail').click(function () {
        var rows = $('#MyNeedDealtTable').datagrid('getSelections');
        if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
        var BookId = rows[0].BookId
        var param = { InspectBookId: BookId };
        var data = ajaxSame('../../GlobalM/Bill/InspectDetail', param, 'post', 'html');

        $('#processMyNeedDealt').empty();
        $('#controlMyNeedDealt').show();
        $('#detailMyNeedDealt').empty();

        $('#detailMyNeedDealt').append(data);
    });
    //保存草稿
    $('#btnMyNeedDealtKeepControl').click(function () {
        if (confirm('确认保存草稿？')) {
@@ -256,4 +245,18 @@
            result = data;
        },
    });
}

function GetMyNeedDealtInspectReck() {
    var rows = $('#MyNeedDealtTable').datagrid('getSelections');
    if (rows.length != 1) { show('查看表单只能选择一行！'); return; }
    var BookId = rows[0].BookId
    var param = { InspectBookId: BookId, ShowBtn: 0 };
    var data = ajaxSame('../../GlobalM/Bill/InspectDetail', param, 'post', 'html');

    $('#processMyNeedDealt').empty();
    $('#controlMyNeedDealt').show();
    $('#detailMyNeedDealt').empty();

    $('#detailMyNeedDealt').append(data);
}