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

dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessFollowRecord.java

@@ -70,8 +70,8 @@ public class BusinessFollowRecord extends BaseEntity
     private String visitWay;
 
     /** 创建时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
     private Date creatTime;
 
     public String getProjectName() {

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

@@ -100,7 +100,7 @@ export default {
         {label: '备注', prop: 'remark'},
       ],
       addRorm: {
-        customerId:'f25219e73249eea0d9fddc5c7f04f97f',
+        customerId:this.customerIds,
         name:'',
         role:'',
         workUnit:'',

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

@@ -17,11 +17,14 @@
       :queryParams="queryParams"
       @handle-current-change="handleCurrentChange"
     >
+      <template slot="deciWritName" slot-scope="scope">
+        <div v-html="scope.row.deciWritName"></div>
+      </template>
       <template slot="content" slot-scope="scope">
-        <span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)?'cell-span':'']" :style="{'-webkit-line-clamp': 2}">
-          {{ scope.row.content }}
+        <div :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)?'cell-span':'']" :style="{'-webkit-line-clamp': 2}">
+          <div v-html="scope.row.content"></div>
           <span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">展开</span></span>
-        </span>
+        </div>
       </template>
     </tables>
 
@@ -48,13 +51,13 @@ export default {
         {label: '许可决定日期', prop: 'deciTime', width: '100'},
         {label: '决定文书号', prop: 'deciWritNo', width: '200'},
         {label: '许可编号', prop: 'permitNo', width: '100'},
-        {label: '决定文书名称', prop: 'deciWritName', width: '190'},
+        {label: '决定文书名称', prop: 'deciWritName', width: '190', slot: true},
         {label: '许可内容', prop: 'content', width: '300', slot: true},
         {label: '有效期自', prop: 'valiBegin', width: '100'},
         {label: '有效期至', prop: 'valiEnd', width: '100'},
         {label: '行政许可类别', prop: 'permitType', width: '100'},
         {label: '许可机关', prop: 'office', width: '180'},
-        {label: '行政许可机关统一社会信用代码', prop: 'xxx', width: '200'},
+        {label: '行政许可机关统一社会信用代码', prop: 'officeCreditCode', width: '200'},
         {label: '数据来源单位', prop: 'dataSourceOffice', width: '110'},
         {label: '数据来源单位统一社会信用代码', prop: 'dataSourceOfficeCreditCode', width: '200'},
         {label: '来源', prop: 'dataSource', width: '80'}
@@ -81,7 +84,12 @@ export default {
       let res = await creditXzxkPage(param)
       this.tableLoading = false
       if(res.code==200){
-        this.tableData = res.rows
+        if(res.rows&&res.rows.length>0){
+          this.tableData = res.rows.map(item => {
+            item.smallContent = item.content.replace(/<.*?>/ig,"")
+            return item
+          })
+        }
       }
       this.tableDataTotal = res.total
     },
@@ -92,14 +100,29 @@ export default {
       })
     },
     isOverHiddenFlag(data, showList, row, column, value) {
-      if(value && String(value).length > this.getLenth(data)) {
+      if(value && this.getByteLen(value) > 88) {
         return !showList.some(item => item.row==row&&item.column==column)
       }else {
         return false
       }
     },
-    getLenth(data) {
-      return Math.floor(data / 12) * 5
+    /*getLenth(data) {
+      return Math.floor(data / 6) * 2  //宽度（300） / 一个字符的宽度（6） * 行数（2）
+    },*/
+    getByteLen(val) {
+      var len = 0
+      for (var i = 0; i < val.length; i++) {
+        var a = val.charAt(i)
+        if (a.match(/[^\x00-\xff]/ig) != null){
+          len += 2
+        }else{
+          len += 1
+        }
+      }
+      /*if(val.match(/ /g)){
+        len =len+Math.floor(val.match(/ /g).length/2)
+      }*/
+      return len
     }
   }
 }

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

@@ -22,7 +22,7 @@ export default {
     if (this.$route.params.id) { // 获取companyId
       this.loading = true
       // this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
-      this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
+      this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}`
     }
   },
   mounted() {

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

@@ -266,6 +266,7 @@
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="status != null">status,</if>
+            <if test="customerId != null">customer_id,</if>
             <if test="evaluationBidWay != null">evaluation_bid_way,</if>
             <if test="bidOpenTime != null">bid_open_time,</if>
             <if test="bidOpenPlace != null">bid_open_place,</if>