xiugai任务

src/api/renwuApi/index.js

@@ -62,4 +62,12 @@ export function addassetTaskadd(data) {
       method: "post",
       data,
     })
+  }
+
+  export function assetTaskdwHc(data) {
+    return request({
+      url: `/unit/assetTask/dwHc`,
+      method: "post",
+      data,
+    })
   }

src/views/auditPages/taskManagement/audit.vue

@@ -6,7 +6,7 @@
         <span class="top-title-box">基本信息</span>
       </el-row>
       <div class="assets-info-box">
-        <el-form :model="ruleForm" :rules="rules" ref="ruleForm" label-width="170px" class="demo-ruleForm" label-position="right" :disabled="disabled">
+        <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">
               <el-form-item label="系统名称" required>
@@ -2670,7 +2670,7 @@
             </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)" :loading="loading">通过</el-button>
+              <el-button type="primary" @click="newAssets(1)" >通过</el-button>
             </el-row>
           </div>
         </el-form>
@@ -2889,6 +2889,8 @@ export default {
   methods:{
     // 获取详情
     getInfo(obj){
+      this.loading = true;
+
       assetTasktaskSh(obj).then(res=>{
         this.ruleForm = res.data;
         if(!this.ruleForm.xjgywxt) {
@@ -2929,6 +2931,8 @@ export default {
           this.dlwz = [this.ruleForm.sheng]
         }
       })
+        this.loading = false;
+
     },
     changeRadio(id){
       this.ruleForm.xjgywxt = {
@@ -3050,9 +3054,12 @@ export default {
     },
     // 新增资产确认按钮
     newAssets(type) {
+        // this.loading = true;
+
       let tijioaobj = {
           taskId: this.$route.query.taskId,
           assetId: this.$route.query.assetId,
+          xtmc:this.ruleForm.xtmc,
           status: 4
         }
       if (type == 0) {

src/views/auditPages/taskManagement/info.vue

@@ -76,7 +76,7 @@
           <el-row>
             <el-col :span="7">
               <el-form-item label="单位名称：">
-                <el-input v-model="formInlineTwo.unitName" placeholder="请输入"></el-input>
+                <el-input v-model="formInlineTwo.dwmc" placeholder="请输入"></el-input>
                 <!-- <el-select v-model="formInline.unit" placeholder="请选择"> -->
                 <!-- <el-option
                         v-for="dict in dict.type.bms_approval_status"
@@ -135,8 +135,8 @@
                     <span class="look-info"
                       style="color: #1485EF;">查看</span>
                   </div>
-                  <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(1,scope.row)" v-if="$route.query.pageType == 'info' || $route.meta.pageType == 'info'">
-                    <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 20px;margin-right: 5px;">
+                  <div style="display: flex;align-items: center;cursor: pointer;" @click="goInfo(2,scope.row)" v-if="$route.query.pageType == 'info' || $route.meta.pageType == 'info'">
+                    <img src="@/assets/images/icon-shenhe@2x.png" alt="" style="width: 15px;margin-right: 5px;">
                     <span class="look-info"
                       style="color: #1485EF;">审核</span>
                   </div>
@@ -193,7 +193,7 @@
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
-import { getassetTaskid, geassetTaskcHc } from "@/api/renwuApi/index.js"
+import { getassetTaskid, geassetTaskcHc,assetTaskdwHc } from "@/api/renwuApi/index.js"
 
 export default {
   dicts: ['zc_xtlx'],
@@ -205,7 +205,7 @@ export default {
 
       },
       formInlineTwo: {
-        unitName: "",
+        dwmc: "",
       },
       total: 0,
       pagination: {
@@ -327,7 +327,7 @@ export default {
         this.getList();
       } else if (this.index == 2) {
         this.formInlineTwo = {
-          unitName: "",
+          dwmc: "",
         }
         this.getListTwo();
       }
@@ -342,11 +342,12 @@ export default {
         this.pagination = { ...this.pagination, ...this.formInline };
         this.getList();
       } else if (this.index == 2) {
+        this.pagination = { ...this.pagination, ...this.formInlineTwo };
         this.getListTwo();
       }
     },
     // 获取页码
-    getPagination() {
+    getPagination(pages) {
       this.pagination.current = pages.page;
       this.pagination.size = pages.limit;
       if (this.index == 1) {
@@ -357,7 +358,12 @@ export default {
     },
     // 切换tab
     activeTab(id) {
+      this.pagination.current =1;
+      this.pagination.size = 10;
+      this.total = 0
       this.index = id
+      console.log(id);
+      
       if (id == 1) {
         this.formInline = {
           unit: "",
@@ -367,18 +373,32 @@ export default {
         this.getList();
       } else {
         this.formInlineTwo = {
-          unitName: "",
+          dwmc: "",
         }
-        this.getList();
+        this.getListTwo();
       }
     },
     getList() {
+      this.loading = true
 
+      this.pagination.taskId = this.$route.query.id || this.$route.meta.id
       geassetTaskcHc(this.pagination).then(res => {
         this.tableData = res.data.records
+        this.total = res.data.total
+        this.loading = false
+
+      })
+    },
+    getListTwo() { 
+      this.loading = true
+
+      this.pagination.taskId = this.$route.query.id || this.$route.meta.id
+      assetTaskdwHc(this.pagination).then(res=>{
+        this.tableDataTwo = res.data.records
+        this.total = res.data.total
+        this.loading = false
       })
     },
-    getListTwo() { },
     // 修改table背景色
     tableRowClassName({ row, rowIndex }) {
       if (rowIndex % 2 !== 0) {

src/views/unitPages/myTask/audit.vue

@@ -3018,10 +3018,11 @@ export default {
     },
     // 新增资产确认按钮
     newAssets(type) {
-
+      this.loading = true
       if (type == 1) {
         //取消
         this.$router.go(-1);
+        this.loading = false
         return
       }
       
@@ -3058,10 +3059,13 @@ export default {
               type: 'info',
               message: '已报废'
             });
+        this.loading = false
+            
             this.$router.go(-1);
             this.ruleForm.bfyy = ""
           })
         }).catch(() => {
+        this.loading = false
           this.$message({
             type: 'info',
             message: '取消输入'
@@ -3076,6 +3080,8 @@ export default {
           console.log(res, "res");
           this.$modal.msgSuccess("修改成功");
           this.$router.go(-1);
+        this.loading = false
+
         })
       }
       if (type == 3) {
@@ -3084,10 +3090,18 @@ export default {
           if (valid) {
             assetTaskjyTj(this.ruleForm).then(res => {
           console.log(res, "res");
-          this.$modal.msgSuccess("修改成功");
+          this.$modal.msgSuccess("提交成功");
           this.$router.go(-1);
+        this.loading = false
+
         })
           } else {
+        this.loading = false
+
+            this.$message({
+            type: 'info',
+            message: '请填写完整'
+          });
             return false;
           }
         });

src/views/unitPages/myTask/info.vue

@@ -115,7 +115,7 @@
                   <span v-if="scope.row.status == 0" style="color: #F59A23;">
                     未核查
                   </span>
-                  <span v-if="scope.row.status == 1" style="color: #F43147;">
+                  <span v-if="scope.row.status == 1" style="color: #00FF00;">
                     已核查
                   </span>
                   <span v-if="scope.row.status == 3" style="color: #00FF00;">
@@ -330,7 +330,7 @@ export default {
       }
     },
     // 获取页码
-    getPagination() {
+    getPagination(pages) {
       this.pagination.current = pages.page;
       this.pagination.size = pages.limit;
       if (this.index == 1) {
@@ -358,10 +358,12 @@ export default {
     },
     getList() {
       this.loading = true
+      this.pagination.taskId = this.$route.query.id || this.$route.meta.id
       geassetTaskcHc(this.pagination).then(res => {
         
         this.tableData = res.data.records
         this.loading = false
+        this.total = res.data.total
       })
     },
     getListTwo() { },
@@ -374,15 +376,15 @@ export default {
     },
     // 屏幕尺寸变化
     cancalDebounce() {
-      // const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
-      // const header = document.getElementById('L-header'); // 通过元素的 ID 获取元素
-      // const tab = document.getElementById('L-tab'); // 通过元素的 ID 获取元素
-      // const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
-      // const elementHeight = element.offsetHeight;
-      // const headerHeight = header.offsetHeight;
-      // const paginationtHeight = pagination.offsetHeight;
-      // const tabHeight = tab.offsetHeight;
-      // this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 120;
+      const element = document.getElementById('L-size-main'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('L-header'); // 通过元素的 ID 获取元素
+      const tab = document.getElementById('L-tab'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      const tabHeight = tab.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - paginationtHeight - tabHeight - 120;
     }
   },
   beforeRouteEnter(to,from,next){