diff --git a/DataBase/版本日志/SGGLDB_WH_2024-02-21-lpf.sql b/DataBase/版本日志/SGGLDB_WH_2024-02-21-lpf.sql
new file mode 100644
index 00000000..191d8e05
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2024-02-21-lpf.sql
@@ -0,0 +1,35 @@
+
+alter table dbo.DriverSub_DriverSubContact
+    add State int
+go
+
+exec sp_addextendedproperty 'MS_Description', N'分包状态', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSubContact',
+     'COLUMN', 'State'
+go
+
+
+alter table dbo.DriverSub_DriverSub
+    add SubContractName nvarchar(100)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开车分包名称', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSub',
+     'COLUMN', 'SubContractName'
+go
+
+alter table dbo.DriverSub_DriverSub
+    add DriverContractCode nvarchar(100)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'开车合同号', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSub', 'COLUMN',
+     'DriverContractCode'
+go
+
+alter table dbo.DriverSub_DriverSub
+    add Evaluator nvarchar(100)
+go
+
+exec sp_addextendedproperty 'MS_Description', N'评价人', 'SCHEMA', 'dbo', 'TABLE', 'DriverSub_DriverSub', 'COLUMN',
+     'Evaluator'
+go
+
+
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index 372cebec..af7de356 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -47,6 +47,9 @@
     <Reference Include="Apache.NMS.ActiveMQ">
       <HintPath>..\..\..\SGGL_CWCEC\SGGL\BLL\bin\Debug\Apache.NMS.ActiveMQ.dll</HintPath>
     </Reference>
+    <Reference Include="Aspose.Words">
+      <HintPath>..\FineUIPro\Reference BLL\Aspose.Words.dll</HintPath>
+    </Reference>
     <Reference Include="FineUIPro, Version=6.3.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\FineUIPro\FineUIPro.dll</HintPath>
diff --git a/SGGL/BLL/TestRun/DriverSub/DriverSubContactService.cs b/SGGL/BLL/TestRun/DriverSub/DriverSubContactService.cs
index cc2e4d1d..9aea23db 100644
--- a/SGGL/BLL/TestRun/DriverSub/DriverSubContactService.cs
+++ b/SGGL/BLL/TestRun/DriverSub/DriverSubContactService.cs
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Net.NetworkInformation;
 using FineUIPro;
 using Model;
 
@@ -45,6 +46,7 @@ namespace BLL
             newDriverSubContact.DriverSubContractorsId = DriverSubContact.DriverSubContractorsId;
             newDriverSubContact.SubcontractingType = DriverSubContact.SubcontractingType;
             newDriverSubContact.IsBidirectional = DriverSubContact.IsBidirectional;
+            newDriverSubContact.State= DriverSubContact.State;
             Funs.DB.DriverSub_DriverSubContact.InsertOnSubmit(newDriverSubContact);
             Funs.DB.SubmitChanges();
         }
@@ -64,6 +66,7 @@ namespace BLL
                 newDriverSubContact.DriverSubContractorsId = DriverSubContact.DriverSubContractorsId;
                 newDriverSubContact.SubcontractingType = DriverSubContact.SubcontractingType;
                 newDriverSubContact.IsBidirectional = DriverSubContact.IsBidirectional;
+                newDriverSubContact.State = DriverSubContact.State;
                 Funs.DB.SubmitChanges();
             }
         }
@@ -154,10 +157,36 @@ namespace BLL
             }
             Funs.DB.SubmitChanges();
         }
-
-       
-
-
+        /// <summary>
+        /// 确定分包商状态
+        /// </summary>
+        /// <param name="driverSubPlanId"></param>
+        /// <param name="driverSubContractorsId"></param>
+        /// <param name="state"></param>
+        public static void SetState(string driverSubPlanId, string driverSubContractorsId, string state)
+        {
+            if (string.IsNullOrEmpty(state))
+            {
+                return;
+            }
+            var list = Funs.DB.DriverSub_DriverSubContact.Where(e => e.DriverSubPlanId == driverSubPlanId && e.DriverSubContractorsId == driverSubContractorsId).ToList();
+            foreach (var item in list)
+            {
+                item.State =int.Parse( state);
+            }
+            Funs.DB.SubmitChanges();
+        }
+        /// <summary>
+        /// 分包状态下拉框
+        /// </summary>
+        /// <param name="dropDownList"></param>
+        public static void InitDriverSubPlanState( DropDownList dropDownList)
+        {
+           dropDownList.DataSource = DropListService.drpDriverSubPlanStateList();
+           dropDownList.DataTextField = "Text";
+           dropDownList.DataValueField = "Value";
+           dropDownList.DataBind(); ;
+        }
 
     }
 }
diff --git a/SGGL/BLL/TestRun/DriverSub/DriverSubService.cs b/SGGL/BLL/TestRun/DriverSub/DriverSubService.cs
index 3adfda9d..4fe89d3e 100644
--- a/SGGL/BLL/TestRun/DriverSub/DriverSubService.cs
+++ b/SGGL/BLL/TestRun/DriverSub/DriverSubService.cs
@@ -1,8 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Data.SqlClient;
+using System.Data;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Aspose.Words;
 
 namespace BLL
 {
@@ -20,8 +24,9 @@ namespace BLL
         {
             return Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubId == DriverSubId);
         }
+
         /// <summary>
-        /// 根据
+        /// 根据分包计划和分包商获取开车分包管理信息
         /// </summary>
         /// <param name="DriverSubPlanId"></param>
         /// <param name="DriverSubContractorsId"></param>
@@ -31,6 +36,89 @@ namespace BLL
         {
             return Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId&& e.DriverSubContractorsId==DriverSubContractorsId);
         }
+
+        /// <summary>
+        /// DriverSubPlanId和DriverSubContractorsId 获取对象的EvaluationData信息，将json数据EvaluationData  转换成List 
+        /// </summary>
+        /// <param name="DriverSubPlanId"></param>
+        /// <param name="DriverSubContractorsId"></param>
+        /// <returns></returns>
+        public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData(string DriverSubPlanId,
+            string DriverSubContractorsId)
+        {
+            List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
+            Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId);
+            if (data != null)
+            {
+                list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.DriverSubEvaluationData>>(data.EvaluationData);
+            }
+            return list;
+        }
+
+        /// <summary>
+        /// 将List DriverSubEvaluationData转换成json数据
+        /// </summary>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        public static string GetDriverSubEvaluationDataJson(List<Model.DriverSubEvaluationData> list)
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(list);
+        }
+
+        /// <summary>
+        ///  根据分包类别获取初始化数据List 
+        /// </summary>
+        /// <returns></returns>
+        public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData(string type )
+        {
+           
+            List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
+            switch (type)
+            {
+                case "1"://催化剂装填
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "催化剂装填准备", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "催化剂装填实施", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "装填结果认定", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
+                   // list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
+                    break;
+                case "2"://烘炉
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "烘炉准备", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "烘炉实施", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "烘炉结果认定", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
+                  //  list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
+                    break;
+                case "3"://化学清洗
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "化学清洗准备", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "化学清洗实施", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "清洗结果认定", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
+                   // list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
+                    break;
+                case "4"://开车队
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "业主人员培训", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "编制技术方案", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "预试车", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "联动试车", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "投料试车", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "生产试运行", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "性能考核", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 8, Matter = "生产安全", Grade = "" });
+                    list.Add(new Model.DriverSubEvaluationData() { Number = 9, Matter = "试车进度", Grade = "" });
+                   // list.Add(new Model.DriverSubEvaluationData() { Number = 10, Matter = "其他", Grade = "" });
+                    break;
+            }
+           
+            return list;
+        }
+
         /// <summary>
         /// 添加开车分包管理信息
         /// </summary>
@@ -45,6 +133,9 @@ namespace BLL
             newDriverSub.DriverSubPlanId= DriverSub.DriverSubPlanId;
             newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId;
             newDriverSub.EvaluationData = DriverSub.EvaluationData; 
+            newDriverSub.DriverContractCode= DriverSub.DriverContractCode;
+            newDriverSub.SubContractName = DriverSub.SubContractName;
+            newDriverSub.Evaluator= DriverSub.Evaluator;
             Funs.DB.DriverSub_DriverSub.InsertOnSubmit(newDriverSub);
             Funs.DB.SubmitChanges();
         }
@@ -63,9 +154,91 @@ namespace BLL
                 newDriverSub.DriverSubPlanId = DriverSub.DriverSubPlanId;
                 newDriverSub.DriverSubContractorsId = DriverSub.DriverSubContractorsId;
                 newDriverSub.EvaluationData = DriverSub.EvaluationData;
+                newDriverSub.DriverContractCode = DriverSub.DriverContractCode;
+                newDriverSub.SubContractName = DriverSub.SubContractName;
+                newDriverSub.Evaluator = DriverSub.Evaluator;
                 Funs.DB.SubmitChanges();
             }
         }
+         
+        public static Document Print(string driverSubPlanId, string driverSubContractorsId)
+        {
+            string rootPath = Funs.RootPath;
+
+            string initTemplatePath = string.Empty;
+            string uploadfilepath = string.Empty;
+            string newUrl = string.Empty;
+            initTemplatePath = "File\\Word\\TestRun\\履约情况评价表.doc";
+            uploadfilepath = rootPath + initTemplatePath;
+            newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc");
+            if (File.Exists(newUrl))
+            {
+                File.Delete(newUrl);
+            }
+            File.Copy(uploadfilepath, newUrl);
+            
+            //定义实体
+            var model = GetDriverSubBySubPlanIdAndTractorsId(driverSubPlanId,driverSubContractorsId);//分包管理实体
+            var subContractorsModel = DriversubcontractorsService.GetDriverSub_DriverSubContractorsById(driverSubContractorsId);//分包商实体
+            var evaluationData = GetDriverSubEvaluationData(driverSubPlanId, driverSubContractorsId);//打分数据
+            var projectModel = ProjectService.GetProjectByProjectId(model.ProjectId);//项目实体
+
+            string subcontractingType = BLL.DriverSubPlanService.GetSubcontractingTypeNames(subContractorsModel.SubcontractingType);//分包类别名称
+
+            
+            //打分数数据绑定
+            DataTable tb= Funs.LINQToDataTable(evaluationData);
+            tb.TableName = "Table";
+            Document doc = new Aspose.Words.Document(newUrl);
+            doc.MailMerge.ExecuteWithRegions(tb);
+           
+            Dictionary<string, object> Dic_File = new Dictionary<string, object>();
+            Dic_File.Add("txtSubcontractingType", subcontractingType);
+            Dic_File.Add("txtProjectCode", projectModel.ProjectCode);
+            Dic_File.Add("txtSubContractName", model.SubContractName);
+            Dic_File.Add("txtDriverContractCode", model.DriverContractCode);
+            Dic_File.Add("txtSubUnitName",subContractorsModel.SubUnitName);
+            Dic_File.Add("txtEvaluator", model.Evaluator);
+            foreach (var item in Dic_File)
+            {
+                string[] key = { item.Key };
+                object[] value = { item.Value };
+                doc.MailMerge.Execute(key, value);
+
+            }
+            doc.Save(newUrl);
+            Document doc1 = new Aspose.Words.Document(newUrl);
+            File.Delete(newUrl);
+            return doc1;
+        }
+        public static void PrintFile(string driverSubPlanId, string driverSubContractorsId)
+        {
+            string rootPath = Funs.RootPath;
+
+            string newUrl = string.Empty;
+            newUrl = rootPath + "File\\Word\\TestRun\\履约情况评价表.doc";
+            newUrl = newUrl.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc");
+            if (File.Exists(newUrl))
+            {
+                File.Delete(newUrl);
+            }
+            var doc = Print(driverSubPlanId,driverSubContractorsId);
+            doc.Save(newUrl);
+             
+            //验证参数
+            if (doc == null) { throw new Exception("Word文件无效"); } 
+            string fileName = Path.GetFileName(newUrl);
+            FileInfo info = new FileInfo(newUrl);
+            long fileSize = info.Length;
+            System.Web.HttpContext.Current.Response.Clear();
+            System.Web.HttpContext.Current.Response.ContentType = "application/x-zip-compressed";
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
+            System.Web.HttpContext.Current.Response.AddHeader("Content-Length", fileSize.ToString());
+            System.Web.HttpContext.Current.Response.TransmitFile(newUrl, 0, fileSize);
+            System.Web.HttpContext.Current.Response.Flush();
+            System.Web.HttpContext.Current.Response.Close();
+            File.Delete(newUrl); 
+        }
 
         /// <summary>
         /// 根据主键删除开车分包管理
@@ -80,25 +253,12 @@ namespace BLL
                 Funs.DB.SubmitChanges();
             }
         }
-        //DriverSubPlanId和DriverSubContractorsId 获取对象的EvaluationData信息，将json数据EvaluationData  转换成List<Model.DriverSubEvaluationData>
-        public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData(string DriverSubPlanId,
-            string DriverSubContractorsId)
-        {
-            List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
-            Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId);
-            if (data != null)
-            {
-                list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.DriverSubEvaluationData>>(data.EvaluationData);
-            }
-            return list;
-        }
-        //将List<Model.DriverSubEvaluationData>转换成json数据
-        public static string GetDriverSubEvaluationDataJson(List<Model.DriverSubEvaluationData> list)
-        {
-            return Newtonsoft.Json.JsonConvert.SerializeObject(list);
-        }
 
-        //DriverSubPlanId和DriverSubContractorsId 删除数据
+        /// <summary>
+        /// DriverSubPlanId和DriverSubContractorsId 删除数据 
+        /// </summary>
+        /// <param name="DriverSubPlanId"></param>
+        /// <param name="DriverSubContractorsId"></param>
         public static void DeleteDriverSubEvaluationData(string DriverSubPlanId, string DriverSubContractorsId)
         {
             Model.DriverSub_DriverSub data = Funs.DB.DriverSub_DriverSub.FirstOrDefault(e => e.DriverSubPlanId == DriverSubPlanId && e.DriverSubContractorsId == DriverSubContractorsId);
@@ -108,6 +268,7 @@ namespace BLL
                 Funs.DB.SubmitChanges();
             }
         } 
+
         /// <summary>
         /// 根据DriverSubPlanId删除实体
         /// </summary>
@@ -129,61 +290,5 @@ namespace BLL
                 Funs.DB.SubmitChanges();
             }
         }
-
-
-        /// <summary>
-        /// 获取初始化数据List<Model.DriverSubEvaluationData> 
-        /// </summary>
-        /// <returns></returns>
-        public static List<Model.DriverSubEvaluationData> GetDriverSubEvaluationData(string type )
-        {
-           
-            List<Model.DriverSubEvaluationData> list = new List<Model.DriverSubEvaluationData>();
-            switch (type)
-            {
-                case "1"://催化剂装填
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "催化剂装填准备", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "催化剂装填实施", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "装填结果认定", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
-                    break;
-                case "2"://烘炉
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "烘炉准备", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "烘炉实施", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "烘炉结果认定", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
-                    break;
-                case "3"://化学清洗
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "方案编制", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "化学清洗准备", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "人员配合", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "化学清洗实施", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "清洗结果认定", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "收尾处理", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "其他", Grade = "" });
-                    break;
-                case "4"://开车队
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 1, Matter = "业主人员培训", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 2, Matter = "编制技术方案", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 3, Matter = "预试车", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 4, Matter = "联动试车", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 5, Matter = "投料试车", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 6, Matter = "生产试运行", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 7, Matter = "性能考核", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 8, Matter = "生产安全", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 9, Matter = "试车进度", Grade = "" });
-                    list.Add(new Model.DriverSubEvaluationData() { Number = 10, Matter = "其他", Grade = "" });
-                    break;
-            }
-           
-            return list;
-        }
-
     }
 }
diff --git a/SGGL/FineUIPro.Web/File/Word/TestRun/履约情况评价表.doc b/SGGL/FineUIPro.Web/File/Word/TestRun/履约情况评价表.doc
new file mode 100644
index 00000000..7e7fe1d9
--- /dev/null
+++ b/SGGL/FineUIPro.Web/File/Word/TestRun/履约情况评价表.doc
@@ -0,0 +1,20 @@
+
+|    |中国五环      |«txtSubcontractingType»履约情况评 |项目号|«txtProjectC|
+|    |工程有限公司  |价表                              |      |ode»        |
+|    |              |                                  |-顺序号-年份码     |
+|                                               |                           |
+|开车合作单位：«txtSubUnitName»       |评价人：«txtEvaluator»               |
+|履约情况评价                                                              |
+|事项       |评分                                                          |
+|装置       |煤气化                                                        |
+|           |合成氨                                                        |
+|           |尿素                                                          |
+|           |水系统                                                        |
+|«TableStart|«Grade»«TableEnd:Table»                                       |
+|:Table»«Mat|                                                              |
+|ter»       |                                                              |
+|其他：                                                                    |
+
+
+填表说明：以百分制进行评价，60分以下为履约差，60~80分为履约一般，80~100分为履
+约优秀。
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index a1b0442b..27733777 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -1765,6 +1765,7 @@
     <Content Include="TestRun\DriverSub\DriverSubPlan.aspx" />
     <Content Include="TestRun\DriverSub\DriverSubPlanEdit.aspx" />
     <Content Include="TestRun\DriverSub\DriverSubSetContactorEdit.aspx" />
+    <Content Include="TestRun\DriverSub\DriverSubSetProgressEdit.aspx" />
     <Content Include="TestRun\DriverSummary\CompleteSummary.aspx" />
     <Content Include="TestRun\DriverSummary\CompleteSummaryEdit.aspx" />
     <Content Include="TestRun\DriverSummary\MonthSummary.aspx" />
@@ -15901,6 +15902,13 @@
     <Compile Include="TestRun\DriverSub\DriverSubSetContactorEdit.aspx.designer.cs">
       <DependentUpon>DriverSubSetContactorEdit.aspx</DependentUpon>
     </Compile>
+    <Compile Include="TestRun\DriverSub\DriverSubSetProgressEdit.aspx.cs">
+      <DependentUpon>DriverSubSetProgressEdit.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
+    </Compile>
+    <Compile Include="TestRun\DriverSub\DriverSubSetProgressEdit.aspx.designer.cs">
+      <DependentUpon>DriverSubSetProgressEdit.aspx</DependentUpon>
+    </Compile>
     <Compile Include="TestRun\DriverSummary\CompleteSummary.aspx.cs">
       <DependentUpon>CompleteSummary.aspx</DependentUpon>
       <SubType>ASPXCodeBehind</SubType>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
index 63ca13cc..9e91deff 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress>false</Use64BitIISExpress>
     <IISExpressSSLPort />
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx
index fe45b0b2..a3f8cf37 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx
@@ -28,6 +28,7 @@
                             <f:Button ID="btnNew" Icon="Add" ToolTip="新增" EnablePostBack="false" runat="server" Hidden="true">
                             </f:Button>
                             <f:Button ID="btnSelect" Icon="ApplicationEdit" ToolTip="选标" Text="选标" EnablePostBack="True" runat="server"   OnClick="btnSelect_OnClick"> </f:Button>
+                            <f:Button ID="btnProgress" Icon="ApplicationEdit" ToolTip="进度" Text="进度" EnablePostBack="True" runat="server"   OnClick="btnProgress_OnClick"> </f:Button>
                             <f:Button ID="btnScoring" Icon="ApplicationEdit" ToolTip="打分" Text="打分"  EnablePostBack="True" runat="server"  OnClick="btnScoring_OnClick"> </f:Button>
 
                         </Items>
@@ -66,7 +67,7 @@
     </f:Panel>
     <f:Window ID="Window1" Title="开车分包情况" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" IsModal="true" OnClose="Window1_Close"
-        Width="1000px" Height="700px">
+        Width="1000px" Height="750px">
     </f:Window>
     <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
         Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs
index 2c685f2a..d97015c8 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.cs
@@ -226,5 +226,23 @@ namespace FineUIPro.Web.TestRun.DriverSub
             }
             PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubEdit.aspx?DriverSubPlanId={0}", Grid1.SelectedRowID, "编辑 - ")));
         }
+
+        protected void btnProgress_OnClick(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+
+
+            if (!DriverSubContactService.IsAllBidirectional(Grid1.SelectedRowID))
+            {
+                Alert.ShowInTop("请先进行选标确定中标单位！", MessageBoxIcon.Warning);
+                return;
+            }
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("DriverSubSetProgressEdit.aspx?DriverSubPlanId={0}", Grid1.SelectedRowID, "编辑 - ")));
+
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs
index bf03c282..76f01d45 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSub.aspx.designer.cs
@@ -95,6 +95,15 @@ namespace FineUIPro.Web.TestRun.DriverSub
         /// </remarks>
         protected global::FineUIPro.Button btnSelect;
 
+        /// <summary>
+        /// btnProgress 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnProgress;
+
         /// <summary>
         /// btnScoring 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx
index 6d2a1f0c..ef207541 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx
@@ -4,7 +4,7 @@
 
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
-    <title>开车分包管理</title>
+    <title>开车分包管理打分</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> 
     <link href="~/res/css/common.css" rel="stylesheet" type="text/css" />
 </head>
@@ -26,12 +26,15 @@
                     </Items>
                 </f:Panel>
                 <f:Panel runat="server" ID="panelCenterRegion" RegionPosition="Center" ShowBorder="true"
-                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="焊接任务单"
+                    Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="履约情况评价表"
                     TitleToolTip="履约情况评价表" AutoScroll="true">
                     <Items>
+                        <f:TextBox runat="server" ID="txtSubContractName" Label="分包合同名称" LabelAlign="Left" LabelWidth="120px" />
+                        <f:TextBox runat="server" ID="txtDriverContractCode" Label="开车合同号" LabelAlign="Left" LabelWidth="120px" />
+                        <f:TextBox runat="server" ID="txtEvaluator" Label="评价人" LabelAlign="Left" LabelWidth="120px" />
                         <f:Grid ID="Grid1" CssClass="blockpanel" ShowBorder="true" ShowHeader="false" Title="" EnableCollapse="false"
                                 runat="server" DataKeyNames="Number" AllowCellEditing="true" ClicksToEdit="1" ForceFit="true"
-                                EnableColumnLines="true" DataIDField="Number" Height="450px">
+                                EnableColumnLines="true" DataIDField="Number" Height="400px">
                             <Columns>
                                 <f:RenderField ColumnID="Number" DataField="Number" FieldType="String" Width="5px"
                                                HeaderText="序号" HeaderTextAlign="Center">
@@ -47,6 +50,10 @@
                                 </f:RenderField> 
                             </Columns>
                         </f:Grid>
+                       <f:Label runat="server" Text="填表说明：以百分制进行评价，60分以下为履约差，60~80分为履约一般，80~100分为履约优秀。"/>
+                        <f:Button ID="btnPrinter" EnablePostBack="true" runat="server"
+                                  Text="导出履约情况评价表" Icon="Printer" OnClick="btnOut_Click" EnableAjax="false" DisableControlBeforePostBack="true">
+                        </f:Button> 
                         <f:Button ID="btnAttach" Icon="TableCell" EnablePostBack="true" Text="附件" runat="server" OnClick="btnAttach_Click">
                         </f:Button>
                     </Items>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs
index dd27c8eb..3709022b 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.cs
@@ -94,6 +94,9 @@ namespace FineUIPro.Web.TestRun.DriverSub
            if (model!=null)
            {
                DriverSubId = model.DriverSubId;
+               txtDriverContractCode.Text = model.DriverContractCode;
+               txtSubContractName.Text = model.SubContractName;
+               txtEvaluator.Text = model.Evaluator;
            }
            else
            {
@@ -160,7 +163,9 @@ namespace FineUIPro.Web.TestRun.DriverSub
             newData.DriverSubPlanId = DriverSubPlanId;
             newData.DriverSubContractorsId = tvControlItem.SelectedNodeID;
             newData.EvaluationData = json;
-
+            newData.DriverContractCode = txtDriverContractCode.Text;
+            newData.SubContractName = txtSubContractName.Text;
+            newData.Evaluator = txtEvaluator.Text;
             if (string.IsNullOrEmpty(DriverSubId))
             {
                 newData.DriverSubId = SQLHelper.GetNewID(typeof(Model.DriverSub_DriverSub));
@@ -177,5 +182,14 @@ namespace FineUIPro.Web.TestRun.DriverSub
 
         #endregion
 
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            if (string.IsNullOrEmpty(DriverSubId))
+            {
+                ShowNotify("请先编辑数据！", MessageBoxIcon.Success);
+                return;
+            }
+            BLL.DriverSubService.PrintFile(DriverSubPlanId, tvControlItem.SelectedNodeID);
+        }
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs
index ac61e7dc..5cb1c9a2 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubEdit.aspx.designer.cs
@@ -68,6 +68,33 @@ namespace FineUIPro.Web.TestRun.DriverSub
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
 
+        /// <summary>
+        /// txtSubContractName 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtSubContractName;
+
+        /// <summary>
+        /// txtDriverContractCode 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtDriverContractCode;
+
+        /// <summary>
+        /// txtEvaluator 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtEvaluator;
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -86,6 +113,15 @@ namespace FineUIPro.Web.TestRun.DriverSub
         /// </remarks>
         protected global::FineUIPro.TextBox txtGrade;
 
+        /// <summary>
+        /// btnPrinter 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnPrinter;
+
         /// <summary>
         /// btnAttach 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlan.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlan.aspx
index 0fa7e97b..cf991ce3 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlan.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlan.aspx
@@ -39,9 +39,7 @@
                                 <asp:Label ID="Label1" runat="server" Text='<%# BLL.DriverSubPlanService.GetSubcontractingTypeNames(Eval("SubcontractingTypes")) %>'></asp:Label>
                             </ItemTemplate>
                         </f:TemplateField>
-                        <f:RenderField ColumnID="StateName" DataField="StateName"
-                                       FieldType="String" HeaderText="状态" HeaderTextAlign="Center" TextAlign="Center" Width="55px">
-                        </f:RenderField>
+
                         <f:LinkButtonField HeaderText="附件" ConfirmTarget="Top" CommandName="AttachUrl" ColumnID="AttachUrl"
                             TextAlign="Center" ToolTip="附件查看" Icon="Find" />
                        
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx
index ea67e138..62dcc3d1 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx
@@ -44,12 +44,7 @@
                                         <Items>
                                             <f:CheckBoxList ID="SubcontractingTypes" Label="开车分包类别" runat="server" LabelAlign="Right" LabelWidth="150px"  Required="True" ShowRedStar="True"  ></f:CheckBoxList>
                                         </Items>
-                                    </f:FormRow>
-                                    <f:FormRow runat="server">
-                                        <Items>
-                                            <f:dropdownlist ID="drpstate" Label="分包状态" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" runat="server" ></f:dropdownlist>
-                                        </Items>
-                                    </f:FormRow>
+                                    </f:FormRow> 
                                     <f:FormRow runat="server">
                                         <Items>
                                             <f:Panel ID="Panel3" Width="300px" ShowHeader="false" ShowBorder="false" Layout="Column" CssClass="" runat="server">
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx.cs
index c770e214..e381c8e4 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx.cs
@@ -23,10 +23,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
                 SubcontractingTypes.DataValueField = "Value";
                 SubcontractingTypes.DataBind();
 
-                drpstate.DataSource = DropListService.drpDriverSubPlanStateList();
-                drpstate.DataTextField = "Text";
-                drpstate.DataValueField = "Value";
-                drpstate.DataBind();
+             
                 if (!string.IsNullOrEmpty(id))
                 {
                     Model.DriverSub_DriverSubPlan data = BLL.DriverSubPlanService.GetDriverSubPlanById(id);
@@ -35,17 +32,7 @@ namespace FineUIPro.Web.TestRun.DriverSub
                         this.hdId.Text = id;
                         this.txtCode.Text = data.Code;
                         this.SubcontractingTypes.SelectedValueArray= data.SubcontractingTypes.Split(',');
-                        this.drpstate.SelectedValue= data.State.ToString();
-                        //if (!string.IsNullOrEmpty(data.SubUnitId))
-                        //{
-                        //    this.drpSubUnitId.SelectedValue = data.SubUnitId;
-                        //}
-                        //this.txtIntroductions.Text = data.Introductions;
-                        //this.txtAchievement.Text = data.Achievement;
-                        //this.txtCooperation.Text = data.Cooperation;
-                        //this.drpUnitWorkIds.SelectedValueArray = data.InstallationIds.Split(',');
-                        //this.rblIsInvited.SelectedValue = data.IsInvited.ToString();
-                        //this.txtRemark.Text = data.Remark;
+               
                     }
                 }
             }
@@ -81,7 +68,6 @@ namespace FineUIPro.Web.TestRun.DriverSub
             Model.DriverSub_DriverSubPlan newData = new Model.DriverSub_DriverSubPlan();
             newData.Code = this.txtCode.Text.Trim();
             newData.SubcontractingTypes = GetStringByArray(this.SubcontractingTypes.SelectedValueArray);
-            newData.State = int.Parse(drpstate.SelectedValue);
             newData.ProjectId = this.CurrUser.LoginProjectId;
             if (!string.IsNullOrEmpty(id))
             {
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx.designer.cs
index 33d6cc0d..c0f2ae54 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubPlanEdit.aspx.designer.cs
@@ -122,15 +122,6 @@ namespace FineUIPro.Web.TestRun.DriverSub
         /// </remarks>
         protected global::FineUIPro.CheckBoxList SubcontractingTypes;
 
-        /// <summary>
-        /// drpstate 控件。
-        /// </summary>
-        /// <remarks>
-        /// 自动生成的字段。
-        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
-        /// </remarks>
-        protected global::FineUIPro.DropDownList drpstate;
-
         /// <summary>
         /// Panel3 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetContactorEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetContactorEdit.aspx
index f9b569ec..66fceff7 100644
--- a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetContactorEdit.aspx
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetContactorEdit.aspx
@@ -6,7 +6,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head runat="server">
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <title>编辑开车分包联络</title>
+    <title>开车分包管理选标</title>
 </head>
 <body>
     <form id="form1" runat="server">
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx
new file mode 100644
index 00000000..537be62d
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx
@@ -0,0 +1,70 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="DriverSubSetProgressEdit.aspx.cs" Inherits="FineUIPro.Web.TestRun.DriverSub.DriverSubSetProgressEdit" %>
+
+<!DOCTYPE html>
+
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head runat="server">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>开车分包管理进度</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+        <f:PageManager ID="PageManager1" AutoSizePanelID="SimpleForm1" runat="server" />
+        <f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
+            BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
+            <Toolbars>
+                <f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server">
+                    <Items>
+                        <f:ToolbarFill ID="ToolbarFill1" runat="server">
+                        </f:ToolbarFill>
+                        <f:Button ID="btnSave" OnClick="btnSave_Click" Icon="SystemSave" runat="server" ToolTip="保存" Text="保存" ValidateForms="SimpleForm1">
+                        </f:Button>
+                        <f:Button ID="btnClose" EnablePostBack="false" ToolTip="关闭" Text="关闭" runat="server" Icon="SystemClose" Size="Medium">
+                        </f:Button>
+                       </Items>
+                </f:Toolbar>
+            </Toolbars>
+            <Rows>
+               <f:FormRow>
+                    <Items>
+                        <f:DropDownList  runat="server" ID="drpCatalystLoading" AutoSelectFirstItem="false" EmptyText="请从下拉选项中选择" MatchFieldWidth="false" Label="催化剂装填" LabelWidth="130px" LabelAlign="Right" Required="True" ShowRedStar="True" Hidden="True" Readonly="True">
+                        </f:DropDownList>
+                        <f:dropdownlist ID="drpCatalystLoadingState" Label="分包状态" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" runat="server" Hidden="True"  ></f:dropdownlist>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList  runat="server" ID="drpOven" AutoSelectFirstItem="false" EmptyText="请从下拉选项中选择" MatchFieldWidth="false" Label="烘炉" LabelWidth="130px" LabelAlign="Right" Required="True" ShowRedStar="True" Hidden="True" Readonly="True">
+                        </f:DropDownList>
+                        <f:dropdownlist ID="drpOvenState" Label="分包状态" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" runat="server" Hidden="True" ></f:dropdownlist>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList  runat="server" ID="drpChemicalCleaning" AutoSelectFirstItem="false" EmptyText="请从下拉选项中选择" MatchFieldWidth="false" Label="化学清洗" LabelWidth="130px" LabelAlign="Right" Required="True" ShowRedStar="True" Hidden="True" Readonly="True">
+                        </f:DropDownList>
+                        <f:dropdownlist ID="drpChemicalCleaningState" Label="分包状态" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" runat="server" Hidden="True" ></f:dropdownlist>
+
+                    </Items>
+                </f:FormRow>
+                <f:FormRow>
+                    <Items>
+                        <f:DropDownList  runat="server" ID="drpDrivingTeam" AutoSelectFirstItem="false" EmptyText="请从下拉选项中选择" MatchFieldWidth="false" Label="开车队" LabelWidth="130px" LabelAlign="Right" Required="True" ShowRedStar="True" Hidden="True" Readonly="True">
+                           </f:DropDownList>
+                        <f:dropdownlist ID="drpDrivingTeamState" Label="分包状态" LabelAlign="Right" LabelWidth="150px" Required="true" ShowRedStar="true" runat="server" Hidden="True" ></f:dropdownlist>
+
+                    </Items>
+                </f:FormRow>
+            </Rows>
+        </f:Form>
+        <f:Window ID="WindowAtt" Title="弹出窗体" Hidden="true" EnableIFrame="true" EnableMaximize="true"
+            Target="Parent" EnableResize="false" runat="server" IsModal="true" Width="700px"
+            Height="500px">
+        </f:Window>
+    </form>
+</body>
+</html>
+
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx.cs
new file mode 100644
index 00000000..b1582e5f
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx.cs
@@ -0,0 +1,115 @@
+using BLL;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+
+namespace FineUIPro.Web.TestRun.DriverSub
+{
+    public partial class DriverSubSetProgressEdit : PageBase
+    {
+        public string DriverSubPlanId
+        {
+            get { return (string)ViewState["DriverSubPlanId"]; }
+            set { ViewState["DriverSubPlanId"] = value; }
+        }
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (!IsPostBack)
+            {
+                this.btnClose.OnClientClick = ActiveWindow.GetHideReference();
+                DriverSubPlanId = Request.Params["DriverSubPlanId"];
+                Bind();
+            }
+
+
+        }
+
+        void Save()
+        {
+            DriverSubContactService.SetState(DriverSubPlanId, drpCatalystLoading.SelectedValue,drpCatalystLoadingState.SelectedValue );
+            DriverSubContactService.SetState(DriverSubPlanId, drpOven.SelectedValue, drpOvenState.SelectedValue);
+            DriverSubContactService.SetState(DriverSubPlanId, drpChemicalCleaning.SelectedValue, drpChemicalCleaningState.SelectedValue);
+            DriverSubContactService.SetState(DriverSubPlanId, drpDrivingTeam.SelectedValue, drpDrivingTeamState.SelectedValue);
+            ShowNotify("保存成功！", MessageBoxIcon.Success);
+            PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
+        }
+
+        void Bind()
+        {
+
+            var model = BLL.DriverSubPlanService.GetDriverSubPlanById(DriverSubPlanId);
+            if (model != null)
+            {
+
+                var subcontractingtypeList = model.SubcontractingTypes.Split(',');
+
+
+                foreach (string item in subcontractingtypeList)
+                {
+                    if (item.Contains("1"))
+                    {
+                        drpCatalystLoading.Hidden = false;
+                        DriverSubContactService.InitDropListByDriverSubPlanId(DriverSubPlanId, item, drpCatalystLoading);
+                        drpCatalystLoading.SelectedValue = DriverSubContactService
+                            .GetBidirectional(DriverSubPlanId, "1")?.DriverSubContractorsId;
+
+                        drpCatalystLoadingState.Hidden=false;
+                        DriverSubContactService.InitDriverSubPlanState(drpCatalystLoadingState);
+                        drpCatalystLoadingState.SelectedValue = DriverSubContactService
+                            .GetBidirectional(DriverSubPlanId, "1")?.State.ToString();
+                    }
+                    else if (item.Contains("2"))
+                    {
+                        drpOven.Hidden = false;
+                        DriverSubContactService.InitDropListByDriverSubPlanId(DriverSubPlanId, item, drpOven);
+                        drpOven.SelectedValue = DriverSubContactService
+                            .GetBidirectional(DriverSubPlanId, "2")?.DriverSubContractorsId;
+
+                        drpOvenState.Hidden = false;
+                        DriverSubContactService.InitDriverSubPlanState(drpOvenState);
+                        drpOvenState.SelectedValue = DriverSubContactService
+                            .GetBidirectional(DriverSubPlanId, "2")?.State.ToString();
+                    }
+                    else if (item.Contains("3"))
+                    {
+                        drpChemicalCleaning.Hidden = false;
+                        DriverSubContactService.InitDropListByDriverSubPlanId(DriverSubPlanId, item, drpChemicalCleaning);
+                        drpChemicalCleaning.SelectedValue = DriverSubContactService
+                            .GetBidirectional(DriverSubPlanId, "3")?.DriverSubContractorsId;
+
+                        drpChemicalCleaningState.Hidden = false;
+                        DriverSubContactService.InitDriverSubPlanState(drpChemicalCleaningState);
+                        drpChemicalCleaningState.SelectedValue = DriverSubContactService
+                            .GetBidirectional(DriverSubPlanId, "3")?.State.ToString();
+                    }
+                    else if (item.Contains("4"))
+                    {
+                        drpDrivingTeam.Hidden = false;
+                        DriverSubContactService.InitDropListByDriverSubPlanId(DriverSubPlanId, item, drpDrivingTeam);
+                        drpDrivingTeam.SelectedValue = DriverSubContactService
+                            .GetBidirectional(DriverSubPlanId, "4")?.DriverSubContractorsId;
+
+                        drpDrivingTeamState.Hidden = false;
+                        DriverSubContactService.InitDriverSubPlanState(drpDrivingTeamState);
+                        drpDrivingTeamState.SelectedValue = DriverSubContactService
+                            .GetBidirectional(DriverSubPlanId, "4")?.State.ToString();
+                    }
+
+                }
+
+            }
+        }
+
+        protected void btnSave_Click(object sender, EventArgs e)
+        {
+            Save();
+        }
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx.designer.cs
new file mode 100644
index 00000000..42596f1b
--- /dev/null
+++ b/SGGL/FineUIPro.Web/TestRun/DriverSub/DriverSubSetProgressEdit.aspx.designer.cs
@@ -0,0 +1,161 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+//     此代码由工具生成。
+//
+//     对此文件的更改可能导致不正确的行为，如果
+//     重新生成代码，则所做更改将丢失。
+// </自动生成>
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.TestRun.DriverSub
+{
+
+
+    public partial class DriverSubSetProgressEdit
+    {
+
+        /// <summary>
+        /// form1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+
+        /// <summary>
+        /// PageManager1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.PageManager PageManager1;
+
+        /// <summary>
+        /// SimpleForm1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Form SimpleForm1;
+
+        /// <summary>
+        /// Toolbar1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Toolbar Toolbar1;
+
+        /// <summary>
+        /// ToolbarFill1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.ToolbarFill ToolbarFill1;
+
+        /// <summary>
+        /// btnSave 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnSave;
+
+        /// <summary>
+        /// btnClose 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Button btnClose;
+
+        /// <summary>
+        /// drpCatalystLoading 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCatalystLoading;
+
+        /// <summary>
+        /// drpCatalystLoadingState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpCatalystLoadingState;
+
+        /// <summary>
+        /// drpOven 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpOven;
+
+        /// <summary>
+        /// drpOvenState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpOvenState;
+
+        /// <summary>
+        /// drpChemicalCleaning 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChemicalCleaning;
+
+        /// <summary>
+        /// drpChemicalCleaningState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpChemicalCleaningState;
+
+        /// <summary>
+        /// drpDrivingTeam 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpDrivingTeam;
+
+        /// <summary>
+        /// drpDrivingTeamState 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpDrivingTeamState;
+
+        /// <summary>
+        /// WindowAtt 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Window WindowAtt;
+    }
+}
diff --git a/SGGL/FineUIPro.Web/Web.config b/SGGL/FineUIPro.Web/Web.config
index 46631457..56282e91 100644
--- a/SGGL/FineUIPro.Web/Web.config
+++ b/SGGL/FineUIPro.Web/Web.config
@@ -8,11 +8,11 @@
   <configSections>
     <section name="FineUIPro" type="FineUIPro.ConfigSection, FineUIPro" requirePermission="false"/>
   </configSections>
-  <FineUIPro DebugMode="false" Theme="Cupertino"/>
+  <FineUIPro DebugMode="true" Theme="Cupertino"/>
   <appSettings>
     <!--连接字符串-->
     <!--<add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>-->
-    <add key="ConnectionString" value="Server=.\SQL2012;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
     <!--系统名称-->
     <add key="SystemName" value="智慧施工管理信息系统V1.0"/>
     <add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>
@@ -77,7 +77,7 @@
       <add verb="GET" path="res.axd" type="FineUIPro.ResourceHandler, FineUIPro" validate="false"/>
       <add path="ChartImg.axd" verb="GET,POST,HEAD" type="System.Web.UI.DataVisualization.Charting.ChartHttpHandler, System.Web.DataVisualization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="false"/>
     </httpHandlers>
-    <compilation debug="false" targetFramework="4.6.1"/>
+    <compilation debug="true" targetFramework="4.6.1"/>
     <httpRuntime requestValidationMode="2.0" maxRequestLength="2147483647" executionTimeout="36000"/>
     <authentication mode="Forms">
       <forms loginUrl="Login.aspx" name="PUBLISHERCOOKIE" protection="All" timeout="1440" path="/"/>
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index 44c7f0e1..c16eca69 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -128437,6 +128437,12 @@ namespace Model
 		
 		private string _EvaluationData;
 		
+		private string _SubContractName;
+		
+		private string _DriverContractCode;
+		
+		private string _Evaluator;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
     #region 可扩展性方法定义
@@ -128457,6 +128463,12 @@ namespace Model
     partial void OnDriverSubContractorsIdChanged();
     partial void OnEvaluationDataChanging(string value);
     partial void OnEvaluationDataChanged();
+    partial void OnSubContractNameChanging(string value);
+    partial void OnSubContractNameChanged();
+    partial void OnDriverContractCodeChanging(string value);
+    partial void OnDriverContractCodeChanged();
+    partial void OnEvaluatorChanging(string value);
+    partial void OnEvaluatorChanged();
     #endregion
 		
 		public DriverSub_DriverSub()
@@ -128609,6 +128621,66 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubContractName", DbType="NVarChar(100)")]
+		public string SubContractName
+		{
+			get
+			{
+				return this._SubContractName;
+			}
+			set
+			{
+				if ((this._SubContractName != value))
+				{
+					this.OnSubContractNameChanging(value);
+					this.SendPropertyChanging();
+					this._SubContractName = value;
+					this.SendPropertyChanged("SubContractName");
+					this.OnSubContractNameChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DriverContractCode", DbType="NVarChar(100)")]
+		public string DriverContractCode
+		{
+			get
+			{
+				return this._DriverContractCode;
+			}
+			set
+			{
+				if ((this._DriverContractCode != value))
+				{
+					this.OnDriverContractCodeChanging(value);
+					this.SendPropertyChanging();
+					this._DriverContractCode = value;
+					this.SendPropertyChanged("DriverContractCode");
+					this.OnDriverContractCodeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Evaluator", DbType="NVarChar(100)")]
+		public string Evaluator
+		{
+			get
+			{
+				return this._Evaluator;
+			}
+			set
+			{
+				if ((this._Evaluator != value))
+				{
+					this.OnEvaluatorChanging(value);
+					this.SendPropertyChanging();
+					this._Evaluator = value;
+					this.SendPropertyChanged("Evaluator");
+					this.OnEvaluatorChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSub_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -128686,6 +128758,8 @@ namespace Model
 		
 		private System.Nullable<bool> _IsBidirectional;
 		
+		private System.Nullable<int> _State;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
     #region 可扩展性方法定义
@@ -128708,6 +128782,8 @@ namespace Model
     partial void OnSubcontractingTypeChanged();
     partial void OnIsBidirectionalChanging(System.Nullable<bool> value);
     partial void OnIsBidirectionalChanged();
+    partial void OnStateChanging(System.Nullable<int> value);
+    partial void OnStateChanged();
     #endregion
 		
 		public DriverSub_DriverSubContact()
@@ -128880,6 +128956,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
+		public System.Nullable<int> State
+		{
+			get
+			{
+				return this._State;
+			}
+			set
+			{
+				if ((this._State != value))
+				{
+					this.OnStateChanging(value);
+					this.SendPropertyChanging();
+					this._State = value;
+					this.SendPropertyChanged("State");
+					this.OnStateChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_DriverSub_DriverSubContact_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index 4edb5e0f..6bc24ada 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <UseIISExpress>true</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />