Merge branch 'dev' of http://47.104.91.134:3000/yiyun-fe/yiyunjianzhu-vue into dev

src/views/components_web/distWork/distWork.vue

@@ -432,7 +432,7 @@
                     </p>
                   </div>
                   <div v-if="isShowStaffList">
-                        <div class="row_painfr" v-for="dept in listDeptComputed" :key="dept.deptID" >
+                        <div class="row_painfr" v-for="dept in listDeptComputed" :key="dept.id" >
                         <div class="yiyun_line"></div>
                         <div v-for="deptID in listDeptUserNoZero(selectedUser)" :key="deptID">
                            <div v-if="deptID == dept.id">
@@ -495,9 +495,10 @@
                                   handleCheckItemAll(group_index, $event)
                                 ">全选</el-checkbox>
                             </template>
-                            <div class="user_info_item" v-for="(user, index) in listUserStaff(
+                            <!-- <div class="user_info_item" v-for="(user, index) in listUserStaff(
                                 dept.listUser
-                              )" :label="user" :key="index">
+                              )" :label="user" :key="index"> -->
+                              <div class="user_info_item" v-for="(user, index) in dept.listUser" :label="user" :key="index">
                               <el-checkbox class="checkBoxCol" v-model="user.selected" @change="
                                   handleCheckedOne(group_index, user, $event)
                                 " :disabled="disabled">
@@ -783,7 +784,7 @@ export default {
         let temp = [];
         for (let i = 0; i < user.length; i++) {
           if (user[i].folderPerm != 2) {
-            temp.push(user[i].deptID);
+            temp.push(user[i].deptId);
           }
         }
         var x = new Set(temp);
@@ -1158,7 +1159,9 @@ export default {
       }
         // 跳过负责人
       if(user.folderPerm == 2)
-      {
+      { 
+        this.checkDeptUserName(e, user); 
+        this.getIsCheckSecondLevel(topIndex);
         return;
       }
       //三级change事件
@@ -1287,7 +1290,9 @@ export default {
     checkDeptUserName: function (checked, item) {
       item.selected = checked;
       if (checked) {
-        item.folderPerm = 1; // 默认角色为：查看和编辑
+        if(item.folderPerm !== 2) {
+          item.folderPerm = 1; // 默认角色为：查看和编辑
+        }
         var valueUser = JSON.parse(JSON.stringify(item));
         this.selectedUser.push(valueUser);
       } else {

src/views/main_web/workspace/components/workLine.vue

@@ -242,6 +242,7 @@
 <script>
 import { queryFileExchange } from '../service';
 import { firstCharToLowerCase, firstCharToUpperCase } from '@/utils/tool';
+import { fetchApi } from '@/utils/request';
 export default {
   props: {
     listUserFolders: Array,
@@ -256,6 +257,7 @@ export default {
       isShowRightManager: false,
       isShowworklink: false,
       workheight: "", //工作链高度
+      projId:sessionStorage.projId,
     };
   },
   methods: {
@@ -316,9 +318,10 @@ export default {
      * 获取它的交换文件
      */
     async getFileExchange(){
-      
-      const temp=this.listUserFolders.reduce((h,folder)=>{
-        h[folder.nodeId]=folder.folderName;
+      const data=await this.$fetchApi('folder/queryNodeFolderListByProjectId', { projectId: sessionStorage.projId });
+      var folderList=data.Data.folder;
+      const temp=folderList.reduce((h,folder)=>{
+        h[folder.NodeId]=folder.FolderName;
         return h;
       },{});
       var templateId=this.listUserFolders[0].templateId;

vue.config.js

@@ -32,7 +32,7 @@ module.exports = {
       proxy: {
         '/api/pms': {
           // target: 'http://47.104.91.134:8089',
-          target:'http://10.240.32.191:8089',
+          target:'http://10.240.32.145:8089',
 
           changeOrigin: true,
           secure: false,