diff --git a/project/fengdu/AppOutSource/AppRateManage/components/AppraiseTask.vue b/project/fengdu/AppOutSource/AppRateManage/components/AppraiseTask.vue
index c6e2fcc8..0ad575cf 100644
--- a/project/fengdu/AppOutSource/AppRateManage/components/AppraiseTask.vue
+++ b/project/fengdu/AppOutSource/AppRateManage/components/AppraiseTask.vue
@@ -7,7 +7,7 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="handleAdd">评选任务</el-button>
             <ai-search label="开始时间">
               <el-date-picker
-                  v-model="search.createTimeStart"
+                  v-model="search.startTime"
                   type="date"
                   size="small"
                   value-format="yyyy-MM-dd"
@@ -17,7 +17,7 @@
             </ai-search>
             <ai-search label="结束时间">
               <el-date-picker
-                  v-model="search.createTimeStart"
+                  v-model="search.endTime"
                   type="date"
                   size="small"
                   value-format="yyyy-MM-dd"
@@ -28,13 +28,13 @@
           </template>
           <template #right>
             <el-input
-                v-model="search.createUserName"
+                v-model="search.taskName"
                 class="search-input"
                 size="small"
                 v-throttle="() => {search.current = 1, getList()}"
                 placeholder="请输入任务名称"
                 clearable
-                @clear="search.current = 1, search.createUserName = '', getList()"
+                @clear="search.current = 1, search.taskName = '', getList()"
                 suffix-icon="iconfont iconSearch">
             </el-input>
           </template>
@@ -48,33 +48,25 @@
             :size.sync="search.size"
             @getList="getList">
 
-          <el-table-column
-              label="状态"
-              slot="state">
-            <template v-slot="{ row }">
-              <span class="start">启用</span>
-            </template>
-          </el-table-column>
-
           <el-table-column slot="options" width="180px" fixed="right" label="操作" align="center">
             <template slot-scope="{ row }">
               <div class="table-options">
-                <el-button type="text">详情</el-button>
-                <el-button type="text">删除</el-button>
+                <el-button type="text" @click="handleDetail(row)">详情</el-button>
+                <el-button type="text" @click="handleDelete(row)">删除</el-button>
               </div>
             </template>
           </el-table-column>
         </ai-table>
       </template>
     </ai-list>
-    <ai-dialog title="评分规则" :visible.sync="dialog" width="800px">
-      <el-form ref="formRef" :model="form" label-width="120px">
-        <el-form-item label="事件类型：">
-          <el-input v-model="form.type" clearable placeholder="请输入任务名称" size="small"></el-input>
+    <ai-dialog title="评分规则" :visible.sync="dialog" width="800px" @closed="onClosed" @confirm="onConfirm">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="任务名称：" prop="taskName">
+          <el-input v-model="form.taskName" clearable placeholder="请输入任务名称" size="small"></el-input>
         </el-form-item>
-        <el-form-item label="任务开始时间：">
+        <el-form-item label="任务开始时间：" prop="startTime">
           <el-date-picker
-              v-model="form.createTimeStart"
+              v-model="form.startTime"
               type="date"
               size="small"
               clearable
@@ -83,9 +75,9 @@
               placeholder="选择开始日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="任务结束时间：">
+        <el-form-item label="任务结束时间：" prop="endTime">
           <el-date-picker
-              v-model="form.createTimeStart"
+              v-model="form.endTime"
               type="date"
               size="small"
               style="width: 100%"
@@ -94,9 +86,9 @@
               placeholder="选择开始日期">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="发布人：">佩奇</el-form-item>
-        <el-form-item label="任务描述：">
-          <el-input v-model="form.desc" clearable placeholder="请输入任务描述" type="textarea" :rows="3" show-word-limit :maxlength="200"></el-input>
+        <el-form-item label="发布人：">{{user.info && user.info.name}}</el-form-item>
+        <el-form-item label="任务描述：" prop="taskDescription">
+          <el-input v-model="form.taskDescription" clearable placeholder="请输入任务描述" type="textarea" :rows="3" show-word-limit :maxlength="200"></el-input>
         </el-form-item>
       </el-form>
     </ai-dialog>
@@ -104,28 +96,110 @@
 </template>
 
 <script>
+import {mapState} from 'vuex'
 export default {
   name: "AppraiseTask",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
   data() {
     return {
-      search:{},
+      search:{
+        taskName:'',
+        startTime:'',
+        endTime:'',
+        current: 1,
+        size: 10,
+      },
       total: 10,
       colConfigs: [
         {type: "selection"},
-        { prop: 'integralUserName',  label: '任务名称', align: 'center' },
-        { prop: 'areaName',  label: '发布人', align: 'center' },
-        { prop: 'girdName',  label: '发布时间', align: 'center' },
-        { prop: 'createTime',  label: '任务发布时间', align: 'center' },
-        { prop: 'createTime',  label: '任务结束时间', align: 'center' },
+        { prop: 'taskName',  label: '任务名称', align: 'center' },
+        { prop: 'userName',  label: '发布人', align: 'center' },
+        { prop: 'releaswTime',  label: '发布时间', align: 'center' },
+        { prop: 'startTime',  label: '任务开始时间', align: 'center' },
+        { prop: 'endTime',  label: '任务结束时间', align: 'center' },
       ],
       tableData: [],
       dialog:false,
-      form:{}
+      form:{},
+      rules:{
+        taskName:[ { required: true, message: '请输入任务名称', trigger: 'blur' }],
+        startTime:[ { required: true, message: '请选择开始时间', trigger: 'change' }],
+        endTime:[ { required: true, message: '请选择结束时间', trigger: 'change' }],
+        taskDescription:[ { required: true, message: '请输入任务描述', trigger: 'blur' }],
+      }
     }
   },
-  methods: {
-    getList(){
 
+  computed:{
+    ...mapState(['user'])
+  },
+
+  created() {
+    this.getList()
+  },
+
+  methods: {
+    onConfirm(){
+      this.$refs['formRef'].validate(async valid=>{
+        if(valid){
+          try {
+            const {code} = await this.instance.post('/app/apptaskmanage/addOrUpdate',null,{
+              params:{
+                ...form
+              }
+            })
+            if(code===0){
+              this.$message.success('保存成功')
+              this.getList()
+            }
+          }catch (e) {
+            console.log(e)
+          }
+        }
+      })
+
+    },
+
+    onClosed(){
+      this.form = {}
+      this.$refs['formRef'].resetFields()
+    },
+
+    handleDetail(row){
+      this.form = {...row}
+      this.dialog = true
+    },
+
+    handleDelete({id}){
+      this.$confirm("是否确定要删除此数据？").then(async ()=>{
+        try {
+          const {code} = await this.instance.post('/app/apptaskmanage/delete',null,{
+            params:{ids:id}
+          })
+          if(code===0){
+            this.$message.success('删除成功')
+            this.getList()
+          }
+        }catch (e) {
+          console.error(e)
+        }
+      })
+    },
+
+    async getList(){
+      try {
+        const {code,data} = await this.instance.post('/app/apptaskmanage/list')
+        if(code===0){
+          this.tableData = data.records
+          this.total = data.total
+        }
+      }catch (e) {
+        console.error(e)
+      }
     },
     handleAdd() {
       this.dialog = true
diff --git a/project/fengdu/AppOutSource/AppRateManage/components/RuleManage.vue b/project/fengdu/AppOutSource/AppRateManage/components/RuleManage.vue
index 4158c575..cbdad920 100644
--- a/project/fengdu/AppOutSource/AppRateManage/components/RuleManage.vue
+++ b/project/fengdu/AppOutSource/AppRateManage/components/RuleManage.vue
@@ -108,6 +108,8 @@ export default {
       search:{
         type:'',
         status:'',
+        current: 1,
+        size: 10,
       },
       dictList:[],
       cardList: [