修改全局loading，联席会议湾办指派协作内容

src/main.js

@@ -24,9 +24,7 @@ Vue.use(VueTinymce) // 安装vue的tinymce组件
 //精简，灵活的web pc弹窗组件
 import layer from 'vue-layer'
 import 'vue-layer/lib/vue-layer.css';
-Vue.prototype.$layer = layer(Vue, {
-	msgtime: 3, //目前只有一项，即msg方法的默认消失时间，单位：秒
-});
+Vue.prototype.$layer = layer(Vue);
 
 import './assets/icons' // icon
 import './permission' // permission control

src/utils/request.js

@@ -138,9 +138,10 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-  setTimeout(() => {
-    Vue.prototype.$layer.closeAll('loading');
-  }, 500);
+  // setTimeout(() => {
+  //   Vue.prototype.$layer.closeAll('loading');
+  // }, 500);
+  if(res.status == 200)  Vue.prototype.$layer.closeAll('loading');
   // --count;
   // if (count === 0) {
   //   Vue.prototype.$layer.closeAll('loading');

src/views/GATHER/index.vue

@@ -148,7 +148,6 @@
 
     <el-table
       :data="GATHERList"
-      v-loading="load"
       @selection-change="handleSelectionChange"
       @row-click="showRow"
     >

src/views/JOINTCONFERENCE/add.vue

@@ -42,7 +42,7 @@
       </el-form-item>
       <el-form-item label="协作要求" prop="collaborativeContent">
         <el-input
-          :disabled="param.edit"
+        :disabled="!(user.deptId == 100 && user.type ==1)"
           type="textarea"
           rows="4"
           placeholder="请输入协作要求"
@@ -178,6 +178,7 @@ export default {
 
     getInfo().then((res) => {
       this.user = res.user.dept;
+      console.log(this.user);
       if (res.user.dept.type == 1 && res.user.userId == 14) {
         listDept().then((res) => {
           this.deptList = res.data;