From 48f72ac5853c120b97264c48575cd1c748fa496b 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 19:12:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8A=A5=E5=BA=9F=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/auditPages/taskManagement/audit.vue |  6 +++
 src/views/unitPages/myAssets/assetsAuth.vue   |  6 +++
 src/views/unitPages/myTask/audit.vue          | 50 +++++++++++++++----
 src/views/unitPages/myTask/index.vue          |  6 +--
 4 files changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/views/auditPages/taskManagement/audit.vue b/src/views/auditPages/taskManagement/audit.vue
index 083f222..37e4361 100644
--- a/src/views/auditPages/taskManagement/audit.vue
+++ b/src/views/auditPages/taskManagement/audit.vue
@@ -2669,6 +2669,12 @@
                 </myUpload>
               </el-form-item>
             </el-row>
+            <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
+              <span class="top-title-box">报废原因</span>
+            </el-row>
+            <el-row style="margin: 20px 0;">
+                <div>{{ ruleForm.bfyy }}</div>
+            </el-row>
             <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
               <el-button type="danger" @click="newAssets(0)">不通过</el-button>
               <el-button type="primary" @click="newAssets(1)" >通过</el-button>
diff --git a/src/views/unitPages/myAssets/assetsAuth.vue b/src/views/unitPages/myAssets/assetsAuth.vue
index d812f17..96dd03f 100644
--- a/src/views/unitPages/myAssets/assetsAuth.vue
+++ b/src/views/unitPages/myAssets/assetsAuth.vue
@@ -2724,6 +2724,12 @@
                 </myUpload>
               </el-form-item>
             </el-row>
+            <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
+              <span class="top-title-box">报废原因</span>
+            </el-row>
+            <el-row style="margin: 20px 0;">
+                <div>{{ ruleForm.bfyy }}</div>
+            </el-row>
           </div>
         </el-form>
       </div>
diff --git a/src/views/unitPages/myTask/audit.vue b/src/views/unitPages/myTask/audit.vue
index 54185bf..d0c17ba 100644
--- a/src/views/unitPages/myTask/audit.vue
+++ b/src/views/unitPages/myTask/audit.vue
@@ -598,9 +598,16 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="fgfzrlxfs" :rules="{
+                        <el-form-item prop="fgfzrlxfs" :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="ruleForm.fgfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -1364,9 +1371,16 @@
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="12">
-                  <el-form-item class="daoqitixingren" required :prop="`xtjsUnit[${index}].lxr`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }" :label="'联系人' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" required :prop="`xtjsUnit[${index}].lxr`" :rules="[
+                         {
+                      pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                      message: '请输入正确的手机号码',
+                      trigger: 'blur'
+                    },
+                          {
+                          required: true, message: '请输入', trigger: 'blur'
+                        }
+                        ]" :label="'联系人' + (index == 0 ? '' : index)">
                     <el-input v-model="domain.lxr" placeholder="请输入联系人"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1432,9 +1446,16 @@
               </el-row>
               <el-row style="display: flex;">
                 <el-col :span="12">
-                  <el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].lxr`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }" :label="'联系人' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].lxr`" :rules="[
+                         {
+                      pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                      message: '请输入正确的手机号码',
+                      trigger: 'blur'
+                    },
+                          {
+                          required: true, message: '请输入', trigger: 'blur'
+                        }
+                        ]" :label="'联系人' + (index == 0 ? '' : index)">
                     <el-input v-model="domain.lxr" placeholder="请输入联系人"></el-input>
                   </el-form-item>
                 </el-col>
@@ -2605,6 +2626,12 @@
                 </myUpload>
               </el-form-item>
             </el-row>
+            <el-row style="margin: 10px 0;" v-if="ruleForm.bfyy">
+              <span class="top-title-box">报废原因</span>
+            </el-row>
+            <el-row style="margin: 20px 0;">
+                <div>{{ ruleForm.bfyy }}</div>
+            </el-row>
             <el-row style="margin: 10px 0 ;padding-bottom: 50px; text-align: center;">
               <el-button type="danger" @click="newAssets(0)">报废</el-button>
               <el-button @click="newAssets(1)">取消</el-button>
@@ -3035,8 +3062,9 @@ export default {
     },
     // 新增资产确认按钮
     newAssets(type) {
-      this.loading = true
       if (type == 1) {
+      this.loading = true
+
         //取消
         this.$router.go(-1);
         this.loading = false
@@ -3092,6 +3120,8 @@ export default {
       }
 
       if (type == 2) {
+      this.loading = true
+
         //暂存
         assetTaskzc(this.ruleForm).then(res => {
           console.log(res, "res");
@@ -3102,6 +3132,8 @@ export default {
         })
       }
       if (type == 3) {
+      this.loading = true
+
         //提交
         this.$refs['ruleForm'].validate((valid) => {
           if (valid) {
diff --git a/src/views/unitPages/myTask/index.vue b/src/views/unitPages/myTask/index.vue
index 90f4779..801f808 100644
--- a/src/views/unitPages/myTask/index.vue
+++ b/src/views/unitPages/myTask/index.vue
@@ -10,11 +10,11 @@
               <el-input v-model="formInline.taskName" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="7">
+          <!-- <el-col :span="7">
             <el-form-item label="任务编号：">
               <el-input v-model="formInline.id" placeholder="请输入"></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="7">
             <el-form-item label="任务状态：">
               <el-select v-model="formInline.taskStatus" placeholder="请选择">
@@ -42,7 +42,7 @@
         <el-table v-loading="loading" :data="tableData" :height="tabHeader" :max-height="tabHeader"
           :row-class-name="tableRowClassName">
           <el-table-column type="index" width="50" label="序号" align="center" />
-          <el-table-column label="任务编号" key="id" width="200px" prop="id" align="center" />
+          <!-- <el-table-column label="任务编号" key="id" width="200px" prop="id" align="center" /> -->
           <el-table-column label="任务名称" key="taskName" prop="taskName" align="center" />
           <el-table-column label="任务下发时间" key="taskTime" prop="taskTime" align="center">
             <!-- <template slot-scope="scope">