Merge branch 'develop' of http://git.censoft.com.cn/rongtong/rongtong-app into dev-yf'

src/main.js

@@ -9,7 +9,7 @@ import './permission'
 import Cookies from 'js-cookie'
 import util from './api/util.js'
 import {DropdownMenu, DropdownItem, Divider, Popup, Overlay, Loading, Dialog, ContactCard, Form, AddressEdit, AddressList, Field, CellGroup, Cell, SwipeCell, Icon, Stepper, Card, Checkbox, CheckboxGroup, Button, Swipe, SwipeItem, PullRefresh, List, Tab, Tabs, GoodsAction, GoodsActionIcon, GoodsActionButton, SubmitBar, Toast ,Search,Picker,Uploader,Notify ,ContactList,Calendar,Radio,RadioGroup,Tag,Tabbar,TabbarItem,Sticky, Grid, GridItem,Skeleton,Col,Row,  Image as VanImage, Badge,NoticeBar,DatetimePicker,
-Step, Steps, Lazyload   } from 'vant'
+Step, Steps } from 'vant'
 import 'lib-flexible/flexible'
 import vueEsign from 'vue-esign'
 Vue.use(vueEsign)

src/views/riskProject/add/inherentRisks.vue

@@ -8,26 +8,11 @@
       <van-tabs v-model="active" @change="tabList" color="#2980f7" animated>
         <van-tab :title="buildingName">
           <van-dropdown-menu z-index="1000">
-            <van-dropdown-item
-              v-model="value1"
-              @change="changeFloor"
-              :options="option1"
-              get-container="body"
-            />
-            <van-dropdown-item
-              v-model="value2"
-              @change="changeRoom"
-              :options="option2"
-              get-container="body"
-            />
+            <van-dropdown-item v-model="value1" @change="changeFloor" :options="option1" get-container="body" />
+            <van-dropdown-item v-model="value2" @change="changeRoom" :options="option2" get-container="body" />
           </van-dropdown-menu>
           <div class="con-list">
-            <van-cell-group
-              inset
-              v-for="(item, index) in messageList"
-              :key="index"
-              @click="touchstart(index, item)"
-            >
+            <van-cell-group inset v-for="(item, index) in messageList" :key="index" @click="touchstart(index, item)">
               <div style="font-size: 0.45rem;padding: 5px 0;">
                 {{ item.title }}
               </div>
@@ -49,42 +34,33 @@
                     <van-col span="15">{{ item.roomName }}</van-col>
                   </van-row>
                 </van-col>
-                <van-col
-                  span="7"
-                  :style="{ color: item.state == 1 ? '#0069e5' : '#03b615' }"
-                >
+                <van-col span="7" :style="{ color: item.state == 1 ? '#0069e5' : '#03b615' }">
                   {{ "●待审批" }}
                 </van-col>
               </van-row>
               <van-overlay :show="showIndex == index">
                 <div class="wrapper" @click.stop="showIndex = null">
-                  <van-button round type="primary" @click="goDetail(item)"
-                    >编辑</van-button
-                  >
+                  <van-button round type="primary" @click="goDetail(item)">编辑</van-button>
                   <!-- <van-button round type="info" @click="goConfirm(item)" v-show="active==0"
                     >确认</van-button
                   > -->
                 </div>
               </van-overlay>
             </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>
         </van-tab>
       </van-tabs>
     </div>
-    <div
-      style="display: flex;
+    <div style="display: flex;
         justify-content: space-around;
         background-color: #fff;
         border-top: 1px solid #e3e3e3;
@@ -92,19 +68,12 @@
         width: 100%;
         text-align: center;
         position: fixed;
-        bottom: 0;"
-    >
-      <div
-        @click="performTasks"
-        style="color: #4bced0;font-size: 14px;font-weight: 600;"
-      >
+        bottom: 0;">
+      <div @click="performTasks" style="color: #4bced0;font-size: 14px;font-weight: 600;">
         <div style="font-size: 22px;"><van-icon name="plus" /></div>
         <div>新增固有风险</div>
       </div>
-      <div
-        @click="endTasks"
-        style="color: #D9001B;font-size: 14px;font-weight: 600;"
-      >
+      <div @click="endTasks" style="color: #D9001B;font-size: 14px;font-weight: 600;">
         <div style="font-size: 22px;"><van-icon name="cross" /></div>
         <div>任务执行结束</div>
       </div>
@@ -113,13 +82,14 @@
 </template>
 
 <script>
+import { Dialog } from 'vant';
 import LHeader from "@/components/header.vue";
 import { getFun, postFun } from "@/service/table.js";
 import { timestampToTime, generateId } from "@/utils/format";
 export default {
   name: "risk-confirme",
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {
@@ -177,6 +147,19 @@ export default {
     //任务执行结束
     endTasks() {
       //toDo
+      postFun(
+        `/risk/plan/submit/${this.planId}/${this.buildingId}`
+      ).then(res => {
+        console.log(res.msg,'lllll')
+        Dialog.alert({
+          title: '任务执行结束',
+          message: res.msg,
+        }).then(() => {
+          this.$router.push({
+            name:'riskAssess'
+          })
+        });
+      })
     },
     handadd() {
       this.$router.push({
@@ -302,9 +285,11 @@ export default {
   font-family: "";
   color: #2c3e50;
 }
+
 .cell-wrap {
   position: relative;
 }
+
 p {
   font-size: 0.4rem;
   font-weight: none;
@@ -312,31 +297,38 @@ p {
   margin: 0.186667rem 0;
   color: #7f7f7f;
 }
+
 .van-cell-group--inset {
   margin: 0;
   margin-bottom: 10px;
   padding: 10px;
   font-size: 13px;
   position: relative;
+
   .van-row {
     margin-bottom: 0.133333rem;
     line-height: 0.64rem;
   }
 }
+
 .journal-wrap {
   position: relative;
 }
+
 .supervise-wrap {
   position: relative;
 }
+
 .info-title {
   color: #2980f7;
   font-weight: none;
 }
+
 .field-title {
   color: black;
   font-weight: none;
 }
+
 .more {
   position: absolute;
   bottom: 0.32rem;
@@ -345,10 +337,12 @@ p {
   font-weight: none;
   z-index: 99;
 }
+
 .con-list {
   padding: 0;
   min-height: 10rem;
   background-color: #f0f1f5;
+
   .van-cell-group--inset {
     margin: 0;
     margin-bottom: 0.26667rem;
@@ -359,13 +353,16 @@ p {
     box-shadow: 0px 0px 10px 2px #f3f3f3;
     width: 90%;
     margin: 0.4rem auto;
+
     .van-row {
       font-size: 0.4rem;
       line-height: 0.8rem;
       margin-bottom: 0;
     }
+
     .van-overlay {
       position: absolute;
+
       .wrapper {
         display: flex;
         align-items: center;

src/views/riskProject/approve/index.vue

 <template>
-    <!-- 提交 -->
-    <div>
-      <van-sticky offset-top="0">
-        <LHeader :text="text"></LHeader>
-      </van-sticky>
-      <van-sticky offset-top="1.5rem">
-        <van-search
-          v-model="searchValue"
-          show-action
-          placeholder="请输入搜索内容"
-          @search="onSearch"
-        >
-          <template #action>
-            <div @click="onSearch">搜索</div>
-          </template>
-        </van-search>
-      </van-sticky>
-      <!-- <van-tabs
-        v-model="active"
-        @change="
-          postList(searchValue);
-          showIndex = null;
-        "
-        color="#2980f7"
-        animated
-        :sticky="true"
-        offset-top="2.93rem"
-      >
-        <van-tab v-for="(item, key) in tabs" :key="key" :title="item.title"> -->
-          <!-- 内容列表 -->
-          <div
-            class="con-list"
-            @touchmove="showIndex = null"
+  <!-- 提交 -->
+  <div>
+    <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">
+        <!-- 内容列表 -->
+        <div class="con-list">
+          <van-cell-group
+            inset
+            v-for="(item, index) in messageList"
+            :key="index"
           >
-            <van-cell-group
-              inset
-              v-for="(item, index) in messageList"
-              :key="index"
-              @click="touchstart(index, item)"
-            >
-             <div style="font-size: 0.45rem;padding: 5px 0;">{{item.title}}</div>
-
-             <van-row gutter="">
-                <van-col span="17">
-                    <van-row gutter="">
-                        <van-col span="9">发起时间：</van-col>
-                        <van-col span="15">{{ item.time}}</van-col>
-                    </van-row>
-                    <van-row gutter="">
-                        <van-col span="9">处理人员：</van-col>
-                        <van-col span="15">{{ item.name }}</van-col>
-                    </van-row>
-                </van-col>
-                <van-col span="7" :style="{'color':item.state == 1 ? '#0069e5':'#03b615'}">
-                    {{ '●待审批'}}
-                </van-col>
-             </van-row>
-
-              <!-- <van-row gutter="">
-                <van-col span="7">风险源：</van-col>
-                <van-col span="17">{{ item.riskSource }}</van-col>
-              </van-row> -->
-  
-              <!-- 长按显示遮罩层 -->
-              <van-overlay :show="showIndex == index">
-                <div class="wrapper" @click.stop="showIndex = null">
-                  <van-button round type="primary" @click="goDetail(item)"
-  
-                    >详情</van-button
-                  >
-                  <van-button round type="info" @click="goConfirm(item)" v-show="active==0"
-                    >确认</van-button
+            <div style="font-size: 0.45rem;padding: 5px 0;">
+              {{ item.title }}
+            </div>
+            <van-row gutter="">
+              <van-col span="17">
+                <van-row gutter="">
+                  <van-col span="9">创建人：</van-col>
+                  <van-col span="15">{{ item.leaderUserName }}</van-col>
+                </van-row>
+                <van-row gutter="">
+                  <van-col span="9">发起时间：</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'
+                  }"
+                >
+                  {{ item.state }}
+                </van-row>
+                <van-row>
+                  <van-button
+                    type="info"
+                    size="mini"
+                    @click="todetail(index, item)"
+                    >{{ active == 2 ? '去处理' :'去审批' }}</van-button
                   >
-                </div>
-              </van-overlay>
-            </van-cell-group>
-            <div
+                </van-row>
+              </van-col>
+            </van-row>
+          </van-cell-group>
+          <div
             style="
               width: 100%;
               text-align: center;
@@ -83,164 +67,153 @@
               position: fixed;
               top: 30%;
             "
-            v-if="messageList['length']==0"
+            v-if="messageList['length'] == 0"
           >
             暂无数据
           </div>
-          </div>
-          <!-- 暂无数据 -->
-          <!-- {{messageList}} -->
-          
-        <!-- </van-tab>
-      </van-tabs> -->
-    
-    </div>
-  </template>
-  
-  <script>
-  import LHeader from "@/components/header.vue";
-  import { getFun, postFun } from "@/service/table.js";
-//   import { postriskConList } from "@/service/risk";
-  export default {
-    name:'risk-confirme',
-    components: {
-      LHeader,
-    },
-    data() {
-      return {
-        text: "风险审批",
-        searchValue: "",
-        isHaveNews: false,
-        messageList: [
-            {
-                title:'XX项目评估任务单',
-                time:'2022-12-12',
-                name:'Mr.周',
-                state:1
-            }
-        ],
-        Loop: "", // 定时器
-        showIndex: null, // 是否显示遮罩层,
-        active: 0,
-        tabs: [
-          {
-            title: "未执行",
-            api: "/riskConfirm/list",
-          },
-          {
-            title: "已执行",
-            api: "/riskConfirm/finishList",
-          },
-        ],
-      };
+        </div>
+        <!-- 暂无数据 -->
+        <!-- {{messageList}} -->
+      </van-tab>
+    </van-tabs>
+  </div>
+</template>
+
+<script>
+import LHeader from "@/components/header.vue";
+import { getFun, postFun } from "@/service/table.js";
+import { timestampToTime, generateId } from "@/utils/format";
+export default {
+  name: "risk-approve",
+  components: {
+    LHeader
+  },
+  data() {
+    return {
+      text: "风险审批",
+      searchValue: "",
+      isHaveNews: false,
+      messageList: [
+        {
+          title: "XX项目评估任务单",
+          time: "2022-12-12",
+          name: "Mr.周",
+          state: 1
+        }
+      ],
+      Loop: "", // 定时器
+      active: 0,
+      // 状态 wait 待评估，running 执行中，finish 已完成
+      tabs: [
+        {
+          title: "待审批",
+          key: "running"
+        },
+        {
+          title: "已审批",
+          key: "completed"
+        },
+        {
+          title: "已退回",
+          key: "return"
+        }
+      ],
+      buildingList: []
+    };
+  },
+  created() {
+    this.postList(0);
+  },
+  methods: {
+    timestampToTimes(time) {
+      return timestampToTime(new Date(time), "DT2", true);
     },
-    created() {
-    //   this.postList();s
+    handadd() {
+      this.$router.push({
+        name: "riskAdd",
+        params: {
+          title: "新增"
+        }
+      });
     },
-    methods: {
-        handadd(){
-            this.$router.push({
-                name: "riskAdd",
-                params: {
-                    title:'新增'
-                },
-            })
-        },
-      postList(select = "") {
-        this.$toast.loading({
-          message: "加载中...",
-          forbidClick: true,
-          loadingType: "spinner",
-          duration: 0,
+    postList(name, title) {
+      this.$toast.loading({
+        message: "加载中...",
+        forbidClick: true,
+        loadingType: "spinner",
+        duration: 0
+      });
+      let url = `/risk/plan/approve/list?status=running`;
+      if (name == 0) {
+        url = `/risk/plan/approve/list?status=running`;
+      } else if (name == 1) {
+        url = `/risk/plan/approve/list?status=completed`;
+      } else {
+        url = `/risk/plan/approve/list?status=return`;
+      }
+      getFun(url)
+        .then(res => {
+          this.$toast.clear();
+          this.messageList = res.data || res.rows;
+          // 判断有无数据返回
+          if (this.messageList.length == 0) {
+            this.isHaveNews = true;
+          }
+        })
+        .catch(() => {
+          this.$toast.clear();
+          this.$toast.fail("加载失败,请稍后再试");
         });
-        let formdata = new FormData();
-        formdata.append("select", select);
-        postFun(this.tabs[this.active]['api'], formdata)
-          .then((res) => {
-            this.$toast.clear();
-            this.messageList =res.data||res.rows;
-            // 判断有无数据返回
-            if (this.messageList.length == 0) {
-              this.isHaveNews = true;
-            }
-          })
-          .catch(() => {
-            this.$toast.clear();
-            this.$toast.fail("加载失败,请稍后再试");
-          });
-      },
-  
-      onSearch(val) {
-        this.postList(this.searchValue);
-      },
-      touchstart(index, item) {
-        if (this.showIndex != null) {
-          this.showIndex = null;
-          return;
+    },
+
+    //查看详情
+    todetail(index, item) {
+      this.$router.push({
+        name: "riskTaskList",
+        params: {
+          id: item.id,
+          // buildingId: item.buildingId
         }
-        this.showIndex = index;
-      },
-  
-      // 详情
-      goDetail(data) {
-        this.$router.push({
-          name: "risk-big-detail",
-          params: {
-            id: data.businessId||data.id,
-          },
-        });
-        this.showIndex = null;
-      },
-      // 确认
-      goConfirm(data) {
-        this.$router.push({
-          name: "risk-affirm",
-          params: {
-            data: data,
-          },
-        });
-        this.showIndex = null;
-      },
+      });
+      sessionStorage.setItem("planId", item.id);
+      sessionStorage.setItem("buildingId", '');
     },
-  };
-  </script>
-  <style lang="less" scoped>
-  
-  #app {
-    font-family: "";
-    color: #2c3e50;
   }
-  .con-list {
-    padding: 0;
-    background-color: #f0f1f5;
-    .van-cell-group--inset {
-      margin: 0;
-      margin-bottom: 0.26667rem;
-      padding: 0.25rem;
+};
+</script>
+<style lang="less" scoped>
+#app {
+  font-family: "";
+  color: #2c3e50;
+}
+
+.con-list {
+  padding: 0;
+  background-color: #f0f1f5;
+  position: relative;
+
+  .van-cell-group--inset {
+    margin: 0;
+    margin-bottom: 0.26667rem;
+    padding: 0.25rem;
+    font-size: 0.4rem;
+    border-radius: 4%;
+    box-shadow: 0px 0px 10px 2px #f3f3f3;
+    width: 90%;
+    margin: 0.4rem auto;
+
+    .van-row {
       font-size: 0.4rem;
-      position: relative;
-      border-radius: 4%;
-      box-shadow: 0px 0px 10px 2px #f3f3f3;
-      width: 90%;
-      margin: 0.4rem auto;
-      .van-row {
-        font-size: 0.4rem;
-        line-height: 0.8rem;
-        margin-bottom: 0;
-      }
-      .van-overlay {
-        position: absolute;
-        .wrapper {
-          display: flex;
-          align-items: center;
-          justify-content: space-evenly;
-          height: 100%;
-        }
-      }
+      line-height: 0.8rem;
+      margin-bottom: 0;
     }
   }
-  /deep/.van-tab__pane{
-      min-height: 8rem;
-  }
-  </style>
-  
+}
+
+.wrapper {
+  display: flex;
+  align-items: center;
\ No newline at end of file
+  justify-content: center;
+  height: 100%;
+}
+</style>

src/views/riskProject/assess/index.vue

@@ -170,7 +170,7 @@ import { timestampToTime, generateId } from "@/utils/format";
 export default {
   name: "risk-execution",
   components: {
-    LHeader
+    LHeader,
   },
   data() {
     return {