Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/resources/application-dev.yml

@@ -194,11 +194,11 @@ xss:
 
 dsk:
   open:
-    #    endPoint: sandbox.openapi.jiansheku.com
-    #    accessKeyId: aec7b3ff2e8b48e79a7e2c463ce21912
-    #    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    #    protocol: https
-    endPoint: 120.27.13.145:8865
+#    endPoint: 120.27.13.145:8865
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: http
+    endPoint: openapi.jiansheku.com
     accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
     accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
-    protocol: http
+    protocol: https

dsk-operate-ui/src/utils/request.js

@@ -67,7 +67,7 @@ service.interceptors.request.use(config => {
 
 // 响应拦截器
 service.interceptors.response.use(res => {
-    const apiList = ['/login']  //需要提示错误的接口
+    const apiList = ['/login', '/system/user/profile/updatePwd']  //需要提示错误的接口
     // 未设置状态码则默认成功状态
     const code = res.data.code || 200;
     // 获取错误信息

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

@@ -345,8 +345,7 @@ export default {
       getCustomerList(this.searchParam).then(result=>{
         this.tableData = result
         this.tableData.rows.forEach(item=>{
-          item.registerCapital.replace('万','')
-          item.registerCapital.replace('元','')
+          item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
           if(item.mainBusiness != "" && item.mainBusiness != null && item.mainBusiness.length>84){
             item.mainBusiness1 = item.mainBusiness.substring(0,81)
             item.sq1 = true

dsk-operate-ui/src/views/detail/party-a/business/index.vue

@@ -3,7 +3,7 @@
     <template v-if="isInfo">
       <!-- 企业信息 -->
       <div class="view-content">
-        <Info :companyInfo="iscompanyInfo" />
+        <Info :companyInfo="companyInfo" />
       </div>
       <!-- 基本信息 -->
       <div class="view-content">
@@ -99,6 +99,13 @@ export default {
       iscompanyInfo:{}
     }
   },
+  watch: {
+    "customerIds"(newVal, oldVal) {
+      if(newVal){
+        this.customerInfos()
+      }
+    }
+  },
   created() {
     this.infos = this.customerInfo
     this.iscompanyInfo = this.companyInfo ? this.companyInfo : {}
@@ -132,10 +139,13 @@ export default {
     },
 
     customerInfos(){
+      this.isInfo = false
       customerInfo(this.customerIds).then(res=>{
+        this.$nextTick(()=>{
           this.infos = res.data
           this.handleQuery()
         })
+      })
     },
     focusNowedits(e){
       this.nowedit = e

dsk-operate-ui/src/views/detail/party-a/index.vue

@@ -167,11 +167,11 @@ export default {
   },
   beforeRouteEnter(to, from, next) {
     next(vm => {
-      if(from.name == 'CustomList'){
-        if (to.query.path){
+      if (to.query.customerId){
+        let customerId = to.query.customerId
+        vm.association(customerId)
         vm.currentPath.pathName = to.query.path
       }
-      }
     })
   },
   created() {
@@ -230,9 +230,9 @@ export default {
         customerInfo(id).then(res => {
           if (res.code == 200) {
             if (res.data.userId == this.$store.state.user.userId) {
+              this.$nextTick(() => {
                 this.customerInfo = res.data
                 this.customerId = res.data.customerId
-              this.$nextTick(() => {
                 this.isCustomer = true
                 this.isCompanyId = true
               })

dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue

@@ -80,6 +80,11 @@
               <span style="padding-right: 28px;">{{ scope.row.amount }}</span>
             </template>
           </el-table-column>
+          <template slot="empty">
+            <div style="padding: 30px 0">
+              <no-data />
+            </div>
+          </template>
         </el-table>
       </div>
     </div>

dsk-operate-ui/src/views/detail/party-a/overview/component/senior.vue

@@ -26,6 +26,11 @@
         <el-table-column
           prop="userJobs"
           label="职务"></el-table-column>
+        <template slot="empty">
+          <div style="padding: 30px 0">
+            <no-data />
+          </div>
+        </template>
       </el-table>
     </div>
   </div>
@@ -33,6 +38,7 @@
 
 <script>
 import {keymembers} from "@/api/detail/party-a/overview"
+import NoData from '../../component/noData'
 
 export default {
   name: 'Senior',
@@ -48,6 +54,9 @@ export default {
       tableData:[]
     }
   },
+  components: {
+    NoData
+  },
   created() {
     this.handleQuery()
   },

dsk-operate-ui/src/views/project/projectList/component/gjjl.vue

@@ -210,6 +210,8 @@
     methods:{
       //添加跟进动态
       addFollow(){
+        if(this.addParam.content == '')
+          return false
         if(this.types == 'projectgjdt'){
           if(this.projectId == "" || this.projectId == null){
             this.$message.error('请选择关联项目！')

dsk-operate-ui/src/views/project/projectList/component/gzdb.vue

@@ -26,7 +26,7 @@
                 <el-input v-model="queryParam.target" placeholder="拜访对象" style="width: 100px;">
                 </el-input>
               </div>
-              <div class="btn btn_primary h32 wc" @click="add" :disabled="queryParam.task == ''" :class="{'btn_disabled':queryParam.task == ''}">完成</div>
+                <div class="btn btn_primary h32 wc" @click="add" :class="{'btn_disabled':queryParam.task == ''}">完成</div>
             </div>
           </div>
         </div>
@@ -109,6 +109,8 @@
         this.value = ""
       },
       add(){
+        if(this.queryParam.task == '')
+          return false
         addGZDB(this.queryParam).then(result=>{
           if(result.code == 200){
             this.$message.success("添加成功！")

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -17,7 +17,7 @@
         <el-table
           :data="tableData.rows"
           style="width: 100%"
-          :default-sort = "{prop: 'depth', order: 'ascending'}"
+          :default-sort = "{prop: 'depth', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">

dsk-operate-ui/src/views/project/projectList/component/zlwd.vue

@@ -61,7 +61,7 @@
         <el-table
           :data="fileDatas.rows"
           style="width: 100%"
-          :default-sort = "{prop: 'creatTime', order: 'ascending'}"
+          :default-sort = "{prop: 'creatTime', order: 'descending'}"
         >
           <template slot="empty">
             <div class="empty">

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java

@@ -152,7 +152,16 @@ public class EnterpriseService {
     public TableDataInfo dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
         if (body.isVaildCid()) return new TableDataInfo(new ArrayList<>(), 0);
         Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
-        return dskOpenApiUtil.responsePage(map);
+        //底层接口写死了pageSize为10，这里前端只要5条
+//        return dskOpenApiUtil.responsePage(map);
+
+        Integer code = MapUtils.getInteger(map, "code", 300);
+        Map data = MapUtils.getMap(map, "data", null);
+        if (200 != code) throw new RuntimeException();
+        Integer count = MapUtils.getInteger(data, "totalCount", 0);
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+
+        return new TableDataInfo(body.getPageSize() <= list.size() ? list.subList(0, body.getPageSize()) : list, count);
     }
 
     public R icInfo(EnterpriseIcInfoBody body) throws Exception {

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

@@ -81,6 +81,7 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
      */
     @Override
     public List<BusinessListVo> selectBusinessInfoList(BusinessListDto dto) {
+        if(StringUtils.isEmpty(dto.getMinAmount()))dto.setMinAmount("0");
         List<BusinessListVo> othersList = new ArrayList<>();
         //userId不传值，就查询全部他人可见项目+自己的
         if (dto.getUserId() == null) {

dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml

@@ -111,15 +111,15 @@
                 </foreach>
             </if>
             <if test="minAmount != null and minAmount != '' and minAmount != 0 and maxAmount != minAmount">
-                and i.investment_amount &gt;= #{minAmount}
+                and i.investment_amount &gt; #{minAmount}
             </if>
             <if test="minAmount == 0 and maxAmount != minAmount">
-                and ((i.investment_amount &gt;= #{minAmount}
-                and i.investment_amount &lt; #{maxAmount})
+                and ((i.investment_amount &gt; #{minAmount}
+                and i.investment_amount &lt;= #{maxAmount})
                 or i.investment_amount is null)
             </if>
             <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount and minAmount != 0">
-                and i.investment_amount &lt; #{maxAmount}
+                and i.investment_amount &lt;= #{maxAmount}
             </if>
             <if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
                 and i.investment_amount = #{minAmount}