更改任务管理

src/api/renwuApi/index.js

@@ -64,10 +64,18 @@ export function addassetTaskadd(data) {
     })
   }
 
-  export function assetTaskdwHc(data) {
+  export function assetTaskdwHc(params) {
     return request({
       url: `/unit/assetTask/dwHc`,
-      method: "post",
+      method: "get",
-      data,
+      params,
+    })
+  }
+
+  export function assetLcpage(params) {
+    return request({
+      url: `/unit/assetLc/page`,
+      method: "get",
+      params,
     })
   }

src/assets/styles/public.scss

@@ -270,7 +270,7 @@
     }
 
     .teshu-top-info {
-      padding: 20px;
+      padding: 0px 20px;
     }
 
     .top-info {

src/views/auditPages/taskManagement/index.vue

@@ -51,9 +51,9 @@
       <div class="search-title">
         <span class="search-title-span">任务列表</span>
         <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">任务创建</el-button>
           </el-col>

src/views/auditPages/taskManagement/info.vue

@@ -149,17 +149,17 @@
           <el-table v-loading="loading" :data="tableDataTwo" :height="tabHeader" :max-height="tabHeader"
             :row-class-name="tableRowClassName">
             <el-table-column type="index" width="50" label="序号" align="center" />
-            <el-table-column label="单位名称" key="unitName" width="200px" prop="unitName" align="center" />
+            <el-table-column label="单位名称" key="dwmc" width="200px" prop="dwmc" align="center" />
-            <el-table-column label="核查资产数量" key="hczcsl" prop="hczcsl" align="center" />
+            <el-table-column label="核查资产数量" key="total" prop="total" align="center" />
-            <el-table-column label="完成数量" key="wcsl" prop="wcsl" align="center">
+            <el-table-column label="完成数量" key="checked" prop="checked" align="center">
               <!-- <template slot-scope="scope">
                     <dict-tag :options="dict.type.project_middle_type" :value="scope.row.projectMiddleType"/>
                   </template> -->
             </el-table-column>
-            <el-table-column label="未完成数量" key="wwcsl" prop="wwcsl" align="center" />
+            <el-table-column label="未完成数量" key="wwcsl" prop="notChecked" align="center" />
-            <el-table-column label="未完成比例" key="wwcbl" width="200px" prop="wwcbl" align="center">
+            <el-table-column label="未完成比例" key="checkedRatio" width="200px" prop="checkedRatio" align="center">
               <template slot-scope="scope">
-                <span style="color: #192A92;">{{ scope.row.wwcbl }}</span>
+                <span style="color: #192A92;">{{ scope.row.checkedRatio }}%</span>
               </template>
             </el-table-column>
           </el-table>
@@ -173,18 +173,16 @@
       <div class="timeline">
         <div class="timeline-items" v-for="(item,index) in timeLineData">
           <div class="left-box">
-            <img class="main-img" v-if="item.status == 1" src="@/assets/images/rwxf.png" alt="">
+            <img class="main-img"  :src="returnidimg(item.assetName)" alt="">
-            <img class="main-img" v-if="item.status == 2" src="@/assets/images/wctj.png" alt="">
+            <!-- <img class="main-img" v-if="item.status == 2" src="" alt="">
-            <img class="main-img" v-if="item.status == 3" src="@/assets/images/shbh.png" alt="">
+            <img class="main-img" v-if="item.status == 3" src="" alt="">
-            <img class="main-img" v-if="item.status == 4" src="@/assets/images/shtg.png" alt="">
+            <img class="main-img" v-if="item.status == 4" src="" alt=""> -->
             <img class="icon-jt" v-if="(index + 1) != timeLineData.length" src="@/assets/images/icon-jt@2x.png" alt="">
           </div>
           <div class="right-box">
-            <span class="span-title" v-if="item.status == 1">管理员任务下发:</span>
+           
-            <span class="span-title" v-if="item.status == 2">单位核查完成提交:</span>
+            <span class="span-title" >{{item.assetName}}:</span>
-            <span class="span-title" v-if="item.status == 3">管理员审核驳回:</span>
+            <span class="span-time">{{ item.xfTime }}</span>
-            <span class="span-title" v-if="item.status == 4">管理员审核通过:</span>
-            <span class="span-time">{{ item.timestamp }}</span>
           </div>
         </div>
       </div>
@@ -193,7 +191,7 @@
 </template>
 <script>
 import myPagination from "@/views/components/Pagination/index.vue"
-import { getassetTaskid, geassetTaskcHc,assetTaskdwHc } from "@/api/renwuApi/index.js"
+import { getassetTaskid, geassetTaskcHc,assetTaskdwHc,assetLcpage } from "@/api/renwuApi/index.js"
 
 export default {
   dicts: ['zc_xtlx'],
@@ -220,40 +218,7 @@ export default {
       ],
       loading: false,
       tabHeader: undefined,
-      timeLineData: [{
+      timeLineData: [],
-        status: 1,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 2,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 3,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 2,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 4,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 2,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 4,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 2,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 4,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 2,
-        timestamp: '2024-11-11 17:00:00'
-      }, {
-        status: 4,
-        timestamp: '2024-11-11 17:00:00'
-      }],
       titleInfoObj: {}
     }
   },
@@ -262,12 +227,54 @@ export default {
     this.cancalDebounce();
     window.addEventListener('resize', this.cancalDebounce);
     this.titleInfo()
+    this.assetLcpageList()
   },
   destroyed() {
     window.removeEventListener('resize', this.cancalDebounce);
   },
 
   methods: {
+    //返回图片
+    returnidimg(iswenzi){
+      // let obj = {
+      //   '下发':require('@/assets/images/rwxf.png'),
+      //   "提交":require('@/assets/images/wctj.png'),
+      //   "驳回,不通过":require('@/assets/images/shbh.png'),
+      //   "审核通过":require('@/assets/images/shtg.png'),
+      // }
+
+      let listsna = [
+        {
+          name:"下发",
+          imgdata:require('@/assets/images/rwxf.png'),
+        },{
+          name:"提交",
+          imgdata:require('@/assets/images/wctj.png'),
+        },{
+          name:"不通过",
+          imgdata:require('@/assets/images/shbh.png'),
+        },{
+          name:"审核通过",
+          imgdata:require('@/assets/images/shtg.png'),
+        },{
+          name:"驳回",
+          imgdata:require('@/assets/images/shbh.png'),
+        }
+      ]
+      let item = listsna.find(item=>iswenzi.includes(item.name))
+        if(item){
+          return item.imgdata
+        }else{
+          return require('@/assets/images/wctj.png')
+        }
+     
+    },
+    //获取流程
+    assetLcpageList(){
+      assetLcpage(this.$route.query.id || this.$route.meta.id).then(res=>{
+        this.timeLineData = res.data
+      })
+    },
     goInfo(type, row) {
       // 查看
       if (type == 1) {
@@ -358,29 +365,17 @@ export default {
     },
     // 切换tab
     activeTab(id) {
-      this.pagination.current =1;
+      this.pagination.current = 1;
       this.pagination.size = 10;
       this.total = 0
       this.index = id
       console.log(id);
       
-      if (id == 1) {
+      this.resetQuery()
-        this.formInline = {
+     
-          unit: "",
-          type: "",
-          status: "",
-        }
-        this.getList();
-      } else {
-        this.formInlineTwo = {
-          dwmc: "",
-        }
-        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