Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-operate-sys-cscec
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fulixin
dsk-operate-sys-cscec
Commits
136743d3
Commit
136743d3
authored
Feb 27, 2024
by
tyn
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
b4d107ec
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
1152 additions
and
18 deletions
+1152
-18
index.js
dsk-operate-ui/src/api/internalCooperation/index.js
+14
-3
consultingAgency.vue
...perate-ui/src/views/detail/biddetail/consultingAgency.vue
+801
-0
HeadFormNew.vue
...ate-ui/src/views/detail/party-a/component/HeadFormNew.vue
+1
-1
Tables.vue
dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
+1
-1
index.vue
dsk-operate-ui/src/views/detail/party-a/index.vue
+11
-2
constructionPerformance.vue
...l/party-a/internalCooperation/constructionPerformance.vue
+151
-0
constructionSituation.vue
...ail/party-a/internalCooperation/constructionSituation.vue
+148
-0
consultingAgencyCooperation.vue
...rty-a/internalCooperation/consultingAgencyCooperation.vue
+25
-10
cooperationRecord.vue
.../detail/party-a/internalCooperation/cooperationRecord.vue
+0
-1
No files found.
dsk-operate-ui/src/api/internalCooperation/index.js
View file @
136743d3
...
...
@@ -2,13 +2,24 @@ import request from '@/utils/request';
/**
* 获取咨询机构合作列表
* @param {*}
data
* @param {*}
params
* @returns
*/
export
const
getConsultingAgencyCooperationListApi
=
(
data
)
=>
request
({
export
const
getConsultingAgencyCooperationListApi
=
(
params
)
=>
request
({
url
:
"/customerInfo/advisoryList"
,
method
:
"get"
,
data
params
});
/**
* 获取咨询机构合作工程类型
* @param {*} params
* @returns
*/
export
const
getConsultingAgencyCooperationTypesApi
=
(
params
)
=>
request
({
url
:
"/dProjectType/getAll"
,
method
:
"get"
,
params
});
/**
...
...
dsk-operate-ui/src/views/detail/biddetail/consultingAgency.vue
0 → 100644
View file @
136743d3
This diff is collapsed.
Click to expand it.
dsk-operate-ui/src/views/detail/party-a/component/HeadFormNew.vue
View file @
136743d3
...
...
@@ -2,7 +2,7 @@
<div
class=
"head-form-new"
:class=
"headerFixed ? 'headerFixed':''"
>
<div
class=
"common-title"
v-if=
"title && title !='集团招标'"
>
{{
title
}}
</div>
<div
class=
"flex-box query-box"
>
<div
class=
"flex-box query-params"
>
<div
class=
"flex-box query-params"
v-if=
"comFormData && comFormData.length"
>
<div
class=
"headForm-from"
>
<div
class=
"from-item"
:key=
"i"
v-for=
"(form, i) in comFormData"
>
<!-- 单选 -->
...
...
dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
View file @
136743d3
...
...
@@ -224,7 +224,7 @@ export default {
}
.el-table
{
.cell
{
font-size
:
1
4
px
;
font-size
:
1
2
px
;
}
.el-table__header-wrapper
{
min-height
:
40px
;
...
...
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @
136743d3
...
...
@@ -64,7 +64,12 @@
<!-- 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>
<cooperation-record
v-if=
"currentPath.pathName=='cooperationRecord'"
:company-id=
"companyId"
:company-name=
"companyName"
></cooperation-record>
<!-- 4、施工业绩 -->
<construction-performance
v-if=
"currentPath.pathName=='constructionPerformance'"
:company-id=
"companyId"
></construction-performance>
<!-- 5、在施工程情况 -->
<construction-situation
v-if=
"currentPath.pathName=='constructionSituation'"
:company-id=
"companyId"
></construction-situation>
</
template
>
<
template
v-if=
"customerId && isCustomer"
>
<!-- 商务信息 -->
...
...
@@ -138,6 +143,8 @@ 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
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"
;
//内部合作 在施工程情况
import
{
urbanInvestmentPage
,
}
from
'@/api/detail/party-a/urbanLnvestment'
;
...
...
@@ -189,7 +196,9 @@ export default {
AccessCondition
,
CooperationRecord
,
CooperativeConstructionUnit
,
CooperativeGroup
CooperativeGroup
,
ConstructionPerformance
,
ConstructionSituation
},
data
()
{
return
{
...
...
dsk-operate-ui/src/views/detail/party-a/internalCooperation/constructionPerformance.vue
0 → 100644
View file @
136743d3
<
template
>
<div
class=
"construction-performance-container"
>
<head-form-new
title=
"施工业绩"
:query-params=
"queryParams"
:total=
"tableDataTotal"
:isExcel=
"false"
@
handle-search=
"handleSearch"
ref=
"searchFormNew"
/>
<skeleton
v-if=
"isSkeleton"
style=
"padding: 16px"
></skeleton>
<tables
v-if=
"!isSkeleton"
:indexFixed=
"true"
:tableData=
"tableData"
:forData=
"forData"
:tableDataTotal=
"tableDataTotal"
:queryParams=
"queryParams"
@
handle-current-change=
"handleCurrentChange"
>
</tables>
</div>
</
template
>
<
script
>
import
skeleton
from
'../component/skeleton'
;
import
mixin
from
'@/views/detail/party-a/mixins/mixin'
;
import
{
}
from
"@/api/internalCooperation"
;
import
{
}
from
"@/api/common"
;
export
default
{
name
:
"constructionPerformance"
,
mixins
:
[
mixin
],
components
:
{
skeleton
},
props
:
[
'companyId'
],
data
()
{
return
{
queryParams
:
{
advisoryBodyCid
:
this
.
companyId
,
pageNum
:
1
,
pageSize
:
10
,
},
forData
:
[
{
label
:
'标志性工程'
,
prop
:
'bzxgc'
,
width
:
'245'
,
showOverflowTooltip
:
true
},
{
label
:
'年度'
,
prop
:
'nd'
,
width
:
'122'
},
{
label
:
'所在区域'
,
prop
:
'szqy'
,
width
:
'101'
},
{
label
:
'所属省份'
,
prop
:
'sssf'
,
width
:
'101'
},
{
label
:
'施工面积(㎡)'
,
prop
:
'sgmj'
,
width
:
'109'
},
{
label
:
'年施工产值(亿)'
,
prop
:
'nsgcz'
,
width
:
'121'
},
{
label
:
'所获荣誉'
,
prop
:
'shry'
,
width
:
'73'
},
{
label
:
'备注说明'
,
prop
:
'bzsm'
,
minWidth
:
'121'
},
{
label
:
'考察项目'
,
prop
:
'kcxm'
,
minWidth
:
'245'
,
showOverflowTooltip
:
true
},
{
label
:
'考察公司'
,
prop
:
'kcgs'
,
minWidth
:
'192'
,
showOverflowTooltip
:
true
},
],
//列表
tableLoading
:
false
,
tableData
:
[
{
bzxgc
:
"黄阁水厂二期扩建工程设计咨询服务项目"
,
nd
:
"2023年"
,
szqy
:
"华北地区"
,
sssf
:
"河北省"
,
sgmj
:
"231.25"
,
nsgcz
:
"12"
,
shry
:
"优质工程"
,
bzsm
:
""
,
kcxm
:
"黄阁水厂二期扩建工程设计咨询服务项目"
,
kcgs
:
"中国建筑一局第二建筑有限公司"
},
{
bzxgc
:
"黄阁水厂二期扩建工程设计咨询服务项目"
,
nd
:
"2023年"
,
szqy
:
"华北地区"
,
sssf
:
"河北省"
,
sgmj
:
"231.25"
,
nsgcz
:
"23"
,
shry
:
"优质工程"
,
bzsm
:
""
,
kcxm
:
"黄阁水厂二期扩建工程设计咨询服务项目"
,
kcgs
:
"中国建筑一局第二建筑有限公司"
},
],
tableDataTotal
:
2
,
isSkeleton
:
true
,
};
},
//可访问data属性
created
()
{
this
.
initDetail
();
},
//计算集
computed
:
{
},
//方法集
methods
:
{
async
initDetail
()
{
try
{
await
this
.
handleQuery
();
}
catch
(
error
)
{
}
},
async
handleQuery
(
params
)
{
try
{
// let data = params ? params : this.queryParams;
// this.isSkeleton = true;
// const res = await getConsultingAgencyCooperationListApi(data);
// this.tableData = res.rows ? res.rows : [];
// this.tableDataTotal = res.total ? res.total : 0;
}
catch
(
error
)
{
console
.
log
(
error
);
}
finally
{
this
.
isSkeleton
=
false
;
}
},
async
handleSearch
()
{
try
{
}
catch
(
error
)
{
}
}
},
}
</
script
>
<
style
lang=
"scss"
scoped
>
.construction-performance-container
{
background
:
#ffffff
;
border-radius
:
4px
;
padding
:
16px
;
input
{
border
:
1px
solid
#efefef
;
}
::v-deep
.el-form-item
{
margin-right
:
8px
!
important
;
}
.query-box
{
margin
:
10px
0
20px
;
}
.cell-span
{
display
:
inline-block
;
position
:
relative
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
-
webkit-box
;
-webkit-box-orient
:
vertical
;
-webkit-line-clamp
:
4
;
cursor
:
pointer
;
>
span
{
display
:
inline-block
;
width
:
37px
;
position
:
absolute
;
right
:
0
;
bottom
:
0
;
background-color
:
#fff
;
z-index
:
1
;
}
}
@import
"@/assets/styles/search-common.scss"
;
}
</
style
>
dsk-operate-ui/src/views/detail/party-a/internalCooperation/constructionSituation.vue
0 → 100644
View file @
136743d3
<
template
>
<div
class=
"construction-situation-container"
>
<head-form-new
title=
"在施工程情况"
:query-params=
"queryParams"
:total=
"tableDataTotal"
:isExcel=
"false"
@
handle-search=
"handleSearch"
ref=
"searchFormNew"
/>
<skeleton
v-if=
"isSkeleton"
style=
"padding: 16px"
></skeleton>
<tables
v-if=
"!isSkeleton"
:indexFixed=
"true"
:tableData=
"tableData"
:forData=
"forData"
:tableDataTotal=
"tableDataTotal"
:queryParams=
"queryParams"
@
handle-current-change=
"handleCurrentChange"
>
</tables>
</div>
</
template
>
<
script
>
import
skeleton
from
'../component/skeleton'
;
import
mixin
from
'@/views/detail/party-a/mixins/mixin'
;
import
{
}
from
"@/api/internalCooperation"
;
import
{
}
from
"@/api/common"
;
export
default
{
name
:
"constructionSituation"
,
mixins
:
[
mixin
],
components
:
{
skeleton
},
props
:
[
'companyId'
],
data
()
{
return
{
queryParams
:
{
advisoryBodyCid
:
this
.
companyId
,
pageNum
:
1
,
pageSize
:
10
,
},
forData
:
[
{
label
:
'工程名称'
,
prop
:
'gcmc'
,
width
:
'245'
,
showOverflowTooltip
:
true
},
{
label
:
'施工承包范围'
,
prop
:
'sgcbfw'
,
width
:
'101'
},
{
label
:
'建筑平面(㎡)'
,
prop
:
'szqy'
,
width
:
'109'
},
{
label
:
'队长名称'
,
prop
:
'dzmc'
,
width
:
'73'
},
{
label
:
'管理人员数量(人)'
,
prop
:
'glrysl'
,
width
:
'130'
},
{
label
:
'施工人员数量(人)'
,
prop
:
'sgrysl'
,
width
:
'130'
},
{
label
:
'质量目标'
,
prop
:
'zlmb'
,
width
:
'121'
},
{
label
:
'考察项目'
,
prop
:
'kcxm'
,
minWidth
:
'245'
,
showOverflowTooltip
:
true
},
{
label
:
'考察公司'
,
prop
:
'kcgs'
,
minWidth
:
'192'
,
showOverflowTooltip
:
true
},
],
//列表
tableLoading
:
false
,
tableData
:
[
{
gcmc
:
"黄阁水厂二期扩建工程设计咨询服务项目"
,
sgcbfw
:
"2023年"
,
szqy
:
"233.33"
,
dzmc
:
"张林"
,
glrysl
:
"32"
,
sgrysl
:
"21233"
,
zlmb
:
"优质工程"
,
kcxm
:
"黄阁水厂二期扩建工程设计咨询服务项目"
,
kcgs
:
"中国建筑一局第二建筑有限公司"
},
{
gcmc
:
"黄阁水厂二期扩建工程设计咨询服务项目"
,
sgcbfw
:
"2023年"
,
szqy
:
"233.33"
,
dzmc
:
"张林"
,
glrysl
:
"32"
,
sgrysl
:
"21233"
,
zlmb
:
"优质工程"
,
kcxm
:
"黄阁水厂二期扩建工程设计咨询服务项目"
,
kcgs
:
"中国建筑一局第二建筑有限公司"
},
],
tableDataTotal
:
2
,
isSkeleton
:
true
,
};
},
//可访问data属性
created
()
{
this
.
initDetail
();
},
//计算集
computed
:
{
},
//方法集
methods
:
{
async
initDetail
()
{
try
{
await
this
.
handleQuery
();
}
catch
(
error
)
{
}
},
async
handleQuery
(
params
)
{
try
{
// let data = params ? params : this.queryParams;
// this.isSkeleton = true;
// const res = await getConsultingAgencyCooperationListApi(data);
// this.tableData = res.rows ? res.rows : [];
// this.tableDataTotal = res.total ? res.total : 0;
}
catch
(
error
)
{
console
.
log
(
error
);
}
finally
{
this
.
isSkeleton
=
false
;
}
},
async
handleSearch
()
{
try
{
}
catch
(
error
)
{
}
}
},
}
</
script
>
<
style
lang=
"scss"
scoped
>
.construction-situation-container
{
background
:
#ffffff
;
border-radius
:
4px
;
padding
:
16px
;
input
{
border
:
1px
solid
#efefef
;
}
::v-deep
.el-form-item
{
margin-right
:
8px
!
important
;
}
.query-box
{
margin
:
10px
0
20px
;
}
.cell-span
{
display
:
inline-block
;
position
:
relative
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
-
webkit-box
;
-webkit-box-orient
:
vertical
;
-webkit-line-clamp
:
4
;
cursor
:
pointer
;
>
span
{
display
:
inline-block
;
width
:
37px
;
position
:
absolute
;
right
:
0
;
bottom
:
0
;
background-color
:
#fff
;
z-index
:
1
;
}
}
@import
"@/assets/styles/search-common.scss"
;
}
</
style
>
dsk-operate-ui/src/views/detail/party-a/internalCooperation/consultingAgencyCooperation.vue
View file @
136743d3
...
...
@@ -38,7 +38,7 @@
<
script
>
import
skeleton
from
'../component/skeleton'
;
import
mixin
from
'@/views/detail/party-a/mixins/mixin'
;
import
{
getConsultingAgencyCooperationListApi
,
exportRecordOfCooperationExcelApi
}
from
"@/api/internalCooperation"
;
import
{
getConsultingAgencyCooperationListApi
,
getConsultingAgencyCooperationTypesApi
,
exportRecordOfCooperationExcelApi
}
from
"@/api/internalCooperation"
;
import
{
getAllAreaApi
}
from
"@/api/common"
;
import
{
getTreeSelectAreaList
}
from
"@/utils"
;
export
default
{
...
...
@@ -73,15 +73,15 @@ export default {
],
formData
:
[
{
type
:
7
,
fieldName
:
'
businessTypes
'
,
value
:
''
,
placeholder
:
'项目省市'
,
uid
:
this
.
getUid
(),
options
:
[],
props
:
{
type
:
7
,
fieldName
:
'
projectProvince
'
,
value
:
''
,
placeholder
:
'项目省市'
,
uid
:
this
.
getUid
(),
options
:
[],
props
:
{
multiple
:
true
,
value
:
"value"
,
label
:
"value"
,
// checkStrictly: true
}
}
,
{
type
:
4
,
fieldName
:
'
causeAction
'
,
value
:
''
,
placeholder
:
'项目承接类型'
,
options
:
[],
uid
:
this
.
getUid
()
}
,
{
type
:
4
,
fieldName
:
'
causeAction
'
,
value
:
''
,
placeholder
:
'工程类别明细'
,
options
:
[],
uid
:
this
.
getUid
()
}
,
{
type
:
4
,
fieldName
:
'
projectUndertakingType
'
,
value
:
''
,
placeholder
:
'项目承接类型'
,
options
:
[],
uid
:
this
.
getUid
()
}
,
{
type
:
4
,
fieldName
:
'
detailOfWorksCategory
'
,
value
:
''
,
placeholder
:
'工程类别明细'
,
options
:
[],
uid
:
this
.
getUid
()
}
,
{
type
:
3
,
fieldName
:
'advisoryBodyName'
,
value
:
''
,
placeholder
:
'请输入'
,
uid
:
this
.
getUid
()
}
,
],
//列表
...
...
@@ -106,6 +106,7 @@ export default {
try
{
await
this
.
handleQuery
();
await
this
.
getAllArea
();
await
this
.
getConsultingAgencyCooperationTypes
();
}
catch
(
error
)
{
}
...
...
@@ -122,6 +123,23 @@ export default {
}
}
,
async
getConsultingAgencyCooperationTypes
(
projectTypeId
)
{
try
{
const
params
=
{
}
;
if
(
projectTypeId
)
params
[
"projectTypeId"
]
=
projectTypeId
;
const
types
=
await
getConsultingAgencyCooperationTypesApi
(
params
);
// if (types.code == 200 && types.data instanceof Array)
{
// const _temp = types.data.map(item =>
{
// item.name = item.projectTypeName;
// item.value = item.projectTypeId;
// return item;
//
}
);
// this.$set(this.formData[1], "options", _temp);
//
}
}
catch
(
error
)
{
}
}
,
async
handleQuery
(
params
)
{
try
{
let
data
=
params
?
params
:
this
.
queryParams
;
...
...
@@ -135,14 +153,11 @@ export default {
this
.
isSkeleton
=
false
;
}
}
,
async
handleSearch
()
{
async
handleSearch
(
params
)
{
try
{
console
.
log
(
params
);
const
areaSearchList
=
this
.
$refs
[
"searchFormNew"
].
$refs
[
"cascader"
][
0
].
getCheckedNodes
();
if
(
areaSearchList
?.
length
)
{
const
valueList
=
areaSearchList
.
map
(
item
=>
item
.
value
);
const
result
=
getTreeSelectAreaList
(
valueList
,
this
.
areaList
,
"value"
);
console
.
log
(
result
);
}
console
.
log
(
areaSearchList
);
}
catch
(
error
)
{
}
...
...
dsk-operate-ui/src/views/detail/party-a/internalCooperation/cooperationRecord.vue
View file @
136743d3
...
...
@@ -134,7 +134,6 @@ export default {
if
(
area
.
code
==
200
)
{
this
.
areaList
=
area
.
data
;
this
.
$set
(
this
.
formData
[
0
],
"options"
,
this
.
areaList
);
console
.
log
();
}
}
catch
(
error
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment