*

dsk-operate-ui/src/layout/components/Navbar.vue

@@ -58,7 +58,7 @@ export default {
   },
   methods: {
     async logout() {
-      this.$confirm('确定注销并退出系统吗？', '提示', {
+      this.$confirm('确定退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'

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

@@ -99,7 +99,7 @@ export const constantRoutes = [
         path: '/enterprise/:id',
         component: () => import('@/views/detail/party-a/index'),
         name: 'PartyA',
-        meta: { title: '甲方详情' },
+        meta: { title: '甲方详情', icon: 'enterprise' },
       }
     ]
   },
@@ -113,7 +113,7 @@ export const constantRoutes = [
         path: '/company/:id',
         component: () => import('@/views/detail/party-b/index'),
         name: 'Company',
-        meta: { title: '已方详情' }
+        meta: { title: '乙方详情' }
       }
     ]
   },

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

@@ -45,7 +45,7 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input @focus="clickFocus('detailFocus'+i)" @blur="clickFocus('detailFocus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
                 <span :id="'detailFocus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>
@@ -197,7 +197,6 @@ export default {
         ::v-deep .el-input__inner {
           border-right: 0;
           border-radius: 2px 0 2px 0;
-          width: 180px;
         }
       }
       .fromTime{

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

@@ -35,7 +35,7 @@
             <!-- 输入框 -->
             <template v-if="form.type==3">
               <div class="cooperate-name">
-                <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
+                <el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder" :style="form.width?'width:'+form.width+'px':'width:180px'"></el-input>
                 <span :id="'focus'+i" @click="changeSelect">搜索</span>
               </div>
             </template>
@@ -230,7 +230,6 @@ export default {
         }
         ::v-deep .el-input__inner {
           border-radius: 2px 0 2px 0;
-          width: 180px;
           border: 1px solid #D9D9D9;
           border-right: 0;
         }

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

@@ -2,8 +2,9 @@
   <div class="header-container">
     <div class="bread-crumb">
       <el-breadcrumb separator="/">
-        <el-breadcrumb-item :to="{ path: '/enterpriseData' }">企业数据</el-breadcrumb-item>
-        <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+        <el-breadcrumb-item :to="{ path: fromPath }" v-if="fromName">{{fromName}}</el-breadcrumb-item>
+<!--        <el-breadcrumb-item :to="{ path: '/enterpriseData?tag=1' }">查企业</el-breadcrumb-item>-->
         <el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '--'}}</el-breadcrumb-item>
       </el-breadcrumb>
     </div>
@@ -17,7 +18,7 @@
 <script>
 export default {
   name: 'Header',
-  props: ['companyId', 'companyInfo'],
+  props: ['companyId', 'companyInfo', 'fromPath', 'fromName'],
   data() {
     return {
     }

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

@@ -14,7 +14,7 @@
         <el-table-column
           v-if="isIndex"
           label="序号"
-          width="50"
+          :width="flexWidth(tableData)"
           align="left"
           :fixed="indexFixed"
           :resizable="false">
@@ -112,7 +112,6 @@ export default {
   },
   data() {
     return {
-
     }
   },
   methods:{
@@ -124,6 +123,14 @@ export default {
     },
     sortChange(e){
       this.$emit('sort-change',e)
+    },
+    flexWidth(tableData) {
+      let currentMax = this.queryParams.pageNum*this.queryParams.pageSize - this.queryParams.pageSize + tableData.length, wdth = 50
+      // return currentMax.toString().length*25 + 'px'
+      if(currentMax.toString().length>3){
+        wdth = wdth + (currentMax.toString().length-3)*10
+      }
+      return wdth+'px'
     }
   }
 }

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

@@ -63,7 +63,7 @@ export default {
         pageSize: 20
       },
       formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
       ],
       forData: [
         {label: '合作项目/工程名称', prop: 'dealTitle', width: '720', slot: true},

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

@@ -68,7 +68,7 @@ export default {
         pageSize: 20
       },
       formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入合作项目/工程名称查询', options: [], width: 260},
       ],
       forData: [
         {label: '合作项目/工程名称', prop: 'projectAllName', width: '720', fixed: true, slot: true},

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

 <template>
   <div class="app-container part-container">
-    <Header :company-id="companyId" :companyInfo="companyInfo" v-if="companyId" />
+    <Header :company-id="companyId" :companyInfo="companyInfo" :fromPath="fromPath" :fromName="fromName" v-if="companyId" />
     <div class="flex-box part-main">
       <div class="part-left">
         <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" />
@@ -147,9 +147,17 @@ export default {
       currentPath: {
         pathName: 'overview'  //默认展示页
       },
-      partBoxHeight: null
+      partBoxHeight: null,
+      fromPath: '',
+      fromName: ''
     }
   },
+  beforeRouteEnter(to, from, next) {
+    next(vm => {
+      vm.fromPath = from.path
+      vm.fromName = from.meta.title
+    })
+  },
   created() {
     if (this.$route.params.id) { // 获取companyId
       let companyId = this.$route.params.id

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

@@ -54,7 +54,7 @@ export default {
         {label: '专项债用作资本金（亿元）', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'}
       ],
       formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
       ],
       //列表
       tableLoading:false,

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

@@ -60,7 +60,7 @@ export default {
       ],
       formData: [
         { type: 4, fieldName: 'landUse', value: '', placeholder: '土地用途', options: []},
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []}
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220}
       ],
       //列表
       tableLoading:false,

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

@@ -60,7 +60,7 @@ export default {
         {label: '是否为民间推介项目', prop: 'isProjcet', width: '150', slot: true}
       ],
       formData: [
-        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
       ],
       //列表
       tableLoading:false,

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

@@ -56,6 +56,7 @@ export default {
       },
       forData: [
         {label: '项目名称', prop: 'projectName', minWidth: '320', slot: true},
+        {label: '发布日期', prop: 'pubdate', width: '110'},
         {label: '金额（万元）', prop: '', children: [
           { label: '建安费暂估', prop: 'projectSafeAmount', width: '88px'},
           { label: '勘察费暂估', prop: 'projectSurveyAmount', width: '88px'},
@@ -74,8 +75,7 @@ export default {
         {label: '分部分项', prop: 'projectSub', width: '130'},
         {label: '项目级别', prop: 'projectLevel', width: '130'},
         {label: '评标办法', prop: 'bidAssessmentWay', width: '130'},
-        {label: '项目属地', prop: 'province', width: '130', slot: true},
-        {label: '发布日期', prop: 'pubdate', width: '130'}
+        {label: '项目属地', prop: 'province', width: '130', slot: true}
       ],
       formData: [
         { type: 1, fieldName: 'projectType', value: '', placeholder: '项目类别', options: []},
@@ -131,6 +131,13 @@ export default {
       this.tableLoading = false
       if(res.code==200){
         this.tableData = res.rows
+        if(this.tableData&&this.tableData.length>0){
+          this.tableData.forEach(item => {
+            item.projectSafeAmount ? item.projectSafeAmount = parseFloat(parseFloat(item.projectSafeAmount).toFixed(4)) : ''
+            item.projectSurveyAmount ? item.projectSurveyAmount = parseFloat(parseFloat(item.projectSurveyAmount).toFixed(4)) : ''
+            item.projectEnsureAmount ? item.projectEnsureAmount = parseFloat(parseFloat(item.projectEnsureAmount).toFixed(4)) : ''
+          })
+        }
       }
       this.tableDataTotal = res.total
     }

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

-<template>
+<template xmlns="http://www.w3.org/1999/html">
   <div class="app-container detail-container">
     <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
       <el-tab-pane label="工商信息" name="first"></el-tab-pane>
@@ -10,6 +10,22 @@
       <template slot="provinceCode" slot-scope="scope">
         <span>{{showRegion(scope.data.provinceCode)}}</span>
       </template>
+      <template slot="term" slot-scope="scope">
+        <span v-if="scope.data.termStart&&scope.data.termEnd">{{ scope.data.termStart }} ~ {{ scope.data.termEnd }}</span>
+        <span v-else-if="scope.data.termStart&&!scope.data.termEnd">{{ scope.data.termStart }}起</span>
+        <span v-else-if="!scope.data.termStart&&scope.data.termEnd">{{ scope.data.termEnd }}止</span>
+        <span v-else>--</span>
+      </template>
+      <template slot="actualCapi" slot-scope="scope">
+        <span>
+          {{ scope.data.actualCapi?scope.data.actualCapi+'万元人民币':'--' }}
+        </span>
+      </template>
+      <template slot="colleguesNum" slot-scope="scope">
+        <span>
+          {{ scope.data.colleguesNum?scope.data.colleguesNum+'人':'--' }}
+        </span>
+      </template>
     </info-table>
     <tables
       :tableLoading="tableLoading"
@@ -53,18 +69,18 @@ export default {
         { name: '登记状态', prop: 'status' },
         { name: '成立日期', prop: 'startDate' },
         { name: '注册资本', prop: 'registCapi' },
-        { name: '实缴资本', prop: 'actualCapi' },
+        { name: '实缴资本', prop: 'actualCapi', slot: true },
         { name: '核准日期', prop: 'checkDate' },
         { name: '组织机构代码', prop: 'orgNo' },
         { name: '工商注册号', prop: 'regNo' },
         { name: '纳税人识别号', prop: 'creditNo' },
         { name: '企业类型', prop: 'econKind' },
-        { name: '营业期限', prop: 'termEnd' },
+        { name: '营业期限', prop: 'term', slot: true },
         { name: '纳税人资质', prop: 'qualification' },
         { name: '所属地区', prop: 'provinceCode', slot: true },
         { name: '登记机关', prop: 'belongOrg' },
-        { name: '人员规模', prop: 'colleguesNum' },
-        { name: '参保人数', prop: 'colleguesNum' },
+        { name: '人员规模', prop: 'colleguesNum', slot: true },
+        { name: '参保人数', prop: 'colleguesNum', slot: true },
         { name: '经营范围', prop: 'scope', style: true }
       ],
       forData: [