From cc34231717d92d19af064027294fe54d56a789f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com>
Date: Fri, 22 Nov 2024 13:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/auditPages/taskManagement/audit.vue |  5 +++--
 src/views/auditPages/taskManagement/index.vue |  8 ++++----
 src/views/auditPages/taskManagement/info.vue  |  4 ++--
 src/views/unitPages/myTask/audit.vue          | 12 +++++++++---
 src/views/unitPages/myTask/index.vue          |  6 +++---
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/views/auditPages/taskManagement/audit.vue b/src/views/auditPages/taskManagement/audit.vue
index 9dd4f6d..5b2a8ab 100644
--- a/src/views/auditPages/taskManagement/audit.vue
+++ b/src/views/auditPages/taskManagement/audit.vue
@@ -5,7 +5,7 @@
       <el-row style="margin: 10px 0;">
         <span class="top-title-box">基本信息</span>
       </el-row>
-      <div class="assets-info-box">
+      <div class="assets-info-box" v-if="!loading">
         <el-form :model="ruleForm" v-loading="loading" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm" label-position="right" :disabled="disabled">
           <el-row>
             <el-col :span="12">
@@ -3054,7 +3054,7 @@ export default {
     },
     // 新增资产确认按钮
     newAssets(type) {
-        // this.loading = true;
+        this.loading = true;
 
       let tijioaobj = {
           taskId: this.$route.query.taskId,
@@ -3103,6 +3103,7 @@ export default {
       assetTasksh(tijioaobj).then(res=>{
           if(res.code == 200){
             this.$modal.msgSuccess("审核成功");
+            this.loading = false
             this.$router.go(-1);
           }
         })
diff --git a/src/views/auditPages/taskManagement/index.vue b/src/views/auditPages/taskManagement/index.vue
index 0c7561e..e5514f3 100644
--- a/src/views/auditPages/taskManagement/index.vue
+++ b/src/views/auditPages/taskManagement/index.vue
@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item label="任务编号：">
-              <el-input v-model="formInline.taskId" placeholder="请输入"></el-input>
+              <el-input v-model="formInline.id" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -78,7 +78,7 @@
               <span v-if="scope.row.taskStatus == 1" style="color: #F58A0C;">
                 进行中
               </span>
-              <span v-if="scope.row.taskStatus == 2" style="color: #F50C0C;">
+              <span v-if="scope.row.taskStatus == 2" style="color: #76EE00;">
                 正常完成
               </span>
               <span v-if="scope.row.taskStatus == 3" style="color: #16B771;">
@@ -100,8 +100,8 @@
                   <span class="look-info"
                     style="color: #1485EF;">查看</span>
                 </div>
-                <!-- v-if="scope.row.taskStatus == 1" -->
-                <div  style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)">
+                <!--  -->
+                <div  style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="del-info"
                     style="color: #1485EF;">审核</span>
diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue
index ae9633f..ef72ef2 100644
--- a/src/views/auditPages/taskManagement/info.vue
+++ b/src/views/auditPages/taskManagement/info.vue
@@ -135,9 +135,9 @@
                     <span class="look-info"
                       style="color: #1485EF;">查看</span>
                   </div>
-                  <div style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;" @click="goInfo(2,scope.row)" v-if="$route.query.pageType == 'info' || $route.meta.pageType == 'info'">
+                  <div style="display: flex;align-items: center;cursor: pointer;margin-left: 5px;" @click="goInfo(2,scope.row)" v-if="$route.query.pageType == 'info' || $route.meta.pageType == 'info'" v-show='scope.row.status == 1'>
                     <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
-                    <span class="look-info"
+                    <span class="look-info" 
                       style="color: #1485EF;">审核</span>
                   </div>
                 </div>
diff --git a/src/views/unitPages/myTask/audit.vue b/src/views/unitPages/myTask/audit.vue
index 3f7b5ca..fe56ef7 100644
--- a/src/views/unitPages/myTask/audit.vue
+++ b/src/views/unitPages/myTask/audit.vue
@@ -1376,7 +1376,10 @@
                         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
                         message: '请输入正确的手机号码',
                         trigger: 'blur'
-                      }
+                      },
+                      {
+                    required: true, message: '请输入', trigger: 'blur'
+                  }
                     ]">
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
@@ -1437,11 +1440,14 @@
                 <el-col :span="12" style="margin-left: 10px;">
                   <el-form-item class="daoqitixingren" required :label="'联系电话' + (index == 0 ? '' : index)"
                     :prop="'xtyyUnit.' + index + '.lxdh'" :rules="[
-                      {
+                     {
                         pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
                         message: '请输入正确的手机号码',
                         trigger: 'blur'
-                      }
+                      },
+                      {
+                    required: true, message: '请输入', trigger: 'blur'
+                  }
                     ]">
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
diff --git a/src/views/unitPages/myTask/index.vue b/src/views/unitPages/myTask/index.vue
index bea9948..90f4779 100644
--- a/src/views/unitPages/myTask/index.vue
+++ b/src/views/unitPages/myTask/index.vue
@@ -12,7 +12,7 @@
           </el-col>
           <el-col :span="7">
             <el-form-item label="任务编号：">
-              <el-input v-model="formInline.taskId" placeholder="请输入"></el-input>
+              <el-input v-model="formInline.id" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="7">
@@ -57,7 +57,7 @@
               <span v-if="scope.row.taskStatus == 1" style="color: #F58A0C;">
                 进行中
               </span>
-              <span v-if="scope.row.taskStatus == 2" style="color: #F50C0C;">
+              <span v-if="scope.row.taskStatus == 2" style="color: #76EE00;">
                 正常完成
               </span>
               <span v-if="scope.row.taskStatus == 3" style="color: #16B771;">
@@ -80,7 +80,7 @@
                     style="color: #1485EF;cursor: pointer;">查看</span>
                 </div>
                 <!-- v-if="scope.row.taskStatus == 1" -->
-                <div  style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)">
+                <div  style="display: flex;align-items: center;cursor: pointer;margin-left: 10px;" @click="delInfo(scope.row)" v-if="scope.row.taskStatus == 1">
                   <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
                   <span class="del-info"
                     style="color: #1485EF;cursor: pointer;">开始核查</span>