From 6438634908b2254f3770ba62341c119047de0ec1 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 6 Aug 2024 23:01:29 +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/task/list/components/checkUnit.vue | 2 +-
 src/views/task/list/components/openLoad.vue  | 8 ++++----
 src/views/task/list/unit.vue                 | 2 +-
 vue.config.js                                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/task/list/components/checkUnit.vue b/src/views/task/list/components/checkUnit.vue
index 3eced61..a96cd07 100644
--- a/src/views/task/list/components/checkUnit.vue
+++ b/src/views/task/list/components/checkUnit.vue
@@ -1185,7 +1185,7 @@
 
                 if(e=='carry_type0'){
                   //自己执行
-                  this.openMyMission()
+                  // this.openMyMission()
                 }else if(e=='carry_type1'){
                   // 任务分解
                   this.editorUnit('pid')
diff --git a/src/views/task/list/components/openLoad.vue b/src/views/task/list/components/openLoad.vue
index 1c7319a..666bd7b 100644
--- a/src/views/task/list/components/openLoad.vue
+++ b/src/views/task/list/components/openLoad.vue
@@ -8,7 +8,7 @@
             <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>执行方式：
           </div>
           <div class="xy-table-item-content">
-            <el-select v-if="formObj.from==1" :disabled="isdisabled || isEditor" v-model="formObj.carry_type"
+            <el-select v-if="formObj.admin_type==2 || formObj.from==1" :disabled="isdisabled || isEditor" v-model="formObj.carry_type"
               style="width: 400px;" placeholder="请选择">
               <el-option v-for="item in carryPidList" :key="item.id" :label="item.value" :value="item.id">
               </el-option>
@@ -58,7 +58,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:finish_status v-if="type=='editor'">
+      <template v-slot:finish_status v-if="type=='editor' || type=='check'">
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red;font-weight: bold;padding-right: 4px;">*</span>完成情况：
@@ -72,7 +72,7 @@
           </div>
         </div>
       </template>
-      <template v-slot:file_ids v-if="type=='editor'">
+      <template v-slot:file_ids v-if="type=='editor' || type=='check'">
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>成果资料：
@@ -88,7 +88,7 @@
       </template>
 
 
-      <template v-slot:end_introduce v-if="type=='editor'">
+      <template v-slot:end_introduce v-if="type=='editor' || type=='check'">
         <div class="xy-table-item">
           <div class="xy-table-item-label" style="font-weight: bold">
             <span style="color: red;font-weight: bold;padding-right: 4px;"></span>完成概述：
diff --git a/src/views/task/list/unit.vue b/src/views/task/list/unit.vue
index 68679df..4e807de 100644
--- a/src/views/task/list/unit.vue
+++ b/src/views/task/list/unit.vue
@@ -88,7 +88,7 @@
                   <!-- 任务是发给部门的，只有指定部门科长能看见，需要再次分发人员 -->
                   <!-- 转办就给 责任人 -->
                   <!-- 任务发给部门的科长，责任人，都能进行任务分解，任务转办，执行任务的操作 -->
-                  <div v-if="scope.row.pid>0 && scope.row.notices.length==0 && !(scope.row.audit_status==3||scope.row.audit_status==5)">
+                  <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>
diff --git a/vue.config.js b/vue.config.js
index c1b0b04..8b49cd5 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',
+  outputDir: '/Users/mac/Documents/朗业/2024/h-河道处项目/a-安全生产/safety-manage-service/public/admin_test',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,