coys 2 年之前
父节点
当前提交
7fe2646ce3

+ 1 - 1
src/config/env.development.js

@@ -2,7 +2,7 @@
 module.exports = {
   title: 'soc-app-dev',
   baseUrl: 'http://10.87.10.55:8080/', // 项目地址
-  baseApi: '/jingyuanchao', // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
+  baseApi: '/dev', // 本地api请求地址,注意:如果你使用了代理,请设置成'/'
   APPID: 'xxx',
   APPSECRET: 'xxx',
   $cdn: 'https://www.sunniejs.cn/static'  //静态资源

+ 27 - 10
src/views/menu/rehearsalTask/components/dialog.vue

@@ -21,15 +21,25 @@
 
       <van-row>
         <van-col span="24">
-          <van-checkbox-group v-model="result" @change="changeCheckBox">
-            <van-cell-group>
-              <van-cell v-for="item in peopleListCpoy" clickable :key="item.id" :title="`${item.defaultCause}`">
-                <template #right-icon>
-                  <van-checkbox :name="item.id" ref="checkboxes" />
-                </template>
-              </van-cell>
-            </van-cell-group>
-          </van-checkbox-group>
+          <van-collapse v-model="activeNames" @change="checkedHandler" accordion>
+            <van-checkbox-group v-model="result"  @change="changeCheckBox">
+            <van-collapse-item
+              :ref="item.id"
+              :name="item.id"
+              v-for="item in peopleListCpoy"
+              
+              :key="item.id"
+              :title="item.drillProjects"
+              >
+              <!-- :title="item.defaultCause" -->
+              <template #right-icon>
+                <van-checkbox  :name="item.id"  ref="checkboxes" class="checkboxList" />
+              </template>
+              {{ item.defaultCause }}
+            </van-collapse-item>
+           
+             </van-checkbox-group>
+          </van-collapse>
         </van-col>
       </van-row>
       <van-row class="bottomdiv">
@@ -82,6 +92,7 @@ export default {
   },
   data() {
     return {
+      activeNames:[],
       orgId: this.organizationId || '',
       show: false,
       value1: '',
@@ -146,15 +157,21 @@ export default {
         })
       })
       this.show = false
-    
 
       // 抛出已选择人员信息
       this.$emit('checkList', list)
+    },
+    checkedHandler(id){
+      console.log(id);
+      this.result.push(id)
     }
   }
 }
 </script>
 <style lang="scss" scoped>
+.checkboxList{
+  z-index: 999;
+}
 .van-action-sheet {
   min-height: 90%;
 }

+ 1 - 1
src/views/menu/rehearsalTask/index.vue

@@ -259,7 +259,7 @@ export default {
     },
     //判断评价按钮是否展示
     evaluateTure(item) {
-      if (item.status == 2) {
+      if (item.status == 2&&window.sessionStorage.getItem('SET_USER_ORGTYPE')!=4) {
         return true
       }
     },