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

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

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

@@ -151,7 +151,7 @@
               prop="address"
               label="企业母公司" width="268">
               <template slot-scope="scope">
-                <div class="wordprimary">{{scope.row.superCompany || '--'}}</div>
+                <div class="">{{scope.row.superCompany || '--'}}</div>
               </template>
             </el-table-column>
             <el-table-column :key="keys"
@@ -365,6 +365,9 @@ export default {
       let customerId = row.customerId
       let companyId = row.companyId
       let path = type
+      if(companyId == null){
+        path = 'business'
+      }
       this.$router.push({path:'/enterprise/'+encodeStr(companyId),query:{customerId:customerId,path:path}})
     },
     clearname(value){

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

@@ -3,19 +3,19 @@
     <div class="company-box">
       <div class="company-nav flex-box">
         <div class="company-left">
-          <img :src="companyInfo.logoUrl" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-if="companyInfo.logoUrl">
+          <img :src="companyInfo.logoUrl" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-if="companyInfo && companyInfo.logoUrl">
           <span
             :class="companyInfo.nameSimple&&companyInfo.nameSimple.length<3?'conenctLogo textOne bg'+companyInfo.nameSimple.length:'conenctLogo textTwo bg'+companyInfo.nameSimple.length"
-            v-else-if="companyInfo.nameSimple"
+            v-else-if="companyInfo && companyInfo.nameSimple"
             v-html="companyInfo.nameSimple"></span>
           <img :src="require('@/assets/images/detail/overview/logo@2x.png')" :alt="companyInfo.companyName" :title="companyInfo.companyName" v-else>
         </div>
         <div class="company-title">
           <div class="company-name">
-            {{companyInfo.companyName || ''}}
+            {{companyInfo && companyInfo.companyName || '--'}}
           </div>
           <div class="company-tag">
-            <div style="float: left;margin-top: 8px;" class="company-history" v-if="companyInfo.historyNames && companyInfo.historyNames.length>0">
+            <div style="float: left;margin-top: 8px;" class="company-history" v-if="companyInfo && companyInfo.historyNames && companyInfo.historyNames.length>0">
               <el-popover
                 placement="bottom-start"
                 popper-class="enterpriseLabel-item"
@@ -26,18 +26,18 @@
                 </ul>
               </el-popover>
             </div>
-            <span style="float: left;" :class="!labelArr.includes(companyInfo.businessStatus)?'label-bg1':'label-bg3'" v-if="companyInfo.businessStatus">{{companyInfo.businessStatus}}</span>
+            <span style="float: left;" :class="!labelArr.includes(companyInfo.businessStatus)?'label-bg1':'label-bg3'" v-if="companyInfo && companyInfo.businessStatus">{{companyInfo.businessStatus}}</span>
           </div>
         </div>
       </div>
       <div class="company-info">
         <div class="info-item flex-box">
-          <div class="flex-box item"><label>法定代表人：</label><span class="text-cl1">{{companyInfo.corporatePerson || '--'}}</span></div>
-          <div class="flex-box item"><label>统一社会信用代码：</label><span class="text-cl1">{{companyInfo.creditCode || '--'}}</span></div>
+          <div class="flex-box item"><label>法定代表人：</label><span class="text-cl1">{{companyInfo && companyInfo.corporatePerson || '--'}}</span></div>
+          <div class="flex-box item"><label>统一社会信用代码：</label><span class="text-cl1">{{companyInfo && companyInfo.creditCode || '--'}}</span></div>
         </div>
         <div class="info-item flex-box">
-          <div class="flex-box item"><label>注册资本：</label><span class="text-cl1">{{companyInfo.regCapital || '--'}}</span></div>
-          <div class="flex-box item"><label>注册地址：</label><span class="text-cl1">{{companyInfo.addressDetail || '--'}}</span></div>
+          <div class="flex-box item"><label>注册资本：</label><span class="text-cl1">{{companyInfo && companyInfo.regCapital || '--'}}</span></div>
+          <div class="flex-box item"><label>注册地址：</label><span class="text-cl1">{{companyInfo && companyInfo.addressDetail || '--'}}</span></div>
         </div>
       </div>
     </div>

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="companyInfo" />
+        <Info :companyInfo="iscompanyInfo" />
       </div>
       <!-- 基本信息 -->
       <div class="view-content">
@@ -95,12 +95,13 @@ export default {
           }
         ],//局级大客户
         creditLevellist: [],//资信等级
-      }
+      },
+      iscompanyInfo:{}
     }
   },
   created() {
-    this.handleQuery()
     this.infos = this.customerInfo
+    this.iscompanyInfo = this.companyInfo ? this.companyInfo : {}
   },
   mounted(){
     this.customerInfos()
@@ -133,6 +134,7 @@ export default {
     customerInfos(){
       customerInfo(this.customerIds).then(res=>{
         this.infos = res.data
+        this.handleQuery()
       })
     },
     focusNowedits(e){

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

@@ -10,8 +10,8 @@
       </el-breadcrumb>
     </div>-->
     <div class="flex-box part-header">
-      <img class="header-logo" :src="companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
-      {{companyInfo.companyName || '--'}}
+      <img class="header-logo" :src="companyInfo && companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
+      {{companyInfo && companyInfo.companyName || '--'}}
     </div>
   </div>
 </template>

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

@@ -16,16 +16,15 @@
       class="detail-menu"
       @open="handleOpen">
       <template v-for="(item, index) in sideRoute">
-        <el-submenu :index="index.toString()" v-if="item.children">
+        <el-submenu :index="index.toString()" v-if="item.children" :disabled="!isCompanyId(item.title)">
           <template slot="title">
             <span>{{item.title}}</span>
           </template>
           <el-menu-item :index="index+'-'+idx" v-for="(it, idx) in item.children" :key="idx" @click="handleItem(it)" :disabled="it.disabled">{{it.title}}</el-menu-item>
         </el-submenu>
         <template v-else>
-          <el-menu-item :index="index.toString()" @click="handleItem(item)" :disabled="item.disabled" v-if="isCustomerId(item.pathName)">{{item.title}}</el-menu-item>
+          <el-menu-item :index="index.toString()" @click="handleItem(item)" :disabled="!isCompanyId(item.title) || item.disabled" v-if="isCustomerId(item.pathName)">{{item.title}}</el-menu-item>
         </template>
-
       </template>
     </el-menu>
   </div>
@@ -46,6 +45,14 @@ export default {
     customerId: {
       type: String,
       default: ''
+    },
+    isCompany: {
+      type: Boolean,
+      default: true
+    },
+    isCustomer: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -106,6 +113,15 @@ export default {
         'decisionMaking',
         'gjjl'
       ],
+      companys:[
+        '企业概要',
+        '财务简析',
+        '项目商机',
+        '业务往来',
+        '城投分析',
+        '风险信息',
+      ],
+      uniqueOpened:false,
       searchIndex: ''
     }
   },
@@ -171,7 +187,16 @@ export default {
     },
     isCustomerId(name){
       if(this.customer.indexOf(name) != -1){
-        if(this.customerId){
+        if(this.customerId && this.isCustomer){
+          return true
+        }
+        return false
+      }
+      return true
+    },
+    isCompanyId(name){
+      if(this.companys.indexOf(name) != -1){
+        if(this.isCompany){
           return true
         }
         return false

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

@@ -57,7 +57,7 @@
           width="604px">
           <div class="poptitle">
             <img src="@/assets/images/economies/icon.png">
-            <span>{{ companyInfo.companyName }}</span>
+            <span>{{ companyInfo && companyInfo.companyName || customerInfo.companyName }}</span>
           </div>
           <div class="addhzqk_from">
             <el-form :model="addParam" :rules="rules" ref="addParam"  size="small" label-width="70px">

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

@@ -39,7 +39,7 @@
       width="464px">
       <div class="poptitle">
         <img src="@/assets/images/economies/icon.png">
-        <span>{{ companyInfo.companyName }}</span>
+        <span>{{ companyInfo && companyInfo.companyName || customerInfo.companyName }}</span>
       </div>
       <el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="90px">
         <el-form-item label="姓名：" prop="name">
@@ -81,7 +81,7 @@ export default {
   components: {
     Tables
   },
-  props: ['customerIds','companyInfo'],
+  props: ['customerIds','companyInfo','customerInfo'],
   data() {
     return {
       ifEmpty:false,

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

@@ -3,10 +3,11 @@
     <Header :company-id="companyId" :companyInfo="companyInfo" :cooDetail="cooDetail" v-if="companyId" @close-detail="closeDetail" />
     <div class="flex-box part-main">
       <div class="part-left">
-        <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
+        <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" :isCompany="isCompany" :isCustomer="isCustomer" />
       </div>
       <div class="part-right">
         <div id="partBox" v-if="companyId">
+          <template v-if="isCompany">
             <!-- 企业概览 -->
             <Overview v-if="currentPath.pathName=='overview'" :company-id="companyId" :companyInfo="companyInfo" />
             <Businfo v-if="currentPath.pathName=='businfo'" :company-id="companyId" />
@@ -15,7 +16,7 @@
             <Overseas v-if="currentPath.pathName=='overseas'" :company-id="companyId" />
             <Branch v-if="currentPath.pathName=='branch'" :company-id="companyId" />
             <Financial v-if="currentPath.pathName=='financial'" :company-id="companyId" />
-<!--          <Business v-if="currentPath.pathName=='business'" /> 商务信息 -->
+  <!--          <Business v-if="currentPath.pathName=='business'" /> 商务信息 -->
             <!-- 项目商机 -->
             <Landtransaction v-if="currentPath.pathName=='landtransaction'" :company-id="companyId" />
             <Proposed v-if="currentPath.pathName=='proposed'" :company-id="companyId" />
@@ -42,7 +43,8 @@
             <Judgment v-if="currentPath.pathName=='judgment'" :company-id="companyId" />
             <CourtNotice v-if="currentPath.pathName=='courtNotice'" :company-id="companyId" />
             <OpenacourtsessionNotice v-if="currentPath.pathName=='openacourtsessionNotice'" :company-id="companyId" />
-          <template v-if="customerId">
+          </template>
+          <template v-if="customerId && isCustomer">
             <!-- 商务信息 -->
             <Business v-if="currentPath.pathName=='business'" :customer-ids="customerId" :companyInfo="companyInfo" :customerInfo="customerInfo" />
             <!-- 招标偏好 -->
@@ -50,7 +52,7 @@
             <!-- 合作情况 -->
             <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" :cooDetail="cooDetail" :customerInfo="customerInfo" @detail="cooperateDetail" />
             <!-- 决策链条 -->
-            <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
+            <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" :customerInfo="customerInfo" />
             <!-- 跟进记录 -->
             <Gjjl v-if="currentPath.pathName=='gjjl'" :isDisabled='false' types="gjdt" :customer-ids="customerId" />
           </template>
@@ -150,6 +152,8 @@ export default {
       customerInfo: {},
       companyId: '',  //企业Id（测试默认3068）
       customerId: '',  //企业Id（测试默认'a00d582a6041f32c16aac804e4924736'）
+      isCompany: false,  //判断是否有建设库数据
+      isCustomer: false,  //判断是否展示修改客户信息
       currentPath: {
         pathName: 'overview'  //默认展示页
       },
@@ -202,7 +206,7 @@ export default {
       let res = await infoHeader({companyId:this.companyId})
       if(res.code==200){
         this.companyInfo = res.data || {}
-        if(this.companyInfo.companyName){
+        if(this.companyInfo && this.companyInfo.companyName){
           this.$nextTick(()=>{
             document.getElementById('tagTitle').innerText = this.companyInfo.companyName
           })
@@ -226,16 +230,41 @@ export default {
       if(id) {
         customerInfo(id).then(res => {
           if (res.code == 200) {
-            if (res.data.companyId == this.companyId && res.data.userId == this.$store.state.user.userId) {
+            if (res.data.userId == this.$store.state.user.userId) {
               this.customerInfo = res.data
               this.customerId = res.data.customerId
+              this.$nextTick(() => {
+                this.isCustomer = true
+                this.isCompanyId = true
+              })
+              if(res.data.companyId == this.companyId && this.companyInfo){
+                this.$nextTick(() => {
+                  this.isCustomer = true
+                  this.isCompany = true
+                })
+              }else{
+                this.$nextTick(() => {
+                  this.isCustomer = true
+                  this.isCompany = false
+                  this.currentPath.pathName = 'business'
+                })
+              }
             } else {
+              this.$nextTick(() => {
+                this.isCustomer = true
+                this.isCompany = true
+              })
               this.currentPath.pathName = 'overview'
             }
           }
         }).catch(err => {
           this.currentPath.pathName = 'overview'
+          this.$nextTick(() => {
+            this.isCompany = true
+          })
         })
+      }else{
+        this.isCompany = true
       }
     }
 

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

@@ -7,7 +7,7 @@
           :data="tableData"
           stripe border
           style="width: 100%"
-          :default-sort = "{prop: 'role', order: 'descending'}"
+          :default-sort = "{prop: 'role', order: 'ascending'}"
         >
           <template slot="empty">
             <div class="empty">

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: 'descending'}"
+          :default-sort = "{prop: 'depth', order: 'ascending'}"
         >
           <template slot="empty">
             <div class="empty">

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

@@ -10,7 +10,8 @@
           <div class="btn" @click="handleCurrentChange(1)">搜索</div>
         </div>
         <!--<div class="btn btn_primary h32 b2" @click="getUP"  v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>-->
-        <el-upload
+
+        <div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div><el-upload
           class="upload-demo"
           :action="action"
           :on-change="handleFileListChange"
@@ -20,9 +21,9 @@
           accept=".word,.pdf.excel,.xlsx,.doc,.docx"
           :headers="headers"
           :show-file-list="false"
-          :on-success="onSuccess">
-        <div class="btn btn_primary h32 b2" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>
-          </el-upload>
+          :on-success="onSuccess"
+          :key='keys'>上传</el-upload></div>
+
       </div>
       <div class="filepath" v-if="filename"><font @click="getall">全部</font> / <span> <img class="img" src="@/assets/images/folder.png">{{filename}}</span></div>
       <div class="uploadbox" v-if="isupload">
@@ -60,7 +61,7 @@
         <el-table
           :data="fileDatas.rows"
           style="width: 100%"
-          :default-sort = "{prop: 'creatTime', order: 'descending'}"
+          :default-sort = "{prop: 'creatTime', order: 'ascending'}"
         >
           <template slot="empty">
             <div class="empty">
@@ -179,6 +180,7 @@
         filename:'',
         ondel:"",
         isDisabled:this.isDisabled,
+        keys:1,
       }
     },
     created(){
@@ -261,6 +263,7 @@
             _this.getList()
             _this.$message.success('上传成功！')
             _this.isupload = false
+            _this.keys++;
           },3000)
 
         }

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

@@ -101,16 +101,24 @@
         LEFT JOIN business_user bu on bu.business_id = i.id
         LEFT JOIN sys_user u on u.user_id = f.user_id
         <where>
+            <if test="userId != null">
+                and bu.user_id = #{userId}
+            </if>
             <if test="projectType != null and projectType != ''">
                 and i.project_type in
                 <foreach collection="projectType" item="projectType" open="(" separator="," close=")">
                     #{projectType}
                 </foreach>
             </if>
-            <if test="minAmount != null and minAmount != '' and maxAmount != minAmount">
+            <if test="minAmount != null and minAmount != '' and minAmount != 0 and maxAmount != minAmount">
                 and i.investment_amount &gt;= #{minAmount}
             </if>
-            <if test="maxAmount != null and maxAmount != '' and maxAmount != minAmount">
+            <if test="minAmount == 0 and maxAmount != minAmount">
+                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}
             </if>
             <if test="minAmount != null and minAmount != '' and maxAmount != null and maxAmount != '' and maxAmount == minAmount">
@@ -128,9 +136,6 @@
             <if test="ownerCompany != null and ownerCompany != ''">
                 or i.construction_unit like concat('%',#{ownerCompany},'%')
             </if>
-            <if test="userId != null">
-                and bu.user_id = #{userId}
-            </if>
             <if test="others != null">
                  and bu.user_id != #{others} and i.is_private = 1
             </if>