Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

dsk-operate-ui/src/api/supplier/supplierOverview.js

+import request from '@/utils/request';
+
+//供应商风险动态统计
+export function statistics() {
+  return request({
+    url: '/customer/dynamicRisk/statistics',
+    method: 'POST',
+  });
+}
+//供应商总台账
+export function customerAll(param) {
+  return request({
+    url: '/customer/all/searchList',
+    data:param,
+    method: 'POSt',
+  });
+}
+
+//涉诉限用禁用名单名单
+export function getSupplierLimitedList(param) {
+  return request({
+    url: '/fSupplierLimited/getSupplierLimitedList',
+    params: param,
+    method: 'get',
+  });
+}
+

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

+<!-- 表格组件 -->
+<template>
+  <div class="infoTable-container">
+    <h2 v-if="title !== '' && isSubTitle" class="infoTable-title">
+      {{ title }}
+    </h2>
+    <el-form class="infoTable-form" label-position="left">
+      <template v-for="(item, index) in list">
+        <el-form-item :style="item.span?{width: `${100/(24/item.span)}%`}:{}" :label="item.name" :label-width="labelWidth?labelWidth+'px':'130px'" :key="index" :class="[
+            { 'infoTable-form-view': item.style },
+            { 'infoTable-form-item': !item.style },
+            { 'infoTable-form-row': item.rowstyle }
+          ]">
+          <div>
+            <template v-if="item.slot === true">
+              <slot :name="item.prop" :data="obj"></slot>
+            </template>
+            <span v-else> {{  obj[item.prop] ?obj[item.prop] !==""?item.formatter?item.formatter(obj[item.prop]):obj[item.prop]:'-' :'-' }}</span>
+          </div>
+        </el-form-item>
+      </template>
+    </el-form>
+    <!--<div v-else class="no-data">-->
+      <!--<div class="no-data-box" v-if="show">-->
+        <!--<img :src="noData" alt="暂时没有找到相关数据" />-->
+        <!--<span>暂时没有找到相关数据</span>-->
+      <!--</div>-->
+    <!--</div>-->
+  </div>
+</template>
+
+<script>
+export default {
+  name: "InfoTable",
+  components: {
+
+  },
+  props: {
+    list: {
+      type: Array,
+      default: () => [],
+    },
+    title: {
+      type: String,
+      default: "",
+    },
+    obj: {
+      type: Object,
+      default: () => { }
+    },
+    labelWidth: {
+      type: Number,
+      default: null
+    },
+    isSubTitle: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      show:false,
+      // 当前移入单元格内容
+      noData: require("@/assets/images/detail/noData.png")
+    };
+  },
+  created() {
+  },
+  mounted(){
+    this.show = true;
+  },
+  methods: {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.infoTable-container {
+  .infoTable-title {
+    font-size: 16px;
+    font-family: Microsoft YaHei-Bold, Microsoft YaHei;
+    font-weight: bold;
+    padding-left: 8px;
+    border-left: 2px solid #58637B;
+    color: #000000;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    margin: 0 0 16px 0;
+  }
+  .infoTable-form {
+    display: flex;
+    flex-wrap: wrap;
+    border-left: 1px solid #e5e9f5;
+    border-top: 1px solid #e5e9f5;
+    border-collapse: collapse;
+    .infoTable-form-item {
+      width: 50%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 13px;
+    }
+    .infoTable-form-view {
+      width: 100%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 13px;
+    }
+    .infoTable-form-row {
+      width: 33%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 13px;
+    }
+    ::v-deep .el-form-item__label {
+      height: 100%;
+      background-color: #F0F3FA;
+      padding: 8px 12px 8px 12px;
+      font-size: 13px;
+      font-weight: normal;
+      color: rgba(35,35,35,0.8);
+      display: flex;
+      align-items: center;
+      line-height: normal;
+    }
+    ::v-deep .el-form-item__content {
+      padding-left: 12px;
+      font-size: 13px;
+      color: #232323;
+    }
+    ::v-deep .el-form-item__content {
+      border-left: 1px solid #e5e9f5;
+      height: 100%;
+      display: flex;
+      align-items: center;
+    }
+    ::v-deep .el-col {
+      border-bottom: 1px solid #e5e9f5;
+    }
+  }
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    max-width: 1200px;
+    height: 328px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 64px;
+        height: 79px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+  ::v-deep .el-form-item__content {
+    line-height: 22px;
+    padding: 6px 4px;
+  }
+}
+</style>

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

 <template>
-    <div>
+    <div class="credit-container">
+      <div class="title_wrap">
+        <div class="enterprise_title">
           信用中国
         </div>
+      </div>
+      <div class="label-item">
+        <span @click="item.number ? labelClick(item.name) : ''" :class="{'color' : nameColor == item.name,'disabled': !item.number}" v-for="item in labelList">{{item.name}} {{item.number}}</span>
+      </div>
+      <div class="detail-cont">
+        <info-table class="info-tab" v-if="nameColor === '行政许可'" :list="defaultList" :obj="forInfo" :labelWidth="labelWidth"></info-table>
+        <info-table class="info-tab" v-if="nameColor === '行政处罚'" :list="defaultList1" :obj="forInfo" :labelWidth="labelWidth"></info-table>
+        <info-table class="info-tab" v-if="nameColor === '诚实守信'" :list="defaultList2" :obj="forInfo" :labelWidth="labelWidth"></info-table>
+        <info-table class="info-tab" v-if="nameColor === '严重失信主体名单'" :list="defaultList3" :obj="forInfo" :labelWidth="labelWidth"></info-table>
+        <info-table class="info-tab" v-if="nameColor === '经营异常'" :list="defaultList4" :obj="forInfo" :labelWidth="labelWidth"></info-table>
+      </div>
+    </div>
 </template>
 
 <script>
+  import skeleton from '../component/skeleton';
+  import InfoTable from '../component/infoTable1';
   export default {
-        name: "credit"
+    name: "credit",
+    components: {
+      skeleton,InfoTable
+    },
+    data() {
+      return {
+        isSkeleton:false,
+        nameColor:'行政许可',
+        labelList:[
+          {
+            number:10,
+            name:'行政许可',
+          },
+          {
+            number:0,
+            name:'行政处罚',
+          },
+          {
+            number:3,
+            name:'诚实守信',
+          },
+          {
+            number:2,
+            name:'严重失信主体名单',
+          },
+          {
+            number:2,
+            name:'经营异常',
+          },
+        ],
+        labelWidth: 250,
+        forInfo: {
+          projectName:''
+        },
+        defaultList: [
+          // { name: '工程名称', prop: 'name', slot: true  },
+          { name: '行政许可决定文书号', prop: 'projectName'},
+          { name: '行政许可决定文书名称', prop: 'areaName' },
+          { name: '许可证书名称', prop: 'projectAddress' },
+          { name: '许可类别', prop: 'status' },
+          { name: '许可编号', prop: 'projectType1' },
+          { name: '许可决定日期', prop: 'registCapi' },
+          { name: '有效期自', prop: 'actualCapi'},
+          { name: '有效期至', prop: 'checkDate' },
+          { name: '许可内容', prop: 'orgNo' },
+          { name: '许可机关', prop: 'designOrgName' },
+          { name: '许可机关统一社会信用代码', prop: 'creditNo' },
+          { name: '数据来源单位', prop: 'supervisorOrgName' },
+          { name: '数据来源单位统一社会信用代码', prop: 'scope', style: true},
+        ],
+        defaultList1: [
+          // { name: '工程名称', prop: 'name', slot: true  },
+          { name: '行政处罚决定书文号', prop: 'projectName'},
+          { name: '处罚类别', prop: 'areaName' },
+          { name: '处罚决定日期', prop: 'projectAddress' },
+          { name: '处罚内容', prop: 'status' },
+          { name: '罚款金额（万元）', prop: 'projectType1' },
+          { name: '没收违法所得、没收非法财物的金额（万元）', prop: 'registCapi' },
+          { name: '暂扣或吊销证照名称及编号', prop: 'actualCapi'},
+          { name: '违法行为类型', prop: 'checkDate' },
+          { name: '违法事实', prop: 'orgNo' },
+          { name: '处罚依据', prop: 'designOrgName' },
+          { name: '处罚机关', prop: 'creditNo' },
+          { name: '处罚机关统一社会信用代码', prop: 'supervisorOrgName' },
+          { name: '数据来源单位', prop: 'supervisorOrgName' },
+          { name: '数据来源统一社会信用代码', prop: 'supervisorOrgName' },
+        ],
+        defaultList2: [
+          { name: '纳税信用级别', prop: 'projectName'},
+          { name: '评价来源', prop: 'areaName' },
+          { name: '评价年度', prop: 'scope', style: true},
+        ],
+        defaultList3: [
+          { name: '失信被执行人姓名/名称', prop: 'projectName'},
+          { name: '身份证号码/组织机构代码', prop: 'areaName' },
+          { name: '执行法院', prop: 'projectAddress' },
+          { name: '立案时间', prop: 'status' },
+          { name: '案号', prop: 'projectType1' },
+          { name: '做出执行依据单位', prop: 'registCapi' },
+          { name: '生效法律文书确定的义务', prop: 'actualCapi'},
+          { name: '被执行人的履行情况', prop: 'checkDate' },
+          { name: '失信被执行人行为具体情形', prop: 'orgNo' },
+          { name: '发布时间', prop: 'designOrgName' },
+          { name: '已履行部分', prop: 'creditNo' },
+          { name: '未履行部分', prop: 'supervisorOrgName' },
+          { name: '数据来源', prop: 'scope', style: true},
+        ],
+        defaultList4: [
+          { name: '案号', prop: 'projectName'},
+          { name: '经营异常类型', prop: 'areaName' },
+          { name: '列入经营异常名录原因类型名称', prop: 'projectAddress' },
+          { name: '拖欠天数', prop: 'status' },
+          { name: '涉及金额（元）', prop: 'projectType1' },
+          { name: '列入日期', prop: 'registCapi' },
+          { name: '列入机关', prop: 'actualCapi'},
+          { name: '数据来源', prop: 'checkDate' },
+        ],
       }
-</script>
+    },
+    created() {
+
+    },
+    //计算集
+    computed: {
 
-<style scoped>
+    },
+    //方法集
+    methods: {
+      labelClick(value){
+        this.nameColor=value
+      },
+    }
+  }
+</script>
 
+<style lang="scss" scoped>
+  .credit-container{
+    .title_wrap{
+      border-bottom: 0;
+    }
+    .label-item{
+      padding: 0 16px;
+      span{
+        display: inline-block;
+        height: 38px;
+        border-radius: 4px;
+        line-height: 38px;
+        border: 1px solid #DCDFE6;
+        color: #232323;
+        font-size: 14px;
+        margin-right: 8px;
+        padding: 0 12px;
+        cursor: pointer;
+      }
+      .color{
+        background: rgba(0, 129, 255, 0.1);
+        border: 1px solid rgba(0, 129, 255, 0.1);
+        color: #0081FF;
+      }
+      .disabled{
+        color: #eee;
+        border: 1px solid #eee;
+        cursor: not-allowed;
+      }
+    }
+    .detail-cont{
+      padding: 16px;
+    }
+  }
 </style>

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

@@ -20,7 +20,7 @@
         border
         highlight-current-row
       >
-        <el-table-column label="序号" width="60" align="left" type="index" fixed="left"></el-table-column>
+        <el-table-column label="序号" width="60" align="left" type="index"></el-table-column>
         <el-table-column label="资质编号" width="150" prop="code"></el-table-column>
         <el-table-column label="资质名称" min-width="200" prop="expenseName"></el-table-column>
         <el-table-column label="发证日期" width="150" prop="date"></el-table-column>
@@ -106,9 +106,8 @@
         }
       },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0) {
+        if (columnIndex === 1) {
           const _row = this.flitterData(this.tableData).one[rowIndex]
-          console.log(_row,"||||||||")
           const _col = _row > 0 ? 1 : 0
           return {
             rowspan: _row,
@@ -140,8 +139,12 @@
       }
       .color{
         background: rgba(0, 129, 255, 0.1);
+        border: 1px solid rgba(0, 129, 255, 0.1);
         color: #0081FF;
       }
     }
+    .table-item{
+      padding: 16px;
+    }
   }
 </style>

dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue

@@ -236,8 +236,10 @@
       async querySubmit() {
         companyPage(this.queryParams).then(res => {
           this.isSkeleton = false;
+          if(res.code === 200){
             this.tableData=res.rows
             this.tableDataTotal=res.total
+          }
         })
       },
       handleKeyword(){
@@ -331,6 +333,9 @@
         if(value && value.length) {
           this.queryParams.condition.beginTime = value[0]
           this.queryParams.condition.endTime = value[1]
+        }else {
+          delete this.queryParams.condition.beginTime
+          delete this.queryParams.condition.endTime
         }
         this.querySubmit()
       },
@@ -412,6 +417,20 @@
 
 <style lang="scss" scoped>
   .EnterpriseMonitoring{
+    .title_wrap{
+      padding: 20px;
+      background-color: #FFFFFF;
+      border-bottom: 1px solid #e0e0e0;
+      .enterprise_title{
+        border-left: 2px solid #445781;
+        padding-left: 8px;
+        font-size: 16px;
+        height: 16px;
+        line-height: 16px;
+        font-weight: 700;
+        color: #232323;
+      }
+    }
     .header{
       background: #FFFFFF;
       padding: 25px 16px;

dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue

@@ -356,6 +356,7 @@
           params.condition.dimension=this.sffx;
         }else {
           params.condition.parentDimension=['司法风险']
+          delete params.condition.dimension
         }
         dynamicPage(params).then(res => {
           this.isSkeleton = false;

dsk-operate-ui/src/views/monitoring/MonitoringDynamicsgs.vue

@@ -355,6 +355,7 @@
           params.condition.dimension=this.gsfx;
         }else {
           params.condition.parentDimension=['工商风险']
+          delete params.condition.dimension
         }
         dynamicPage(params).then(res => {
           this.isSkeleton = false;

dsk-operate-ui/src/views/monitoring/MonitoringDynamicsjy.vue

@@ -346,6 +346,7 @@
           params.condition.dimension=this.jyfx;
         }else {
           params.condition.parentDimension=['经营风险']
+          delete params.condition.dimension
         }
         dynamicPage(params).then(res => {
           this.isSkeleton = false;

dsk-operate-ui/src/views/monitoring/MonitoringReportDetails.vue

@@ -372,9 +372,9 @@
     },
     methods: {
       changeSffx(val) {
-        if(val == '不限')
+        if(val == '不限'){
           this.sffx = ['不限']
-        else if(this.sffx.indexOf('不限')>-1){
+        }else if(this.sffx.indexOf('不限')>-1){
           this.sffx.splice(this.sffx.indexOf('不限'),1)
         }
         // if (this.sffx.indexOf(val.dimensionName) == -1) {
@@ -382,15 +382,14 @@
         // } else {
         //   this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
         // }
-
         this.queryParams.pageNum=1
         this.queryParams.pageSize=10
         this.querySubmit()
       },
       changeGsfx(val) {
-        if(val == '不限')
+        if(val == '不限'){
           this.gsfx = ['不限']
-        else if(this.gsfx.indexOf('不限')>-1){
+        }else if(this.gsfx.indexOf('不限')>-1){
           this.gsfx.splice(this.gsfx.indexOf('不限'),1)
         }
         // if (this.gsfx.indexOf(val.dimensionName) == -1) {
@@ -432,6 +431,7 @@
           delete params.condition.riskLevel
         }
         let sffx = this.sffx
+
         if(sffx.indexOf('不限')>-1){
           sffx = []
         }
@@ -452,6 +452,8 @@
 
         if(arr.length > 0){
           params.condition.dimension=arr
+        }else {
+          delete params.condition.dimension
         }
 
         // if(sffx.length > 0 && gsfx.length > 0 && jyfx.length > 0){

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

@@ -382,6 +382,7 @@
   import '@/assets/styles/public.scss'
   import '@/assets/styles/supplierlist.scss'
   import mixin from '@/views/detail/party-a/mixins/mixin'
+  import { statistics } from '@/api/supplier/supplierOverview'
   import CustomTimeSelect from '../../component/CustomTimeSelect'
   import { v4 } from "uuid"
   import * as echarts from 'echarts'
@@ -1054,6 +1055,7 @@
       }
     },
     created() {
+      this.getStatistics();
       this.$nextTick(()=>{
         this.initChart(this.fxList)
         this.initChart1(this.fxqsList)
@@ -1072,6 +1074,11 @@
       })
     },
     methods:{
+      getStatistics(){
+        statistics().then(res => {
+          console.log(res.data)
+        })
+      },
       getUid() {
         return v4();
       },