Commit 6f669b92 authored by danfuman's avatar danfuman
parents ad528408 f9f20fd9
......@@ -265,11 +265,11 @@ public class FileUtils
for (File directory : files) {
// 如果是文件夹则递归调用此方法
if (directory.isDirectory()) {
fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(directory.lastModified())));
fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(directory.lastModified())));
getAllFiles(directory.getPath());
} else {
// 如果是文件则直接输出路径
fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(directory.lastModified())));
fileList.add(new BusinessFileVo(directory.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(directory.lastModified())));
}
}
return fileList;
......@@ -301,7 +301,7 @@ public class FileUtils
tempFile = new File(path + File.separator + fileName);
}
if (tempFile.isFile()) {
fileList.add(new BusinessFileVo(tempFile.getPath(),new SimpleDateFormat("yyyy-MM-dd").format(tempFile.lastModified())));
fileList.add(new BusinessFileVo(tempFile.getPath(),new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(tempFile.lastModified())));
}
if (tempFile.isDirectory()) {
List<BusinessFileVo> allFiles = getAllFileNames(tempFile.getAbsolutePath());
......
dsk-operate-ui/public/favicon.ico

5.53 KB | W: | H:

dsk-operate-ui/public/favicon.ico

16.6 KB | W: | H:

dsk-operate-ui/public/favicon.ico
dsk-operate-ui/public/favicon.ico
dsk-operate-ui/public/favicon.ico
dsk-operate-ui/public/favicon.ico
  • 2-up
  • Swipe
  • Onion skin
......@@ -739,7 +739,7 @@ select {
.checkbox {
display: flex;
align-items: center;
align-items: flex-start;
}
.checkbox .checkbox-titel {
......@@ -751,7 +751,7 @@ select {
.checkbox .checkbox-content {
display: flex;
align-items: center;
align-items: flex-start;
}
.checkbox .el-checkbox__label {
......
......@@ -43,6 +43,7 @@ export default {
.app-main {
/* 84 = navbar + tags-view = 50 + 34 */
min-height: calc(100vh - 56px);
min-width:1440px;
background: #F5F5F5;
}
......
......@@ -345,7 +345,7 @@ export default {
getCustomerList(this.searchParam).then(result=>{
this.tableData = result
this.tableData.rows.forEach(item=>{
item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
item.registerCapital = item.registerCapital == null?null: item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
if(item.mainBusiness != "" && item.mainBusiness != null && item.mainBusiness.length>84){
item.mainBusiness1 = item.mainBusiness.substring(0,81)
item.sq1 = true
......
......@@ -167,11 +167,15 @@ export default {
},
beforeRouteEnter(to, from, next) {
next(vm => {
if(from.name){
if (to.query.customerId){
let customerId = to.query.customerId
vm.association(customerId)
if(to.query.path){
vm.currentPath.pathName = to.query.path
}
vm.association(customerId)
}
}
})
},
created() {
......@@ -277,6 +281,7 @@ export default {
<style lang="scss" scoped>
.part-container{
min-width: 1300px;
padding: 0;
}
.part-main{
......
......@@ -49,9 +49,9 @@ export default {
defaultSort: {prop: 'projectTotalInvestment', order: 'descending'},
forData: [
{label: '项目名称', prop: 'projectName', minWidth: '300', slot: true},
{label: '项目总投资(亿元)', prop: 'projectTotalInvestment', sortable: 'custom', descending: '1', ascending: '2', width: '160'},
{label: '项目资本金(亿元)', prop: 'projectCapital', sortable: 'custom', descending: '17', ascending: '18', width: '160'},
{label: '专项债用作资本金(亿元)', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'}
{label: '项目总投资(元)', prop: 'projectTotalInvestment', sortable: 'custom', descending: '1', ascending: '2', width: '160'},
{label: '项目资本金(元)', prop: 'projectCapital', sortable: 'custom', descending: '17', ascending: '18', width: '160'},
{label: '专项债用作资本金(元)', prop: 'specialBondCapital', sortable: 'custom', descending: '19', ascending: '20', width: '200'}
],
formData: [
{ type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220},
......
......@@ -28,7 +28,7 @@
<el-table-column
prop="percent"
align="right"
label="占比">
label="占比(%)">
</el-table-column>
<template slot="empty">
<div style="padding: 30px 0">
......@@ -81,7 +81,7 @@ export default {
if(res.code==200 && res.data){
let data = res.data, totalVal = data.map(item => item.value).reduce((prev, cur) => prev + cur)
this.viewData = data.map(item => {
let it = {name:item.name, value:item.value, percent:parseFloat(Number(Number(item.value)/Number(totalVal)*100).toFixed(2))+'%'}
let it = {name:item.name, value:item.value, percent:parseFloat(Number(Number(item.value)/Number(totalVal)*100).toFixed(2))}
return it
})
if(this.viewData.length>0){
......
......@@ -185,11 +185,11 @@ export default {
companyName:this.companyInfo.companyName,
creditLevel:this.companyInfo.bratingSubjectLevel || '',
legalPerson:this.companyInfo.corporatePerson || '',
registerCapital:this.companyInfo.regCapital || '',
registerCapital:this.companyInfo.registeredCapital || '',
provinceId:this.companyInfo.provinceId || '',
cityId:this.companyInfo.cityId || '',
districtId:this.companyInfo.districtCode || '',
registerAddress:this.companyInfo.provinceName+this.companyInfo.cityName?'-'+this.companyInfo.cityName:''+this.companyInfo.districtName?'-'+this.companyInfo.districtName:'',
registerAddress:this.companyInfo.provinceName+(this.companyInfo.cityName?'-'+this.companyInfo.cityName:'')+(this.companyInfo.districtName?'-'+this.companyInfo.districtName:''),
creditCode:this.companyInfo.creditCode
}
let res = await claim(param)
......
......@@ -23,7 +23,7 @@
<el-table-column
prop="bl"
align="right"
label="占比">
label="占比(%)">
<template slot-scope="scope">
<span>{{ scope.row.bl }}</span>
</template>
......@@ -139,7 +139,7 @@ export default {
this.viewData = this.viewData.map(item => {
let number = this.statistic[item.category]&&this.statistic[item.category][item.field]?this.statistic[item.category][item.field]:0
let bl = number ? parseFloat(Number(Number(number)/Number(totalVal)*100).toFixed(2)) : 0
let it = {name:item.name, value:number, tz: '', bl:bl+'%'}
let it = {name:item.name, value:number, tz: '', bl:bl}
return it
})
this.viewData.sort((a, b) => {
......@@ -161,7 +161,7 @@ export default {
if(params.data.tz){
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;" >'+ params.data.tz +'亿元</p>'
}
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.bl+'</p>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.bl+'%</p>'
return result;
},
extraCssText:'width:150px!important;',
......
......@@ -59,7 +59,7 @@ export default {
{label: '法院', prop: 'court', width: '280'},
{label: '法庭', prop: 'tribunal', width: '180'},
{label: '承办部门', prop: 'department', width: '280'},
{label: '审判长/主判人', prop: 'judge', width: '106'}
{label: '审判长/主判人', prop: 'judge', width: '110'}
],
formData: [
{ type: 1, fieldName: 'causeAction', value: '', placeholder: '案由', options: []},
......
......@@ -961,7 +961,7 @@ export default {
.content_item{
padding-top:20px;
display: flex;
align-items: center;
align-items: flex-start;
.label{
width: 84px;
font-size: 14px;
......
<template>
<div>
<el-card class="box-card noborder">
<div class="cardtitles" v-if="showtype != 'projectgjdt'">跟进记录</div>
<div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>
<div class="cardtitles">{{indexname}}</div>
<!--<div style="height: 24px" v-if="showtype == 'projectgjdt'"></div>-->
<div class="records">
<div class="writeIn" v-if="isDisableds == false">
<div class="default" v-if="isEdit == false" @click="getEdit">
......@@ -87,6 +87,13 @@
</div>
<div class="recordlist" v-if="showtype=='gjjl' || showtype == 'projectgjdt' && recordlist.total>0">
<div class="rec_detail" v-for="(item,index) in recordlist.rows">
<div class="delform" v-if="isdel && delID == item.id">
<div class="words">是否删除该条记录</div>
<div>
<div class="btnsmall btn_primary h28" @click="delele">确定</div>
<div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
</div>
</div>
<div class="rec_time">
<i class="el-icon-time"></i>
......@@ -151,6 +158,7 @@
name: 'gjjl',
data(){
return{
indexname:'跟进记录',
showtype:'',
isEdit:false,
value:'',
......@@ -174,6 +182,7 @@
userId:this.$store.state.user.userId,//当前用户id
projectList:[],//关联项目
isDisableds:this.isDisabled,
keys:1,
}
},
computed: {
......@@ -186,6 +195,7 @@
this.showtype = this.types
//客户管理跟进动态
if(this.showtype == 'gjdt'){
this.indexname = '跟进动态'
this.isDisableds = false
getUserList().then(result=>{
this.glqylist = result.data
......@@ -198,6 +208,7 @@
}
//项目管理跟进动态
if(this.showtype == 'projectgjdt'){
this.indexname = '跟进动态'
this.isDisableds = false
this.projectId = null//项目id暂时清空,必须手选id
relateProject(this.userId).then(res=>{
......@@ -270,6 +281,7 @@
delRecord(id){
this.isdel = true
this.delID = id
this.keys++;
},
delele(){
if(this.types == 'gjdt') {
......@@ -381,6 +393,9 @@
</script>
<style lang="scss" scoped>
.app-main{
overflow: initial !important;
}
.el-card{
overflow: initial;
}
......
......@@ -109,8 +109,8 @@
this.value = ""
},
add(){
if(this.queryParam.task == '')
return false
if(this.queryParam.task == '' || this.queryParam.finishTime == '')
return this.$message.warning('时间和内容需填写完整!')
addGZDB(this.queryParam).then(result=>{
if(result.code == 200){
this.$message.success("添加成功!")
......
......@@ -21,5 +21,4 @@ export default {
</script>
<style lang="scss" scoped>
</style>
......@@ -49,7 +49,7 @@
<p>
<label class="label">项目法人</label>
<span>
<router-link v-if="textList.companyName" :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.companyName"></router-link>
<router-link v-if="textList.companyName" :to="textList.uipId?'/enterprise/' + encodeStr(textList.companyId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.companyName"></router-link>
<span v-else>--</span>
</span>
<label class="label">总投资(万元)</label>
......
......@@ -11,8 +11,9 @@
<p class="list-content-text">
<span>受让人:</span>
<span v-if="textList.company">
<router-link v-if="textList.uipId" :to="'/enterprise/' + encodeStr(textList.uipId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
<router-link v-else :to="'/company/' + encodeStr(textList.id) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
<router-link v-if="textList.company" :to="textList.uipId?'/enterprise/' + encodeStr(textList.companyId) :'/company/' + encodeStr(textList.companyId) " tag="a" class="list-titel-a blue" v-html="textList.company"></router-link>
<span v-else>--</span>
</span>
<span v-else class="blue">{{textList.company||"--"}}</span>
</p>
......
......@@ -31,13 +31,15 @@
<div class="list-content">
<p class="list-content-text" v-if="textList.tenderee">
<span>招采单位:</span>
<router-link v-if="textList.projectUnitId" :to="'/company/' + encodeStr(textList.projectUnitId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<span v-else > {{textList.tenderee||'--'}}</span>
<router-link v-if="textList.tenderee" :to="textList.tendereeUipId?'/enterprise/' + encodeStr(textList.tendereeId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a blue" v-html="textList.tenderee"></router-link>
<span v-else>--</span>
</p>
<p class="list-content-text" v-if="textList.agency">
<span>代理单位:</span>
<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="textList.agency"></router-link>
<span v-else > {{textList.agency||'--'}}</span>
<router-link v-if="textList.agency" :to="textList.agencyUipId?'/enterprise/' + encodeStr(textList.agencyId) :'/company/' + encodeStr(textList.agencyId) " tag="a" class="list-titel-a blue" v-html="textList.agency"></router-link>
<span v-else>--</span>
</p>
......
......@@ -185,9 +185,10 @@
<div class="main3-box">
<p>
<label class="label">招标人</label>
<router-link :to="textList.uipId?'/enterprise/' + encodeStr(textList.uipId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a color2" v-html="textList.tenderee"></router-link>
<router-link v-if="textList.tendereeId" :to="textList.tendereeUipId?'/enterprise/' + encodeStr(textList.tendereeId) :'/company/' + encodeStr(textList.tendereeId) " tag="a" class="list-titel-a color2" v-html="textList.tenderee"></router-link>
<span v-else class="color2">{{textList.tenderee||'--'}}</span>
<label class="label">代理机构</label>
<router-link v-if="textList.agencyId" :to="'/company/' + encodeStr(textList.agencyId) + '/?index=true'" tag="a" class="list-titel-a color2" v-html="textList.agency"></router-link>
<router-link v-if="textList.agencyId" :to="textList.agencyUipId?'/enterprise/' + encodeStr(textList.agencyId) :'/company/' + encodeStr(textList.agencyId) " tag="a" class="list-titel-a color2" v-html="textList.agency"></router-link>
<span v-else class="color2">{{textList.agency||'--'}}</span>
</p>
......
......@@ -211,7 +211,12 @@
<div class="list-content" v-if="item.tenderee||item.planTenderAmount||item.projectCapitalSource">
<p class="list-content-text" v-if="item.tenderee">
<span>招采单位:</span>
<span class="blue" @click="getUipIdByCid(item.tendereeId)" v-html="item.tenderee">
<span v-if="item.tendereeId">
<span class="blue" @click="getUipIdByCid(item.tendereeId)" v-html="item.tenderee"></span>
</span>
<span v-else v-html="item.tenderee">
</span>
</span>
</p>
<p class="list-content-text" v-if="item.planTenderAmount">
......@@ -823,9 +828,9 @@ export default {
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
......@@ -211,10 +211,11 @@
<div class="list-content">
<p class="list-content-text" v-if="item.companyName">
<span>项目业主:</span>
<span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName">
<span v-if="item.companyId">
<span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName"></span>
</span>
<span v-else v-html="item.companyName">
</span>
</p>
<p class="list-content-text"v-if="item.money">
......@@ -1078,9 +1079,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
......@@ -239,8 +239,10 @@
<div class="list-content" v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage">
<p class="list-content-text" v-if="item.companyName">
<span>受让人:</span>
<span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName">
<span v-if="item.companyId">
<span class="blue" @click="getUipIdByCid(item.companyId)" v-html="item.companyName"></span>
</span>
<span v-else v-html="item.companyName">
</span>
</p>
......@@ -925,9 +927,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
......@@ -213,12 +213,18 @@
<div class="list-content list-content1" v-if="item.companyName||item.agency">
<p class="list-content-text" v-if="item.companyName">
<span>招采单位:</span>
<span class="blue" @click="getUipIdByCid(item.jskEid)" v-html="item.companyName">
<span v-if="item.jskEid">
<span class="blue" @click="getUipIdByCid(item.jskEid)" v-html="item.companyName"></span>
</span>
<span v-else v-html="item.companyName">
</span>
</p>
<p class="list-content-text" v-if="item.agency">
<span>代理单位:</span>
<span class="blue" @click="getUipIdByCid(item.agencyId)" v-html="item.agency">
<span v-if="item.agencyId">
<span class="blue" @click="getUipIdByCid(item.agencyId)" v-html="item.agency"></span>
</span>
<span v-else v-html="item.agency">
</span>
</p>
......@@ -1107,9 +1113,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
......@@ -448,8 +448,12 @@
</el-table-column>
<el-table-column prop="zj" label="招标人" width="280" >
<template slot-scope="scope">
<span class="list-titel-a" @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee">
<span v-if="scope.row.tendereeId">
<span class="list-titel-a" @click="getUipIdByCid(scope.row.tendereeId)" v-html="scope.row.tenderee"></span>
</span>
<span v-else v-html="scope.row.tenderee">
</span>
</template>
</el-table-column>
......@@ -1680,9 +1684,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
......@@ -135,7 +135,11 @@
<div class="list-content">
<p class="list-content-text" v-if="item.projectEntity">
<span>项目主体:</span>
<span v-html="item.projectEntity" class="blue" @click="getUipIdByCid(item.projectEntityId)"></span>
<span v-if="item.projectEntityId">
<span class="blue" @click="getUipIdByCid(item.projectEntityId)" v-html="item.projectEntity"></span>
</span>
<span v-else v-html="item.projectEntity">
</span>
</p>
<p class="list-content-text" v-if="item.chargeDepartment">
<span>主管部门:</span>
......@@ -145,7 +149,11 @@
</p>
<p class="list-content-text" v-if="item.piu" >
<span>实施单位:</span>
<span v-html="item.piu" class="blue" @click="getUipIdByCid(item.piuId)"></span>
<span v-if="item.piuId">
<span class="blue" @click="getUipIdByCid(item.piuId)" v-html="item.piu"></span>
</span>
<span v-else v-html="item.piu">
</span>
</p>
</div>
</li>
......@@ -548,9 +556,9 @@
api.getUipIdByCid(params).then(res=>{
if (res.code==200) {
if(res.data&&res.data.length>0&&res.data[0].uipId){
this.$router.push({path: '/enterprise/'+this.encodeStr(res.data[0].uipId)})
this.$router.push({path: '/enterprise/'+this.encodeStr(companyId)})
}else{
this.$router.push({path: '/company/'+this.encodeStr(res.data[0].companyId)})
this.$router.push({path: '/company/'+this.encodeStr(companyId)})
}
}
......
......@@ -136,14 +136,14 @@
<div class="main4-box">
<label class="label">项目主体</label>
<span>
<router-link v-if="textList.projectEntity" :to="textList.projectEntityUipId?'/enterprise/' + textList.projectEntityUipId :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
<router-link v-if="textList.projectEntity" :to="textList.projectEntityUipId?'/enterprise/' + encodeStr(textList.projectEntityId) :'/company/' + encodeStr(textList.projectEntityId) " tag="a" class="list-titel-a blue" v-html="textList.projectEntity"></router-link>
<template v-else>--</template>
</span>
<label class="label">主管部门</label>
<span>{{textList.chargeDepartment||'--'}}</span>
<label class="label">实施单位</label>
<span>
<router-link v-if="textList.piu" :to="textList.piuUipId?'/enterprise/' + textList.piuUipId :'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
<router-link v-if="textList.piu" :to="textList.piuUipId?'/enterprise/' +encodeStr(textList.piuId):'/company/' + encodeStr(textList.piuId) " tag="a" class="list-titel-a blue" v-html="textList.piu"></router-link>
<template v-else>--</template>
</span>
</div>
......
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