修改执行情况查看

src/views/riskProject/execution/index.vue

@@ -4,12 +4,24 @@
     <van-sticky offset-top="0">
       <LHeader :text="text"></LHeader>
     </van-sticky>
-    <van-tabs v-model="active" @change="postList" color="#2980f7" animated :sticky="true">
-      <van-tab v-for="(item) in tabs" :key="item.key" :title="item.title">
+    <van-tabs
+      v-model="active"
+      @change="postList"
+      color="#2980f7"
+      animated
+      :sticky="true"
+    >
+      <van-tab v-for="item in tabs" :key="item.key" :title="item.title">
         <!-- 内容列表 -->
         <div class="con-list" @touchmove="showIndex = null">
-          <van-cell-group inset v-for="(item, index) in messageList" :key="index">
-            <div style="font-size: 0.45rem;padding: 5px 0;">{{ item.title }}</div>
+          <van-cell-group
+            inset
+            v-for="(item, index) in messageList"
+            :key="index"
+          >
+            <div style="font-size: 0.45rem;padding: 5px 0;">
+              {{ item.title }}
+            </div>
             <van-row gutter="">
               <van-col span="17">
                 <van-row gutter="">
@@ -18,26 +30,45 @@
                 </van-row>
                 <van-row gutter="">
                   <van-col span="9">发起时间：</van-col>
-                  <van-col span="15">{{ timestampToTimes(item.startTime) }}</van-col>
+                  <van-col span="15">{{
+                    timestampToTimes(item.startTime)
+                  }}</van-col>
                 </van-row>
               </van-col>
               <van-col span="7">
-                <van-row :style="{ 'color': (active == 0) ? '#f79648' : (active == 1) ? '#0069e5' : '#03b615' }">
+                <van-row
+                  :style="{
+                    color:
+                      active == 0
+                        ? '#f79648'
+                        : active == 1
+                        ? '#0069e5'
+                        : '#03b615'
+                  }"
+                >
                   {{ item.state }}
                 </van-row>
                 <van-row>
-                  <van-button type="info" size="mini" @click="lookdetail(index, item)">查看详情</van-button>
+                  <van-button
+                    type="info"
+                    size="mini"
+                    @click="lookdetail(index, item)"
+                    >执行情况</van-button
+                  >
                 </van-row>
               </van-col>
             </van-row>
           </van-cell-group>
-          <div style="
+          <div
+            style="
               width: 100%;
               text-align: center;
               font-size: 0.48rem;
               position: fixed;
               top: 30%;
-            " v-if="messageList['length'] == 0">
+            "
+            v-if="messageList['length'] == 0"
+          >
             暂无数据
           </div>
         </div>
@@ -46,11 +77,95 @@
       </van-tab>
     </van-tabs>
     <!-- 长按显示遮罩层 -->
-   <van-overlay :show="showIndex">
-      <div class="wrapper" @click.stop="showIndex = false">
+    <van-popup
+      v-model="showIndex"
+      closeable
+      round
+      position="right"
+      :style="{ width: '90%', height: '100%' }"
+    >
+      <van-cell-group title="执行情况">
+        <!-- 内容列表 -->
+        <div class="con-list" @touchmove="showIndex = null">
+          <van-cell-group
+            inset
+            v-for="(item, index) in buildingList"
+            :key="index"
+          >
+            <van-row gutter="">
+              <van-col span="16">{{ item.buildingName }}</van-col>
+              <van-col
+                span="8"
+                :style="{
+                  color:
+                    item.status == 'wait'
+                      ? '#F79648'
+                      : item.status == 'finish'
+                      ? '#03B615'
+                      : '#FF041D'
+                }"
+                >{{
+                  item.status == "wait"
+                    ? "待评估"
+                    : item.status == "finish"
+                    ? "已完成"
+                    : "已退回"
+                }}</van-col
+              >
+            </van-row>
 
+            <van-row>
+              <van-col span="18">
+                <van-row gutter="">
+                  <van-col span="8">创 建 人：</van-col>
+                  <van-col span="16">{{ item.createUserName }}</van-col>
+                </van-row>
+
+                <van-row gutter="">
+                  <van-col span="8">处理人员：</van-col>
+                  <van-col span="16">{{ item.workUserNames }}</van-col>
+                </van-row>
+
+                <van-row gutter="">
+                  <van-col span="8">发起时间：</van-col>
+                  <van-col span="16"
+                    >{{ timestampToTimes(item.startTime) }}
+                  </van-col>
+                </van-row>
+              </van-col>
+              <van-col span="6">
+                <van-row>
+                  <van-button
+                    type="info"
+                    size="mini"
+                    @click="todetail(index, item)"
+                    >查看详情</van-button
+                  >
+                </van-row></van-col
+              >
+            </van-row>
+          </van-cell-group>
+          <div
+            style="
+              width: 100%;
+              text-align: center;
+              font-size: 0.48rem;
+              position: fixed;
+              top: 30%;
+            "
+            v-if="buildingList['length'] == 0"
+          >
+            暂无数据
+          </div>
         </div>
-    </van-overlay>
+      </van-cell-group>
+    </van-popup>
+    <!-- <van-overlay :show="showIndex">
+   
+      <div class="wrapper" @click.stop="showIndex = false">
+        111
+      </div>
+    </van-overlay> -->
   </div>
 </template>
 
@@ -59,9 +174,9 @@ import LHeader from "@/components/header.vue";
 import { getFun, postFun } from "@/service/table.js";
 import { timestampToTime, generateId } from "@/utils/format";
 export default {
-  name: 'risk-execution',
+  name: "risk-execution",
   components: {
-    LHeader,
+    LHeader
   },
   data() {
     return {
@@ -70,9 +185,9 @@ export default {
       isHaveNews: false,
       messageList: [
         {
-          title: 'XX项目评估任务单',
-          time: '2022-12-12',
-          name: 'Mr.周',
+          title: "XX项目评估任务单",
+          time: "2022-12-12",
+          name: "Mr.周",
           state: 1
         }
       ],
@@ -83,17 +198,18 @@ export default {
       tabs: [
         {
           title: "待评估",
-          key: 'wait'
+          key: "wait"
         },
         {
           title: "执行中",
-          key: 'running'
+          key: "running"
         },
         {
           title: "已完成",
-          key: 'finish'
-        },
+          key: "finish"
+        }
       ],
+      buildingList: []
     };
   },
   created() {
@@ -101,32 +217,33 @@ export default {
   },
   methods: {
     timestampToTimes(time) {
-      return timestampToTime(new Date(time), "DT2", true)
+      return timestampToTime(new Date(time), "DT2", true);
     },
     handadd() {
       this.$router.push({
         name: "riskAdd",
         params: {
-          title: '新增'
-        },
-      })
+          title: "新增"
+        }
+      });
     },
     postList(name, title) {
       this.$toast.loading({
         message: "加载中...",
         forbidClick: true,
         loadingType: "spinner",
-        duration: 0,
+        duration: 0
       });
-      let url = `/risk/plan/allocation/list?status=wait`
+      let url = `/risk/plan/allocation/list?status=wait`;
       if (name == 0) {
-        url = `/risk/plan/allocation/list?status=wait`
+        url = `/risk/plan/allocation/list?status=wait`;
       } else if (name == 1) {
-        url = `/risk/plan/allocation/list?status=running`
+        url = `/risk/plan/allocation/list?status=running`;
       } else {
-        url = `/risk/plan/allocation/list?status=finish`
+        url = `/risk/plan/allocation/list?status=finish`;
       }
-      getFun(url).then(res => {
+      getFun(url)
+        .then(res => {
           this.$toast.clear();
           this.messageList = res.data || res.rows;
           // 判断有无数据返回
@@ -143,9 +260,34 @@ export default {
     onSearch(val) {
       this.postList(this.searchValue);
     },
-    //查看详情
+    //执行情况
     lookdetail(index, item) {
-      this.showIndex = true
+      this.showIndex = true;
+      console.log(item);
+      getFun("/risk/plan/allocation/building/list/" + item.id)
+        .then(res => {
+          console.log(res);
+          this.buildingList = res.data;
+        })
+        .catch(() => {
+          this.$toast.clear();
+          this.$toast.fail("加载失败,请稍后再试");
+        });
+    },
+    //查看详情
+    todetail(index, item) {
+      this.showIndex = true;
+      console.log(item);
+      this.$router.push({
+        name: "riskTaskList",
+        params: {
+          id: item.id,
+          buildingId: item.buildingId
+        }
+      });
+      sessionStorage.setItem("planId", item.id);
+      sessionStorage.setItem("buildingId", item.buildingId);
+      this.showIndex = null;
     },
 
     // 详情
@@ -153,8 +295,8 @@ export default {
       this.$router.push({
         name: "risk-big-detail",
         params: {
-          id: data.businessId || data.id,
-        },
+          id: data.businessId || data.id
+        }
       });
       this.showIndex = null;
     },
@@ -163,12 +305,12 @@ export default {
       this.$router.push({
         name: "risk-affirm",
         params: {
-          data: data,
-        },
+          data: data
+        }
       });
       this.showIndex = null;
-    },
-  },
+    }
+  }
 };
 </script>
 <style lang="less" scoped>
@@ -200,4 +342,3 @@ export default {
   }
 }
 </style>
-  
\ No newline at end of file