Skip to content

D
dsk-operate-sys-cscec
Commit faca9663 authored by danfuman's avatar danfuman
Browse files
Options

修改

parent 456dfb57
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1036 additions and 114 deletions
dsk-operate-ui/src/api/projectCostLedger/index.js
View file @ faca9663
......@@ -11,6 +11,14 @@ export const getProjectDetailApi = (projectId) => request({
params: {}
});
//校验项目名称是否有相同
export function checkProjectNameExistProjectName(data) {
return request({
url: '/cbProjectRecord/checkProjectNameExist/projectName',
method: 'get',
params: data,
});
}
//校验项目编码是否存在
export function checkProjectCodeExist(data) {
return request({
......
dsk-operate-ui/src/components/CustomTable/index.vue
View file @ faca9663
......@@ -11,7 +11,7 @@
<!-- 列二次封装 -->
<template v-for="(item,index) of formColum">
<table-list-column v-if="item.use !== false" :key="item.uid" :tableData="tableData" :item="item">
<table-list-column v-if="item.use !== false" :key="item.uid" :tableData="tableData" :item="item" :queryParams="queryParams">
<!-- 根据透传属性创建插槽 -->
<template v-for="(fn, slotName) in $slots" :slot="slotName">
<slot :name="slotName"></slot>
......
dsk-operate-ui/src/components/TableListCom/index.vue
View file @ faca9663
......@@ -13,7 +13,7 @@
</el-table-column>
<!-- 列二次封装 -->
<template v-for="(item,index) of formColum">
<table-list-column v-if="item.use !== false" :key="item.uid ? item.uid : index" :tableData="tableData" :item="item">
<table-list-column v-if="item.use !== false" :key="item.uid ? item.uid : index" :tableData="tableData" :item="item" :queryParams="queryParams">
<!-- 根据透传属性创建插槽 -->
<template v-for="(index, name) in $slots" :slot="name">
<slot :name="name" />
......@@ -167,7 +167,7 @@ export default {
async maxHeightInit() {
try {
await this.$nextTick();
/**
/**
* @type {HTMLDivElement}
*/
const container = this.$el.querySelector(".table-item");
......
dsk-operate-ui/src/views/consultingOrgManagement/components/ProjectList/index.vue
View file @ faca9663
......@@ -71,7 +71,7 @@
<skeleton v-if="tableLoading"></skeleton>
<!-- table 列表 -->
<table-list-com ref="tableContainer" :tableData="tableDataList" :formColum="formColum" :tableDataTotal="total" :queryParams="queryParams"
v-else-if="!tableLoading" :maxHeight="true" @handle-current-change="handleCurrentChange">
v-else-if="!tableLoading" :maxHeight="false" @handle-current-change="handleCurrentChange">
<!-- 项目列表 -->
<template slot="projectName" slot-scope="{data,row}">
<div v-if="row.projectName" class="no-line-feed" v-html="row.projectName" @click="viewProjectDetail(row)">{{row.projectName}}</div>
......
dsk-operate-ui/src/views/consultingOrgManagement/enterpriseList.vue
View file @ faca9663
......@@ -68,8 +68,8 @@ export default {
.default-layout-container-inner {
.cooperation-desk-account-project,
.cooperation-desk-account-enterprise {
overflow: hidden;
height: calc(100%);
/*overflow: hidden;*/
/*height: calc(100%);*/
}
}
.title_wrap{
......
dsk-operate-ui/src/views/consultingOrgManagement/projectList.vue
View file @ faca9663
......@@ -63,8 +63,8 @@ export default {
.default-layout-container-inner {
.cooperation-desk-account-project,
.cooperation-desk-account-enterprise {
overflow: hidden;
height: calc(100%);
/*overflow: hidden;*/
/*height: calc(100%);*/
}
}
.title_wrap{
......
dsk-operate-ui/src/views/detail/party-a/internalCooperation/cooperationRecord.vue
View file @ faca9663
......@@ -65,9 +65,9 @@ export default {
{ label: '联系电话', prop: 'projectManagerPhone', width: '102' },
{ label: '资源平台类型', prop: 'projectType2', width: '98' },
{ label: '合同签订日期', prop: 'signDate', width: '149' },
{ label: '合同总价', prop: 'subcontractValue', width: '79' },
{ label: '结算总价', prop: 'settleValue', width: '79' },
{ label: '分包内容', prop: 'jobScope', width: '126' },
{ label: '合同总价', prop: 'subcontractValue', width: '100' },
{ label: '结算总价', prop: 'settleValue', width: '100' },
{ label: '分包内容', prop: 'jobScope', width: '400' },
{ label: '工程类型', prop: 'projectType2', width: '78' },
{ label: '队伍完工评价', prop: '', minWidth: '98' },
{ label: '合同完工评价', prop: '', minWidth: '98' },
......
dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue
View file @ faca9663
......@@ -231,7 +231,6 @@
selectList:[],
selectList1:[],
sffx:[],
gsfx:[],
queryParams:{
pageNum:1,
pageSize:50,
......@@ -348,29 +347,15 @@
}else {
delete params.condition.riskLevel
}
let sffx = this.sffx
let sffx = this.sffx;
if(sffx.indexOf('不限')>-1){
sffx = []
}
let gsfx = this.gsfx
if(gsfx.indexOf('不限')>-1){
gsfx = []
}
if(sffx.length > 0 && gsfx.length > 0){
params.condition.riskType='司法风险,工商风险'
params.condition.dimension=this.sffx.concat(this.gsfx)
}
if(sffx.length > 0 && gsfx.length === 0){
params.condition.riskType='司法风险'
params.condition.dimension=this.sffx
}
if(sffx.length === 0 && gsfx.length > 0){
params.condition.riskType='工商风险'
params.condition.dimension=this.gsfx
}
if(sffx.length === 0 && gsfx.length === 0){
delete params.condition.riskType
delete params.condition.dimension
if(sffx.length > 0){
params.condition.parentDimension=['司法风险']
params.condition.dimension=this.sffx;
}else {
params.condition.parentDimension=['司法风险']
}
dynamicPage(params).then(res => {
this.isSkeleton = false;
......@@ -420,21 +405,6 @@
this.queryParams.pageSize=10
this.querySubmit()
},
changeGsfx(val) {
if(val == '不限')
this.gsfx = ['不限']
else if(this.gsfx.indexOf('不限')>-1){
this.gsfx.splice(this.gsfx.indexOf('不限'),1)
}
// if (this.gsfx.indexOf(val.dimensionName) == -1) {
// this.gsfx.push(val.dimensionName)
// } else {
// this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
// }
this.queryParams.pageNum=1
this.queryParams.pageSize=10
this.querySubmit()
},
checkFxjbBtn(val) {
this.fxjbType = [];
this.checkFx = true;
......@@ -724,7 +694,7 @@
.main-right {
width: calc(100% - 112px);
.select-popper {
text-align: center;
/*text-align: center;*/
display: inline-block;
position: relative;
color: #333333;
......
dsk-operate-ui/src/views/monitoring/MonitoringDynamicsgs.vue
View file @ faca9663
......@@ -229,7 +229,6 @@
],
selectList:[],
selectList1:[],
sffx:[],
gsfx:[],
queryParams:{
pageNum:1,
......@@ -347,29 +346,15 @@
}else {
delete params.condition.riskLevel
}
let sffx = this.sffx
if(sffx.indexOf('不限')>-1){
sffx = []
}
let gsfx = this.gsfx
if(gsfx.indexOf('不限')>-1){
gsfx = []
}
if(sffx.length > 0 && gsfx.length > 0){
params.condition.riskType='司法风险,工商风险'
params.condition.dimension=this.sffx.concat(this.gsfx)
}
if(sffx.length > 0 && gsfx.length === 0){
params.condition.riskType='司法风险'
params.condition.dimension=this.sffx
}
if(sffx.length === 0 && gsfx.length > 0){
params.condition.riskType='工商风险'
params.condition.dimension=this.gsfx
}
if(sffx.length === 0 && gsfx.length === 0){
delete params.condition.riskType
delete params.condition.dimension
if(gsfx.length > 0){
params.condition.parentDimension=['工商风险']
params.condition.dimension=this.gsfx;
}else {
params.condition.parentDimension=['工商风险']
}
dynamicPage(params).then(res => {
this.isSkeleton = false;
......@@ -404,21 +389,6 @@
this.detail=res.data;
})
},
changeSffx(val) {
if(val == '不限')
this.sffx = ['不限']
else if(this.sffx.indexOf('不限')>-1){
this.sffx.splice(this.sffx.indexOf('不限'),1)
}
// if (this.sffx.indexOf(val.dimensionName) == -1) {
// this.sffx.push(val.dimensionName)
// } else {
// this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
// }
this.queryParams.pageNum=1
this.queryParams.pageSize=10
this.querySubmit()
},
changeGsfx(val) {
if(val == '不限')
this.gsfx = ['不限']
......@@ -723,7 +693,7 @@
.main-right {
width: calc(100% - 112px);
.select-popper {
text-align: center;
/*text-align: center;*/
display: inline-block;
position: relative;
color: #333333;
......
dsk-operate-ui/src/views/monitoring/MonitoringDynamicsjy.vue 0 → 100644
View file @ faca9663
This diff is collapsed.
dsk-operate-ui/src/views/monitoring/MonitoringReport/daily.vue
View file @ faca9663
......@@ -67,7 +67,7 @@
import { reportPage } from '@/api/monitoring/monitoring'
import skeleton from '../../component/skeleton'
export default {
name: 'MonitoringReport',
name: 'daily',
components: {
skeleton
},
......@@ -93,6 +93,7 @@
},
created() {
this.querySubmit()
console.log("111111")
},
methods: {
async querySubmit() {
......@@ -126,6 +127,20 @@
<style lang="scss" scoped>
.MonitoringReport{
.title_wrap{
padding: 20px;
background-color: #FFFFFF;
border-bottom: 1px solid #e0e0e0;
}
.enterprise_title{
border-left: 2px solid #445781;
padding-left: 8px;
font-size: 16px;
height: 16px;
line-height: 16px;
font-weight: 700;
color: #232323;
}
/*background: #ffffff;*/
.header{
justify-content: space-between;
......
dsk-operate-ui/src/views/monitoring/MonitoringReport/monthlyReport.vue
View file @ faca9663
......@@ -67,7 +67,7 @@
import { reportPage } from '@/api/monitoring/monitoring'
import skeleton from '../../component/skeleton'
export default {
name: 'MonitoringReport',
name: 'monthlyReport',
components: {
skeleton
},
......@@ -127,6 +127,22 @@
<style lang="scss" scoped>
.MonitoringReport{
/*background: #ffffff;*/
.title_wrap{
padding: 20px;
background-color: #FFFFFF;
border-bottom: 1px solid #e0e0e0;
}
.enterprise_title{
border-left: 2px solid #445781;
padding-left: 8px;
font-size: 16px;
height: 16px;
line-height: 16px;
font-weight: 700;
color: #232323;
}
.header{
justify-content: space-between;
height: 48px;
......
dsk-operate-ui/src/views/monitoring/MonitoringReport/weekly.vue
View file @ faca9663
......@@ -67,7 +67,7 @@
import { reportPage } from '@/api/monitoring/monitoring'
import skeleton from '../../component/skeleton'
export default {
name: 'MonitoringReport',
name: 'weekly',
components: {
skeleton
},
......@@ -127,6 +127,22 @@
<style lang="scss" scoped>
.MonitoringReport{
/*background: #ffffff;*/
.title_wrap{
padding: 20px;
background-color: #FFFFFF;
border-bottom: 1px solid #e0e0e0;
}
.enterprise_title{
border-left: 2px solid #445781;
padding-left: 8px;
font-size: 16px;
height: 16px;
line-height: 16px;
font-weight: 700;
color: #232323;
}
.header{
justify-content: space-between;
height: 48px;
......
dsk-operate-ui/src/views/monitoring/MonitoringReportDetails.vue
View file @ faca9663
......@@ -64,6 +64,17 @@
</div>
</div>
</div>
<div class="search-item">
<div class="label">经营风险</div>
<div class="main-right">
<div class="select-popper">
<el-checkbox-group v-model="jyfx">
<el-checkbox label="不限" @change="changeJyfx('不限')">不限</el-checkbox>
<el-checkbox v-for="(i,index) in selectList2" :key="index" :label="i.dimensionName" @change="changeJyfx(i)">{{i.dimensionName}}</el-checkbox>
</el-checkbox-group>
</div>
</div>
</div>
<div class="search-item" style="line-height: 16px;">
<div class="label">时间筛选</div>
<div class="checkbox">
......@@ -169,6 +180,13 @@
</template>
</info-table>
</template>
<template v-if="title=='行政处罚详情'">
<info-table class="info-tab" :list="defaultList6" :obj="detail" :labelWidth="labelWidth">
<template v-slot:dataSource="row">
<span v-for="i in row.data.dataSource">{{i.web}}</span>
</template>
</info-table>
</template>
</div>
</el-dialog>
</div>
......@@ -231,8 +249,11 @@
fxlxType:[],
selectList:[],
selectList1:[],
selectList2:[],
sffx:[],
gsfx:[],
jyfx:[],
dimension:[],
queryParams:{
pageNum:1,
pageSize:10,
......@@ -314,6 +335,19 @@
{ name: '判决日期', prop: 'date'},
{ name: '判决结果', prop: 'judgeresult',style: true},
],
//行政处罚详情
defaultList6:[
{ name: '企业名称', prop: 'companyName'},
{ name: '相关人员', prop: 'personName' },
{ name: '决定文书号', prop: 'fileNum'},
{ name: '处罚类型', prop: 'punishType'},
{ name: '处罚开始日期', prop: 'punishBegin'},
{ name: '处罚结束日期', prop: 'punishEnd'},
{ name: '处罚机关', prop: 'office',style: true},
{ name: '处罚内容（原因）', prop: 'punishReason',style: true},
{ name: '处罚结果', prop: 'punishResult',style: true},
{ name: '来源', prop: 'dataSource',style: true,slot: true},
],
title:'开庭公告详情',
detail:{}
}
......@@ -321,7 +355,6 @@
created() {
this.getPlaceholder()
this.querySubmit()
console.log(this.$route.params)
rulesSelect().then(res => {
this.selectList=res.data;
for(let i in res.data){
......@@ -331,6 +364,9 @@
if(res.data[i].dimensionName === '工商风险'){
this.selectList1=res.data[i].children
}
if(res.data[i].dimensionName === '经营风险'){
this.selectList2=res.data[i].children
}
}
})
},
......@@ -346,6 +382,7 @@
// } else {
// this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
// }
this.queryParams.pageNum=1
this.queryParams.pageSize=10
this.querySubmit()
......@@ -365,6 +402,16 @@
this.queryParams.pageSize=10
this.querySubmit()
},
changeJyfx(val) {
if(val == '不限')
this.jyfx = ['不限']
else if(this.jyfx.indexOf('不限')>-1){
this.jyfx.splice(this.jyfx.indexOf('不限'),1)
}
this.queryParams.pageNum=1
this.queryParams.pageSize=10
this.querySubmit()
},
async querySubmit() {
let endTime = new Date()
let params={
......@@ -392,22 +439,37 @@
if(gsfx.indexOf('不限')>-1){
gsfx = []
}
if(sffx.length > 0 && gsfx.length > 0){
params.condition.riskType='司法风险,工商风险'
params.condition.dimension=this.sffx.concat(this.gsfx)
let jyfx = this.jyfx
if(jyfx.indexOf('不限')>-1){
jyfx = []
}
if(sffx.length > 0 && gsfx.length === 0){
params.condition.riskType='司法风险'
params.condition.dimension=this.sffx
}
if(sffx.length === 0 && gsfx.length > 0){
params.condition.riskType='工商风险'
params.condition.dimension=this.gsfx
}
if(sffx.length === 0 && gsfx.length === 0){
delete params.condition.riskType
delete params.condition.dimension
let arr=[
...sffx,
...gsfx,
...jyfx,
]
if(arr.length > 0){
params.condition.dimension=arr
}
// if(sffx.length > 0 && gsfx.length > 0 && jyfx.length > 0){
// // params.condition.riskType='司法风险,工商风险'
// params.condition.dimension=this.sffx.concat(this.gsfx)
// }
// if(sffx.length > 0 && gsfx.length === 0){
// // params.condition.riskType='司法风险'
// params.condition.dimension=this.sffx
// }
// if(sffx.length === 0 && gsfx.length > 0){
// // params.condition.riskType='工商风险'
// params.condition.dimension=this.gsfx
// }
// if(sffx.length === 0 && gsfx.length === 0){
// // delete params.condition.riskType
// delete params.condition.dimension
// }
dynamicPage(params).then(res => {
this.isSkeleton = false;
this.object=res.object;
......@@ -477,6 +539,10 @@
this.title='股权冻结详情'
this.getDetail(item.dimensionName,item.sourceId)
break;
case '新增行政处罚':
this.title='行政处罚详情'
this.getDetail(item.dimensionName,item.sourceId)
break;
default:
this.$message.success("暂无详情");
break;
......@@ -671,6 +737,7 @@
border-radius: 4px;
.enterprise{
border-bottom: 1px solid #EEEEEE;
margin-bottom: 18px;
.name{
img{
width: 28px;
......@@ -711,7 +778,7 @@
.main-right {
width: calc(100% - 112px);
.select-popper {
text-align: center;
/*text-align: center;*/
display: inline-block;
position: relative;
color: #333333;
......
dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue
View file @ faca9663
......@@ -273,11 +273,11 @@ export default {
total: 0,
// 列表表头
formColum: [
{ label: '序号', prop: "staticSerialNumber", type: "index", lock: true, width: "53", fixed: false, uid: v4() },
{ label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4() },
{ label: '序号', prop: "staticSerialNumber", type: "index", lock: true, width: "53", fixed: true, uid: v4() },
{ label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4(), fixed: true },
{ label: '名称', prop: "cbName", width: "232", uid: v4(), fixed: true },
{ label: '公司编码', prop: "companyNo", width: "137", uid: v4() },
{ label: '集团编码', prop: "orgNo", width: "137", uid: v4() },
{ label: '名称', prop: "cbName", width: "232", uid: v4() },
{ label: '工作内容', prop: "jobContent", width: "341", uid: v4() },
{ label: '计算规则', prop: "calculationRule", width: "137", uid: v4() },
{ label: '单位', prop: "unit", width: "57", uid: v4() },
......@@ -311,10 +311,10 @@ export default {
entityMaterialsFormColum: [
{ label: '多选', prop: "staticSerialNumber", type: "selection", lock: true, width: "53", fixed: "left", uid: v4() },
{ label: '序号', prop: "staticIndexNumber", type: "index", lock: true, width: "53", fixed: "left", uid: v4() },
{ label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4() },
{ label: '成本科目', prop: "cbSubjectName", width: "137", uid: v4(), fixed: "left" },
{ label: '名称', prop: "cbName", width: "232", uid: v4(), fixed: "left" },
{ label: '公司编码', prop: "companyNo", width: "137", uid: v4() },
{ label: '集团编码', prop: "orgNo", width: "137", uid: v4() },
{ label: '名称', prop: "cbName", width: "232", uid: v4() },
{ label: '工作内容', prop: "jobContent", width: "341", uid: v4() },
{ label: '计算规则', prop: "calculationRule", width: "137", uid: v4() },
{ label: '单位', prop: "unit", width: "57", uid: v4() },
......
dsk-operate-ui/src/views/projectCostLedger/index.vue
View file @ faca9663
......@@ -134,8 +134,8 @@
<el-table-column label="操作" min-width="260" :resizable="false" fixed="right">
<template slot-scope="scope">
<span class="wordprimary tabs" @click="editpro(scope.row)">修改项目信息</span>
<span class="wordprimary tabs" @click="detailpro(scope.row)" v-if="scope.row.cbStage !=3">查看导入进度</span>
<span style="color:#eee;" class="wordprimary tabs" v-if="scope.row.cbStage ===3">查看导入进度</span>
<span class="wordprimary tabs" @click="detailpro(scope.row)" v-if="scope.row.cbStage !=3 || scope.row.cbStage !='3'">查看导入进度</span>
<span style="color:#eee;" class="wordprimary tabs" v-if="scope.row.cbStage ===3 || scope.row.cbStage ==='3'">查看导入进度</span>
<span class="worddel tabs" v-if="scope.row.projectFileStatus != 1" @click="deleetpro(scope.row)">删除</span>
</template>
</el-table-column>
......@@ -177,7 +177,7 @@
</div>
<el-form class="popform" label-width="97px" :model="queryParam" :rules="rules" ref="ruleForm">
<el-form-item label="项目名称" class="row" prop="projectName">
<el-input type="text" v-model="queryParam.projectName" placeholder="请输入完整的项目名称"></el-input>
<el-input type="text" v-model="queryParam.projectName" @blur="blurProjectName" placeholder="请输入完整的项目名称"></el-input>
</el-form-item>
<el-form-item label="IPM项目编码" class="row">
<el-input type="text" placeholder="请输入IPM项目编码" v-model="queryParam.ipmProjectNo">
......@@ -199,7 +199,8 @@
<div class="btn btn_primary h32" v-if="isedit && !ischeck" @click="savepro">保存</div>
<div class="btn btn_primary h32" v-if="!isedit && ischeck && queryParam.cbStage ==='3'" @click="insertPro1">创建项目</div>
<div class="btn btn_primary h32" v-if="isedit && ischeck && queryParam.cbStage !=='3'" @click="changepro">下一步，导入数据</div>
<div class="btn btn_primary h32" v-if="!isedit && ischeck && queryParam.cbStage !=='3'" @click="insertPro" :class="{'btn_disabled':!queryParam.cbStage}" :disabled="!queryParam.cbStage">下一步，导入数据</div>
<div class="btn btn_primary h32" v-if="!isedit && ischeck && queryParam.cbStage !=='3' && !repeatState" @click="insertPro" :class="{'btn_disabled':!queryParam.cbStage}" :disabled="!queryParam.cbStage">下一步，导入数据</div>
<div class="btn btn_primary h32" v-if="!isedit && ischeck && queryParam.cbStage !=='3' && repeatState" @click="insertPro" :class="{'btn_disabled':repeatState}" :disabled="repeatState">下一步，导入数据</div>
</div>
</el-dialog>
......@@ -260,6 +261,7 @@
import {
addNewStageProject,
addProject,
checkProjectNameExistProjectName,
checkProjectCodeExist,
deleteDraft,
editProjectInfo,
......@@ -316,6 +318,7 @@
checkAll:false,
checkds:[],
allchecks:[],//可以用的项目阶段
repeatState:false, //当新增项目名称重复的时候下一步按钮状态
};
},
//可访问data属性
......@@ -469,9 +472,30 @@
this.getlist()
},
//验证项目名称是否有相同的
blurProjectName(){
let pram = {
projectName:this.queryParam.projectName
}
checkProjectNameExistProjectName(pram).then(res=>{
if(res.code == 200 && res.data){
this.$confirm(res.msg, '提示', {
confirmButtonText: '修改项目信息',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.editpro(res.data)
}).catch(() => {
this.repeatState = true
});
}else{
this.repeatState = false
}
})
},
getipmProjectNo(){
//点击且校验了当前编码有数据才获取
console.log(this.queryParam)
let pram = {
projectId:this.queryParam.id,
projectCode:this.queryParam.ipmProjectNo
......
dsk-operate-ui/vue.config.js
View file @ faca9663
......@@ -36,7 +36,7 @@ module.exports = {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `http://111.204.34.146:9099/prod-api`,//测试
target: `http://172.17.0.12: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`, //线上
......
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