From e20c6810b40584674eb0b00e390524029510adea 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 20:28:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/auditPages/taskManagement/audit.vue |  57 +++-
 src/views/auditPages/taskManagement/info.vue  |   4 +-
 src/views/unitPages/myTask/audit.vue          | 255 +++++++++++++-----
 src/views/unitPages/myTask/info.vue           |   7 +-
 4 files changed, 245 insertions(+), 78 deletions(-)

diff --git a/src/views/auditPages/taskManagement/audit.vue b/src/views/auditPages/taskManagement/audit.vue
index 083f222..874b565 100644
--- a/src/views/auditPages/taskManagement/audit.vue
+++ b/src/views/auditPages/taskManagement/audit.vue
@@ -662,7 +662,16 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="phoneNumber">
+                        <el-form-item prop="fgfzrlxfs" :rules="[
+                            {
+                            required: true, message: '请输入', trigger: 'blur'
+                          },
+                            {
+                              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                              message: '请输入正确的手机号码',
+                              trigger: 'blur'
+                            } 
+                          ]">
                           <el-input v-model="ruleForm.fgfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -693,7 +702,17 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="phoneNumber">
+                        <el-form-item prop="bmfzrlxfs" 
+                          :rules="[
+                            {
+                            required: true, message: '请输入', trigger: 'blur'
+                          },
+                            {
+                              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                              message: '请输入正确的手机号码',
+                              trigger: 'blur'
+                            } 
+                          ]">
                           <el-input v-model="ruleForm.bmfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -724,7 +743,18 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="phoneNumber">
+                        <el-form-item  prop="dylxrlxfs" 
+                          :rules="[
+                            {
+                            required: true, message: '请输入', trigger: 'blur'
+                          },
+                            {
+                              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                              message: '请输入正确的手机号码',
+                              trigger: 'blur'
+                            } 
+                          ]"
+                        >
                           <el-input v-model="ruleForm.dylxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -755,7 +785,18 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="phoneNumber">
+                        <el-form-item :prop="'otherConcat.' + index + '.qtlxrlxfs'"
+                          :rules="[
+                            {
+                            required: true, message: '请输入', trigger: 'blur'
+                          },
+                            {
+                              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                              message: '请输入正确的手机号码',
+                              trigger: 'blur'
+                            } 
+                          ]"
+                        >
                           <el-input v-model="domain.qtlxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -2669,6 +2710,14 @@
                 </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;">
+              <el-form-item>
+                <div>{{ruleForm.bfyy}}</div>
+              </el-form-item>
+            </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/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue
index 4e2d630..9728b6d 100644
--- a/src/views/auditPages/taskManagement/info.vue
+++ b/src/views/auditPages/taskManagement/info.vue
@@ -6,9 +6,9 @@
         <div class="teshu-top-info">
           <div class="top-info">
             <el-row class="top-row">
-              <el-col :span="8">
+              <!-- <el-col :span="8">
                 任务编号：<span>{{ titleInfoObj.id }}</span>
-              </el-col>
+              </el-col> -->
               <el-col :span="8">
                 任务名称：<span>{{ titleInfoObj.taskName }}</span>
               </el-col>
diff --git a/src/views/unitPages/myTask/audit.vue b/src/views/unitPages/myTask/audit.vue
index 82b33da..192efb7 100644
--- a/src/views/unitPages/myTask/audit.vue
+++ b/src/views/unitPages/myTask/audit.vue
@@ -94,7 +94,7 @@
                   <el-col :span="23">
                     <el-input v-model="domain.key" placeholder="请输入关联域名"></el-input>
                   </el-col>
-                  <el-col :span="1" style="text-align: center;">
+                  <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                     <i @click="addForm('glymList')" v-if="index == 0" class="el-icon-circle-plus-outline"
                       style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                     <i @click="removeDomainOne(domain, 'glymList')" v-else class="el-icon-remove-outline"
@@ -134,7 +134,7 @@
                   <el-col :span="23">
                     <el-input v-model="domain.key" placeholder="请输入关联IP"></el-input>
                   </el-col>
-                  <el-col :span="1" style="text-align: center;">
+                  <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                     <i @click="addForm('glIpList')" v-if="index == 0" class="el-icon-circle-plus-outline"
                       style="margin-left: 5px;font-size: 16px;cursor: pointer;"></i>
                     <i @click="removeDomainOne(domain, 'glIpList')" v-else class="el-icon-remove-outline"
@@ -598,9 +598,16 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="fgfzrlxfs" :rules="{
-                          required: true, message: '请输入', trigger: 'blur'
-                        }">
+                        <el-form-item prop="fgfzrlxfs" :rules="[
+                            {
+                            required: true, message: '请输入', trigger: 'blur'
+                          },
+                            {
+                              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                              message: '请输入正确的手机号码',
+                              trigger: 'blur'
+                            } 
+                          ]">
                           <el-input v-model="ruleForm.fgfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -632,9 +639,17 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="bmfzrlxfs" :rules="{
-                          required: true, message: '请输入', trigger: 'blur'
-                        }">
+                        <el-form-item prop="bmfzrlxfs" 
+                          :rules="[
+                            {
+                            required: true, message: '请输入', trigger: 'blur'
+                          },
+                            {
+                              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                              message: '请输入正确的手机号码',
+                              trigger: 'blur'
+                            } 
+                          ]">
                           <el-input v-model="ruleForm.bmfzrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -665,9 +680,18 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="dylxrlxfs" :rules="{
-                          required: true, message: '请输入', trigger: 'blur'
-                        }">
+                        <el-form-item prop="dylxrlxfs" 
+                          :rules="[
+                            {
+                            required: true, message: '请输入', trigger: 'blur'
+                          },
+                            {
+                              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                              message: '请输入正确的手机号码',
+                              trigger: 'blur'
+                            } 
+                          ]"
+                        >
                           <el-input v-model="ruleForm.dylxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -698,7 +722,18 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="8" style="margin-left: 10px;">
-                        <el-form-item prop="phoneNumber">
+                        <el-form-item  :prop="'otherConcat.' + index + '.qtlxrlxfs'"
+                          :rules="[
+                            {
+                            required: true, message: '请输入', trigger: 'blur'
+                          },
+                            {
+                              pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+                              message: '请输入正确的手机号码',
+                              trigger: 'blur'
+                            } 
+                          ]"
+                        >
                           <el-input v-model="domain.qtlxrlxfs" style="width: 100%;" placeholder="请输入联系方式"></el-input>
                         </el-form-item>
                       </el-col>
@@ -713,7 +748,7 @@
                           <el-input v-model="domain.qtlxryx" style="width: 100%;" placeholder="请输入邮箱"></el-input>
                         </el-form-item>
                       </el-col>
-                      <el-col :span="1" style="text-align: center;">
+                      <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                         <i @click="removeDomain(domain, 'otherConcat')" class="el-icon-remove-outline"
                           style="font-size: 16px;cursor: pointer;"></i>
                       </el-col>
@@ -721,7 +756,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row>
+              <el-row v-if="$route.query.pageType !== 'look'">
                 <el-col :span="24">
                   <el-form-item prop="btn">
                     <el-button @click="addOtherConcat('otherConcat')">添加其他联系人</el-button>
@@ -1193,7 +1228,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1216,7 +1257,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('chepingUnit', 1)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'chepingUnit')" v-else class="el-icon-remove-outline"
@@ -1233,7 +1274,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1256,7 +1303,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('yjgysUnit', 2)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'yjgysUnit')" v-else class="el-icon-remove-outline"
@@ -1273,7 +1320,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1296,7 +1349,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('jfywUnit', 3)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'jfywUnit')" v-else class="el-icon-remove-outline"
@@ -1313,7 +1366,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)"  :rules="[
+                      {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                    ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1336,7 +1395,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('xtsjUnit', 4)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'xtsjUnit')" v-else class="el-icon-remove-outline"
@@ -1355,9 +1414,14 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :prop="`xtjsUnit[${index}].tyshxydm`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }" required :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :prop="`xtjsUnit[${index}].tyshxydm`" :rules="[
+                    {required: true, message: '请输入', trigger: 'blur'},
+                    {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                  ]" required :label="'统一社会信用代码' + (index == 0 ? '' : index)">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1404,7 +1468,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('xtjsUnit', 5)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'xtjsUnit')" v-else class="el-icon-remove-outline"
@@ -1423,9 +1487,16 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].tyshxydm`" :rules="{
-                    required: true, message: '请输入', trigger: 'blur'
-                  }" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" required :prop="`xtyyUnit[${index}].tyshxydm`" 
+                  :rules="[
+                    {required: true, message: '请输入', trigger: 'blur'},
+                    {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                  ]" 
+                  :label="'统一社会信用代码' + (index == 0 ? '' : index)">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1472,7 +1543,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('xtyyUnit', 7)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'xtyyUnit')" v-else class="el-icon-remove-outline"
@@ -1489,7 +1560,13 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" style="margin-left: 10px;">
-                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)">
+                  <el-form-item class="daoqitixingren" :label="'统一社会信用代码' + (index == 0 ? '' : index)" :rules="[
+                    {
+                        pattern: /^[a-zA-Z0-9]{18}$/,
+                        message: '请输入正确格式的18位统一社会信用代码',
+                        trigger: 'blur'
+                      }
+                  ]">
                     <el-input v-model="domain.tyshxydm" placeholder="请输入统一信用代码"></el-input>
                   </el-form-item>
                 </el-col>
@@ -1512,7 +1589,7 @@
                     <el-input v-model="domain.lxdh" placeholder="请输入联系电话"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="1" style="text-align: center;">
+                <el-col :span="1" style="text-align: center;" v-if="$route.query.pageType !== 'look'">
                   <i @click="addGongyinglian('aqfwUnit', 6)" v-if="index == 0" class="el-icon-circle-plus-outline"
                     style="margin-top: 10px;font-size: 16px;cursor: pointer;"></i>
                   <i @click="removeDomain(domain, 'aqfwUnit')" v-else class="el-icon-remove-outline"
@@ -2605,15 +2682,14 @@
                 </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;">
-              <el-form-item>
-                <div>{{ruleForm.bfyy}}</div>
-              </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;">
+              <el-form-item>
+                <div>{{ruleForm.bfyy}}</div>
+              </el-form-item>
+            </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>
@@ -2623,10 +2699,29 @@
           </div>
         </el-form>
       </div>
+      <my-dialog title="报废原因" ref="liebiaoDialog"  @close="importClose" class="taskDialogBox" width="40%">
+      <el-row>
+        <el-col :span="21">
+          <el-form :model="dialogruleForm" :rules="dialogruleFormrules" ref="dialogruleForm" label-width="100px">
+            <el-form-item  prop="bfyy">
+              <el-input v-model="dialogruleForm.bfyy" placeholder="请输入报废原因"></el-input>
+            </el-form-item>
+            <el-form-item class="newTask-form-item">
+              <el-button @click="resetForm('dialogruleForm')">取消</el-button>
+              <el-button type="primary" @click="submitForm('dialogruleForm')">确定</el-button>
+            </el-form-item>
+          </el-form>
+        </el-col>
+        <el-col :span="6"></el-col>
+      </el-row>
+      </my-dialog>
     </div>
+
   </div>
 </template>
 <script>
+import myDialog from "@/views/components/myDialog/index.vue"
+
 import pcas from "@/utils/pca-code.json"
 import myUpload from "@/views/components/myUpload/index.vue";
 import { assetUnitData, assetInfo } from "@/api/auditPagesApi/index";
@@ -2644,7 +2739,7 @@ export default {
     'xtfhqk_fcg', 'xtfhqk_fxl', 'xtfhqk_fzd', 'xtfhqk_fls'
   ],
   components: {
-    myUpload
+    myUpload,myDialog
   },
   data() {
     return {
@@ -2819,8 +2914,14 @@ export default {
       xtfhqkFzd: [],
       // 防勒索
       xtfhqkFls: [],
-
-
+      dialogruleForm:{
+        bfyy:""
+      },
+      dialogruleFormrules:{
+        bfyy: [
+          { required: true, message: '请输入', trigger: 'blur' },
+        ],
+      },
       rules: {},
       disabled: false,
       loading: false,
@@ -2853,6 +2954,39 @@ export default {
     }
   },
   methods: {
+    importClose(){},
+     // 关闭新增弹窗
+     resetForm() {
+      this.dialogruleForm = {
+        bfyy:""
+      }
+      this.$refs.liebiaoDialog.close()
+      
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          this.ruleForm.isbf = 2
+          this.ruleForm.bfyy = this.dialogruleForm.bfyy
+          assetTaskzc(this.ruleForm).then(res => {
+            console.log(res, "res");
+            this.$message({
+              type: 'info',
+              message: '已报废'
+            });
+        this.loading = false
+            
+            this.$router.go(-1);
+            this.ruleForm.bfyy = ""
+          })
+         
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+
+    },
     // 获取详情
     getInfo(obj) {
       this.loading = true
@@ -3044,8 +3178,9 @@ export default {
     },
     // 新增资产确认按钮
     newAssets(type) {
-      this.loading = true
       if (type == 1) {
+      this.loading = true
+
         //取消
         this.$router.go(-1);
         this.loading = false
@@ -3072,35 +3207,13 @@ export default {
         this.ruleForm.fwwz = this.select + "-" + this.ruleForm.fwwz
       }
       if (type == 0) {
-        //报废
-        this.$prompt('请输入报废原因', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-        }).then(({ value }) => {
-          this.ruleForm.isbf = 2
-          this.ruleForm.bfyy = value
-          assetTaskzc(this.ruleForm).then(res => {
-            console.log(res, "res");
-            this.$message({
-              type: 'info',
-              message: '已报废'
-            });
-        this.loading = false
-            
-            this.$router.go(-1);
-            this.ruleForm.bfyy = ""
-          })
-        }).catch(() => {
-        this.loading = false
-          this.$message({
-            type: 'info',
-            message: '取消输入'
-          });
-        });
+      this.$refs.liebiaoDialog.open()
 
       }
 
       if (type == 2) {
+      this.loading = true
+
         //暂存
         assetTaskzc(this.ruleForm).then(res => {
           console.log(res, "res");
@@ -3111,6 +3224,8 @@ export default {
         })
       }
       if (type == 3) {
+      this.loading = true
+
         //提交
         this.$refs['ruleForm'].validate((valid) => {
           if (valid) {
diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue
index 8c43cac..08250c6 100644
--- a/src/views/unitPages/myTask/info.vue
+++ b/src/views/unitPages/myTask/info.vue
@@ -9,7 +9,7 @@
           <div class="top-info">
             <el-row class="top-row">
               <el-col :span="8">
-                任务编号：<span>{{ titleInfoObj.id }}</span>
+                <!-- 任务编号：<span>{{ titleInfoObj.id }}</span> -->
               </el-col>
               <el-col :span="8">
                 任务名称：<span>{{ titleInfoObj.taskName }}</span>
@@ -370,7 +370,10 @@ export default {
     getList() {
       this.loading = true
       this.pagination.taskId = this.$route.query.id || this.$route.meta.id
-      this.pagination.dwmc = this.$route.query.dwmc || this.$route.meta.dwmc
+      // this.pagination.dwmc = this.$route.query.dwmc || this.$route.meta.dwmc
+      if(this.$store.state.user.roles.includes("unit")){
+      this.pagination.dwmc=this.$store.state.user.useer.nickName
+    }
       geassetTaskcHc(this.pagination).then(res => {
         
         this.tableData = res.data.records