Merge branch 'V20230915' of 192.168.60.201:root/dsk-operate-sys into V20230915

dsk-operate-ui/src/api/system/user.js

-import request from '@/utils/request'
+import request from '@/utils/request';
 import { parseStrEmpty } from "@/utils/ruoyi";
 
 // 查询用户列表
@@ -7,7 +7,7 @@ export function listUser(query) {
     url: '/system/user/list',
     method: 'get',
     params: query
-  })
+  });
 }
 
 // 查询用户详细
@@ -15,7 +15,7 @@ export function getUser(userId) {
   return request({
     url: '/system/user/' + parseStrEmpty(userId),
     method: 'get'
-  })
+  });
 }
 
 // 新增用户
@@ -24,7 +24,7 @@ export function addUser(data) {
     url: '/system/user',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 修改用户
@@ -33,7 +33,7 @@ export function updateUser(data) {
     url: '/system/user',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 删除用户
@@ -41,7 +41,7 @@ export function delUser(userId) {
   return request({
     url: '/system/user/' + userId,
     method: 'delete'
-  })
+  });
 }
 
 // 用户密码重置
@@ -49,12 +49,12 @@ export function resetUserPwd(userId, password) {
   const data = {
     userId,
     password
-  }
+  };
   return request({
     url: '/system/user/resetPwd',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 用户状态修改
@@ -62,12 +62,12 @@ export function changeUserStatus(userId, status) {
   const data = {
     userId,
     status
-  }
+  };
   return request({
     url: '/system/user/changeStatus',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 查询用户个人信息
@@ -75,7 +75,7 @@ export function getUserProfile() {
   return request({
     url: '/system/user/profile',
     method: 'get'
-  })
+  });
 }
 
 // 修改用户个人信息
@@ -84,7 +84,7 @@ export function updateUserProfile(data) {
     url: '/system/user/profile',
     method: 'put',
     data: data
-  })
+  });
 }
 
 // 用户密码重置
@@ -92,12 +92,12 @@ export function updateUserPwd(oldPassword, newPassword) {
   const data = {
     oldPassword,
     newPassword
-  }
+  };
   return request({
     url: '/system/user/profile/updatePwd',
     method: 'put',
     params: data
-  })
+  });
 }
 
 // 用户头像上传
@@ -106,7 +106,7 @@ export function uploadAvatar(data) {
     url: '/system/user/profile/avatar',
     method: 'post',
     data: data
-  })
+  });
 }
 
 // 查询授权角色
@@ -114,7 +114,7 @@ export function getAuthRole(userId) {
   return request({
     url: '/system/user/authRole/' + userId,
     method: 'get'
-  })
+  });
 }
 
 // 保存授权角色
@@ -123,15 +123,18 @@ export function updateAuthRole(data) {
     url: '/system/user/authRole',
     method: 'put',
     params: data
-  })
+  });
 }
 
 // 查询部门下拉树结构
 export function deptTreeSelect() {
   return request({
-    url: '/system/user/deptTree',
-    method: 'get'
-  })
+    url: `/system/user/deptTree`,
+    method: 'get',
+    params: {
+      status: 0
+    }
+  });
 }
 
 // 用户文件记录列表
@@ -139,6 +142,6 @@ export function fileList(data) {
   return request({
     url: '/user/file/record/list',
     method: 'get',
-    params:data
-  })
+    params: data
+  });
 }

dsk-operate-ui/src/router/index.js

@@ -127,7 +127,7 @@ export const constantRoutes = [
         path: 'profile',
         component: () => import('@/views/system/user/profile/index'),
         name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
+        meta: { title: '个人中心', icon: 'user',noCache: true }
       }
     ]
   },

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -82,7 +82,7 @@
   import ExportDialog from "../../../component/export-dialog"
   export default {
     name: 'members',
-    props: ['customerId'],
+    props: ['customerId','combineName'],
     mixins: [mixin],
     components:{ExportDialog},
     data(){
@@ -484,13 +484,12 @@
         if(value > 2000){
           return
         }
-        this.dataEXCEL.exportExeclName=this.exportData.title;
+        this.dataEXCEL.exportExeclName=this.combineName+'-'+this.exportData.title;
         if(value){
-          this.dataEXCEL.pageSize=value
+          this.dataEXCEL.exportCount=value
         }else {
-          this.dataEXCEL.pageSize=2000;
+          this.dataEXCEL.exportCount=2000;
         }
-        delete this.dataEXCEL.pageNum
         memberListExport(this.dataEXCEL).then(res=>{
           if(res.code === 200){
             this.exportData.exportEXCEL=true;

dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue

@@ -318,13 +318,12 @@
         if(value > 2000){
           return
         }
-        this.dataEXCEL.exportExeclName=this.exportData.title;
+        this.dataEXCEL.exportExeclName=this.combineName+'-'+this.exportData.title;
         if(value){
-          this.dataEXCEL.pageSize=value
+          this.dataEXCEL.exportCount=value
         }else {
-          this.dataEXCEL.pageSize=2000;
+          this.dataEXCEL.exportCount=2000;
         }
-        delete this.dataEXCEL.pageNum
         exportWinBid(this.dataEXCEL).then(res=>{
           if(res.code === 200){
             this.exportData.exportEXCEL=true;

dsk-operate-ui/src/views/detail/groupAccount/component/zbxmmx.vue

@@ -60,7 +60,7 @@
   import ExportDialog from "../../../component/export-dialog"
   export default {
     name: 'qualifications',
-    props: ['customerId'],
+    props: ['customerId','combineName'],
     mixins: [mixin],
     components:{CustomTimeSelect,CustomMoneySelect,ExportDialog},
     data(){
@@ -113,32 +113,6 @@
         timeList: ['近三天', '近七天', '近半月', '自定义'],
         moneyList: ['5000万以下', '5000万-1亿', '1亿-5亿', '5亿-10亿','10亿以上', '自定义'],
         dataEXCEL:{},
-        exportTableData:[
-          {
-            "address":"四川省-成都市",
-            "stockPercent":"18.43%",
-            "agency":'鞍钢股份有限公司',
-            "issueTime":"2023-09-22",
-            "subjectMatter":"其他",
-            "memberLevel":"二级企业",
-            "tenderee":"鞍钢冷轧钢板（莆田）有限公司综合部",
-            "projectType":"其他",
-            "bidAmount":"202万元",
-            "projectName":"2023年中铁一局集团第二工程有限公司江浙区域项目自购物资集中招标采购文件（一）（钢材）招标公告",
-          },
-          {
-            "address":"四川省-成都市",
-            "stockPercent":"18.43%",
-            "agency":'鞍钢股份有限公司',
-            "issueTime":"2023-09-22",
-            "subjectMatter":"其他",
-            "memberLevel":"二级企业",
-            "tenderee":"鞍钢股份有限公司",
-            "projectType":"其他",
-            "bidAmount":"202万元",
-            "projectName":"太极集团四川太极制药有限公司转让持有的成都市4套住宅-高新区玉虹巷2号1栋6单元7层13号",
-          },
-        ],
         value:'',
         exportData:{
           title:'集团招标',
@@ -320,13 +294,12 @@
         if(value > 2000){
           return
         }
-        this.dataEXCEL.exportExeclName=this.exportData.title;
+        this.dataEXCEL.exportExeclName=this.combineName+'-'+this.exportData.title;
         if(value){
-          this.dataEXCEL.pageSize=value
+          this.dataEXCEL.exportCount=value
         }else {
-          this.dataEXCEL.pageSize=2000;
+          this.dataEXCEL.exportCount=2000;
         }
-        delete this.dataEXCEL.pageNum
         exportBid(this.dataEXCEL).then(res=>{
           if(res.code === 200){
             this.exportData.exportEXCEL=true;

dsk-operate-ui/src/views/detail/groupAccount/component/zhaobiao.vue

@@ -8,8 +8,8 @@
         </el-tabs>
       </div>
     </div>
-    <Zbxmfx v-if="activeName === 'first'" :customer-id="id"></Zbxmfx>
-    <Zbxmmx v-if="activeName === 'second'" :customer-id="id"></Zbxmmx>
+    <Zbxmfx v-if="activeName === 'first'" :customer-id="id" :combineName="name"></Zbxmfx>
+    <Zbxmmx v-if="activeName === 'second'" :customer-id="id" :combineName="name"></Zbxmmx>
   </div>
 </template>
 
@@ -18,12 +18,13 @@
   import Zbxmmx from './zbxmmx'
   export default {
     name: 'qualifications',
-    props: ['customerId'],
+    props: ['customerId','combineName'],
     components:{Zbxmfx,Zbxmmx},
     data(){
       return{
         activeName: 'first',
-        id:this.customerId
+        id:this.customerId,
+        name:this.combineName
       }
     },
     created() {

dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue

@@ -1006,11 +1006,10 @@ export default {
       }
       this.dataEXCEL.exportExeclName=this.exportData.title;
       if(value){
-        this.dataEXCEL.pageSize=value
+        this.dataEXCEL.exportCount=value
       }else {
-        this.dataEXCEL.pageSize=2000;
+        this.dataEXCEL.exportCount=2000;
       }
-      delete this.dataEXCEL.pageNum
       api.uipSerachExport(this.dataEXCEL).then(res => {
         if(res.code === 200){
           this.exportData.exportEXCEL=true;

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -3046,11 +3046,10 @@ export default {
       }
       this.dataEXCEL.exportExeclName=this.exportData.title;
       if(value){
-        this.dataEXCEL.pageSize=value
+        this.dataEXCEL.exportCount=value
       }else {
-        this.dataEXCEL.pageSize=2000;
+        this.dataEXCEL.exportCount=2000;
       }
-      delete this.dataEXCEL.pageNum
       if(this.exportData.title === '企业资质'){
         api.aptitudeExport(this.dataEXCEL).then(res => {
           if(res.code === 200){

dsk-operate-ui/src/views/index.vue

@@ -114,7 +114,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item prop="type">
-                  <el-select v-model="queryParams1.type" multiple collapse-tags @change="iptAdaptive(inputID6,'','changeSelect2')" :class="[`select-adaptive-${inputID6}`,queryParams1.type.length > 1 ? 'selectTag' : '']" clearable placeholder="项目类型">
+                  <el-select v-model="queryParams1.type" multiple collapse-tags @change="iptAdaptive(inputID6,true,'changeSelect2')" :class="[`select-adaptive-${inputID6}`,queryParams1.type.length > 1 ? 'selectTag' : '']" clearable placeholder="项目类型">
                     <el-option v-for="(item,index) in projectType" :key="index" :label="item" :value="item"></el-option>
                   </el-select>
                 </el-form-item>
@@ -253,7 +253,7 @@
               </el-select>
             </el-form-item>
             <el-form-item prop="projects">
-              <el-select v-model="queryParams2.projects" @change="iptAdaptive(inputID10,'','changeSelect3')" multiple collapse-tags clearable placeholder="项目类型" :class="[`select-adaptive-${inputID10}`,queryParams2.projects.length > 1 ? 'selectTag' : '']">
+              <el-select v-model="queryParams2.projects" @change="iptAdaptive(inputID10,true,'changeSelect3')" multiple collapse-tags clearable placeholder="项目类型" :class="[`select-adaptive-${inputID10}`,queryParams2.projects.length > 1 ? 'selectTag' : '']">
                 <el-option v-for="(item,index) in projectType" :key="index" :label="item" :value="item"></el-option>
               </el-select>
             </el-form-item>

dsk-operate-ui/src/views/macro/urban/index.vue

@@ -853,11 +853,10 @@ export default {
       }
       this.dataEXCEL.exportExeclName=this.exportData.title;
       if(value){
-        this.dataEXCEL.pageSize=value
+        this.dataEXCEL.exportCount=value
       }else {
-        this.dataEXCEL.pageSize=2000;
+        this.dataEXCEL.exportCount=2000;
       }
-      delete this.dataEXCEL.pageNum
       urbanInvestmentExport(this.dataEXCEL).then(res=>{
         if(res.code === 200){
           this.exportData.exportEXCEL=true;

dsk-operate-ui/src/views/radar/components/MajorProject/index.vue

@@ -691,11 +691,10 @@ export default {
       }
       this.dataEXCEL.exportExeclName=this.exportData.title;
       if(value){
-        this.dataEXCEL.pageSize=value
+        this.dataEXCEL.exportCount=value
       }else {
-        this.dataEXCEL.pageSize=2000;
+        this.dataEXCEL.exportCount=2000;
       }
-      delete this.dataEXCEL.pageNum
       api.radarExport(this.dataEXCEL).then(res => {
         if(res.code === 200){
           this.exportData.exportEXCEL=true;

dsk-operate-ui/src/views/system/user/profile/index.vue

@@ -76,7 +76,8 @@
               <el-table-column label="导出时间" align="left" prop="createTime"></el-table-column>
               <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                 <template slot-scope="scope" align="left">
-                  <div class="wordprimary" style="text-align: left" @click="getFile(scope.row.url)">下载表格</div>
+                  <div v-if="scope.row.status === 0" class="wordprimary" style="text-align: left" @click="getFile(scope.row.url)">下载表格</div>
+                  <div v-if="scope.row.status === 2" class="wordprimary" style="text-align: left">生成中...</div>
                 </template>
               </el-table-column>
             </el-table>

dsk-system/src/main/java/com/dsk/system/service/impl/SysDeptServiceImpl.java

@@ -59,7 +59,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService {
                 .eq(ObjectUtil.isNotNull(dept.getDeptId()), SysDept::getDeptId, dept.getDeptId())
                 .eq(ObjectUtil.isNotNull(dept.getParentId()), SysDept::getParentId, dept.getParentId())
                 .like(StringUtils.isNotBlank(dept.getDeptName()), SysDept::getDeptName, dept.getDeptName())
-                .eq(SysDept::getStatus, 0)
+                .eq(StringUtils.isNotBlank(dept.getStatus()), SysDept::getStatus, dept.getStatus())
                 .orderByAsc(SysDept::getParentId)
                 .orderByAsc(SysDept::getOrderNum);
         return baseMapper.selectDeptList(lqw);