From 30cce0b28183bc8e07656e31119dd51d0672f360 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 6 Aug 2024 23:28:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 177 ++--------------------------------
 vue.config.js                 |   2 +-
 2 files changed, 11 insertions(+), 168 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 39244a5..6f9638b 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -93,167 +93,9 @@
                       <template v-slot:btns>
                         <el-table-column align='center' label="操作" width="100" header-align="center">
                           <template slot-scope="scope">
-                            <!-- 任务是发给部门的，只有指定部门科长能看见，需要再次分发人员 -->
-                            <!-- 任务发给部门的科长，责任人，都能进行任务分解，任务转办，执行任务的操作 -->
-                            <div
-                              v-if="(scope.row.accept_department_ids && scope.row.accept_department_ids.length>0 && stateObj.is_manger
-                              ) || scope.row.main_admin_id==stateObj.login_id
-                              ">
-                              <el-tooltip placement="left" effect="light"  v-if="!(scope.row.audit_status==3||scope.row.audit_status==5)">
-                                <div slot="content">
-
-                                  <el-popover
-
-                                     placement="right"
-                                     title=""
-                                     width="200"
-                                     trigger="hover"
-                                     content="您可以按照任务要求完成任务">
-                                     <template v-for="item in unitTypeList">
-                                       <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                                         @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                                     </template>
-                                   </el-popover>
-
-                                   <el-popover
-                                      placement="right"
-                                      title=""
-                                      width="200"
-                                      trigger="hover"
-                                      content="您可以按照任务要求分解给到其他科室或人员">
-                                      <div style="margin-bottom:5px;" slot="reference" >
-                                        <Button type="primary" size="small"
-                                          @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                                      </div>
-                                    </el-popover>
-                                    <el-popover
-                                       placement="right"
-                                      v-if="scope.row.main_admin_id==stateObj.login_id || scope.row.admin_id==stateObj.login_id"
-                                       title=""
-                                       width="200"
-                                       trigger="hover"
-                                       content="您可以按照任务要求转办给其他人员">
-                                       <div style="margin-bottom:5px;" slot="reference" >
-                                         <Button type="primary" size="small"
-                                           @click="editorUnit(scope.row.id,'send')">任务转办</Button>
-                                       </div>
-                                     </el-popover>
-
-                                </div>
-                                <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
-                                    执行任务
-                                </Button>
-                              </el-tooltip>
-
-                            </div>
-                             <!-- 小组的带头人 -->
-                            <div v-else-if="(scope.row.groups && scope.row.groups.length>0 )
-                            || scope.row.main_admin_id==stateObj.login_id">
-                              <!-- 组长权限 -->
-                              <el-tooltip placement="left" effect="light" v-if="scope.row.grounp_admin_detail.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
-                                <div slot="content">
-                                  <el-popover
-
-                                     placement="right"
-                                     title=""
-                                     width="200"
-                                     trigger="hover"
-                                     content="您可以按照任务要求完成任务">
-                                     <template v-for="item in unitTypeList">
-                                       <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                                         @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                                     </template>
-                                   </el-popover>
-
-                                   <el-popover
-                                      placement="right"
-                                      title=""
-                                      width="200"
-                                      trigger="hover"
-                                      content="您可以按照任务要求分解给到其他科室或人员">
-                                      <div style="margin-bottom:5px;" slot="reference" >
-                                        <Button type="primary" size="small"
-                                          @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                                      </div>
-                                    </el-popover>
-                                    <el-popover
-                                       v-if="scope.row.main_admin_id==stateObj.login_id || scope.row.admin_id==stateObj.login_id"
-                                       placement="right"
-                                       title=""
-                                       width="200"
-                                       trigger="hover"
-                                       content="您可以按照任务要求转办给其他人员">
-                                       <div style="margin-bottom:5px;" slot="reference" >
-                                         <Button type="primary" size="small"
-                                           @click="editorUnit(scope.row.id,'send')">任务转办</Button>
-                                       </div>
-                                     </el-popover>
-
-
-                                </div>
-                                <Button style="margin-right:5px;margin-bottom:5px;" type="primary" size="small">
-                                    执行任务
-                                </Button>
-                              </el-tooltip>
-                              <!-- 除组长外 组里面所有人都能执行任务 -->
-                              <div v-else>
-                                  <el-popover
-                                     placement="right"
-                                     title=""
-                                     width="200"
-                                     trigger="hover"
-                                     content="您可以按照任务要求完成任务">
-                                     <template v-for="item in unitTypeList">
-                                       <Button  style="margin-bottom:5px;margin-right:5px" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                                         @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                                     </template>
-                                   </el-popover>
-                              </div>
-                            </div>
-                            <!-- doadmins 转办的人员 只有执行任务 -->
-                            <div v-else-if="scope.row.do_admin_ids && scope.row.do_admin_ids.length>0">
-                              <el-tooltip placement="left" effect="light" v-if="scope.row.do_admin_ids.includes(stateObj.login_id) && !(scope.row.audit_status==3||scope.row.audit_status==5)">
-                              <div slot="content">
-                                <el-popover
-
-                                   placement="right"
-                                   title=""
-                                   width="200"
-                                   trigger="hover"
-                                   content="您可以按照任务要求完成任务">
-                                   <template v-for="item in unitTypeList">
-                                     <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                                       @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                                   </template>
-                                 </el-popover>
-
-                                 <!-- <el-popover
-                                    placement="right"
-                                    title=""
-                                    width="200"
-                                    trigger="hover"
-                                    content="您可以按照任务要求分解给到其他科室或人员">
-                                    <div style="margin-bottom:5px;" slot="reference" >
-                                      <Button type="primary" size="small"
-                                        @click="editorUnit(scope.row.id,'pid')">任务分解</Button>
-                                    </div>
-                                  </el-popover> -->
-                                </div>
-                                </el-tooltip>
-                            </div>
-                            <!-- 直接 执行任务 -->
-                            <div v-else>
-                              <el-popover
-                                 placement="right"
-                                 title=""
-                                 width="200"
-                                 trigger="hover"
-                                 content="您可以按照任务要求完成任务">
-                                 <template v-for="item in unitTypeList">
-                                   <Button  style="margin-bottom:5px;" slot="reference" v-if="scope.row.unit_type==item.id&&scope.row.audit_status==1" type="primary" size="small"
-                                     @click="openMyMission(item.value,scope.row)">执行任务</Button>
-                                 </template>
-                               </el-popover>
+                            <div v-if="scope.row.pid>0 && scope.row.notices.length==0 && !(scope.row.audit_status==3||scope.row.audit_status==5) || scope.row.type==4">
+                              <Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
+                                @click="sendNotice(scope.row)">督办提醒</Button>
                             </div>
                             <div>
                               <Button style='margin-right:5px;margin-bottom:5px;' type="primary" size="small"
@@ -1354,13 +1196,14 @@ export default {
             }
           })
             const newArr = res.data.filter((_, index) => !spliceIndex.includes(index));
-			newArr.map(item=>{
-			  if(item.audit_status==5 || (item.mission_finished && item.mission_finished.length>0)){
 
-			  }else{
-				  _arr.push(item)
-			  }
-			})
+            newArr.map(item=>{
+              if(item.audit_status==5 || item.audit_status==3){
+
+              }else{
+                _arr.push(item)
+              }
+            })
 			  this.myselfTotal = _arr.length
               _arr = this.buildTree(_arr)
               _arr.map((r,index)=>{
diff --git a/vue.config.js b/vue.config.js
index 8b49cd5..c1b0b04 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -25,7 +25,7 @@ module.exports = {
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
   publicPath: process.env.ENV === 'staging' ? '/admin_test' : '/admin',
-  outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin_test',
+  outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,