diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
index fff4b98..0702992 100644
--- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
+++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java
@@ -263,7 +263,8 @@ public class TAmentPartyAffairsController extends BaseController
     @ResponseBody
     public AjaxResult addSave(TAmentPartyAffairs tAmentPartyAffairs)
     {
-        tAmentPartyAffairs.setUnit(getSysUser().getDept().getDeptName());
+//        tAmentPartyAffairs.setUnit(getSysUser().getDept().getDeptName());
+        tAmentPartyAffairs.setPerId(getUserId());
         tAmentPartyAffairs.setStatus("1");
         return toAjax(tAmentPartyAffairsService.insertTAmentPartyAffairs(tAmentPartyAffairs));
     }
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/add.html b/cyx-admin/src/main/resources/templates/base/affairs/add.html
index 56b3ad2..b4757b8 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/add.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/add.html
@@ -7,12 +7,7 @@
 <body class="white-bg">
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-affairs-add">
-<!--            <div class="form-group">    -->
-<!--                <label class="col-sm-3 control-label">单位名称：</label>-->
-<!--                <div class="col-sm-8">-->
-<!--                    <input name="unit" class="form-control" type="text">-->
-<!--                </div>-->
-<!--            </div>-->
+            <input name="method" type="hidden" id="method" class="form-control" />
             <div class="form-group">    
                 <label class="col-sm-3 control-label">类型：</label>
                 <div class="col-sm-8">
@@ -31,14 +26,26 @@
                     <textarea required name="target" class="form-control"></textarea>
                 </div>
             </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label" id="shotName">简写：</label>
+                <div class="col-sm-8">
+                    <input required name="shotName" class="form-control" />
+                </div>
+            </div>
             <div class="form-group">
                 <label class="col-sm-3 control-label" id="demand">目标要求：</label>
                 <div class="col-sm-8">
                     <textarea name="demand" class="form-control"></textarea>
                 </div>
             </div>
+            <div class="form-group dy" style="display: none">
+                <label class="col-sm-3 control-label" >标准要求：</label>
+                <div class="col-sm-8">
+                    <textarea name="method1" id="method1" class="form-control"></textarea>
+                </div>
+            </div>
             <div class="form-group">
-                <label class="col-sm-3 control-label" id="detailed">评分细则：</label>
+                <label class="col-sm-3 control-label" id="detailed">工作任务：</label>
                 <div class="col-sm-8">
                     <textarea required name="detailed" class="form-control"></textarea>
                 </div>
@@ -49,10 +56,16 @@
                     <input required name="score" class="form-control" />
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label" id="method">考核方式：</label>
+            <div class="form-group dy" style="display: none">
+                <label class="col-sm-3 control-label" id="unit">考核类别：</label>
                 <div class="col-sm-8">
-                    <textarea required name="method" class="form-control"></textarea>
+                    <input required name="unit" class="form-control" />
+                </div>
+            </div>
+            <div class="form-group" id="dw" style="display: none">
+                <label class="col-sm-3 control-label" >考核方式：</label>
+                <div class="col-sm-8">
+                    <input name="method2" id="method2" class="form-control" />
                 </div>
             </div>
             <div class="form-group">    
@@ -80,16 +93,8 @@
                     </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">操作人员ID：</label>
-                <div class="col-sm-8">
-                    <select name="perId" id="perId" class="form-control m-b">
-                        <option value="">请选择</option>
-                    </select>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">部门ID：</label>
+            <div class="form-group dy" style="display: none">
+                <label class="col-sm-3 control-label">部门：</label>
                 <div class="col-sm-8">
                     <select name="deptId" id="deptId" class="form-control m-b">
                         <option value="">请选择</option>
@@ -120,8 +125,8 @@
             onkeyup: false,
             focusCleanup: true
         });
-        refresh()
-        function refresh(){
+
+        $(document).ready(function () {
             $.ajax({
                 type: "post",
                 url: ctx + "base/personnel/personnelList",
@@ -134,7 +139,6 @@
                     })
                     $("#head")[0].innerHTML=opt;
                     $("#reviewed")[0].innerHTML=opt;
-                    $("#perId")[0].innerHTML=opt;
                 }
             });
 
@@ -165,7 +169,7 @@
                     $("#branchId")[0].innerHTML=opt;
                 }
             });
-        }
+        })
 
         $("#type-selector").on("change", function() {
             var type = $(this).val();
@@ -173,42 +177,61 @@
             var demand = $("#demand");
             var detailed = $("#detailed");
             var score = $("#score");
-            var method = $("#method");
             switch (type) {
                 case "党务及意识形态":
-                    $("#deptId").hide()
+                    $("#dw").show()
+                    $(".dy").hide()
                     target[0].innerHTML = '目标项：'
                     demand[0].innerHTML = '目标要求：'
-                    detailed[0].innerHTML = '评分细则：'
+                    detailed[0].innerHTML = '工作任务：'
                     score[0].innerHTML = '达标分：'
-                    method[0].innerHTML = '考核方式：'
                 break;
                 case "党风廉政建设":
-                    $("#deptId").hide()
+                    $("#dw").show()
+                    $(".dy").hide()
                     target[0].innerHTML = '责任类别：'
                     demand[0].innerHTML = '目标要求：'
-                    detailed[0].innerHTML = '指标明细：'
-                    score[0].innerHTML = '总分值：'
-                    method[0].innerHTML = '考核要求：'
+                    detailed[0].innerHTML = '工作任务：'
+                    score[0].innerHTML = '达标分：'
                     break;
                 case "日常考核指标":
+                    $("#dw").hide()
+                    $(".dy").show()
                     target[0].innerHTML = '考核内容：'
                     demand[0].innerHTML = '考核目标：'
-                    detailed[0].innerHTML = '评分办法：'
+                    detailed[0].innerHTML = '工作任务：'
                     score[0].innerHTML = '分值：'
-                    method[0].innerHTML = '标准要求：'
                     break;
                 case "年度考核指标":
+                    $("#dw").hide()
+                    $(".dy").show()
                     target[0].innerHTML = '考核内容：'
                     demand[0].innerHTML = '考核目标：'
                     detailed[0].innerHTML = '评分办法：'
                     score[0].innerHTML = '分值：'
-                    method[0].innerHTML = '标准要求：'
                     break;
             }
         });
 
         function submitHandler() {
+            var type = $("#type-selector").val()
+            var method = $("#method");
+            var method1 = $("#method1");
+            var method2 = $("#method2");
+            switch (type) {
+                case "党务及意识形态":
+                    method.val(method2.val())
+                    break;
+                case "党风廉政建设":
+                    method.val(method2.val())
+                    break;
+                case "日常考核指标":
+                    method.val(method1.val())
+                    break;
+                case "年度考核指标":
+                    method.val(method1.val())
+                    break;
+            }
             if ($.validate.form()) {
                 $.operate.save(prefix + "/add", $('#form-affairs-add').serialize());
             }
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
index b8b8a63..ac22876 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/affairs.html
@@ -182,6 +182,7 @@
                             actions.push('<a data-files="'+row.files+'" data-type="1" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看图片</a> ');
                             actions.push('<a data-files="'+row.files+'" data-type="2" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-download"></i>下载附件</a> ');
                         }
+                        // actions.push('<a class="btn btn-default btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看详情</a> ');
                         return actions.join('');
                     }
                 }]
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/day.html b/cyx-admin/src/main/resources/templates/base/affairs/day.html
index 66b82cc..9fc7a05 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/day.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/day.html
@@ -59,7 +59,7 @@
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
         var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
-        var prefix = ctx + "base/season";
+        var prefix = ctx + "base/affairs";
 
         $(document).ready(function () {
             $.ajax({
@@ -201,6 +201,7 @@
                             actions.push('<a data-files="'+row.files+'" data-type="1" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看图片</a> ');
                             actions.push('<a data-files="'+row.files+'" data-type="2" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-download"></i>下载附件</a> ');
                         }
+                        // actions.push('<a class="btn btn-default btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看详情</a> ');
                         return actions.join('');
                     }
                 }]
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
index 4d36351..d09e247 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/finishedstatic.html
@@ -10,11 +10,11 @@
                 <form id="formId">
                     <div class="select-list">
                         <ul>
-                            <input id="type0831" type="hidden" name="type" value=""/>
+<!--                            <input id="type0831" type="hidden" name="type" value=""/>-->
 
                             <li>
                                 <label>责任类别：</label>
-                                <select id="type" name="type">
+                                <select id="type0831" name="type">
                                     <option value="">请选择</option>
                                     <option value="党务及意识形态">党务及意识形态</option>
                                     <option value="党风廉政建设">党风廉政建设</option>
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
index ed16ca6..5e8fbd2 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/partystyle.html
@@ -185,6 +185,7 @@
                             actions.push('<a data-files="'+row.files+'" data-type="1" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看图片</a> ');
                             actions.push('<a data-files="'+row.files+'" data-type="2" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-download"></i>下载附件</a> ');
                         }
+                        // actions.push('<a class="btn btn-default btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看详情</a> ');
                         return actions.join('');
                     }
                 }]
diff --git a/cyx-admin/src/main/resources/templates/base/affairs/year.html b/cyx-admin/src/main/resources/templates/base/affairs/year.html
index a91e7df..22dfffc 100644
--- a/cyx-admin/src/main/resources/templates/base/affairs/year.html
+++ b/cyx-admin/src/main/resources/templates/base/affairs/year.html
@@ -59,7 +59,7 @@
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('base:affairs:edit')}]];
     var removeFlag = [[${@permission.hasPermi('base:affairs:remove')}]];
-    var prefix = ctx + "base/season";
+    var prefix = ctx + "base/affairs";
 
     $(document).ready(function () {
         $.ajax({
@@ -201,6 +201,7 @@
                             actions.push('<a data-files="'+row.files+'" data-type="1" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-picture-o"></i>查看图片</a> ');
                             actions.push('<a data-files="'+row.files+'" data-type="2" class="viewFiles0828 btn btn-primary btn-xs ' + editFlag + '" href="javascript:void(0)"><i class="fa fa-download"></i>下载附件</a> ');
                         }
+                        // actions.push('<a class="btn btn-default btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>查看详情</a> ');
                         return actions.join('');
                     }
                 }]
diff --git a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
index a6f01db..dc79456 100644
--- a/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
+++ b/cyx-system/src/main/resources/mapper/base/TAmentPartyAffairsMapper.xml
@@ -285,6 +285,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null and type != ''">type,</if>
             <if test="unit != null">unit,</if>
             <if test="target != null">target,</if>
+            <if test="shotName != null">shot_name,</if>
             <if test="demand != null">demand,</if>
             <if test="detailed != null">detailed,</if>
             <if test="score != null">score,</if>
@@ -306,6 +307,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="type != null and type != ''">#{type},</if>
             <if test="unit != null">#{unit},</if>
             <if test="target != null">#{target},</if>
+            <if test="shotName != null">#{shotName},</if>
             <if test="demand != null">#{demand},</if>
             <if test="detailed != null">#{detailed},</if>
             <if test="score != null">#{score},</if>
