Merge branch 'develop' into dev-lv

src/components/selectDept/index.vue

 <template>
   <div style="width:100%">
-    <LHeader :text="text"></LHeader>
     <!-- 搜索 -->
     <div class="content-wrap">
       <!-- <div class="search-wrap">
@@ -70,7 +69,6 @@
 </template>
 
 <script>
-import LHeader from "@/components/header.vue";
 import { getFun, postFun } from "@/service/table";
 import { getUserInfo } from "@/utils/userInfo";
 import { debounce } from "@/utils/common.js";
@@ -78,9 +76,6 @@ import { Toast } from "vant";
 
 export default {
   name: "select-people",
-  components: {
-    LHeader
-  },
   created() {
     this.getInsideUser(getUserInfo().secondaryUnit);
   },
@@ -106,7 +101,7 @@ export default {
       this.resultName = this.allDeptList.find(
         item => item.deptId == this.result
       ).deptName;
-      this.$emit("changeDept", this.result);
+      this.$emit("changeDept", this.result, this.resultName);
     },
     // 查询内部人员
     getInsideUser(id, val) {

src/views/riskProject/add/index.vue

@@ -86,8 +86,8 @@
       <van-field
         required
         clickable
-        name="deptId"
-        :value="form.deptId"
+        name="deptName"
+        :value="form.deptName"
         label="评估小组选择"
         placeholder="请选择"
         @click="selectDept()"
@@ -196,6 +196,7 @@
         <div style="display:flex;margin-top: 44px;">
           <van-checkbox-group
             v-model="riskList"
+            ref="checkboxGroup"
             style="width: 100%;font-size: 18px;"
           >
             <van-checkbox
@@ -207,6 +208,10 @@
               >{{ item[filedName] }}</van-checkbox
             >
           </van-checkbox-group>
+          <div>
+            <van-button type="primary" @click="checkAll">全选</van-button>
+            <van-button type="info" @click="toggleAll">反选</van-button>
+          </div>
         </div>
       </van-popup>
 
@@ -361,6 +366,12 @@ export default {
     // this.getList();
   },
   methods: {
+    checkAll() {
+      this.$refs.checkboxGroup.toggleAll(true);
+    },
+    toggleAll() {
+      this.$refs.checkboxGroup.toggleAll();
+    },
     // 确定时间的方法
     onConTime(date) {
       console.log(
@@ -393,7 +404,7 @@ export default {
         loadingType: "spinner",
         duration: 0
       });
-      getFun(`/risk/plan/user/list/${this.form.projectId}`).then(res => {
+      getFun(`/risk/plan/user/list/${this.form.deptId}`).then(res => {
         if (res.code == 200) {
           this.columnsTrouble = res.data;
           // 对数据进行赋值
@@ -429,9 +440,10 @@ export default {
     selectDept() {
       this.projectDept = true;
     },
-    changeDept(id) {
+    changeDept(id, name) {
       console.log(id);
       this.form.deptId = id;
+      this.form.deptName = name;
     },
     closeDept() {
       console.log(this.form.deptId);
@@ -453,7 +465,7 @@ export default {
         loadingType: "spinner",
         duration: 0
       });
-      getFun(`/risk/plan/user/list/${this.form.projectId}`).then(res => {
+      getFun(`/risk/plan/user/list/${this.form.deptId}`).then(res => {
         if (res.code == 200) {
           this.riskModelList = res.data;
           // 对数据进行赋值

src/views/riskProject/assess/index.vue

@@ -281,17 +281,6 @@ export default {
       sessionStorage.setItem("buildingId", item.buildingId);
       this.showIndex = false;
     },
-
-    // 详情
-    goDetail(data) {
-      this.$router.push({
-        name: "riskBigDetail",
-        params: {
-          id: data.businessId || data.id
-        }
-      });
-      this.showIndex = false;
-    },
     // 确认
     goConfirm(data) {
       this.$router.push({