任务、市场活动新增 结束(管理) 功能

src/HManagement/clueManage/m_activity/modules/details.vue

@@ -20,8 +20,10 @@
       <div slot="customOperation">
         <relase class="inline-16" v-if="tool.checkAuth($route.name,'relase') && mainData.status != '结束'" :data="mainData" @onSuccess="queryMainData"></relase>
         <finish class="inline-16" v-if="tool.checkAuth($route.name,'finish')  && mainData.status != '结束' && mainData.status != '新建'" :data="mainData" @onSuccess="queryMainData"></finish>
-        <el-button size="mini" :disabled="mainData.ordercluecount > 0"  :type="mainData.ordercluecount === 0?'primary':''" @click="onDel" v-if="tool.checkAuth($route.name,'onDelete')  && mainData.status != '发布' && mainData.status != '结束' && mainData.disabled">{{$t('删 除')}}</el-button>
+        <el-button class="inline-16" size="mini" :disabled="mainData.ordercluecount > 0"  :type="mainData.ordercluecount === 0?'primary':''" @click="onDel" v-if="tool.checkAuth($route.name,'onDelete')  && mainData.status != '发布' && mainData.status != '结束' && mainData.disabled">{{$t('删 除')}}</el-button>
         <el-button size="mini" class="inline-16" type="primary" @click="onDeManage" v-if="tool.checkAuth($route.name,'deleteManage')">{{$t('删除(管理)')}}</el-button>
+        <btnClick class="inline-16" v-if="mainData.status == '发布' && tool.checkAuth($route.name, 'endManage')" btnTitle="结束(管理)" message="确定结束该活动吗？" nameId="2025091115541002"
+                  nameKey="sat_campaignids" :id="$route.query.id" btnType="primary" @deleteSuccess="queryMainData" infoMessage="已取消结束"></btnClick>
       </div>
       <div slot="slot0" class="container normal-panel">
         <DetailTable ref="DetailTable">
@@ -46,6 +48,7 @@ import finish from './finish.vue'
 
 import addClue from './addClue'
 import editClue from './editClue'
+import btnClick from '@/components/btn-delete/index'
 export default {
   name: "detail",
   data() {
@@ -111,7 +114,8 @@ export default {
     relase,
     finish,
     addClue,
-    editClue
+    editClue,
+    btnClick
   },
   methods:{
     async queryMainData(id) {

src/HManagement/task/index.vue

@@ -92,6 +92,10 @@ export default {
           label:'已完成',
           value:3
         },
+        {
+          label:'已结束',
+          value:4
+        },
       ],
       status:'',
       pathData:[]

src/HManagement/task/modules/detail.vue

@@ -20,7 +20,7 @@
         <complete-task
           :data="mainData"
           class="inline-16"
-          v-if="tool.checkAuth($route.name, 'complete') && mainData.disabled"
+          v-if="tool.checkAuth($route.name, 'complete') && mainData.disabled && mainData.status != '已结束'"
           style="display: inline"
           @onSuccess="queryMainData()"
         ></complete-task>
@@ -28,6 +28,7 @@
           v-if="tool.checkAuth($route.name, 'delete') && nowUserid === mainData.createuserid"
           type="primary"
           size="mini"
+          class="inline-16"
           @click="deleteTask"
           >{{ $t("删 除") }}</el-button
         >
@@ -39,6 +40,8 @@
             @click="deleteTaskManage"
         >{{ $t("删除(管理)") }}</el-button
         >
+        <btnClick class="inline-16" v-if="mainData.status != '已完成' && mainData.status != '已结束' && tool.checkAuth($route.name, 'endManage')" btnTitle="结束(管理)" message="确定结束该任务吗？" nameId="2025091116074602" :isNumber="true"
+                  nameKey="sys_taskid" :id="$route.query.id" btnType="primary" @deleteSuccess="queryMainData" infoMessage="已取消结束"></btnClick>
       </div>
       <div slot="slot0">
         <!--        <p class="mt-10">标题:{{mainData.title}}</p>
@@ -235,6 +238,7 @@
 import { mapGetters } from "vuex";
 
 import completeTask from "./completeTask.vue";
+import btnClick from '@/components/btn-delete/index'
 export default {
   name: "detail",
   data() {
@@ -255,7 +259,7 @@ export default {
     }),
   },
   components: {
-    completeTask,
+    completeTask,btnClick
   },
   methods: {
     async queryMainData(id) {

src/components/btn-delete/index.vue

@@ -7,7 +7,7 @@
 <script>
 export default {
   name: "index",
-  props:['btnType','btnTitle','message','confirmButtonText','cancelButtonText','isNumber','nameId','nameKey','id'],
+  props:['btnType','btnTitle','message','confirmButtonText','cancelButtonText','isNumber','nameId','nameKey','id','infoMessage'],
   data() {
     return {
       param: {
@@ -30,7 +30,7 @@ export default {
       }).catch(() => {
         this.$message({
           type: 'info',
-          message: this.$t('已取消删除')
+          message: this.infoMessage?this.$t(this.infoMessage):this.$t('已取消删除')
         });
       });
     },