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-中建一局二公司 # Conflicts: # dsk-operate-ui/vue.config.js

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-中建一局二公司 # Conflicts: # dsk-operate-ui/vue.config.js
c0d97a8c · danfuman · af1eeefb · b957c2cb · c0d97a8c · c0d97a8c
Commit c0d97a8c authored Mar 20, 2024 by danfuman
28 changed files
--- a/dsk-operate-ui/src/utils/decimal.js
+++ b/dsk-operate-ui/src/utils/decimal.js
@@ -59,3 +59,10 @@ export const divide = (num1, num2, digit = 9, omit = false) => {
  const result = decimal1.dividedBy(decimal2);
  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toString();
 };
+// 检测结果是否是负数
+export const targetIsNegative = (num) => {
+  const flag = (!parseFloat(num) && parseFloat(num) != "0");
+  if (flag) throw new Error("传入参数错误，参数不为number");
+  return new Decimal(num).isNegative();
+};
--- a/dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
@@ -8,7 +8,7 @@
      </el-input>
    </div>
-    <el-menu ref="sideMenu" :unique-opened="true" :default-active="searchIndex" class="detail-menu" @open="handleOpen">
+    <el-menu ref="sideMenu" :unique-opened="false" :default-active="searchIndex" class="detail-menu" @open="handleOpen">
      <template v-for="(item, index) in sideRoute">
        <!-- 一级菜单 -->
@@ -170,6 +170,7 @@ export default {
            {
              title: '供应商合作记录', pathName: '', children: [
                { title: '准入情况', pathName: 'accessCondition' },
+                { title: '供应商考评', pathName: 'assessMent' },
                { title: '施工业绩', pathName: 'constructionPerformance' },
                { title: '在施工程情况', pathName: 'constructionSituation' },
                { title: '合作记录', pathName: 'cooperationRecord' },
@@ -306,6 +307,26 @@ export default {
      const _temp = this.sideAddUid(JSON.parse(JSON.stringify(this.sideRoute)));
      this.sideRoute = _temp;
      this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute));
+      this.$nextTick(()=>{
+        function getindex(data,result=[]) {
+          if (data.length) {
+            for (const item of data) {
+              // 确保打开菜单为目录
+              if (item.children && !item.pathName) {
+                result.push(item.index);
+                getindex(item.children, result);
+              }
+            }
+          }
+          return result
+        }
+        const arrlist = getindex(_temp)
+        if(this.$refs.sideMenu){
+        arrlist.forEach(item=>{
+          this.$refs.sideMenu.open(item)
+        })
+        }
+      })
      // this.searchIndex = this.findNodeIndex(this.defaultRoute, "overview").index;
    },
    // 查找菜单中的元素

--- a/dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/consultingTransaction/cooperativeOwnerUnits.vue
@@ -127,7 +127,7 @@ export default {
        { 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' },
+        { label: '数据来源', prop: 'dataSource', width: '90',showOverflowTooltip: true  },
      ],
      dialogFormData: [
        { type: 4, fieldName: 'businessTypes', value: '', placeholder: '咨询机构业务', options: [], uid: this.getUid() },

--- a/dsk-operate-ui/src/views/detail/party-a/index.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/index.vue
@@ -66,6 +66,8 @@
              :company-id="companyId"></consulting-agency-cooperation>
            <!-- 2、准入情况 -->
            <access-condition v-if="currentPath.pathName=='accessCondition'" :company-id="companyId" :companyInfo="companyInfo"></access-condition>
+            <!-- 2、供应商考评 -->
+            <assessMent class="no-padding" v-if="currentPath.pathName=='assessMent'" :company-id="companyId" :companyInfo="companyInfo"></assessMent>
            <!-- 3、供应商合作记录 -->
            <cooperation-record v-if="currentPath.pathName=='cooperationRecord'" :company-id="companyId"
              :company-name="companyName" :ctm-id="ctmId"></cooperation-record>
@@ -145,6 +147,7 @@ import DecisionMaking from "./decisionMaking"; //决策链条
 import Gjjl from "../../project/projectList/component/gjjl"; //跟进记录
 import ConsultingAgencyCooperation from "@/views/detail/party-a/internalCooperation/consultingAgencyCooperation"; //内部合作 咨询机构合作
 import AccessCondition from "@/views/detail/party-a/internalCooperation/accessCondition"; //内部合作 准入情况
+import assessMent from "@/views/supplier/supplierlist/assessment"; //供应商考评
 import CooperationRecord from "@/views/detail/party-a/internalCooperation/cooperationRecord"; //内部合作 供应商合作记录
 import ConstructionPerformance from "@/views/detail/party-a/internalCooperation/constructionPerformance"; //内部合作 施工业绩
 import ConstructionSituation from "@/views/detail/party-a/internalCooperation/constructionSituation"; //内部合作 在施工程情况
@@ -198,6 +201,7 @@ export default {
    CooperativeOwnerUnits,
    ConsultingAgencyCooperation,
    AccessCondition,
+    assessMent,
    CooperationRecord,
    CooperativeConstructionUnit,
    CooperativeGroup,

--- a/dsk-operate-ui/src/views/detail/party-a/internalCooperation/constructionPerformance.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/internalCooperation/constructionPerformance.vue
@@ -28,46 +28,40 @@ export default {
        pageSize: 10,
      },
      forData: [
-        { label: '标志性工程', prop: 'bzxgc', width: '245', showOverflowTooltip: true },
+        { label: '标志性工程', prop: 'name1', width: '245', showOverflowTooltip: true },
-        { label: '年度', prop: 'nd', width: '122' },
+        { label: '年度', prop: 'name2', width: '122' },
-        { label: '所在区域', prop: 'szqy', width: '101' },
+        { label: '所在区域', prop: 'name3', width: '101' },
-        { label: '所属省份', prop: 'sssf', width: '101' },
+        { label: '所属省份', prop: 'name4', width: '101' },
-        { label: '施工面积（㎡）', prop: 'sgmj', width: '109' },
+        { label: '施工面积（㎡）', prop: 'name5', width: '109' },
-        { label: '年施工产值（亿）', prop: 'nsgcz', width: '121' },
+        { label: '年施工产值（亿）', prop: 'name6', width: '121' },
-        { label: '所获荣誉', prop: 'shry', width: '73' },
+        { label: '所获荣誉', prop: 'name7', width: '73' },
-        { label: '备注说明', prop: 'bzsm', minWidth: '121' },
+        { label: '备注说明', prop: 'name8', minWidth: '121' },
-        { label: '考察项目', prop: 'kcxm', minWidth: '245', showOverflowTooltip: true },
+        { label: '考察项目', prop: 'name9', minWidth: '245', showOverflowTooltip: true },
-        { label: '考察公司', prop: 'kcgs', minWidth: '192', showOverflowTooltip: true },
+        { label: '考察公司', prop: 'name10', minWidth: '192', showOverflowTooltip: true },
      ],
      //列表
      tableLoading: false,
-      tableData: [
+      tableData:[
-        {
+        {name1:'济南转山项目B-2地块',name2:'2022年',name3:'东北地区',name4:'黑龙江省',name5:'1635421.864',name6:'1.303,576.58',name7:'优质工程',name8:'--',name9:'济南转山项目B-2地块',name10:'中建一局集团装饰工程有限公司'},
-          bzxgc: "黄阁水厂二期扩建工程设计咨询服务项目",
+        {name1:'齐南转山A-4地块施工总承包工程',name2:'2022年',name3:'东北地区',name4:'黑龙江省',name5:'1263521.864',name6:'819,360.23',name7:'优质工程',name8:'--',name9:'齐南转山A-4地块施工总承包工程',name10:'中建一局集团装饰工程有限公司'},
-          nd: "2023年",
+        {name1:'济南雪山项目%03、X07地块小学幼儿园工程施工总',name2:'2021年',name3:'东北地区',name4:'黑龙江省',name5:'1862131.876',name6:'704,290.04',name7:'优质工程',name8:'--',name9:'济南雪山项目%03、X07地块小学幼儿园工程施工总',name10:'中建一局集团装饰工程有限公司'},
-          szqy: "华北地区",
+        {name1:'承包合同',name2:'2021年 ',name3:'东北地区',name4:'黑龙江省',name5:'1975323.765',name6:'806,938.26',name7:'优质工程',name8:'--',name9:'承包合同',name10:'中建一局集团装饰工程有限公司'},
-          sssf: "河北省",
+        {name1:'齐南雪山项目A04地块工程总承包',name2:'2019年 ',name3:'华中地区',name4:'河南省',name5:'1635421.864',name6:'23,128,687.72',name7:'优质工程',name8:'--',name9:'齐南雪山项目A04地块工程总承包',name10:'中建一局集团装饰工程有限公司'},
-          sgmj: "231.25",
+        {name1:'济南未来城A5地块房地产开发项目(西地块一期)',name2:'2019年',name3:'华中地区',name4:'河南省',name5:'1263521.864',name6:'6,567,000.00',name7:'优质工程',name8:'--',name9:'济南未来城A5地块房地产开发项目(西地块一期)',name10:'中建一局集团装饰工程有限公司'},
-          nsgcz: "12",
+        {name1:'集成电路园二期工程',name2:'2018年 ',name3:'华东地区',name4:'安徽省',name5:'1862131.876',name6:'697,338.94',name7:'优质工程',name8:'--',name9:'集成电路园二期工程',name10:'总承包公司'},
-          shry: "优质工程",
+        {name1:'极恒桓星智能飞行器制造项自',name2:'2018年 ',name3:'华东地区',name4:'安徽省',name5:'1975323.765',name6:'167,303.16',name7:'优质工程',name8:'--',name9:'极恒桓星智能飞行器制造项自',name10:'总承包公司'},
-          bzsm: "",
+        {name1:'吉林市哈达湾七家子回迁区(哈达、新域)',name2:'2017年 ',name3:'东北地区',name4:'北京市',name5:'1635421.864',name6:'8,326,379.74',name7:'优质工程',name8:'--',name9:'吉林市哈达湾七家子回迁区(哈达、新域)',name10:'中建一局集团第二建筑有限公司'},
-          kcxm : "黄阁水厂二期扩建工程设计咨询服务项目",
+        {name1:'吉林市哈达湾七家子回迁区(哈达、新域)',name2:'2017年 ',name3:'华北地区',name4:'河北省',name5:'1263521.864',name6:'2,770,220.00',name7:'优质工程',name8:'--',name9:'吉林市哈达湾七家子回迁区(哈达、新域)',name10:'中建一局集团第二建筑有限公司'},
-          kcgs : "中国建筑一局第二建筑有限公司"
+        {name1:'合肥苏宁广场施工总承包工程',name2:'2016年 ',name3:'东北地区',name4:'北京市',name5:'1862131.876',name6:'461,561.47',name7:'优质工程',name8:'--',name9:'合肥苏宁广场施工总承包工程',name10:'中国建筑一局(集团)有限公司总承包公司'},
-        },
+        {name1:'合肥京东方医院项目',name2:'2016年 ',name3:'东北地区',name4:'北京市',name5:'1975323.765',name6:'1.303,576.58',name7:'优质工程',name8:'--',name9:'合肥京东方医院项目',name10:'华北分公司'},
-        {
+        {name1:'合肥苏宁广场施工总承包工程',name2:'2015年 ',name3:'东北地区',name4:'北京市',name5:'1635421.864',name6:'819,360.23',name7:'优质工程',name8:'--',name9:'合肥苏宁广场施工总承包工程',name10:'中建一局集团第二建筑有限公司'},
-          bzxgc: "黄阁水厂二期扩建工程设计咨询服务项目",
+        {name1:'合肥京东方医院项目',name2:'2015年 ',name3:'东北地区',name4:'北京市',name5:'1263521.864',name6:'704,290.04',name7:'优质工程',name8:'--',name9:'合肥京东方医院项目',name10:'中建一局集团第二建筑有限公司'},
-          nd: "2023年",
+        {name1:'海南电南科技发展大厦项',name2:'2014年 ',name3:'东北地区',name4:'北京市',name5:'1862131.876',name6:'806,938.26',name7:'优质工程',name8:'--',name9:'海南电南科技发展大厦项',name10:'中建一局集团第二建筑有限公司'},
-          szqy: "华北地区",
+        {name1:'海口吾悦广场一期土建安装工程(二标段)',name2:'2014年 ',name3:'东北地区',name4:'北京市',name5:'1635421.864',name6:'23,128,687.72',name7:'优质工程',name8:'--',name9:'海口吾悦广场一期土建安装工程(二标段)',name10:'中建一局集团第二建筑有限公司'},
-          sssf: "河北省",
+        {name1:'海淀区北部地区交化中心',name2:'2013年 ',name3:'华北地区',name4:'北京市',name5:'1263521.864',name6:'6,567,000.00',name7:'优质工程',name8:'--',name9:'海淀区北部地区交化中心',name10:'中建一局集团第二建筑有限公司'},
-          sgmj: "231.25",
+        {name1:'海淀区北部地区交化中心',name2:'2013年 ',name3:'华北地区',name4:'北京市',name5:'1862131.876',name6:'697,338.94',name7:'优质工程',name8:'--',name9:'海淀区北部地区交化中心',name10:'中建一局集团第二建筑有限公司'},
-          nsgcz: "23",
-          shry: "优质工程",
-          bzsm: "",
-          kcxm : "黄阁水厂二期扩建工程设计咨询服务项目",
-          kcgs : "中国建筑一局第二建筑有限公司"
-        },
      ],
-      tableDataTotal: 2,
+      tableDataTotal: 18,
      isSkeleton: true,
    };
  },
@@ -103,7 +97,7 @@ export default {
    },
    async handleSearch() {
      try {
      } catch (error) {
      }

--- a/dsk-operate-ui/src/views/detail/party-a/internalCooperation/constructionSituation.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/internalCooperation/constructionSituation.vue
@@ -28,43 +28,39 @@ export default {
        pageSize: 10,
      },
      forData: [
-        { label: '工程名称', prop: 'gcmc', width: '245', showOverflowTooltip: true },
+        { label: '工程名称', prop: 'name1', width: '245', showOverflowTooltip: true },
-        { label: '施工承包范围', prop: 'sgcbfw', width: '101' },
+        { label: '施工承包范围', prop: 'name2', width: '101' },
-        { label: '建筑平面（㎡）', prop: 'szqy', width: '109' },
+        { label: '建筑平面（㎡）', prop: 'name3', width: '109' },
-        { label: '队长名称', prop: 'dzmc', width: '73' },
+        { label: '队长名称', prop: 'name4', width: '73' },
-        { label: '管理人员数量（人）', prop: 'glrysl', width: '130' },
+        { label: '管理人员数量（人）', prop: 'name5', width: '130' },
-        { label: '施工人员数量（人）', prop: 'sgrysl', width: '130' },
+        { label: '施工人员数量（人）', prop: 'name6', width: '130' },
-        { label: '质量目标', prop: 'zlmb', width: '121' },
+        { label: '质量目标', prop: 'name7', width: '121' },
-        { label: '考察项目', prop: 'kcxm', minWidth: '245', showOverflowTooltip: true },
+        { label: '考察项目', prop: 'name8', minWidth: '245', showOverflowTooltip: true },
-        { label: '考察公司', prop: 'kcgs', minWidth: '192', showOverflowTooltip: true },
+        { label: '考察公司', prop: 'name9', minWidth: '192', showOverflowTooltip: true },
      ],
      //列表
      tableLoading: false,
-      tableData: [
+      tableData:[
-        {
+        {name1:'中央储备粮虎林直属库有限公司粮食仓储物流项目施工第二标段',name2:'房建其他',name3:'1635421.864',name4:'宋璐',name5:'6',name6:'36',name7:'优质工程',name8:'中央储备粮虎林直属库有限公司粮食仓储物流项目施工第二标段',name9:'中建一局集团装饰工程有限公司'},
-          gcmc: "黄阁水厂二期扩建工程设计咨询服务项目",
+        {name1:'中央储备粮虎林直属厍有限公司粮食仓储物流项目施工第二标段',name2:'房建其他',name3:'1263521.864',name4:'宋璐',name5:'16',name6:'28',name7:'优质工程',name8:'中央储备粮虎林直属库有限公司粮食仓储物流项目施工第二标段',name9:'中建一局集团装饰工程有限公司'},
-          sgcbfw: "2023年",
+        {name1:'中央储备粮大庆直属库有限公司粮食仓储物流项目施工一标段',name2:'房建其他',name3:'1862131.876',name4:'宋璐',name5:'20',name6:'26',name7:'优质工程',name8:'中央储备粮大庆直属库有限公司粮食仓储物流项目施工一标段',name9:'中建一局集团装饰工程有限公司'},
-          szqy: "233.33",
+        {name1:'中央储备粮大庆直属库有限公司粮食仓储物流项目施工一标段',name2:'房建其他',name3:'1975323.765',name4:'宋璐',name5:'18',name6:'25',name7:'优质工程',name8:'中央储备粮大庆直属库有限公司粮食仓储物流项目施工一标段',name9:'中建一局集团装饰工程有限公司'},
-          dzmc: "张林",
+        {name1:'中牟绿博文化产业区绿博1号安置区2#(中科)',name2:'住宅',name3:'1635421.864',name4:'贾云鹏',name5:'14',name6:'30',name7:'优质工程',name8:'中牟绿博文化产业区绿博1号安置区2#(中科)',name9:'中建一局集团第-一建筑有限公司'},
-          glrysl: "32",
+        {name1:'中牟绿博文化产业区绿博1号安置区2#(中科)',name2:'住宅',name3:'1635421.864',name4:'贾云鹏',name5:'6',name6:'29',name7:'优质工程',name8:'中牟绿博文化产业区绿博1号安置区2#(中科)',name9:'中建一局集团第-一建筑有限公司'},
-          sgrysl: "21233",
+        {name1:'中国邮政储蓄银行合肥基地(三期)建设施工总承包项目',name2:'商业综合',name3:'1862131.876',name4:'温俊然',name5:'16',name6:'19',name7:'优质工程',name8:'中国邮政储蓄银行合肥基地(三期)建设施工总承包项目',name9:'总承包公司'},
-          zlmb: "优质工程",
+        {name1:'中国邮政储蓄银行合肥基地(三期)建设施工总承包项目',name2:'商业综合',name3:'1975323.765',name4:'温俊然',name5:'20',name6:'36',name7:'优质工程',name8:'中国邮政储蓄银行合肥基地(三期)建设施工总承包项目',name9:'总承包公司'},
-          kcxm: "黄阁水厂二期扩建工程设计咨询服务项目",
+        {name1:'中国卫星通信大厦',name2:'公共场馆',name3:'1635421.864',name4:'齐凤亭',name5:'18',name6:'28',name7:'优质工程',name8:'中国卫星通信大厦',name9:'中建一局集团第二建筑有限公司'},
-          kcgs: "中国建筑一局第二建筑有限公司"
+        {name1:'中国人保(廊坊)金融大厦项目EFC工程总承包',name2:'房建其他',name3:'1263521.864',name4:'李帆',name5:'14',name6:'26',name7:'优质工程',name8:'中国人保(廊坊)金融大厦项目EFC工程总承包',name9:'中建一局集团第二建筑有限公司'},
-        },
+        {name1:'中国康复研究中心I段装修改造、I段结构加固和连廊建设、发热门诊翻扩建工程采购项目',name2:'医疗',name3:'1862131.876',name4:'李英',name5:'6',name6:'25',name7:'优质工程',name8:'中国康复研究中心I段装修改造、I段结构加固和连廊建设、发热门诊翻扩建工程采购项目',name9:'中国建筑一局(集团)有限公司总承包公司'},
-        {
+        {name1:'中国建设银行二期(数控机房等五项)项目',name2:'公共场馆',name3:'1975323.765',name4:'刘宇',name5:'16',name6:'30',name7:'优质工程',name8:'中国建设银行二期(数控机房等五项)项目',name9:'华北分公司'},
-          gcmc: "黄阁水厂二期扩建工程设计咨询服务项目",
+        {name1:'中国机械设备工程股份有限公司总部综合楼工程',name2:'商业综合',name3:'1635421.864',name4:'陈丹',name5:'20',name6:'29',name7:'优质工程',name8:'中国机械设备工程股份有限公司总部综合楼工程',name9:'中建一局集团第二建筑有限公司'},
-          sgcbfw: "2023年",
+        {name1:'中关村永丰基地II-22地块中关村壹号一期项目(E区)',name2:'房建其他',name3:'1263521.864',name4:'宋璐',name5:'18',name6:'19',name7:'优质工程',name8:'中关村永丰基地II-22地块中关村壹号一期项目(E区)',name9:'中建一局集团第二建筑有限公司'},
-          szqy: "233.33",
+        {name1:'中关村永丰产业基地新技术成果转移科技研发中心',name2:'房建其他',name3:'1862131.876',name4:'宋璐',name5:'14',name6:'36',name7:'优质工程',name8:'中关村永丰产业基地新技术成果转移科技研发中心',name9:'中建一局集团第二建筑有限公司'},
-          dzmc: "张林",
+        {name1:'中关村永丰产业基地II-22地块中关村壹号一期项目(B区)',name2:'房建其他',name3:'1635421.864',name4:'宋璐',name5:'6',name6:'28',name7:'优质工程',name8:'中关村永丰产业基地II-22地块中关村壹号一期项目(B区)',name9:'中建一局集团第二建筑有限公司'},
-          glrysl: "32",
+        {name1:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name2:'房建其他',name3:'1263521.864',name4:'宋璐',name5:'16',name6:'26',name7:'优质工程',name8:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name9:'中建一局集团第二建筑有限公司'},
-          sgrysl: "21233",
+        {name1:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name2:'房建其他',name3:'1862131.876',name4:'贾云鹏',name5:'20',name6:'25',name7:'优质工程',name8:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name9:'中建一局集团第二建筑有限公司'},
-          zlmb: "优质工程",
-          kcxm: "黄阁水厂二期扩建工程设计咨询服务项目",
-          kcgs: "中国建筑一局第二建筑有限公司"
-        },
      ],
-      tableDataTotal: 2,
+      tableDataTotal: 18,
      isSkeleton: true,
    };
  },

--- a/dsk-operate-ui/src/views/detail/party-a/internalCooperation/cooperationRecord.vue
+++ b/dsk-operate-ui/src/views/detail/party-a/internalCooperation/cooperationRecord.vue
@@ -57,7 +57,7 @@ export default {
        pageSize: 10,
      },
      forData: [
-        { label: '工程名称', prop: 'projectName', width: '244', slot: true, showOverflowTooltip: true },
+        { label: '工程名称', prop: 'projectName', width: '244', slot: false, showOverflowTooltip: true ,fixed:'left'},
        { label: '合作区域', prop: 'areaName', width: '102' },
        { label: '省份', prop: 'provinceName', width: '102' },
        { label: '城市', prop: 'cityName', width: '102' },

--- a/dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue
+++ b/dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue
 <template>
  <!--企业监控列表-->
    <div class="app-container EnterpriseMonitoring">
+      <div class="title_wrap">
+        <div class="enterprise_title">
+          企业监控列表
+        </div>
+      </div>
      <div class="header">
        <div class="search">
          <div class="label">风险动态时间</div>

--- a/dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue
+++ b/dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue
 <template>
  <!--监控动态-->
    <div class="app-container MonitoringDynamics">
+      <div class="title_wrap">
+        <div class="enterprise_title">
+          风险监控动态
+        </div>
+      </div>
      <div class="search">
        <div class="search-item" style="line-height: 32px;margin-top: 0;padding-bottom: 8px;">
          <div class="label">监控对象</div>
@@ -246,7 +251,7 @@
        gsfx:[],
        queryParams:{
          pageNum:1,
-          pageSize:10,
+          pageSize:50,
          condition:{}
        },
        type:[],

--- a/dsk-operate-ui/src/views/monitoring/MonitoringReport/daily.vue
+++ b/dsk-operate-ui/src/views/monitoring/MonitoringReport/daily.vue
 <template>
  <!--监控报告-->
    <div class="app-container MonitoringReport">
-      <div class="header">
+      <div class="title_wrap">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <div class="enterprise_title">
-          <el-tab-pane label="监控日报" name="1"></el-tab-pane>
+          监控日报
-          <!--<el-tab-pane label="监控周报" name="2"></el-tab-pane>-->
+        </div>
-          <!--<el-tab-pane label="监控月报" name="3"></el-tab-pane>-->
-        </el-tabs>
      </div>
+      <!--<div class="header">-->
+        <!--<el-tabs v-model="activeName" @tab-click="handleClick">-->
+          <!--<el-tab-pane label="监控日报" name="1"></el-tab-pane>-->
+          <!--&lt;!&ndash;<el-tab-pane label="监控周报" name="2"></el-tab-pane>&ndash;&gt;-->
+          <!--&lt;!&ndash;<el-tab-pane label="监控月报" name="3"></el-tab-pane>&ndash;&gt;-->
+        <!--</el-tabs>-->
+      <!--</div>-->
      <div class="report-content">
        <div class="list" v-if="tableDataTotal > 0  && !isSkeleton" v-for="item in dataList">
          <div class="list-title">

--- a/dsk-operate-ui/src/views/monitoring/MonitoringReport/monthlyReport.vue
+++ b/dsk-operate-ui/src/views/monitoring/MonitoringReport/monthlyReport.vue
 <template>
  <!--监控报告-->
    <div class="app-container MonitoringReport">
-      <div class="header">
+      <div class="title_wrap">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <div class="enterprise_title">
-          <!--<el-tab-pane label="监控日报" name="1"></el-tab-pane>-->
+          监控月报
-          <!--<el-tab-pane label="监控周报" name="2"></el-tab-pane>-->
+        </div>
-          <el-tab-pane label="监控月报" name="3"></el-tab-pane>
-        </el-tabs>
      </div>
+      <!--<div class="header">-->
+        <!--<el-tabs v-model="activeName" @tab-click="handleClick">-->
+          <!--&lt;!&ndash;<el-tab-pane label="监控日报" name="1"></el-tab-pane>&ndash;&gt;-->
+          <!--&lt;!&ndash;<el-tab-pane label="监控周报" name="2"></el-tab-pane>&ndash;&gt;-->
+          <!--<el-tab-pane label="监控月报" name="3"></el-tab-pane>-->
+        <!--</el-tabs>-->
+      <!--</div>-->
      <div class="report-content">
        <div class="list" v-if="tableDataTotal > 0  && !isSkeleton" v-for="item in dataList">
          <div class="list-title">

--- a/dsk-operate-ui/src/views/monitoring/MonitoringReport/weekly.vue
+++ b/dsk-operate-ui/src/views/monitoring/MonitoringReport/weekly.vue
 <template>
  <!--监控报告-->
    <div class="app-container MonitoringReport">
-      <div class="header">
+      <div class="title_wrap">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <div class="enterprise_title">
-          <!--<el-tab-pane label="监控日报" name="1"></el-tab-pane>-->
+          监控周报
-          <el-tab-pane label="监控周报" name="2"></el-tab-pane>
+        </div>
-          <!--<el-tab-pane label="监控月报" name="3"></el-tab-pane>-->
-        </el-tabs>
      </div>
+      <!--<div class="header">-->
+        <!--<el-tabs v-model="activeName" @tab-click="handleClick">-->
+          <!--&lt;!&ndash;<el-tab-pane label="监控日报" name="1"></el-tab-pane>&ndash;&gt;-->
+          <!--<el-tab-pane label="监控周报" name="2"></el-tab-pane>-->
+          <!--&lt;!&ndash;<el-tab-pane label="监控月报" name="3"></el-tab-pane>&ndash;&gt;-->
+        <!--</el-tabs>-->
+      <!--</div>-->
      <div class="report-content">
        <div class="list" v-if="tableDataTotal > 0  && !isSkeleton" v-for="item in dataList">
          <div class="list-title">

--- a/dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/components/PushProjectUseDialog.vue
+++ b/dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/components/PushProjectUseDialog.vue
 <template>
-  <el-dialog :title="comIsEntityMaterials ?  '推送到物资用量' : '推送工程量'" :visible.sync="comPushProjectUseDialog" width="480px"
+  <el-dialog :title="comIsEntityMaterials ?  '推送到物资用量' : '推送工程量'" :visible="comPushProjectUseDialog" width="480px" class="push-project-use-dialog"
-    class="push-project-use-dialog" @close="dialogClose">
+    @close="dialogClose" @open="dialogOpen" :close-on-click-modal="false" :destroy-on-close="true">
    <div class="dialog-body-content">
      <el-form :model="pushForm" ref="pushForm" :rules="rules" class="push-form">
        <el-form-item label="分包项目名称">
-          <el-input :value="pushForm.projectName" :disabled="true"></el-input>
+          <el-input :value="pushForm.projectDetailInfo.projectName" :disabled="true"></el-input>
        </el-form-item>
        <el-form-item label="本月实际工程量">
          <el-input :value="pushForm.totalQuantities" :disabled="true"></el-input>
        </el-form-item>
-        <el-form-item label="需推送工程量" prop="pushQuantities">
+        <el-form-item label="需推送工程量" prop="pushQuantities" :rules="pushQuantitiesValidator(pushForm.totalQuantities)">
          <el-input v-model="pushForm.pushQuantities" placeholder="请填写需推送工程量"></el-input>
        </el-form-item>
+        <!-- ipm项目编码 -->
+        <el-form-item label="IPM项目编码">
+          <el-input v-model="pushForm.projectDetailInfo.ipmProjectNo" placeholder="请输入IPM项目编码"></el-input>
+        </el-form-item>
+        <!-- ipm合同编码 -->
+        <el-form-item label="IPM合同编码">
+          <el-input v-model="pushForm.ipmContractCode" placeholder="请输入IPM合同编码"></el-input>
+        </el-form-item>
+        <!-- ipm作业编码 -->
+        <el-form-item label="IPM作业编码">
+          <el-input v-model="pushForm.ipmBizCode" placeholder="请输入IPM作业编码"></el-input>
+        </el-form-item>
      </el-form>
    </div>
+    <!-- 底部按钮 -->
+    <div class="dialog-footer-content">
+      <div class="footer-btn cancel-submit" @click="cancelSubmit">取消</div>
+      <div class="footer-btn ok-submit">确定推送</div>
+    </div>
  </el-dialog>
 </template>
 <script>
-import { subtract } from "@/utils/decimal";
+import { subtract, targetIsNegative } from "@/utils/decimal";
 import { cloneDeep } from 'lodash-es';
 export default {
  name: "pushProjectUseDialog",
@@ -58,12 +75,6 @@ export default {
    }
  },
  data() {
-    // 验证需推送工程量
-    const pushQuantitiesValidator = (rule, value, callback) => {
-      const reg = /^(?!0\d)(?!0+$)(?!0*\.0*$)\d+(\.\d+)?$/;
-      if (!reg.test(value)) return callback(new Error("请输入正确的工程量"));
-      callback();
-    };
    return {
      comIsEntityMaterials: this.isEntityMaterials,
      comPushProjectUseDialog: this.pushProjectUseDialog,
@@ -72,13 +83,14 @@ export default {
        pushQuantities: "",
        ipmProjectCode: "",
        ipmContractCode: "",
-        ipmBizCode: ""
+        ipmBizCode: "",
+        totalQuantities: "",
+        projectDetailInfo: {
+          projectName: "",
+          ipmProjectNo: ""
+        }
      },
-      rules: {
+      rules: {}
-        pushQuantities: [
-          { trigger: ["blur", "change"], validator: pushQuantitiesValidator }
-        ]
-      }
    };
  },
  //可访问data属性
@@ -91,12 +103,30 @@ export default {
  },
  //方法集
  methods: {
+    // 验证需推送工程量
+    pushQuantitiesValidator(maxValue) {
+      return [{
+        trigger: ['blur', 'change'], validator: (rule, value, callback) => {
+          const reg = /^(?!0\d)(?!0+$)(?!0*\.0*$)\d+(\.\d+)?$/;
+          if (!reg.test(value)) return callback(new Error("请输入正确的工程量"));
+          const _maxValue = maxValue ? maxValue : 0;
+          if (targetIsNegative(subtract(_maxValue, value))) return callback(new Error("注：推送工程量不得大于实际产生的总工程量"));
+          callback();
+        }
+      }];
+    },
    dialogClose() {
-      const form = this.$refs["pushForm"];
-      if (form) form.clearValidate();
      this.$emit("dialogClose");
      this.pushForm = this.$options.data.call(this).pushForm;
+      const form = this.$refs["pushForm"];
+      if (form) form.clearValidate();
      this.$emit("close", false);
+    },
+    dialogOpen() {
+    },
+    cancelSubmit() {
+      this.comPushProjectUseDialog = false;
    }
  },
 }
@@ -143,6 +173,10 @@ export default {
        .push-form {
          .el-form-item {
+            &.is-error {
+              margin-bottom: 33px;
+            }
            margin-bottom: 16px;
            display: flex;
            align-items: center;
@@ -186,6 +220,40 @@ export default {
          }
        }
      }
+      .dialog-footer-content {
+        padding: 16px 20px;
+        box-sizing: border-box;
+        border-top: 1px solid #eeeeee;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        .footer-btn {
+          height: 32px;
+          padding: 0px 16px;
+          font-size: 14px;
+          font-weight: 350;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border-radius: 4px;
+          cursor: pointer;
+          &.cancel-submit {
+            color: rgba(35, 35, 35, 0.8);
+            background: #fff;
+            border: 1px solid #dcdfe6;
+            margin-right: 12px;
+          }
+          &.ok-submit {
+            color: #fff;
+            background: #0081ff;
+          }
+        }
+      }
    }
  }
 }

--- a/dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
+++ b/dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
@@ -641,8 +641,7 @@ export default {
    pushProjectUse(row) {
      if (!row.id) return;
      // 打开推送推送弹窗
-      const _temp = { ...this.pushProjectUseTemp, ...cloneDeep(row) };
+      const _temp = { ...this.pushProjectUseTemp, ...cloneDeep(row), projectDetailInfo: cloneDeep(this.projectDetailInfo) };
-      _temp.projectName = this.projectDetailInfo.projectName;
      this.pushProjectUseTemp = _temp;
      this.pushProjectUseDialog = true;
    },

--- a/dsk-operate-ui/src/views/supplier/aptitude/historySearch.vue
+++ b/dsk-operate-ui/src/views/supplier/aptitude/historySearch.vue
 <template>
   <div class="app-container enterprise_contatiner">
+     <div class="title_wrap">
+       <div class="enterprise_title">
+         历史查询
+       </div>
+     </div>
    <!--<div class="header">-->
      <!--<div class="title_wrap">-->
        <!--<div class="enterprise_title">-->

--- a/dsk-operate-ui/src/views/supplier/aptitude/zizhi.vue
+++ b/dsk-operate-ui/src/views/supplier/aptitude/zizhi.vue
 <template>
   <div class="app-container enterprise_contatiner">
+     <div class="title_wrap">
+       <div class="enterprise_title">
+         查资质
+       </div>
+     </div>
    <!--<div class="header">-->
      <!--<div class="title_wrap">-->
        <!--<div class="enterprise_title">-->

--- a/dsk-operate-ui/src/views/supplier/aptitude/zzStandard.vue
+++ b/dsk-operate-ui/src/views/supplier/aptitude/zzStandard.vue
 <template>
   <div class="app-container enterprise_contatiner">
+     <div class="title_wrap">
+       <div class="enterprise_title">
+         资质标准
+       </div>
+     </div>
    <!--<div class="header">-->
      <!--<div class="title_wrap">-->
        <!--<div class="enterprise_title">-->

--- a/dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue
+++ b/dsk-operate-ui/src/views/supplier/disableManagement/Unlist.vue
 <template>
  <div class="supplier">
    <div class="search-supplier">
-      <!--<div class="title_wrap">-->
+      <div class="title_wrap">
-      <!--<div class="enterprise_title">-->
+        <div class="enterprise_title">
-      <!--解除限用禁用名单-->
+          解除限用禁用名单
-      <!--</div>-->
+        </div>
-      <!--</div>-->
+      </div>
      <div class="content-supplier">
        <el-form :model="formdata" label-width="100px" label-position="right"  :inline="true" >
          <el-row>
@@ -121,11 +121,12 @@
 </template>
 <script>
-  import { encodeStr } from "@/assets/js/common.js";
+  import { encodeStr } from '@/assets/js/common.js'
-  import "@/assets/styles/public.scss";
+  import '@/assets/styles/public.scss'
-  import "@/assets/styles/supplierlist.scss";
+  import '@/assets/styles/supplierlist.scss'
-  import skeleton from '@/views/project/projectList/component/skeleton';
+  import skeleton from '@/views/project/projectList/component/skeleton'
-  import {getSupplierUnlimitedList} from '@/api/supplier/supplier';
+  import { getSupplierUnlimitedList } from '@/api/supplier/supplier'
  export default {
    name: 'Unlist',
    components:{skeleton},

--- a/dsk-operate-ui/src/views/supplier/disableManagement/disableList.vue
+++ b/dsk-operate-ui/src/views/supplier/disableManagement/disableList.vue
 <template>
  <div class="supplier">
    <div class="search-supplier">
-      <!--<div class="title_wrap">-->
+      <div class="title_wrap">
-        <!--<div class="enterprise_title">-->
+        <div class="enterprise_title">
-          <!--涉诉限用禁用名单-->
+          涉诉限用禁用名单
-        <!--</div>-->
+        </div>
-      <!--</div>-->
+      </div>
      <div class="content-supplier">
        <el-form :model="formdata" label-width="160px" label-position="right"  :inline="true" >
          <el-row>

--- a/dsk-operate-ui/src/views/supplier/supplierlist/access.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/access.vue
--- a/dsk-operate-ui/src/views/supplier/supplierlist/assessment.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/assessment.vue
@@ -78,8 +78,23 @@
      return{
        encodeStr,
        tableData:[
-          {name1:'2021年度',name2:'重庆大司空信息科技有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-'},
+          {name1:'2018',name2:'华北公司',name3:'北京航华科贸项目',name4:'19',name5:'-',name6:'19.4'},
-          {name1:'2021年度',name2:'重庆大司空信息科技有限公司',name3:'剧场及配套办公等2项（北京市文化中心）',name4:'-',name5:'-',name6:'-'},
+          {name1:'2017',name2:'中建一局集团第三建筑有限公司',name3:'朝阳区崔各庄乡大望京村2号地626地块1号楼工程',name4:'81',name5:'-',name6:'82'},
+          {name1:'2017',name2:'总承包公司',name3:'晋中万达广场项目',name4:'82',name5:'-',name6:'80'},
+          {name1:'2017',name2:'总承包公司',name3:'晋中万达广场项目',name4:'80',name5:'-',name6:'96'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'运河国际生态城一期百合座',name4:'96',name5:'-',name6:'100'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'北京新机场安置房郑西.鑫苑名家(二期)项目施工总承包工程',name4:'100',name5:'-',name6:'82'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'胶州鼎峰中央公园c26#楼项目德州鲁班御景国际二期工程及地下车库一标段',name4:'82',name5:'-',name6:'95'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南转山项目B-2地块',name4:'95',name5:'-',name6:'91'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南未来城A5地块房地产开发项目(西地块一期)',name4:'91',name5:'-',name6:'88'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'盐城万达广场项目部',name4:'84',name5:'-',name6:'84'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南雪山项目A04地块工程总承包',name4:'84',name5:'-',name6:'84'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'合肥整机智能制造生产线',name4:'84',name5:'-',name6:'95'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'清华附中凯文国际学校工程武汉新城四新项目C地块一期总包工程',name4:'95',name5:'-',name6:'83'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'合肥京东方医院项目',name4:'86',name5:'-',name6:'95'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'长春吾悦广场住宅区土建安装工程(一标段)',name4:'98',name5:'-',name6:'86'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'中国机械设备工程股份有限公司总部综合楼工程',name4:'83',name5:'-',name6:'98'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name4:'92',name5:'-',name6:'83'},
        ],
        isSkeleton:false,
        total:2,

--- a/dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontracting.vue
@@ -115,7 +115,7 @@
          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
          </el-table-column>
-          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
+          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="310" :resizable="false">
            <template slot-scope="scope">
              <div class="renling">
                <div style="display:flex;align-items:center">

--- a/dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/laborSubcontractingTeam.vue
@@ -122,7 +122,7 @@
          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
          </el-table-column>
-          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
+          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="310" :resizable="false">
            <template slot-scope="scope">
              <div class="renling">
                <div style="display:flex;align-items:center">

--- a/dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/ledger.vue
@@ -114,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="380" :resizable="false">
+          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="310" :resizable="false">
            <template slot-scope="scope">
              <div style="display:flex;align-items:center">
                <el-tooltip placement="top" v-if="scope.row.customerText.length>20">

--- a/dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/professionalSubcontracting.vue
@@ -115,7 +115,7 @@
          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
          </el-table-column>
-          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
+          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="310" :resizable="false">
            <template slot-scope="scope">
              <div class="renling">
                <el-tooltip placement="top" v-if="scope.row.customerText.length>20">

--- a/dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/rentalServices.vue
@@ -115,7 +115,7 @@
          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
          </el-table-column>
-          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
+          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="310" :resizable="false">
            <template slot-scope="scope">
              <div class="renling">
                <div style="display:flex;align-items:center">

--- a/dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue
+++ b/dsk-operate-ui/src/views/supplier/supplierlist/supplySubcontracting.vue
@@ -115,7 +115,7 @@
          <el-table-column label="供应商编号" prop="customerCode" :fixed="tableColumnFixed" width="120" :resizable="false">
          </el-table-column>
-          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="380" :resizable="false">
+          <el-table-column label="供应商名称" :fixed="tableColumnFixed" width="310" :resizable="false">
            <template slot-scope="scope">
              <div class="renling">
                <div style="display:flex;align-items:center">

--- a/dsk-operate-ui/vue.config.js
+++ b/dsk-operate-ui/vue.config.js
@@ -35,7 +35,8 @@ module.exports = {
    proxy: {
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {
-        target: `http://172.17.0.12:9099/prod-api`,//测试
+        // target: `http://111.204.34.146:9099/prod-api`,//测试
+        target: `http://172.17.0.12:9099//prod-api`,//测试
        // target: `http://192.168.60.5:9098`,//陈跃方
        // target: `http://192.168.60.27:9098`,//邓
        // target: `http://122.9.160.122:9011`,  //线上