Merge branch 'blueBranch' into testToMerge

src/HManagement/task/modules/detail.vue

@@ -25,16 +25,20 @@
           @onSuccess="queryMainData()"
         ></complete-task>
         <el-button
-          class="inline-16"
-          v-if="
-            tool.checkAuth($route.name, 'delete') &&
-            nowUserid === mainData.createuserid
-          "
+          v-if="tool.checkAuth($route.name, 'delete') && nowUserid === mainData.createuserid"
           type="primary"
           size="mini"
           @click="deleteTask"
           >{{ $t("删 除") }}</el-button
         >
+        <el-button
+            class="inline-16"
+            v-if="tool.checkAuth($route.name, 'deleteTaskManage')"
+            type="primary"
+            size="mini"
+            @click="deleteTaskManage"
+        >{{ $t("删除(管理)") }}</el-button
+        >
       </div>
       <div slot="slot0">
         <!--        <p class="mt-10">标题:{{mainData.title}}</p>
@@ -407,6 +411,30 @@ export default {
           });
         });
     },
+    deleteTaskManage(){
+      this.$confirm(this.$t("是否要删除当前任务") + "?", this.$t("提示"), {
+        confirmButtonText: this.$t("确定"),
+        cancelButtonText: this.$t("取消"),
+        type: "warning",
+      })
+          .then(async () => {
+            const res = await this.$api.requested({
+              id: 2025080513225502,
+              content: {
+                sys_taskids: [this.mainData.sys_taskid],
+              },
+            });
+            this.tool.showMessage(res, () => {
+              this.$store.dispatch("detailDeleteRouterBack");
+            });
+          })
+          .catch((err) => {
+            this.$message({
+              type: "info",
+              message: this.$t("已取消删除"),
+            });
+          });
+    },
     /*任务协助人*/
     teamList(val) {
       console.log(val, "任务协助人");

src/components/table/index10.vue

@@ -2,8 +2,8 @@
   <div>
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
     <el-table ref="table" :fit="tool.calculatedColumnWidth($refs.table,layout)" :row-class-name="tableClassName" highlight-current-row :data="data"  size="small"    @row-click="rowClick" show-summary
-              style="width:100%;" :header-cell-style="{height:'60px',fontWeight:'400',fontSize:'22px',color:'#333333',background:'#ddebf7'}"
-              :cell-style="{height:'40px',fontWeight:'400',fontSize:'18px'}" border @selection-change="selectionChange" >
+              style="width:100%;" :header-cell-style="{height:'60px',fontWeight:'400',fontSize:'14px',color:'#333333',background:'#ddebf7',fontWeight:'bold'}"
+              :cell-style="{height:'40px',fontWeight:'400',fontSize:'14px'}" border @selection-change="selectionChange" >
       <el-table-column
           type="selection"
           width="35" fixed v-if="checkbox">
@@ -68,6 +68,7 @@ export default {
 </script>
 <style scoped>
 /deep/ .el-table--small {
-  font-size: 18px;
+  font-size: 14px;
+  font-weight: bold;
 }
 </style>

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -149,6 +149,9 @@
           <div v-else-if="scope.column.columnname == 'address'">
             <span>{{scope.column.data.province?scope.column.data.province + scope.column.data.city + scope.column.data.county + scope.column.data[[scope.column.columnname]]:'--'}}</span>
           </div>
+          <div v-else-if="scope.column.columnname == 'projectname'">
+            <el-button size="mini" type="text" @click="goDetail(scope.column.data)">{{scope.column.data[[scope.column.columnname]]}}</el-button>
+          </div>
           <div v-else>
             {{scope.column.data[[scope.column.columnname]]?scope.column.data[[scope.column.columnname]]:'--'}}
           </div>
@@ -997,6 +1000,21 @@ export default {
       this.projectList = res.data
       this.total = res.total
       this.projectTile = date + this.$t('_预计成交项目') + '(' + res.total + ')'
+    },
+    goDetail(data){
+      let route = this.$route
+      if (route.path !== '/projectChangeDetail') {
+        this.oldRoute = {path:route.path,query:route.query}
+        this.$store.dispatch('setHistoryRouter',this.oldRoute)
+      }
+      this.$store.dispatch("changeDetailDrawer", true);
+      this.$router.push({
+        path:'/projectChangeDetail',
+        query:{
+          id:data.sa_projectid,
+          rowindex:data.rowindex,
+        }
+      })
     }
   },
   mounted () {