Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodyVo.java

@@ -98,13 +98,19 @@ public class AdvisoryBodyVo {
      */
     @ExcelProperty(value = "合同金额", index = 10)
     private BigDecimal contractValue;
-
+    /**
+     * 业主单位cid
+     */
+    private Integer ownerCid;
     /**
      * 业主单位
      */
     @ExcelProperty(value = "业主单位", index = 11)
     private String ownerName;
-
+    /**
+     * 项目承接单位cid
+     */
+    private Integer contractOrgCid;
     /**
      * 项目承接单位
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbProjectHeadInfoVo.java

@@ -2,6 +2,8 @@ package com.dsk.cscec.domain.vo;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @author sxk
  * @date 2024.03.06
@@ -25,7 +27,10 @@ public class CbProjectHeadInfoVo {
      * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
      */
     private Integer cbStage;
-
+    /**
+     * 创建时间
+     */
+    private Date createTime;
     /**
      * 客商名称(客户名称)
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java

@@ -134,6 +134,24 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
     public TableDataInfo<AdvisoryBodyVo> queryAdvisoryList(AdvisoryBodyBo bo, PageQuery query) {
         bo.setContractOrgId(AdvisoryBodyManageQueryConstants.LEVEL1_COMPANY_ID);
         Page<AdvisoryBodyVo> page = advisoryBodyMapper.queryListByBo(query.build(),bo);
+        page.getRecords().parallelStream().forEach(vo -> {
+            try {
+                Map<String, Object> map = opportunityRadarService.enterpriseByName(vo.getOwnerName());
+                if (!ObjectUtils.isEmpty(map.get("data"))) {
+                    Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+                    Integer companyId = MapUtil.getInt(data, "jskEid");
+                    vo.setOwnerCid(companyId);
+                }
+                map = opportunityRadarService.enterpriseByName(vo.getContractOrgName());
+                if (!ObjectUtils.isEmpty(map.get("data"))) {
+                    Map<String, Object> data = BeanUtil.beanToMap(map.get("data"));
+                    Integer companyId = MapUtil.getInt(data, "jskEid");
+                    vo.setContractOrgCid(companyId);
+                }
+            } catch (Exception e) {
+                log.error("CustomerInfoServiceImpl.queryAdvisoryList() error:" + e);
+            }
+        });
         return TableDataInfo.build(page);
     }
 

dsk-operate-ui/.env.development

 # 页面标题
-VUE_APP_TITLE = 中建一局集团第二建筑有限公司
+VUE_APP_TITLE = 重庆大司空信息科技有限公司
 
 # 开发环境配置
 ENV = 'development'

dsk-operate-ui/.env.production

 # 页面标题
-VUE_APP_TITLE = 中建一局集团第二建筑有限公司
+VUE_APP_TITLE = 重庆大司空信息科技有限公司
 
 # 生产环境配置
 ENV = 'production'

dsk-operate-ui/.env.staging

 # 页面标题
-VUE_APP_TITLE = 中建一局集团第二建筑有限公司
+VUE_APP_TITLE = 重庆大司空信息科技有限公司
 
 NODE_ENV = production
 

dsk-operate-ui/.env.test

 # 页面标题
-VUE_APP_TITLE = 中建一局集团第二建筑有限公司
+VUE_APP_TITLE = 重庆大司空信息科技有限公司
 
 NODE_ENV = "production"
 

dsk-operate-ui/src/assets/styles/supplierlist.scss

@@ -33,13 +33,14 @@
   padding: 20px 16px 4px;
   .el-form-item{
    margin-bottom: 16px;
+    width: 100%;
   }
   .el-divider{
     margin-top: 4px;
     margin-bottom: 20px;
   }
   .el-form-item__content{
-    width: 282px;
+    width: calc(100% - 100px);
     .el-cascader,.el-select,.el-date-editor{
       width: 100%;
     }
@@ -251,3 +252,10 @@
 .el-date-editor .el-range-input{
   text-align: left;
 }
+.wrap2{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}

dsk-operate-ui/src/components/TableListCom/components/TableListColumn.vue

@@ -42,9 +42,9 @@
       <!-- 操作栏 不需要设置slot-->
       <slot v-else-if="item.prop == 'action-field-bar'" name="action-field-bar" :row="scope.row" :index="scope.$index" :data="item"></slot>
       <!-- 没有插槽 -->
-      <div v-else>
+      <span v-else>
         {{ scope.row[item.prop] ? scope.row[item.prop] : '-' }}
-      </div>
+      </span>
     </template>
   </el-table-column>
 </template>

dsk-operate-ui/src/layout/components/Sidebar/Logo.vue

@@ -45,7 +45,7 @@ export default {
   },
   data() {
     return {
-      title: '中建一局集团第二建筑有限公司',
+      title: '重庆大司空信息科技有限公司',
       // logo: logoImg
       logo: ''
     }

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

@@ -172,7 +172,7 @@ export const constantRoutes = [
         path: '/enterprise/:id',
         component: () => import('@/views/detail/party-a/index'),
         name: 'PartyA',
-        meta: { title: '甲方详情', icon: 'enterpriseData', noCache: false },
+        meta: { title: '企业详情', icon: 'enterpriseData', noCache: false },
       }
     ]
   },

dsk-operate-ui/src/views/consultingOrgManagement/components/EnterpriseList/index.vue

@@ -97,14 +97,14 @@ export default {
       formColum: [
         { label: '序号', prop: "staticSerialNumber", type: "index", lock: true, fixed: false, uid: v4() },
         { label: '咨询机构名称', prop: 'advisoryBodyName', width: "198px", lock: true, fixed: false, slot: true, uid: v4(), showOverflowTooltip: true },
-        { label: '最近一次合作时间', prop: 'lastCooperateTime', width: "201px", uid: v4() },
-        { label: '经营状态', prop: 'businessStatus', minWidth: "74px", uid: v4(), showOverflowTooltip: true },
+        { label: '最近一次合作时间', prop: 'lastCooperateTime', width: "140px", uid: v4() },
+        { label: '经营状态', prop: 'businessStatus', width: "74px", uid: v4(), showOverflowTooltip: true },
         { label: '法定代表人', prop: 'corporatePerson', width: "86px", uid: v4() },
         { label: '注册资本', prop: 'regCapital', width: "120px", uid: v4() },
         { label: '注册地区', prop: 'regArea', width: "149px", uid: v4() },
         { label: '成立日期', prop: 'registeredDate', width: "97px", uid: v4() },
-        { label: '经营范围', prop: 'businessScope', width: "417px", uid: v4(), slot: true },
         { label: '合作项目数量', prop: 'cooperateProjectCount', width: "98px", uid: v4(), slot: true },
+        { label: '经营范围', prop: 'businessScope', uid: v4(), slot: true },
       ],
       queryParams: {
         pageSize: 50,
@@ -181,6 +181,9 @@ export default {
         const result = await getConsultingOrgEenterpriseListWithSearchApi(params);
         if (result.code == 200) {
           this.tableDataList = result.rows ? result.rows : [];
+          this.tableDataList.forEach(item=>{
+            item.regCapital =  item.regCapital.replace('人民币','')
+          })
           this.total = result.total ? result.total : 0;
         } else {
           this.$message.error(result.msg);

dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue

@@ -203,21 +203,53 @@ export default {
       engineeringCategoryOptions: [
         {
           value: "1",
-          label: "测试1"
+          label: "房屋建筑"
         },
         {
           value: "2",
-          label: "测试2"
+          label: "专业分包"
+        },
+        {
+          value: "3",
+          label: "基础设施"
         }
       ],
       engineeringCategoryDetailOptions: [
         {
           value: "1",
-          label: "测试1"
+          label: "住宅"
         },
         {
           value: "2",
-          label: "测试2"
+          label: "房建其他"
+        },
+        {
+          value: "3",
+          label: "装饰"
+        },
+        {
+          value: "4",
+          label: "专业其他"
+        },
+        {
+          value: "5",
+          label: "市政工程"
+        },
+        {
+          value: "6",
+          label: "教育"
+        },
+        {
+          value: "7",
+          label: "安装"
+        },
+        {
+          value: "8",
+          label: "工业厂房"
+        },
+        {
+          value: "9",
+          label: "商业综合"
         }
       ]
     };

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

@@ -73,7 +73,7 @@
 					<label class="label label1">招标代理机构</label>
 					<span class="span1">{{info.agency||"--"}}</span>
 				</p>
-				
+
 			</div>
       <div class="tip">
         <span>温馨提示：</span>本栏信息全部来自政府建设主管单位，可作为该公司资质电报、招标投标业绩核实、优质工程（奖杯)申请、信用评估等用途使用。
@@ -81,7 +81,7 @@
 		</div>
 		<div class="content main3">
 			<div class="common-title">信息快照</div>
-			
+
 			<div class="main3-box" >
         <img class="tip-img" :src="'https://imgs.jiansheku.com/'+info.snapshootPic" v-if="info.snapshootPic" />
         <div v-else class="no-data">
@@ -92,8 +92,8 @@
         </div>
 			</div>
 		</div>
-	
-	
+
+
 	</div>
 </template>
 
@@ -125,7 +125,7 @@ export default {
             this.info = res.data
           }
 				}).catch(error => {
-			
+
 				});
     }
   }
@@ -184,6 +184,7 @@ export default {
 			font-size: 14px;
 			border-bottom: 1px solid #EFEFEF;
 			padding-bottom: 14px;
+      position: relative;
 
 			.list-titel {
 				font-size: 16px;
@@ -324,7 +325,7 @@ export default {
 	}
 
 	.app-container {
-		padding: 0;
+		/*padding: 0;*/
 	}
 
 	.qyzx-details {
@@ -428,7 +429,7 @@ export default {
 					.blue {
 						color: #0081FF !important;
 						cursor: pointer;
-					
+
 					}
 
 				}
@@ -439,4 +440,4 @@ export default {
 
 
 	}
-</style>
\ No newline at end of file
+</style>

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

@@ -296,6 +296,7 @@ export default {
     },
     pathName: {
       handler(newValue) {
+        console.log(newValue,"|||||||")
         this.searchIndex = this.findNodeIndex(this.sideRoute, newValue).index;
       }
     }
@@ -349,7 +350,7 @@ export default {
       const _sideBarData = JSON.parse(JSON.stringify(value));
 
       // {basic,behavior,business,combineMember,credit,evaluation,global,performance,personnel,qualification}
-      /** 
+      /**
        * @type {Map<string,string>}
       */
       const _tempMap = detailSideBar;

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

@@ -11,6 +11,11 @@
           v-html="scope.row.counterpartCompanyName">{{scope.row.counterpartCompanyName}}</span>
         <span v-else>-</span>
       </template>
+      <!-- 合作总金额-->
+      <template slot="amount" slot-scope="scope">
+        <span v-if="scope.row.amount">{{scope.row.amount.toFixed(2)}}</span>
+        <span v-else>-</span>
+      </template>
       <!-- 合作项目数量 -->
       <template slot="count" slot-scope="scope">
         <span v-if="scope.row.count" style="color: #0081FF;cursor: pointer;" @click="viewProject(scope.row)">{{scope.row.count}}</span>
@@ -18,7 +23,7 @@
       </template>
     </tables>
 
-    <el-dialog title="合作项目/工程明细" :visible.sync="cooperationRecordDialog" width="1100px" @close="dialogClose" @open="dialogOPen"
+    <el-dialog title="合作项目/工程明细" :visible.sync="cooperationRecordDialog" width="1100px" @close="dialogClose" @open="dialogOPen" :modal-append-to-body="false"
       class="cooperation-record-dialog-container" custom-class="cooperation-record-dialog" :destroy-on-close="true" :close-on-click-modal="false">
       <div class="cooperation-record-dialog-innner">
         <dialog-head-form-new title="" :form-data="dialogFormData" :query-params="dialogQueryParams" :total="dialogtableDataTotal" :isExcel="false"
@@ -32,7 +37,18 @@
           @sort-change="dialogSortChange" :maxHeight="true">
           <!-- 合作项目/工程名称-->
           <template slot="projectName" slot-scope="scope">
-            <span v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+            <template v-if="scope.row.dataSource ==='中标业绩'">
+              <router-link :to="`/biddetail/${scope.row.sourceId}`" tag="a" class="a-link" v-if="scope.row.sourceId" v-html="scope.row.projectName"></router-link>
+              <div v-else v-html="scope.row.projectName || '--'"></div>
+            </template>
+            <template>
+              <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+              <span v-else>-</span>
+            </template>
+          </template>
+          <!-- 合作总金额-->
+          <template slot="amount" slot-scope="scope">
+            <span v-if="scope.row.amount">{{scope.row.amount.toFixed(2)}}</span>
             <span v-else>-</span>
           </template>
           <!-- 省市区 -->
@@ -53,6 +69,7 @@ import DialogHeadFormNew from "../component/HeadFormNew";
 import DialogTables from "../component/Tables";
 import { replaceDomTags } from "@/utils";
 import { encodeStr } from "@/assets/js/common";
+import {skyProjectDetail} from '@/api/detail/party-a/dealings'
 export default {
   name: "cooperativeConstructionUnit",
   mixins: [mixin],
@@ -76,7 +93,7 @@ export default {
         { label: '施工单位名称', prop: 'counterpartCompanyName', width: '295', slot: true, showOverflowTooltip: true },
         { label: '合作项目数量', prop: 'count', minWidth: '190', align: "right", slot: true, sortable: "custom" },
         { label: '最近一次合作时间', prop: 'time', minWidth: '214', sortable: "custom" },
-        { label: '合作总金额（万元）', prop: 'amount', minWidth: '226', align: "right", sortable: "custom" },
+        { label: '合作总金额（万元）', prop: 'amount', slot: true, minWidth: '226', align: "right", sortable: "custom" },
       ],
       formData: [
         { type: 4, fieldName: 'businessTypes', value: '', placeholder: '咨询机构业务', options: [], uid: this.getUid() },
@@ -105,9 +122,9 @@ export default {
         { label: '合作项目/工程名称', prop: 'projectName', width: '260', slot: true, showOverflowTooltip: true },
         { label: '合作时间', prop: 'time', width: '140', sortable: "custom" },
         { label: '咨询机构承担角色', prop: 'agencyBusinessType', width: '140' },
-        { label: '项目类型', prop: 'counterpartRole', minWidth: '90' },
-        { label: '工程类型', prop: 'projectType', minWidth: '90' },
-        { label: '项目/工程金额（万元）', prop: 'amount', width: '190', sortable: "custom", align: "right", },
+        { label: '项目类型', prop: 'counterpartRole', minWidth: '105' },
+        { label: '工程类型', prop: 'projectType', minWidth: '100' },
+        { label: '项目/工程金额（万元）', prop: 'amount', slot: true, width: '190', sortable: "custom", align: "right", },
         { label: '项目地区', prop: 'area', width: '245', slot: true },
         { label: '数据来源', prop: 'dataSource', width: '90' },
       ],
@@ -181,7 +198,7 @@ export default {
     },
     // 创建列表查询条件
     createQueryCondition(form) {
-      /** 
+      /**
        * @type {Array<{
        * fieldName : string;
        * value : any
@@ -347,6 +364,15 @@ export default {
       this.dialogFormData = data.dialogFormData;
       this.dialogtableDataTotal = data.dialogtableDataTotal;
       this.dialogTableData = data.dialogTableData;
+    },
+    linkTo1(id){
+      let url = ""
+      skyProjectDetail({sourceId:id}).then(res=>{
+        if(res.data&&res.data.sourceUrl){
+          url = res.data.sourceUrl
+          window.open(url, "_blank")
+        }
+      })
     }
   },
 }

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

@@ -7,7 +7,7 @@
       :queryParams="queryParams" @handle-current-change="handleCurrentChange" @sort-change="sortChange">
       <!-- 业主名称 -->
       <template slot="combineName" slot-scope="scope">
-        <span v-if="scope.row.combineName" style="color: #0081FF;cursor: pointer;" @click="viewEnterprise(scope.row)"
+        <span v-if="scope.row.combineName" @click="viewEnterprise(scope.row)"
           v-html="scope.row.combineName">{{scope.row.combineName}}</span>
         <span v-else>-</span>
       </template>
@@ -18,7 +18,7 @@
       </template>
     </tables>
 
-    <el-dialog title="合作项目/工程明细" :visible.sync="cooperationRecordDialog" width="1100px" @close="dialogClose" @open="dialogOPen"
+    <el-dialog title="合作项目/工程明细" :visible.sync="cooperationRecordDialog" width="1100px" @close="dialogClose" @open="dialogOPen" :modal-append-to-body="false"
       class="cooperation-record-dialog-container" custom-class="cooperation-record-dialog" :destroy-on-close="true" :close-on-click-modal="false">
 
       <!-- tab切换栏 -->
@@ -64,8 +64,18 @@
             @sort-change="dialogSortChange" :maxHeight="true">
             <!-- 合作项目/工程名称-->
             <template slot="projectName" slot-scope="scope">
-              <span v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;"
-                v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+              <template v-if="scope.row.dataSource ==='中标业绩'">
+                <router-link :to="`/biddetail/${scope.row.sourceId}`" tag="a" class="a-link" v-if="scope.row.sourceId" v-html="scope.row.projectName"></router-link>
+                <div v-else v-html="scope.row.projectName || '--'"></div>
+              </template>
+              <template>
+                <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+                <span v-else>-</span>
+              </template>
+            </template>
+            <!-- 合作总金额-->
+            <template slot="amount" slot-scope="scope">
+              <span v-if="scope.row.amount">{{scope.row.amount.toFixed(2)}}</span>
               <span v-else>-</span>
             </template>
             <!-- 合作成员 -->
@@ -95,6 +105,7 @@ import DialogTables from "../component/Tables";
 import DskTabToggle from "@/components/DskTabToggle";
 import { replaceDomTags } from "@/utils";
 import { encodeStr } from "@/assets/js/common";
+import {skyProjectDetail} from '@/api/detail/party-a/dealings'
 export default {
   name: "cooperativeGroup",
   mixins: [mixin],
@@ -140,7 +151,7 @@ export default {
         // { type: 4, fieldName: 'projectTypes', value: '', placeholder: '合作工程类型', options: [], uid: this.getUid() },
         // { type: 5, fieldName: 'time', value: '', placeholder: '合作频率', startTime: 'beginTime', endTime: 'endTime', uid: this.getUid() },
         // { type: 6, fieldName: 'money', value: '', placeholder: '合作金额', uid: this.getUid() },
-        { type: 3, fieldName: 'keyword', value: '', placeholder: '请输入', uid: this.getUid() },
+        { type: 3, fieldName: 'keyword', value: '', placeholder: '请输入集团名称', uid: this.getUid() },
       ],
       //列表
       tableLoading: false,
@@ -170,9 +181,9 @@ export default {
         { label: '合作时间', prop: 'time', width: '140', sortable: "custom" },
         { label: '集团成员身份', prop: 'role', width: '140' },
         { label: '咨询机构承担角色', prop: 'agencyBusinessType', width: '140' },
-        { label: '项目类型', prop: 'counterpartRole', minWidth: '90' },
-        { label: '工程类型', prop: 'projectType', minWidth: '90' },
-        { label: '项目/工程金额（万元）', prop: 'amount', width: '190', sortable: "custom", align: "right", },
+        { label: '项目类型', prop: 'counterpartRole', minWidth: '105' },
+        { label: '工程类型', prop: 'projectType', minWidth: '100' },
+        { label: '项目/工程金额（万元）', slot: true, prop: 'amount', width: '190', sortable: "custom", align: "right", },
         { label: '项目地区', prop: 'area', width: '245', slot: true },
       ],
       dialogFormData: [
@@ -249,7 +260,7 @@ export default {
     },
     // 创建列表查询条件
     createQueryCondition(form) {
-      /** 
+      /**
        * @type {Array<{
        * fieldName : string;
        * value : any
@@ -440,6 +451,15 @@ export default {
     async tabToggle() {
       await this.resetDialogQuery();
       await this.dialogHandleQurey();
+    },
+    linkTo1(id){
+      let url = ""
+      skyProjectDetail({sourceId:id}).then(res=>{
+        if(res.data&&res.data.sourceUrl){
+          url = res.data.sourceUrl
+          window.open(url, "_blank")
+        }
+      })
     }
   },
 }

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

@@ -11,6 +11,11 @@
           v-html="scope.row.companyName">{{scope.row.companyName}}</span>
         <span v-else>-</span>
       </template>
+      <!-- 合作总金额-->
+      <template slot="amount" slot-scope="scope">
+        <span v-if="scope.row.amount">{{scope.row.amount.toFixed(2)}}</span>
+        <span v-else>-</span>
+      </template>
       <!-- 合作项目数量 -->
       <template slot="count" slot-scope="scope">
         <span v-if="scope.row.count" style="color: #0081FF;cursor: pointer;" @click="viewProject(scope.row)">{{scope.row.count}}</span>
@@ -18,7 +23,7 @@
       </template>
     </tables>
 
-    <el-dialog title="合作项目/工程明细" :visible.sync="cooperationRecordDialog" width="1100px" @close="dialogClose" @open="dialogOPen"
+    <el-dialog title="合作项目/工程明细" :visible.sync="cooperationRecordDialog" width="1100px" @close="dialogClose" @open="dialogOPen" :modal-append-to-body="false"
       class="cooperation-record-dialog-container" custom-class="cooperation-record-dialog" :destroy-on-close="true" :close-on-click-modal="false">
       <div class="cooperation-record-dialog-innner">
         <dialog-head-form-new title="" :form-data="dialogFormData" :query-params="dialogQueryParams" :total="dialogtableDataTotal" :isExcel="false"
@@ -32,7 +37,18 @@
           @sort-change="dialogSortChange" :maxHeight="true">
           <!-- 合作项目/工程名称-->
           <template slot="projectName" slot-scope="scope">
-            <span v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+            <template v-if="scope.row.dataSource ==='中标业绩'">
+              <router-link :to="`/biddetail/${scope.row.sourceId}`" tag="a" class="a-link" v-if="scope.row.sourceId" v-html="scope.row.projectName"></router-link>
+              <div v-else v-html="scope.row.projectName || '--'"></div>
+            </template>
+            <template>
+              <span @click="linkTo1(scope.row.sourceId)" v-if="scope.row.projectName" style="color: #0081FF;cursor: pointer;" v-html="scope.row.projectName">{{scope.row.projectName}}</span>
+              <span v-else>-</span>
+            </template>
+          </template>
+          <!-- 合作总金额-->
+          <template slot="amount" slot-scope="scope">
+            <span v-if="scope.row.amount">{{parseFloat(Number(scope.row.amount).toFixed(2))}}</span>
             <span v-else>-</span>
           </template>
           <!-- 省市区 -->
@@ -53,6 +69,7 @@ import DialogHeadFormNew from "../component/HeadFormNew";
 import DialogTables from "../component/Tables";
 import { replaceDomTags } from "@/utils";
 import { encodeStr } from "@/assets/js/common";
+import {skyProjectDetail} from '@/api/detail/party-a/dealings'
 export default {
   name: "cooperativeOwnerUnits",
   mixins: [mixin],
@@ -67,7 +84,7 @@ export default {
       queryParams: {
         companyId: this.companyId,
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 50,
         companyType: 1,
         sort: ""
       },
@@ -76,7 +93,7 @@ export default {
         { label: '业主名称', prop: 'companyName', width: '295', slot: true, showOverflowTooltip: true },
         { label: '合作项目数量', prop: 'count', minWidth: '190', align: "right", slot: true, sortable: "custom" },
         { label: '最近一次合作时间', prop: 'time', minWidth: '214', sortable: "custom" },
-        { label: '合作总金额（万元）', prop: 'amount', minWidth: '226', align: "right", sortable: "custom" },
+        { label: '合作总金额（万元）', prop: 'amount', slot: true, minWidth: '226', align: "right", sortable: "custom" },
       ],
       formData: [
         { type: 4, fieldName: 'businessTypes', value: '', placeholder: '咨询机构业务', options: [], uid: this.getUid() },
@@ -105,9 +122,9 @@ export default {
         { label: '合作项目/工程名称', prop: 'projectName', width: '260', slot: true, showOverflowTooltip: true },
         { label: '合作时间', prop: 'time', width: '140', sortable: "custom" },
         { label: '咨询机构承担角色', prop: 'agencyBusinessType', width: '140' },
-        { label: '项目类型', prop: 'counterpartRole', minWidth: '90' },
-        { label: '工程类型', prop: 'projectType', minWidth: '90' },
-        { label: '项目/工程金额（万元）', prop: 'amount', width: '190', sortable: "custom", align: "right", },
+        { label: '项目类型', prop: 'counterpartRole', minWidth: '105' },
+        { label: '工程类型', prop: 'projectType', minWidth: '100' },
+        { label: '项目/工程金额（万元）', prop: 'amount', slot: true, width: '190', sortable: "custom", align: "right", },
         { label: '项目地区', prop: 'area', width: '245', slot: true },
         { label: '数据来源', prop: 'dataSource', width: '90' },
       ],
@@ -181,7 +198,7 @@ export default {
     },
     // 创建列表查询条件
     createQueryCondition(form) {
-      /** 
+      /**
        * @type {Array<{
        * fieldName : string;
        * value : any
@@ -348,6 +365,15 @@ export default {
       this.dialogFormData = data.dialogFormData;
       this.dialogtableDataTotal = data.dialogtableDataTotal;
       this.dialogTableData = data.dialogTableData;
+    },
+    linkTo1(id){
+      let url = ""
+      skyProjectDetail({sourceId:id}).then(res=>{
+        if(res.data&&res.data.sourceUrl){
+          url = res.data.sourceUrl
+          window.open(url, "_blank")
+        }
+      })
     }
   },
 }

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

 <template>
   <div class="app-container part-container details-of-party">
+    <div style="height: 100%;"  v-if="!isCompany">
+      <skeleton style="padding-top: 16px"></skeleton>
+    </div>
     <Header :company-id="companyId" :companyInfo="companyInfo" :cooDetail="cooDetail" v-if="companyId" @close-detail="closeDetail" />
     <div class="part-main">
       <div class="part-left">
         <side-bar :statisticObj="statisticObj" ref="sidebar" @currentPath="showPartPage" :pathName="currentPath.pathName"
-          :partBoxHeight="partBoxHeight" :customerId="customerId" :isCompany="isCompany" :isCustomer="isCustomer" />
+                  :partBoxHeight="partBoxHeight" :customerId="customerId" :isCompany="isCompany" :isCustomer="isCustomer" />
       </div>
       <div class="part-right">
         <div id="partBox" v-if="companyId" class="part-common-container-style">
@@ -37,7 +40,7 @@
             <cooperative-owner-units v-if="currentPath.pathName=='cooperativeOwnerUnits'" :company-id="companyId"></cooperative-owner-units>
             <!-- 2、常合作施工单位 -->
             <cooperative-construction-unit v-if="currentPath.pathName=='cooperativeConstructionUnit'"
-              :company-id="companyId"></cooperative-construction-unit>
+                                           :company-id="companyId"></cooperative-construction-unit>
             <!-- 3、常合作集团 -->
             <cooperative-group v-if="currentPath.pathName=='cooperativeGroup'" :company-id="companyId"></cooperative-group>
             <!-- 投诚分析 -->
@@ -60,12 +63,12 @@
             <!-- 内部合作 -->
             <!-- 1、咨询机构合作 -->
             <consulting-agency-cooperation v-if="currentPath.pathName=='consultingAgencyCooperation'"
-              :company-id="companyId"></consulting-agency-cooperation>
+                                           :company-id="companyId"></consulting-agency-cooperation>
             <!-- 2、准入情况 -->
             <access-condition v-if="currentPath.pathName=='accessCondition'" :company-id="companyId" :companyInfo="companyInfo"></access-condition>
             <!-- 3、供应商合作记录 -->
             <cooperation-record v-if="currentPath.pathName=='cooperationRecord'" :company-id="companyId"
-              :company-name="companyName"></cooperation-record>
+                                :company-name="companyName"></cooperation-record>
             <!-- 4、施工业绩 -->
             <construction-performance v-if="currentPath.pathName=='constructionPerformance'" :company-id="companyId"></construction-performance>
             <!-- 5、在施工程情况 -->
@@ -78,10 +81,10 @@
             <Preference v-if="currentPath.pathName=='preference'" :customer-ids="customerId" :customerInfo="customerInfo" />
             <!-- 合作情况 -->
             <Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" :companyInfo="companyInfo" :cooDetail="cooDetail"
-              :customerInfo="customerInfo" @detail="cooperateDetail" />
+                       :customerInfo="customerInfo" @detail="cooperateDetail" />
             <!-- 决策链条 -->
             <DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo"
-              :customerInfo="customerInfo" />
+                            :customerInfo="customerInfo" />
             <!-- 跟进记录 -->
             <Gjjl v-if="currentPath.pathName=='gjjl'" :isDisabled='false' types="gjdt" :customer-ids="customerId" />
           </template>
@@ -148,6 +151,7 @@ import ConstructionSituation from "@/views/detail/party-a/internalCooperation/co
 import {
   urbanInvestmentPage,
 } from '@/api/detail/party-a/urbanLnvestment';
+import skeleton from './component/skeleton'
 export default {
   name: 'PartyA',
   components: {
@@ -198,11 +202,13 @@ export default {
     CooperativeConstructionUnit,
     CooperativeGroup,
     ConstructionPerformance,
-    ConstructionSituation
+    ConstructionSituation,
+    skeleton
   },
   data() {
     return {
       isSkeleton: true,
+      isSkeleton1: true,
       companyInfo: {},
       customerInfo: {},
       // 企业名称
@@ -276,6 +282,12 @@ export default {
     }
   },
   created() {
+    let companyName = this.$route.query.companyName ? this.$route.query.companyName : "";
+    document.getElementById('tagTitle').innerText = companyName;
+    let titlename = document.getElementById('tagTitles');
+    if (titlename) {
+      titlename.innerText = companyName;
+    }
     this.init();
   },
   mounted() {
@@ -303,13 +315,15 @@ export default {
         this.companyId = data;
         await this.$nextTick();
         this.listenSider();
-        await this.getStatistic(this.companyName);
         await this.handleQuery();
+        await this.getStatistic(this.companyName);
         await this.association(this.$route.query.customerId);
+
         this.$refs.sidebar.getFinancial(data);
       }
     },
     async getStatistic(companyName) {
+
       let params = {
         companyId: this.companyId
       };

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

@@ -17,19 +17,20 @@
       </template>
       <!-- 业主单位 -->
       <template slot="ownerName" slot-scope="scope">
-        <span v-if="scope.row.ownerName" style="color: #0081FF;cursor: pointer;" @click="viewEnterprise(scope.row)">{{scope.row.ownerName}}</span>
+        <!--<span v-if="scope.row.ownerName" style="color: #0081FF;cursor: pointer;" @click="viewEnterprise(scope.row)">{{scope.row.ownerName}}</span>-->
+        <!--<span v-if="scope.row.ownerName" @click="viewEnterprise(scope.row)">{{scope.row.ownerName}}</span>-->
+        <router-link :to="`/enterprise/${encodeStr(scope.row.ownerCid)}}`" tag="a" class="a-link" v-if="scope.row.ownerCid" v-html="scope.row.ownerName"></router-link>
         <span v-else>-</span>
       </template>
       <!-- 项目承接单位 -->
       <template slot="contractOrgName" slot-scope="scope">
-        <span v-if="scope.row.contractOrgName" style="color: #0081FF;cursor: pointer;"
-          @click="viewEnterprise(scope.row)">{{scope.row.contractOrgName}}</span>
+        <!--<span v-if="scope.row.contractOrgName" @click="viewEnterprise(scope.row)">{{scope.row.contractOrgName}}</span>-->
+        <router-link :to="`/enterprise/${encodeStr(scope.row.contractOrgCid)}}`" tag="a" class="a-link" v-if="scope.row.contractOrgCid" v-html="scope.row.contractOrgName"></router-link>
         <span v-else>-</span>
       </template>
       <!-- 咨询机构名称 -->
       <template slot="advisoryBodyName" slot-scope="scope">
-        <span v-if="scope.row.advisoryBodyName" style="color: #0081FF;cursor: pointer;"
-          @click="viewEnterprise(scope.row)">{{scope.row.advisoryBodyName}}</span>
+        <router-link :to="`/enterprise/${encodeStr(scope.row.advisoryBodyCid)}}`" tag="a" class="a-link" v-if="scope.row.advisoryBodyCid" v-html="scope.row.advisoryBodyName"></router-link>
         <span v-else>-</span>
       </template>
     </tables>
@@ -41,6 +42,7 @@ import mixin from '@/views/detail/party-a/mixins/mixin';
 import { getConsultingAgencyCooperationListApi, getConsultingAgencyCooperationTypesApi, exportRecordOfCooperationExcelApi } from "@/api/internalCooperation";
 import { getAllAreaApi } from "@/api/common";
 import { getTreeSelectAreaList } from "@/utils";
+import { encodeStr } from "@/assets/js/common";
 export default {
   name: "consultingAgencyCooperation",
   mixins: [mixin],
@@ -50,6 +52,7 @@ export default {
   props: ['companyId'],
   data() {
     return {
+      encodeStr,
       queryParams: {
         advisoryBodyCid: this.companyId,
         pageNum: 1,

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

@@ -70,7 +70,7 @@
           <!--<div class="on" @click="isDXlogin = false">密码登录</div>-->
           <!--<div @click="isDXlogin = true">快捷登录</div>-->
         <!--</div>-->
-        <div class="loginname"><!--<img src="../assets/images/login/ztlogo.png">-->中建一局集团第二建筑有限公司</div>
+        <div class="loginname"><!--<img src="../assets/images/login/ztlogo.png">-->重庆大司空信息科技有限公司</div>
         <el-form-item prop="username" >
           <el-input
             v-model="loginForm.username"

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

@@ -206,7 +206,7 @@
         pldrVisible:false,
         queryParams:{
           pageNum:1,
-          pageSize:10,
+          pageSize:50,
           condition:{}
         },
         dataList:[],
@@ -229,7 +229,7 @@
     },
     methods: {
       async querySubmit() {
-        companyPage(this.queryParams).then(res => {
+        companyPage(this.queryParamsqueryParams).then(res => {
           this.isSkeleton = false;
           this.tableData=res.rows
           this.tableDataTotal=res.total
@@ -272,7 +272,7 @@
       radioBtn(val){
         let endTime = new Date()
         this.queryParams.pageNum=1
-        this.queryParams.pageSize=10
+        this.queryParams.pageSize=50
         switch (val) {
           case 1:
             this.queryParams.condition.beginTime=this.formatDate(endTime)

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

@@ -8,7 +8,7 @@
             <el-button slot="append" @click="handleKeyword()">搜索</el-button>
           </el-input>
         </div>
-        <div class="search-item">
+        <div class="search-item" style="margin-bottom: 25px">
           <div class="label">更新时间</div>
           <div class="checkbox">
             <el-radio-group v-model="radio">
@@ -28,24 +28,38 @@
             </el-date-picker>
           </div>
         </div>
-        <div class="search-item" style="line-height: 32px;">
-          <div class="label">监控类型</div>
+        <div class="search-item">
+          <div class="label">司法风险</div>
           <div class="main-right">
             <div class="select-popper">
-              <span :class="{ color_text: sffx.length }">司法风险{{sffx.length > 0 ? sffx.length:''}}<i class="el-icon-caret-bottom"></i></span>
-              <el-select ref="tenderTypeSelect" v-model="sffx" class="select-multiple" collapse-tags multiple placeholder="请选择">
-                <el-option v-for="(i,index) in selectList" :key="index" :label="i.dimensionName" :value="i.dimensionName">
-                  <el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeSffx(i)">{{i.dimensionName}}</el-checkbox>
-                </el-option>
-              </el-select>
+              <!--<span :class="{ color_text: sffx.length }">司法风险{{sffx.length > 0 ? sffx.length:''}}<i class="el-icon-caret-bottom"></i></span>-->
+
+              <el-checkbox-group v-model="sffx">
+                <el-checkbox label="不限" @change="changeSffx('不限')">不限</el-checkbox>
+                <el-checkbox v-for="(i,index) in selectList" :key="index" :label="i.dimensionName" @change="changeSffx(i)">{{i.dimensionName}}</el-checkbox>
+              </el-checkbox-group>
+              <!--<el-select ref="tenderTypeSelect" v-model="sffx" class="select-multiple" collapse-tags multiple placeholder="请选择">-->
+                <!--<el-option v-for="(i,index) in selectList" :key="index" :label="i.dimensionName" :value="i.dimensionName">-->
+                  <!--<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeSffx(i)">{{i.dimensionName}}</el-checkbox>-->
+                <!--</el-option>-->
+              <!--</el-select>-->
             </div>
+          </div>
+        </div>
+        <div class="search-item">
+          <div class="label">工商风险</div>
+          <div class="main-right">
             <div class="select-popper">
-              <span :class="{ color_text: gsfx.length }">工商风险{{gsfx.length > 0 ? gsfx.length:''}}<i class="el-icon-caret-bottom"></i></span>
-              <el-select ref="tenderTypeSelect" v-model="gsfx" class="select-multiple" collapse-tags multiple placeholder="请选择">
-                <el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" :value="i.dimensionName">
-                  <el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>
-                </el-option>
-              </el-select>
+              <el-checkbox-group v-model="gsfx">
+                <el-checkbox label="不限" @change="changeGsfx('不限')">不限</el-checkbox>
+                <el-checkbox v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>
+              </el-checkbox-group>
+              <!--<span :class="{ color_text: gsfx.length }">工商风险{{gsfx.length > 0 ? gsfx.length:''}}<i class="el-icon-caret-bottom"></i></span>-->
+              <!--<el-select ref="tenderTypeSelect" v-model="gsfx" class="select-multiple" collapse-tags multiple placeholder="请选择">-->
+                <!--<el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" :value="i.dimensionName">-->
+                  <!--<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>-->
+                <!--</el-option>-->
+              <!--</el-select>-->
             </div>
           </div>
         </div>
@@ -97,7 +111,9 @@
                 width="150"
               >
                 <template slot-scope="scope">
-                  <span style="cursor: pointer;color:#0081FF;" @click="handleDetail(scope.row)">查看详情</span>
+                  <!---->
+                  <span v-if="scope.row.hasdetail" style="cursor: pointer;color:#0081FF;" @click="handleDetail(scope.row)">查看详情</span>
+                  <span v-else="scope.row.hasdetail" @click="handleDetail(scope.row)">查看详情</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -344,19 +360,27 @@
         }else {
           delete params.condition.riskLevel
         }
-        if(this.sffx.length > 0 && this.gsfx.length > 0){
+        let sffx = this.sffx
+        if(sffx.indexOf('不限')>-1){
+          sffx = []
+        }
+        let gsfx = this.gsfx
+        if(gsfx.indexOf('不限')>-1){
+          gsfx = []
+        }
+        if(sffx.length > 0 && gsfx.length > 0){
           params.condition.riskType='司法风险,工商风险'
           params.condition.dimension=this.sffx.concat(this.gsfx)
         }
-        if(this.sffx.length > 0 && this.gsfx.length === 0){
+        if(sffx.length > 0 && gsfx.length === 0){
           params.condition.riskType='司法风险'
           params.condition.dimension=this.sffx
         }
-        if(this.sffx.length === 0 && this.gsfx.length > 0){
+        if(sffx.length === 0 && gsfx.length > 0){
           params.condition.riskType='工商风险'
           params.condition.dimension=this.gsfx
         }
-        if(this.sffx.length === 0 && this.gsfx.length === 0){
+        if(sffx.length === 0 && gsfx.length === 0){
           delete params.condition.riskType
           delete params.condition.dimension
         }
@@ -375,6 +399,14 @@
             for(let [i,j] of arr){
               el.Array.push({key:i,value:j})
             }
+
+            let types = ['新增开庭公告','新增法院公告','新增裁判文书','新增经营异常','新增失信被执行人','新增股权冻结']
+            if(types.indexOf(el.dimensionName)>-1){
+              el.hasdetail = true
+            }else{
+              el.hasdetail = false
+            }
+
           })
         })
       },
@@ -386,21 +418,31 @@
         })
       },
       changeSffx(val) {
-        if (this.sffx.indexOf(val.dimensionName) == -1) {
-          this.sffx.push(val.dimensionName)
-        } else {
-          this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
-        }
+        if(val == '不限')
+          this.sffx = ['不限']
+        else if(this.sffx.indexOf('不限')>-1){
+          this.sffx.splice(this.sffx.indexOf('不限'),1)
+        }
+        // if (this.sffx.indexOf(val.dimensionName) == -1) {
+        //   this.sffx.push(val.dimensionName)
+        // } else {
+        //   this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
+        // }
         this.queryParams.pageNum=1
         this.queryParams.pageSize=10
         this.querySubmit()
       },
       changeGsfx(val) {
-        if (this.gsfx.indexOf(val.dimensionName) == -1) {
-          this.gsfx.push(val.dimensionName)
-        } else {
-          this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
-        }
+        if(val == '不限')
+          this.gsfx = ['不限']
+        else if(this.gsfx.indexOf('不限')>-1){
+          this.gsfx.splice(this.gsfx.indexOf('不限'),1)
+        }
+        // if (this.gsfx.indexOf(val.dimensionName) == -1) {
+        //   this.gsfx.push(val.dimensionName)
+        // } else {
+        //   this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
+        // }
         this.queryParams.pageNum=1
         this.queryParams.pageSize=10
         this.querySubmit()

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

@@ -16,7 +16,7 @@
             <span class="val">{{object.registeredDate}}</span>
           </p>
         </div>
-        <div class="search-item">
+        <div class="search-item" style="margin-bottom: 25px">
           <div class="label">风险级别</div>
           <div class="main-right">
             <div class="checkbox">
@@ -29,24 +29,38 @@
             </div>
           </div>
         </div>
-        <div class="search-item" style="line-height: 32px;">
-          <div class="label">监控类型</div>
+        <div class="search-item">
+          <div class="label">司法风险</div>
           <div class="main-right">
             <div class="select-popper">
-              <span :class="{ color_text: sffx.length }">司法风险{{sffx.length > 0 ? sffx.length:''}}<i class="el-icon-caret-bottom"></i></span>
-              <el-select ref="tenderTypeSelect" v-model="sffx" class="select-multiple" collapse-tags multiple placeholder="请选择">
-                <el-option v-for="(i,index) in selectList" :key="index" :label="i.dimensionName" :value="i.dimensionName">
-                  <el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeSffx(i)">{{i.dimensionName}}</el-checkbox>
-                </el-option>
-              </el-select>
+              <!--<span :class="{ color_text: sffx.length }">司法风险{{sffx.length > 0 ? sffx.length:''}}<i class="el-icon-caret-bottom"></i></span>-->
+
+              <el-checkbox-group v-model="sffx">
+                <el-checkbox label="不限" @change="changeSffx('不限')">不限</el-checkbox>
+                <el-checkbox v-for="(i,index) in selectList" :key="index" :label="i.dimensionName" @change="changeSffx(i)">{{i.dimensionName}}</el-checkbox>
+              </el-checkbox-group>
+              <!--<el-select ref="tenderTypeSelect" v-model="sffx" class="select-multiple" collapse-tags multiple placeholder="请选择">-->
+              <!--<el-option v-for="(i,index) in selectList" :key="index" :label="i.dimensionName" :value="i.dimensionName">-->
+              <!--<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeSffx(i)">{{i.dimensionName}}</el-checkbox>-->
+              <!--</el-option>-->
+              <!--</el-select>-->
             </div>
+          </div>
+        </div>
+        <div class="search-item">
+          <div class="label">工商风险</div>
+          <div class="main-right">
             <div class="select-popper">
-              <span :class="{ color_text: gsfx.length }">工商风险{{gsfx.length > 0 ? gsfx.length:''}}<i class="el-icon-caret-bottom"></i></span>
-              <el-select ref="tenderTypeSelect" v-model="gsfx" class="select-multiple" collapse-tags multiple placeholder="请选择">
-                <el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" :value="i.dimensionName">
-                  <el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>
-                </el-option>
-              </el-select>
+              <el-checkbox-group v-model="gsfx">
+                <el-checkbox label="不限" @change="changeGsfx('不限')">不限</el-checkbox>
+                <el-checkbox v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>
+              </el-checkbox-group>
+              <!--<span :class="{ color_text: gsfx.length }">工商风险{{gsfx.length > 0 ? gsfx.length:''}}<i class="el-icon-caret-bottom"></i></span>-->
+              <!--<el-select ref="tenderTypeSelect" v-model="gsfx" class="select-multiple" collapse-tags multiple placeholder="请选择">-->
+              <!--<el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" :value="i.dimensionName">-->
+              <!--<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>-->
+              <!--</el-option>-->
+              <!--</el-select>-->
             </div>
           </div>
         </div>
@@ -322,21 +336,31 @@
     },
     methods: {
       changeSffx(val) {
-        if (this.sffx.indexOf(val.dimensionName) == -1) {
-          this.sffx.push(val.dimensionName)
-        } else {
-          this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
-        }
+        if(val == '不限')
+          this.sffx = ['不限']
+        else if(this.sffx.indexOf('不限')>-1){
+          this.sffx.splice(this.sffx.indexOf('不限'),1)
+        }
+        // if (this.sffx.indexOf(val.dimensionName) == -1) {
+        //   this.sffx.push(val.dimensionName)
+        // } else {
+        //   this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
+        // }
         this.queryParams.pageNum=1
         this.queryParams.pageSize=10
         this.querySubmit()
       },
       changeGsfx(val) {
-        if (this.gsfx.indexOf(val.dimensionName) == -1) {
-          this.gsfx.push(val.dimensionName)
-        } else {
-          this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
-        }
+        if(val == '不限')
+          this.gsfx = ['不限']
+        else if(this.gsfx.indexOf('不限')>-1){
+          this.gsfx.splice(this.gsfx.indexOf('不限'),1)
+        }
+        // if (this.gsfx.indexOf(val.dimensionName) == -1) {
+        //   this.gsfx.push(val.dimensionName)
+        // } else {
+        //   this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
+        // }
         this.queryParams.pageNum=1
         this.queryParams.pageSize=10
         this.querySubmit()
@@ -360,19 +384,27 @@
         }else {
           delete params.condition.riskLevel
         }
-        if(this.sffx.length > 0 && this.gsfx.length > 0){
+        let sffx = this.sffx
+        if(sffx.indexOf('不限')>-1){
+          sffx = []
+        }
+        let gsfx = this.gsfx
+        if(gsfx.indexOf('不限')>-1){
+          gsfx = []
+        }
+        if(sffx.length > 0 && gsfx.length > 0){
           params.condition.riskType='司法风险,工商风险'
           params.condition.dimension=this.sffx.concat(this.gsfx)
         }
-        if(this.sffx.length > 0 && this.gsfx.length === 0){
+        if(sffx.length > 0 && gsfx.length === 0){
           params.condition.riskType='司法风险'
           params.condition.dimension=this.sffx
         }
-        if(this.sffx.length === 0 && this.gsfx.length > 0){
+        if(sffx.length === 0 && gsfx.length > 0){
           params.condition.riskType='工商风险'
           params.condition.dimension=this.gsfx
         }
-        if(this.sffx.length === 0 && this.gsfx.length === 0){
+        if(sffx.length === 0 && gsfx.length === 0){
           delete params.condition.riskType
           delete params.condition.dimension
         }

dsk-operate-ui/src/views/projectCostLedger/detail/components/DirectCost/index.vue

@@ -158,7 +158,7 @@ export default {
       menuDetails:{},
       menuOptions: {
         nodeName: "menuName",
-        nodeValue: "menuId",
+        nodeValue: "menuName",
         children : "childrenList"
       },
       detailsId:'',

dsk-operate-ui/src/views/supplier/components/AptitudeStandard.vue

@@ -5,7 +5,7 @@
         </div>
         <div class="apt_stan_content">
             <div class="apt_stan_content_header">
-                <el-select v-model="value" value-key="id" @change="selectChange" placeholder="请选择">
+                <el-select v-model="value" value-key="id" @change="selectChange" placeholder="请选择" :style="{'width':selectwidth}">
                     <el-option
                     v-for="item in list[activeIndex].list"
                     :key="item.id"
@@ -13,7 +13,7 @@
                     :value="item">
                     </el-option>
                 </el-select>
-                <el-select v-model="value1" value-key="id" @change="selectChange1" v-if="options1&&options1.length>0" placeholder="请选择">
+                <el-select v-model="value1" value-key="id" @change="selectChange1" v-if="options1&&options1.length>0" placeholder="请选择" :style="{'width':selectwidth1}">
                     <el-option
                     v-for="item in options1"
                     :key="item.name"
@@ -21,7 +21,7 @@
                     :value="item">
                     </el-option>
                 </el-select>
-                <el-select v-model="value2" value-key="id" @change="selectChange2" v-if="options2&&options2.length>0" placeholder="请选择">
+                <el-select v-model="value2" value-key="id" @change="selectChange2" v-if="options2&&options2.length>0" placeholder="请选择" :style="{'width':selectwidth2}">
                     <el-option
                     v-for="item in options2"
                     :key="item.name"
@@ -29,7 +29,7 @@
                     :value="item">
                     </el-option>
                 </el-select>
-                <el-select v-model="value3" value-key="id" @change="selectChange3" v-if="options3&&options3.length>0" placeholder="请选择">
+                <el-select v-model="value3" value-key="id" @change="selectChange3" v-if="options3&&options3.length>0" placeholder="请选择" :style="{'width':selectwidth3}">
                     <el-option
                     v-for="item in options3"
                     :key="item.name"
@@ -41,13 +41,13 @@
             <div style="padding:16px;">
                 <el-table :data="info.list" :span-method="objectSpanMethod" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
                 class="table-item1 fixed-table" border highlight-current-row>
-                
+
                     <el-table-column :resizable="false" label="资质名称" fixed >
                         <template slot-scope="scope">
                             {{scope.row.name}}
                         </template>
                     </el-table-column>
-                    
+
                     <el-table-column :resizable="false" label="等级" width="274">
                         <template slot-scope="scope">
                             {{scope.row.level||"--"}}
@@ -68,10 +68,10 @@
 </template>
 
 <script>
-import list from "@/assets/json/certs.json"
-import {standard} from '@/api/supplier/assistant.js';
+  import list from '@/assets/json/certs.json'
+  import { standard } from '@/api/supplier/assistant.js'
 
-export default {
+  export default {
     data(){
         return{
             list,
@@ -84,128 +84,143 @@ export default {
             value2: '',
             value3: '',
             info:"",
+          selectwidth:'120px',
+          selectwidth1:'120px',
+          selectwidth2:'120px',
+          selectwidth3:'120px',
         }
     },
     mounted(){
         this.choose()
     },
     methods:{
-        choose(){
-            this.value = this.list[this.activeIndex].list[0];
-            this.options1 = this.list[this.activeIndex].list[0].list
-            if(this.options1){
-                this.value1 = this.list[this.activeIndex].list[0].list[0];
-                this.options2 = this.list[this.activeIndex].list[0].list[0].list
-                if(this.options2){
-                    this.value2 = this.list[this.activeIndex].list[0].list[0].list[0];
-                    this.options3 = this.list[this.activeIndex].list[0].list[0].list[0].list
-                    if(this.options3){
-                        this.value3 = this.list[this.activeIndex].list[0].list[0].list[0].list[0];
-                        standard({id:this.value3.id}).then(res=>{
-                            this.info = res.data
-                        })
-                    }else{
-                        standard({id:this.value2.id}).then(res=>{
-                            this.info = res.data
-                        })
-                    }
-                }else{
-                    standard({id:this.value1.id}).then(res=>{
-                        this.info = res.data
-                    })
-                }
-            }else{
-                standard({id:this.value.id}).then(res=>{
-                    this.info = res.data
-                })
+      choose() {
+        this.value = this.list[this.activeIndex].list[0]
+        this.selectwidth = this.value.name.length * 14 + 50 + 'px'
+        this.options1 = this.list[this.activeIndex].list[0].list
+        if (this.options1) {
+          this.value1 = this.list[this.activeIndex].list[0].list[0]
+          this.options2 = this.list[this.activeIndex].list[0].list[0].list
+          if (this.options2) {
+            this.value2 = this.list[this.activeIndex].list[0].list[0].list[0]
+            this.options3 = this.list[this.activeIndex].list[0].list[0].list[0].list
+            if (this.options3) {
+              this.value3 = this.list[this.activeIndex].list[0].list[0].list[0].list[0]
+              standard({ id: this.value3.id }).then(res => {
+                this.info = res.data
+              })
+            } else {
+              standard({ id: this.value2.id }).then(res => {
+                this.info = res.data
+              })
             }
-        },
-        flitterData(arr) {
-        let spanOneArr = [];
-        let concatOne = 0;
+          } else {
+            standard({ id: this.value1.id }).then(res => {
+              this.info = res.data
+            })
+          }
+        } else {
+          standard({ id: this.value.id }).then(res => {
+            this.info = res.data
+          })
+        }
+      },
+      flitterData(arr) {
+        let spanOneArr = []
+        let concatOne = 0
         arr.forEach((item, index) => {
-            if (index === 0) {
-            spanOneArr.push(1);
-            } else {
+          if (index === 0) {
+            spanOneArr.push(1)
+          } else {
             if (item.name === arr[index - 1].name) {
-                spanOneArr[concatOne] += 1;
-                spanOneArr.push(0);
+              spanOneArr[concatOne] += 1
+              spanOneArr.push(0)
             } else {
-                spanOneArr.push(1);
-                concatOne = index;
+              spanOneArr.push(1)
+              concatOne = index
             }
-            }
-        });
+          }
+        })
         return {
-            one: spanOneArr,
-        };
-        },
-        objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+          one: spanOneArr
+        }
+      },
+      objectSpanMethod({ row, column, rowIndex, columnIndex }) {
         if (columnIndex === 0) {
-            const _row = this.flitterData(this.info.list).one[rowIndex];
-            const _col = _row > 0 ? 1 : 0;
-            return {
+          const _row = this.flitterData(this.info.list).one[rowIndex]
+          const _col = _row > 0 ? 1 : 0
+          return {
             rowspan: _row,
-            colspan: _col,
-            };
+            colspan: _col
+          }
         }
-        },
-        selectChange(){
-            if(this.value.list&&this.value.list.length>0){
-                this.options1 = this.value.list;
-                this.value1 = ""
-            }else{
-                this.options1 = []
-                    standard({id:this.value.id}).then(res=>{
-                        this.info = res.data
-                    })
-            }
-            this.value2 = "";
-            this.options2 = []
-        },
-        selectChange1(){
-            this.info = "";
-            if(this.value1.list&&this.value1.list.length>0){
-                this.options2 = this.value1.list;
-                this.value2 = ""
-            }else{
-                this.options2 = []
-                standard({id:this.value1.id}).then(res=>{
-                    this.info = res.data
-                })
-            }
-        },
-        selectChange2(){
-            this.info = "";
-            if(this.value2.list&&this.value2.list.length>0){
-                this.options3 = this.value2.list;
-                this.value3 = ""
-            }else{
-                this.options3 = []
-                standard({id:this.value2.id}).then(res=>{
-                    this.info = res.data
-                })
-            }
-        },
-        selectChange3(){
-            this.info = "";
-            standard({id:this.value3.id}).then(res=>{
-                this.info = res.data
-            })
-        },
-        changeActiveIndex(index){
-            this.info = "";
-            this.activeIndex=index;
-            this.value = '';
-            this.options1 = [];
-            this.value2 = "";
-            this.options2 = [];
-            this.value3 = "";
-            this.options3 = [];
-            this.choose()
-        },
+      },
+      selectChange() {
+        this.selectwidth = this.value.name.length * 14 + 50 + 'px'
+        if (this.value.list && this.value.list.length > 0) {
+          this.options1 = this.value.list
+          this.value1 = ''
+        } else {
+          this.options1 = []
+          standard({ id: this.value.id }).then(res => {
+            this.info = res.data
+          })
+        }
+        this.value2 = ''
+        this.options2 = []
+        this.selectwidth1 = '120px'
+        this.selectwidth2 = '120px'
+        this.selectwidth3 = '120px'
+      },
+      selectChange1() {
+        this.info = ''
+        this.selectwidth1 = this.value1.name.length * 14 + 50 + 'px'
+        if (this.value1.list && this.value1.list.length > 0) {
+          this.options2 = this.value1.list
+          this.value2 = ''
+        } else {
+          this.options2 = []
+          standard({ id: this.value1.id }).then(res => {
+            this.info = res.data
+          })
+        }
+        this.selectwidth2 = '120px'
+        this.selectwidth3 = '120px'
+      },
+      selectChange2() {
+        this.info = ''
+        this.selectwidth2 = this.value2.name.length * 14 + 50 + 'px'
+        if (this.value2.list && this.value2.list.length > 0) {
+          this.options3 = this.value2.list
+          this.value3 = ''
+        } else {
+          this.options3 = []
+          standard({ id: this.value2.id }).then(res => {
+            this.info = res.data
+          })
+        }
+        this.selectwidth3 = '120px'
+      },
+      selectChange3() {
+        this.info = ''
+        this.selectwidth3 = this.value3.name.length * 14 + 50 + 'px'
+        standard({ id: this.value3.id }).then(res => {
+          this.info = res.data
+        })
+      },
+      changeActiveIndex(index) {
+        this.info = ''
+        this.activeIndex = index
+        this.value = ''
+        this.options1 = []
+        this.value2 = ''
+        this.options2 = []
+        this.value3 = ''
+        this.options3 = []
+        this.choose()
+      }
     }
-}
+  }
 </script>
 
 <style lang="scss" scoped>
@@ -253,4 +268,4 @@ export default {
             margin-top: 16px;
         }
     }
-</style>
\ No newline at end of file
+</style>

dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue

@@ -68,9 +68,9 @@
                 <div class="item-jf-titel">抱歉，没找到相关数据！</div>
                 <div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
             </div>
+          <div style="padding: 0 16px;" v-if="isSkeleton"><skeleton></skeleton></div>
             <template v-if="!isSkeleton&&tableData.length>0">
                 <div v-for="(item,index) in tableData" :key="index" style="padding-bottom: 16px;">
-                    <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
                     <div class=" table-item-jf table-item " >
                         <div class="title_box">
                             <img :src="item.logoUrl?item.logoUrl:require('@/assets/images/enterprise.png')" >
@@ -257,7 +257,7 @@ export default {
             pageSize1: 5,
             dataEXCEL:{},
             pageFlag:true,
-            isSkeleton: false,
+            isSkeleton: true,
             exportData:{
                 title:'查城投平台',
                 dialogExportVisible:false,
@@ -321,6 +321,7 @@ export default {
             }
         },
         search(pageNum){
+          this.isSkeleton = true
             if(pageNum){
                 this.pageNum = pageNum
             }
@@ -349,6 +350,7 @@ export default {
             this.params = params
             params.keyword = this.keyword
             zjyjAptitude(params).then(res=>{
+              this.isSkeleton=false
                 if(res.code==200){
                     this.tableData = res.data.list
                     this.total = res.data.total

dsk-operate-ui/src/views/supplier/components/SearchResult.vue

 <template>
     <div class="search_result_box">
-        <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
+      <skeleton v-if="isSkeleton"></skeleton>
+        <el-table :data="tableData" v-if="total>0" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" v-horizontal-scroll="'hover'"
                 class="table-item1" border highlight-current-row>
                 <el-table-column :resizable="false" type="index" label="序号" fixed width="60">
                 <template slot-scope="scope">
@@ -35,14 +41,17 @@
 
 <script>
 import {list} from '@/api/supplier/assistant.js';
+import skeleton from '@/views/project/projectList/component/skeleton';
 
 export default {
+  components:{skeleton},
     data(){
         return{
             tableData:[],
             total: 0,
             pageNum: 1,
             pageSize:10,
+          isSkeleton:true,
         }
     },
     created(){
@@ -54,11 +63,13 @@ export default {
             this.getList()
         },
         getList(){
+          this.isSkeleton = true
             let params = {
                 pageNum:this.pageNum,
                 pageSize:this.pageSize,
             }
             list(params).then(res=>{
+              this.isSkeleton = false
                 if(res.code==200){
                     this.tableData = res.rows
                     this.total = res.total

dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue

@@ -9,6 +9,7 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="100px" label-position="right"  :inline="true" >
           <el-row>
+            <el-col :span="8">
             <el-form-item label="解除限用时间">
               <el-date-picker
                 v-model="formdata.time"
@@ -19,12 +20,14 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
-            <el-form-item label="申请单位">
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="申请单位" class="i" label-width="80px">
               <el-select v-model="formdata.user" placeholder="请选择">
-                <el-option label="区域一" value="shanghai"></el-option>
-                <el-option label="区域二" value="beijing"></el-option>
+                <el-option label="二公司" value="shanghai"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-form-item label="  ">
             <el-button type="primary" size="small" @click="searchList">查询</el-button>
@@ -82,7 +85,7 @@
           </el-table-column>
           <el-table-column label="解除限用理由" min-width="280" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.frelievereason||"--"}}
+              <div class="wrap2">{{scope.row.frelievereason||"--"}}</div>
             </template>
           </el-table-column>
           <el-table-column label="申请单位" min-width="120" :resizable="false">
@@ -95,12 +98,12 @@
               {{scope.row.fbeforestate||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="限用日期" min-width="150" :resizable="false">
+          <el-table-column label="限用日期" min-width="180" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.flimitdate||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="解除限用/禁用日期" min-width="150" :resizable="false">
+          <el-table-column label="解除限用/禁用日期" min-width="180" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.fts||"--"}}
             </template>
@@ -217,7 +220,17 @@
   }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
+  ::v-deep .content-supplier {
+    .el-form-item__content {
+      width: calc(100% - 110px);
+    }
 
+    .i{
+      .el-form-item__content{
+        width: calc(100% - 95px);
+      }
+    }
+  }
 </style>
 

dsk-operate-ui/src/views/supplier/disableManagement/disableList.vue

@@ -7,18 +7,23 @@
         <!--</div>-->
       <!--</div>-->
       <div class="content-supplier">
-        <el-form :model="formdata" label-width="155px" label-position="right"  :inline="true" >
+        <el-form :model="formdata" label-width="160px" label-position="right"  :inline="true" >
           <el-row>
-            <el-form-item label="供应商名称">
+            <el-col :span="8">
+            <el-form-item label="供应商名称" label-width="90px" class="i">
               <el-input v-model="formdata.supplierName" placeholder="请输入供应商名称" clearable></el-input>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="是否为局名义被诉案件">
               <el-select v-model="formdata.isGroupCase" placeholder="请选择" clearable>
                 <el-option label="是" value="是"></el-option>
                 <el-option label="否" value="否"></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="限用/禁用时间">
+            </el-col>
+            <el-col :span="8">
+            <el-form-item label="限用/禁用时间" label-width="115px" class="j">
               <el-date-picker
                 v-model="formdata.times" clearable
                 type="daterange"
@@ -28,8 +33,9 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
+            </el-col>
           </el-row>
-          <el-form-item label="  ">
+          <el-form-item label="  " label-width="90px" >
             <el-button type="primary" size="small" @click="searchList">查询</el-button>
             <el-button size="small" @click="clears">重置</el-button>
           </el-form-item>
@@ -85,7 +91,7 @@
           </el-table-column>
           <el-table-column label="限用情形" min-width="280" :resizable="false">
             <template slot-scope="scope">
-              {{scope.row.flimitsituation||"--"}}
+              <div class="wrap2">{{scope.row.flimitsituation||"--"}}</div>
             </template>
           </el-table-column>
           <el-table-column label="禁用情景" min-width="280" :resizable="false">
@@ -222,6 +228,20 @@
   }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+ ::v-deep .content-supplier {
+   .el-form-item__content {
+     width: calc(100% - 170px);
+   }
+   .i{
+     .el-form-item__content{
+       width: calc(100% - 105px);
+     }
+   }
+   .j{
+     .el-form-item__content{
+       width: calc(100% - 120px);
+     }
+   }
+ }
 </style>

dsk-operate-ui/src/views/supplier/supplierlist/assessment.vue

@@ -78,8 +78,8 @@
       return{
         encodeStr,
         tableData:[
-          {name1:'2021年度',name2:'中建一局集团第二建筑有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-'},
-          {name1:'2021年度',name2:'中建一局集团第二建筑有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-'},
+          {name1:'2021年度',name2:'重庆大司空信息科技有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-'},
+          {name1:'2021年度',name2:'重庆大司空信息科技有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-'},
         ],
         isSkeleton:false,
         total:2,

dsk-operate-ui/src/views/supplier/supplierlist/disposal.vue

@@ -103,8 +103,8 @@
       return{
         encodeStr,
         tableData:[
-          {name1:'河南水投分布式光伏项目（一期）工程EPC总承包',name2:'中建一局集团第二建筑有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'2023年11月25日',name5:'2023',name6:'-',name7:'涉诉禁用',name8:'A',name9:'B',name10:'-',name11:'-'},
-          {name1:'河南水投分布式光伏项目（一期）工程EPC总承包',name2:'中建一局集团第二建筑有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-',name7:'-',name8:'-',name9:'-',name10:'-',name11:'-'}
+          {name1:'河南水投分布式光伏项目（一期）工程EPC总承包',name2:'重庆大司空信息科技有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'2023年11月25日',name5:'2023',name6:'-',name7:'涉诉禁用',name8:'A',name9:'B',name10:'-',name11:'-'},
+          {name1:'河南水投分布式光伏项目（一期）工程EPC总承包',name2:'重庆大司空信息科技有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-',name7:'-',name8:'-',name9:'-',name10:'-',name11:'-'}
         ],
         isSkeleton:false,
         total:2,

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue

@@ -9,50 +9,67 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
+            <el-col :span="8">
             <el-form-item label="分供方名称">
               <el-input v-model="formdata.customerName" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.areas"
                 :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="供应商状态">
               <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="资质等级">
               <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="专业类别">
               <el-cascader clearable
                            v-model="formdata.groupSpecialtys"
                            :options="groupSpecialty" :collapse-tags="true"
                            :props="groupprops"></el-cascader>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="评价等级">
               <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="纳税人身份">
               <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="纳税人税率">
               <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="准入时间">
               <el-date-picker
                 v-model="formdata.times"
@@ -63,6 +80,7 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
@@ -168,7 +186,7 @@
               {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="纳税人税率" min-width="120" :resizable="false">
+          <el-table-column label="纳税人税率(%)" min-width="120" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.taxRate||"--"}}
             </template>

dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue

@@ -9,55 +9,74 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
+            <el-col :span="8">
             <el-form-item label="供应商名称">
               <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="劳务队长">
               <el-input v-model="formdata.leaderName" placeholder="请输入劳务队长"></el-input>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.areas"
                 :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="供应商状态">
               <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="资质等级">
               <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="专业类别">
               <el-cascader clearable
                            v-model="formdata.groupSpecialtys"
                            :options="groupSpecialty" :collapse-tags="true"
                            :props="groupprops"></el-cascader>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="评价等级">
               <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="纳税人身份">
               <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="纳税人税率">
               <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="准入时间">
               <el-date-picker
                 v-model="formdata.times"
@@ -68,6 +87,7 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
@@ -180,7 +200,7 @@
               {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="纳税人税率" min-width="120" :resizable="false">
+          <el-table-column label="纳税人税率(%)" min-width="120" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.taxRate||"--"}}
             </template>

dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue

@@ -9,40 +9,55 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
+            <el-col :span="8">
             <el-form-item label="分供方名称">
               <el-input v-model="formdata.customerName" placeholder="请输入分供方名称" clearable></el-input>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="注册城市">
-              <el-cascader
+              <el-cascader style="width: 100%"
                 v-model="formdata.areas"
                 :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+            </el-col>
+              <el-col :span="8">
             <el-form-item label="供应商类别">
               <el-select v-model="formdata.customerClass" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in suppliertype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+              </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="供应商状态">
               <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+
+            <el-col :span="8">
             <el-form-item label="评价等级">
               <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="资质等级">
               <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-row>
+
+            <el-col :span="8">
             <el-form-item label="准入时间">
               <el-date-picker
                 v-model="formdata.times"
@@ -53,11 +68,14 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="涉诉状态">
               <el-select multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in litigationstatus" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
@@ -96,7 +114,7 @@
           <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
           </el-table-column>
 
-          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="305" :resizable="false">
+          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
             <template slot-scope="scope">
               <div style="display:flex;align-items:center">
                 <el-tooltip placement="top" v-if="scope.row.customerText.length>20">
@@ -161,7 +179,7 @@
               {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="纳税人税率" min-width="120" :resizable="false">
+          <el-table-column label="纳税人税率(%)" min-width="120" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.taxRate||"--"}}
             </template>

dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue

@@ -9,50 +9,67 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
+            <el-col :span="8">
             <el-form-item label="分供方名称">
               <el-input v-model="formdata.customerName" placeholder="请输入分供方名称"></el-input>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.areas"
                 :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="供应商状态">
               <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="资质等级">
               <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="专业类别">
               <el-cascader clearable
                 v-model="formdata.groupSpecialtys"
                 :options="groupSpecialty" :collapse-tags="true"
                 :props="groupprops"></el-cascader>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="评价等级">
               <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="纳税人身份">
               <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="纳税人税率">
               <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="准入时间">
               <el-date-picker
                 v-model="formdata.times"
@@ -63,6 +80,7 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
@@ -162,7 +180,7 @@
               {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="纳税人税率" min-width="120" :resizable="false">
+          <el-table-column label="纳税人税率(%)" min-width="120" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.taxRate||"--"}}
             </template>
@@ -441,6 +459,7 @@
           this.total = res.total
           this.tableData.forEach(item=>{
             item.customerText = item.customerName.replace(/<\/?[^>]+(style=('|")[^'"]*)?>/gi, '')
+            item.constructJobScope = item.constructJobScope == "无"?"--":item.constructJobScope
           })
         })
       },

dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue

@@ -9,50 +9,67 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
+            <el-col :span="8">
             <el-form-item label="供应商名称">
               <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.areas"
                 :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="供应商状态">
               <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="资质等级">
               <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="物资类别">
               <el-cascader clearable
                            v-model="formdata.groupSpecialtys"
                            :options="groupSpecialty" :collapse-tags="true"
                            :props="groupprops"></el-cascader>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="评价等级">
               <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="纳税人身份">
               <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="纳税人税率">
               <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="准入时间">
               <el-date-picker
                 v-model="formdata.times"
@@ -63,6 +80,7 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
@@ -164,7 +182,7 @@
               {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="纳税人税率" min-width="120" :resizable="false">
+          <el-table-column label="纳税人税率(%)" min-width="120" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.taxRate||"--"}}
             </template>

dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue

@@ -9,50 +9,67 @@
       <div class="content-supplier">
         <el-form :model="formdata" label-width="82px" label-position="right"  :inline="true" >
           <el-row>
+            <el-col :span="8">
             <el-form-item label="供应商名称">
               <el-input v-model="formdata.customerName" placeholder="请输入供应商名称"></el-input>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="注册城市">
               <el-cascader
                 v-model="formdata.areas"
                 :options="addressList" :collapse-tags="true" :show-all-levels="false" clearable
                 :props="provienceprops"></el-cascader>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="供应商状态">
               <el-select v-model="formdata.customerState" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in customstate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="资质等级">
               <el-select v-model="formdata.credential" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in credential" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="物资类别">
               <el-cascader clearable
                            v-model="formdata.groupSpecialtys"
                            :options="groupSpecialty" :collapse-tags="true"
                            :props="groupprops"></el-cascader>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="评价等级">
               <el-select v-model="formdata.creditLevel" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in creditlevel" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
+            <el-col :span="8">
             <el-form-item label="纳税人身份">
               <el-select v-model="formdata.paytaxType" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in paytaxtype" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="纳税人税率">
               <el-select v-model="formdata.taxRate" multiple placeholder="请选择" :collapse-tags="true" clearable>
                 <el-option v-for="(item,index) in taxrate" :label="item.dictLabel" :value="item.dictValue" :key="index"></el-option>
               </el-select>
             </el-form-item>
+            </el-col>
+            <el-col :span="8">
             <el-form-item label="准入时间">
               <el-date-picker
                 v-model="formdata.times"
@@ -63,6 +80,7 @@
                 end-placeholder="年/月/日">
               </el-date-picker>
             </el-form-item>
+            </el-col>
           </el-row>
           <el-divider></el-divider>
           <el-form-item label="  ">
@@ -156,7 +174,7 @@
               {{scope.row.paytaxType||"--"}}
             </template>
           </el-table-column>
-          <el-table-column label="纳税人税率" min-width="120" :resizable="false">
+          <el-table-column label="纳税人税率(%)" min-width="120" :resizable="false">
             <template slot-scope="scope">
               {{scope.row.taxRate||"--"}}
             </template>