Skip to content

D
dsk-cr20g
Commit a3853652 authored by danfuman's avatar danfuman
Browse files
Options

Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

parents 671497f6 b975caae
Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 77 deletions
dsk-operate-ui/src/router/index.js
View file @ a3853652
......@@ -226,7 +226,13 @@ export const constantRoutes = [
component: () => import('@/views/radar/Tender/details'),
name: 'TenderDetails',
meta: { title: '公招标讯详情', icon: 'radar' }
}
},
{
path: '/radar/Notice/details/:id',
component: () => import('@/views/radar/Tender/details'),
name: 'NoticeDetails',
meta: { title: '招标公告详情', icon: 'radar' }
}
]
},
{
......
dsk-operate-ui/src/utils/request.js
View file @ a3853652
......@@ -111,7 +111,11 @@ service.interceptors.response.use(res => {
} else if (message.includes("Request failed with status code")) {
message = "系统接口" + message.substr(message.length - 3) + "异常";
}
Message({ message: message, type: 'error', duration: 5 * 1000 })
if(message=='数据正在处理，请勿重复提交'){ //重复提交，提示样式特殊处理
Message({ message: message, type: 'warning', duration: 5 * 1000 })
}else{
Message({ message: message, type: 'error', duration: 5 * 1000 })
}
return Promise.reject(error)
}
)
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ a3853652
......@@ -364,6 +364,7 @@ export default {
},
//获取建设库客户
getCompany(value){
this.queryParam.companyId = null
if (value.length>=2){
let param = {
keyword:value,
......@@ -381,15 +382,21 @@ export default {
}
},
selCompany(item){
console.log(item)
this.queryParam.companyId = item.jskEid
this.queryParam.companyName = item.name.replace(/<[^>]+>/g, '')
this.queryParam.legalPerson = item.legalPerson
this.queryParam.registerCapital = item.registeredCapitalStr
let registeredCapitalStr = ""
if(item.registeredCapitalStr == "0" || item.registeredCapitalStr == 0){
registeredCapitalStr = ''
}else{
registeredCapitalStr = item.registeredCapitalStr
}
this.queryParam.registerCapital = registeredCapitalStr
this.queryParam.creditCode = item.creditCode
this.queryParam.provinceId = item.provinceId
this.queryParam.cityId = item.cityId
this.queryParam.districtId = item.cityId
let list = []
if(item.provinceId != null && item.provinceId != "")
list.push(item.provinceId)
......@@ -403,11 +410,11 @@ export default {
},
//添加客户
submitForm(formName) {
if(this.queryParam.companyId=="" || this.queryParam.companyId == null){
this.$message.error({message:'请选择企业！',showClose:true})
return;
}
// if(this.queryParam.companyId=="" || this.queryParam.companyId == null){
// this.$message.error({message:'请选择企业！',showClose:true})
//
// return;
// }
this.$refs[formName].validate((valid) => {
if (valid) {
addCustomer(this.queryParam).then(result=>{
......
dsk-operate-ui/src/views/custom/trends/index.vue
View file @ a3853652
......@@ -7,7 +7,7 @@
</div>
<div class="app-container">
<gjjl types="gjdt" :data="datas"></gjjl>
<gjjl types="gjdt" :data="datas" isDisabled=false></gjjl>
</div>
</div>
</template>
......
dsk-operate-ui/src/views/detail/party-a/component/Header.vue
View file @ a3853652
......@@ -62,6 +62,7 @@ export default {
background: #FFFFFF;
padding: 14px 16px;
margin-top: 12px;
border-radius: 4px;
.header-logo{
width: 28px;
height: 28px;
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ a3853652
......@@ -174,6 +174,7 @@ export default {
min-height: calc(100vh - 170px);
padding-bottom: 20px;
background: #FFFFFF;
border-radius: 4px;
.side-input{
width: 128px;
margin-top: 16px;
......@@ -189,6 +190,7 @@ export default {
}
}
.el-icon-search{
line-height: 34px;
color: #0081FF;
cursor: pointer;
}
......@@ -204,6 +206,7 @@ export default {
padding: 0 0 0 16px !important;
text-align: initial !important;
&:hover, &:focus, &.is-active{
color: #0081FF !important;
background: linear-gradient(91deg, rgba(0,129,255,0.1) 0%, rgba(0,129,255,0) 100%);;
}
.el-submenu__icon-arrow{
......
dsk-operate-ui/src/views/detail/party-a/component/noData.vue
View file @ a3853652
<template>
<div class="no-data">
<div class="no-data-box">
<img :src="noData" alt="暂时没有找到相关数据" />
<span>暂时没有找到相关数据</span>
<img :src="noData" alt="抱歉，没找到相关数据" />
<div>抱歉，没找到相关数据</div>
<span v-if="condition">建议调整关键词或筛选条件，重新搜索</span>
</div>
</div>
</template>
......@@ -11,7 +12,10 @@
export default {
name: "NoData",
props: {
condition: {
type: Boolean,
default: false
}
},
data() {
return {
......@@ -27,28 +31,30 @@ export default {
<style lang="scss" scoped>
.no-data {
font-size: 14px;
font-family: Microsoft YaHei-Regular, Microsoft YaHei;
font-weight: 400;
color: #999999;
text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
width: 100%;
height: 100%;
min-height: 140px;
min-height: 120px;
display: flex;
justify-content: center;
align-items: center;
background: #ffffff;
border-radius: 0px 0px 0px 0px;
opacity: 1;
border: 1px solid #eeeeee;
//border: 1px solid #eeeeee;
.no-data-box {
display: flex;
flex-direction: column;
align-items: center;
img {
width: 54px;
height: 69px;
margin-bottom: 16px;
width: 108px;
height: 109px;
margin-bottom: 22px;
}
div{
font-size: 16px;
color: #333333;
}
span{
margin-top: 4px;
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/cooperate/index.vue
View file @ a3853652
......@@ -49,7 +49,7 @@
<!-- 弹窗关联项目 -->
<el-drawer
title="添加合作情况"
size="45%"
size="50%"
:visible.sync="drawer"
:direction="direction"
:with-header="false"
......@@ -501,8 +501,25 @@ export default {
font-size: 14px;
color: rgba(35,35,35,0.4);
margin-left: 28px;
display: flex;
//flex: 1;
span{
color: rgba(35,35,35,0.8);
display: inline-block;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
cursor: pointer;
flex: 1;
}
&:nth-child(1){
max-width: 15%;
}
&:nth-child(2){
max-width: 30%;
}
&:nth-child(3){
max-width: 50%;
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/dealings/bidagency.vue
View file @ a3853652
......@@ -25,7 +25,7 @@
<div v-else v-html="scope.row.agency || '--'"></div>
</template>
<template slot="projectInfo" slot-scope="scope">
<router-link :to="`/radar/Tender/details/${scope.row.projectInfo.bid}`" tag="a" class="a-link" v-if="scope.row.projectInfo.bid&&scope.row.projectInfo.dealTitle" v-html="scope.row.projectInfo.dealTitle"></router-link>
<router-link :to="`/radar/Notice/details/${scope.row.projectInfo.bid}`" tag="a" class="a-link" v-if="scope.row.projectInfo.bid&&scope.row.projectInfo.dealTitle" v-html="scope.row.projectInfo.dealTitle"></router-link>
<div v-else v-html="scope.row.projectInfo.dealTitle || '--'"></div>
<div v-if="scope.row.count>1" @click="handleClick($event, scope.row)" style="color: #FF7E38;cursor: pointer;">有{{scope.row.count}}个合作项目/工程 ></div>
</template>
......
dsk-operate-ui/src/views/detail/party-a/dealings/component/bidagencyDetail.vue
View file @ a3853652
......@@ -27,7 +27,7 @@
<template slot="dealTitle" slot-scope="scope">
<div class="flex-box">
<img class="tip-img" src="@/assets/images/detail/ico_pdf.png" v-if="scope.row.fileUrlL" @click="handlePic(scope.row.fileUrlL)"/>
<router-link :to="`/radar/Tender/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.dealTitle" v-html="scope.row.dealTitle"></router-link>
<router-link :to="`/radar/Notice/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.dealTitle" v-html="scope.row.dealTitle"></router-link>
<span v-else v-html="scope.row.dealTitle || '--'"></span>
</div>
</template>
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ a3853652
......@@ -50,7 +50,7 @@
<!-- 决策链条 -->
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
<!-- 跟进记录 -->
<Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" :customer-ids="customerId" />
<Gjjl v-if="currentPath.pathName=='gjjl'" :isDisabled='false' types="gjdt" :customer-ids="customerId" />
</template>
</div>
......@@ -172,6 +172,16 @@ export default {
},
mounted() {
},
activated(){
if (this.$route.query.path) { // 获取跳转对应板块
this.currentPath.pathName = this.$route.query.path
}else{
this.currentPath.pathName = 'overview'
}
if (this.$route.query.customerId) { // 判断是否显示
this.customerId = this.$route.query.customerId
}
},
methods: {
showPartPage(e){
this.currentPath = e
......@@ -218,5 +228,6 @@ export default {
min-width: 1088px;
width: 100%;
background: #FFFFFF;
border-radius: 4px;
}
</style>
dsk-operate-ui/src/views/detail/party-a/opport/administrative.vue
View file @ a3853652
......@@ -85,11 +85,11 @@ export default {
this.tableLoading = false
if(res.code==200){
if(res.rows&&res.rows.length>0){
this.tableData = res.rows.map(item => {
res.rows.forEach(item => {
item.smallContent = item.content.replace(/<.*?>/ig,"")
return item
})
}
this.tableData = res.rows
}
this.tableDataTotal = res.total
},
......
dsk-operate-ui/src/views/detail/party-a/opport/announcement.vue
View file @ a3853652
......@@ -22,7 +22,7 @@
@sort-change="sortChange"
>
<template slot="projectName" slot-scope="scope">
<router-link :to="`/radar/Tender/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
<router-link :to="`/radar/Notice/details/${scope.row.bid}`" tag="a" class="a-link" v-if="scope.row.bid&&scope.row.projectName " v-html="scope.row.projectName"></router-link>
<div v-else v-html="scope.row.projectName || '--'"></div>
</template>
<template slot="province" slot-scope="scope">
......
dsk-operate-ui/src/views/detail/party-a/overview/component/bidding.vue
View file @ a3853652
......@@ -65,14 +65,20 @@
</template>
</el-table-column>
<el-table-column
prop="count"
width="160"
align="right"
label="合作次数">
<template slot-scope="scope">
<span style="padding-right: 88px;">{{ scope.row.count }}</span>
</template>
</el-table-column>
<el-table-column
prop="amount"
width="160"
align="right"
label="合作总金额（万元）">
<template slot-scope="scope">
<span style="padding-right: 34px;">{{ scope.row.amount }}</span>
</template>
</el-table-column>
</el-table>
</div>
......@@ -142,16 +148,24 @@ export default {
let option = {
xAxis: {
type: 'category',
boundaryGap: false,
data: labels
},
yAxis: {
type: 'value'
type: 'value',
splitNumber: 5,
splitLine : { //网格线
lineStyle: {
type: 'dashed' //设置网格线类型 dotted：虚线 solid:实线
},
}
},
grid:{
left:'6%',
left:'1',
top:'8%',
right:'2%',
bottom:'8%',
containLabel: true
},
tooltip:{
axisPointer:{ //悬浮于圆点展示标签
......@@ -178,6 +192,7 @@ export default {
show:false
}
},
symbolSize:8,
areaStyle: {
color: {
type: 'linear',
......@@ -235,9 +250,10 @@ export default {
vertical-align: text-top;
}
.zbph-item-num{
font-size: 16px;
font-weight: bold;
display: block;
padding-top: 8px;
padding-top: 10px;
}
}
}
......@@ -271,6 +287,7 @@ export default {
&.on{
background: #0081FF;
color: #FFFFFF;
border-color: #0081FF;
}
&:first-child{
border-radius: 2px 0px 0px 2px;
......
dsk-operate-ui/src/views/detail/party-a/overview/component/busclue.vue
View file @ a3853652
......@@ -98,6 +98,18 @@ export default {
type: 'scroll',
orient: 'horizontal',
bottom: 20,
itemWidth: 14,
itemHeight: 9,
textStyle: {
padding: [-2, 20, -4, 0],
color: 'rgba(0,0,0,0.85)',
backgroundColor: "transparent",
fontSize: 10,
rich: {
a: {
},
},
},
data: data,
pageButtonPosition: 'end',
},
......@@ -114,6 +126,16 @@ export default {
shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)'
}
},
label: {
normal: {
show: true,
textStyle: {
color: 'rgba(0,0,0,0.85)',
fontSize: 10,
fontWeight: 400
}
}
}
}
]
......@@ -161,8 +183,7 @@ export default {
.clue-box{
width: 100%;
justify-content: space-between;
align-items: normal;
margin-top: 8px;
margin: 8px 0 24px 0;
.clue-echarts{
width: calc(50% - 8px);
}
......@@ -186,6 +207,7 @@ export default {
padding-left: 16px;
padding-right: 16px;
.clue-type-item{
font-size: 14px;
color: #232323;
cursor: pointer;
&:hover{
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ a3853652
......@@ -303,7 +303,7 @@ export default {
<style lang="scss" scoped>
.info-container{
margin: 0;
padding: 24px 16px;
padding: 24px 16px 10px 16px;
background: #FFFFFF;
border-radius: 4px;
.company-swiper{
......
dsk-operate-ui/src/views/detail/party-a/overview/component/relationship.vue
View file @ a3853652
......@@ -44,7 +44,7 @@
<router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName" v-html="scope.row.investName"></router-link>
<div v-else v-html="scope.row.investName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
<span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
</div>
</template>
......@@ -88,7 +88,8 @@ export default {
pageNum: 1,
pageSize: 5
},
shipTotal: 0
shipTotal: 0,
labelArr:['失信联合惩戒企业','严重行政处罚','司法纠纷','注销', '注销企业']
}
},
created() {
......@@ -159,6 +160,10 @@ export default {
background: #E4F3FD;
color: #41A1FD;
}
&.style2{
background: #FFF1F1;
color: #FF3C3C;
}
}
}
::v-deep .el-table--border .el-table__cell{
......
dsk-operate-ui/src/views/detail/party-a/overview/component/senior.vue
View file @ a3853652
......@@ -8,14 +8,23 @@
style="width: 100%"
:default-sort = "{prop: 'date', order: 'descending'}"
>
<el-table-column label="序号" width="55" align="left" fixed>
<template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template>
<el-table-column label="序号" width="55" align="left">
<template slot-scope="scope">{{ scope.row.serial }}</template>
</el-table-column>
<el-table-column
prop="name"
prop="userName"
label="姓名"></el-table-column>
<el-table-column
prop="jobTitle"
prop="userJob"
label="职务"></el-table-column>
<el-table-column label="序号" width="55" align="left">
<template slot-scope="scope">{{ scope.row.userNames?scope.row.serials:'' }}</template>
</el-table-column>
<el-table-column
prop="userNames"
label="姓名"></el-table-column>
<el-table-column
prop="userJobs"
label="职务"></el-table-column>
</el-table>
</div>
......@@ -48,7 +57,22 @@ export default {
async handleQuery(){
let res = await keymembers(this.queryParams)
if(res.code==200){
this.tableData = res.rows
let tempRows = []
if(res.rows&&res.rows.length>0){
let arrLength = res.rows.length%2==0?(res.rows.length/2):(Math.floor(res.rows.length/2)+1)
for(let i=0; i<arrLength; i++){
let obj = {
serial: 2*i+1,
userName:res.rows[2*i]?res.rows[2*i].name:'',
userJob:res.rows[2*i]?res.rows[2*i].jobTitle:'',
serials: 2*i+2,
userNames:res.rows[2*i+1]?res.rows[2*i+1].name:'',
userJobs:res.rows[2*i+1]?res.rows[2*i+1].jobTitle:''
}
tempRows.push(obj)
}
}
this.tableData = tempRows
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/overview/component/tender.vue
View file @ a3853652
......@@ -4,7 +4,7 @@
<div class="common-title">招标公告</div>
<template v-if="zbggList.length>0">
<div class="tender-item" v-for="(item, index) in zbggList" :key="index">
<div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Tender/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.projectCategory}}</span></div>
<div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Notice/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.projectCategory}}</span></div>
<span class="tender-time">{{item.issueTime}}</span>
</div>
</template>
......
dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue
View file @ a3853652
......@@ -23,7 +23,7 @@
<router-link :to="`/enterprise/${encodeStr(scope.row.stockId)}`" tag="a" class="a-link" v-if="scope.row.stockId&&scope.row.stockName " v-html="scope.row.stockName"></router-link>
<div v-else v-html="scope.row.stockName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus">
<span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingCount">招标{{scope.row.biddingCount}}</span>
<span class="tag style1" v-if="scope.row.landInfoCount">土地{{scope.row.landInfoCount}}</span>
<span class="tag style1" v-if="scope.row.proposedProjectCount">拟建{{scope.row.proposedProjectCount}}</span>
......@@ -65,6 +65,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
labelArr:['失信联合惩戒企业','严重行政处罚','司法纠纷','注销', '注销企业'],
}
},
created() {
......@@ -120,6 +121,10 @@ export default {
background: #E4F3FD;
color: #41A1FD;
}
&.style2{
background: #FFF1F1;
color: #FF3C3C;
}
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue
View file @ a3853652
......@@ -22,7 +22,7 @@
<router-link :to="`/enterprise/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.investName " v-html="scope.row.investName"></router-link>
<div v-else v-html="scope.row.investName || '--'"></div>
<div class="tags" v-if="scope.row.businessStatus || scope.row.biddingAnnouncement">
<span class="tag style1" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag" :class="labelArr.includes(scope.row.businessStatus)?'style2':'style1'" v-if="scope.row.businessStatus">{{scope.row.businessStatus}}</span>
<span class="tag style1" v-if="scope.row.biddingCount">招标数{{scope.row.biddingCount}}</span>
</div>
</template>
......@@ -86,6 +86,7 @@ export default {
tableLoading:false,
tableData:[],
tableDataTotal:0,
labelArr:['失信联合惩戒企业','严重行政处罚','司法纠纷','注销', '注销企业'],
}
},
created() {
......@@ -146,6 +147,10 @@ export default {
background: #E4F3FD;
color: #41A1FD;
}
&.style2{
background: #FFF1F1;
color: #FF3C3C;
}
}
}
}
......
dsk-operate-ui/src/views/project/overview/index.vue
View file @ a3853652
......@@ -249,10 +249,11 @@ export default {
switch (type) {
case 1:
time = time.getDay()
// week.length = time
time = time == 0?7:time
weekdata1.length = time
weekdata2.length = time
weekdata3.length = time
console.log(time)
for(var i=0;i<7;i++){
if(i > time){
weekdata1.push('')
......@@ -303,6 +304,8 @@ export default {
default:
break;
}
console.log(datas)
console.log(labels)
this.initDT(datas,labels)
},
resizeEcharts (){
......
dsk-operate-ui/src/views/project/projectList/component/gjjl.vue
View file @ a3853652
......@@ -100,6 +100,7 @@
<div><strong>{{item.nickName}}</strong> <span v-if="item.visitWay">({{item.visitWay}})</span></div>
<div><span>{{item.recordInfo}}</span></div>
<div class="rec_text">
<span v-if="item.projectName && showtype == 'projectgjdt'">关联项目：{{item.projectName||'--'}}</span>
<span v-if="item.visitPerson">拜访对象：{{item.visitPerson||'--'}}</span>
<span v-if="item.position">职位：{{item.position||'--'}}</span>
<span v-if="item.creatTime">拜访时间：{{item.creatTime}}</span>
......@@ -178,7 +179,6 @@
computed: {
},
created(){
console.log(this.isDisabled)
//获取拜访方式
getDictType('visit_mode_type').then(result=>{
this.bffslist = result.code == 200 ? result.data:[]
......@@ -225,6 +225,7 @@
this.$message.success(result.msg)
this.handleCurrentChange(1)
this.isEdit = false
this.resetForm()
}else{
this.$message.error(result.msg)
}
......@@ -245,12 +246,24 @@
this.$message.success(result.msg)
this.handleCurrentChange(1)
this.isEdit = false
this.resetForm()
}else{
this.$message.error(result.msg)
}
})
}
},
resetForm(){
this.addParam={
customerId:'', //客户id
visitMode:'',//拜访方式
nextVisitTime:'',//下次拜访时间
name:'',//拜访对象姓名
position:'',//拜访对象职务
content:'',//拜访内容
}
},
//删除跟进动态
delRecord(id){
this.isdel = true
......
dsk-operate-ui/src/views/project/projectList/component/jsnr.vue
View file @ a3853652
<template>
<div>
<div id="jsnr">
<el-card class="box-card noborder">
<div class="cardtitles">基本信息</div>
<div class="baseinfo" style="padding-bottom: 8px">
......@@ -208,7 +208,9 @@
type: Number,
default: 0
},
isDisabled:false,
isDisabled:{
default: false
},
},
data(){
return{
......@@ -233,7 +235,7 @@
watch:{
},
mounted(){
document.addEventListener('mouseup',(e) => {
document.getElementById('jsnr').addEventListener('mouseup',(e) => {
if(this.isDisabled == true)
return false
let j = 0
......@@ -305,19 +307,23 @@
})
},
changes(str){
this.nowedit = -1
let param = str
param.id = this.id
if(this.isDisabled == true)
return false
editXMNR(param).then(result=>{
if(result.code == 200)
if(result.code == 200){
this.$message.success('修改成功!')
if(param.investmentAmount){//修改项目阶段
this.$emit('Refrehmoney')
}
}
else{
this.$message.error(res.msg)
this.$message.error(result.msg)
this.getJSNR()
}
})
this.nowedit = -1
},
//输入数字
number(value){
......
dsk-operate-ui/src/views/project/projectList/component/xmsl.vue
View file @ a3853652
<template>
<div>
<div id="xmsl">
<el-card class="box-card noborder">
<div class="cardtitles">基本信息</div>
<div class="baseinfo">
......@@ -204,7 +204,7 @@
this.getXMSL()
},
mounted(){
document.addEventListener('mouseup',(e) => {
document.getElementById('xmsl').addEventListener('mouseup',(e) => {
if(this.isDisabled == true)
return false
let j = 0
......@@ -236,13 +236,16 @@
param = {'constructionPrincipal':this.xmsldata.constructionPrincipal}
break;
case 6 :
param = {'supervisorPhone':this.xmsldata.supervisorPhone}
// param = {'supervisorPhone':this.xmsldata.supervisorPhone}
this.isphone(1,this.xmsldata.supervisorPhone)
break;
case 7 :
param = {'constructionPhone':this.xmsldata.constructionPhone}
// param = {'constructionPhone':this.xmsldata.constructionPhone}
this.isphone(1,this.xmsldata.constructionPhone)
break;
}
this.editXMSL(param)
if(this.nowedit!=6 && this.nowedit!=7)
this.editXMSL(param)
}
this.nowedit = -1
}
......@@ -285,7 +288,7 @@
//验证电话号码
isphone(type,value){
var regPartton = /1[3-9]+\d{9}/;
var regPartton1 = /^(0[0-9]{2,3}[\-]?[2-9][0-9]{6,7}[\-]?[0-9]?)$/;
var regPartton1 = /0\d{2,3}-\d{7,8}|\(?0\d{2,3}[)-]?\d{7,8}|\(?0\d{2,3}[)-]*\d{7,8}/;
if (!regPartton.test(value) && !regPartton1.test(value)) {
this.$message.error("请输入正确的电话");
} else {
......
dsk-operate-ui/src/views/project/projectList/detail.vue
View file @ a3853652
......@@ -58,7 +58,7 @@
</div>
<div class="det-con con" id="inputxt">
<span>投资估算（万元）：</span>
<div class="inputxt i" :class="{'nomar':nowedit != 3}">
<div class="inputxt i" :class="{'nomar':nowedit != 3}" :key="keys2">
<div class="flex" v-if="nowedit == 3 && isDisabled == false">
<el-input v-model="ProjectData.investmentAmount" placeholder="待添加" @input="number"></el-input>
<div class="flex">
......@@ -109,7 +109,7 @@
<!--项目速览-->
<xmsl v-if="thistag == 'xmsl'" :key="keys" @Refreshs="getsl" :detailId="detailId"></xmsl>
<!--建设内容-->
<jsnr v-if="thistag == 'jsnr'" :isDisabled='isDisabled' :detailId="detailId"></jsnr>
<jsnr v-if="thistag == 'jsnr'" :key="keys1" :isDisabled='isDisabled' @Refrehmoney="getXMSL" :detailId="detailId"></jsnr>
<!--联系人-->
<lxr v-if="thistag == 'lxr'" :isDisabled='isDisabled' :detailId="detailId"></lxr>
<!--跟进记录-->
......@@ -177,6 +177,8 @@
ProjectData:{},
isDisabled:false,
keys:1,
keys1:2,
keys2:20,
}
},
created(){
......@@ -247,6 +249,7 @@
}
this.address = list.length>0?list:"待添加"
this.addresstxt = txt == "" ? "待添加":txt
this.keys2 ++;
})
},
locks(isPrivate){
......@@ -263,6 +266,12 @@
editXMNR(JSON.stringify(params)).then(res=>{
if (res.code == 200){
this.$message.success('修改成功！')
if(this.nowedit == 1){
let _this = this
setTimeout(function() {
_this.keys1++;
},1000)
}
}else{
this.$message.error(res.msg)
this.getXMSL()
......
dsk-operate-ui/src/views/project/trends/index.vue
View file @ a3853652
<template>
<div class="app-container">
<gjjl types="projectgjdt"></gjjl>
<gjjl types="projectgjdt" isDisabled=false></gjjl>
</div>
</template>
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ a3853652
......@@ -155,14 +155,14 @@
<router-link :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p>
<div class="content-label" v-if="(item.province||item.city||item.city)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
<div class="content-label" v-if="(item.province||item.city||item.area)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
<span class="list-label" v-if="item.domicile">
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.city">
-{{item.city}}
<template v-if="item.area">
-{{item.area}}
</template>
</span>
<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ a3853652
......@@ -228,14 +228,12 @@
</div>
<div class="list-content" v-if="item.buildScale">
<p class="list-content-text" >
<span>建设规模：</span>
<span>{{item.buildScale}}</span>
<div class="list-content" v-if="item.buildScale">
<p class="list-content-text">
<span class="content-text-gc">建设规模：</span>
<span class="content-text-p">{{item.buildScale||'--'}}</span>
</p>
</div>
......@@ -1309,6 +1307,12 @@
color: rgba(35,35,35,0.8);
line-height: 15px
}
.content-text-gc{
width: 72px;
}
.content-text-p{
width: 1200px;
}
.blue{
color: #0081FF !important;
cursor: pointer;
......@@ -1323,7 +1327,7 @@
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 7px;
margin-top: 12px;
.list-content-text{
margin-top: 0px;
span{
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseBussinessService.java
View file @ a3853652
......@@ -66,8 +66,8 @@ public class EnterpriseBussinessService {
contentParam.put("strategy_id", mongoContentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
Map contentData = MapUtils.getMap(contentMap, "data", null);
log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
return BeanUtil.toBean(map, R.class);
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java
View file @ a3853652
......@@ -127,8 +127,8 @@ public class EnterpriseProjectService {
contentParam.put("strategy_id", contentId);
Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", contentParam);
log.info("contentData:{}", JSONUtil.toJsonStr(contentMap));
Map contentData = MapUtils.getMap(contentMap, "data", null);
log.info("contentData:{}", JSONUtil.toJsonStr(contentData));
if (200 != MapUtils.getInteger(contentMap, "code", 300)) {
return BeanUtil.toBean(map, R.class);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment