FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_2024325_BZSQ' into dev_2024325_BZSQ

Browse Source
This commit is contained in:
baoyu
2024-03-29 12:46:08 +08:00
parent dc39e28214 ba87035e0a
commit 5d34e98d6b
11 changed files with 419 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/processNodeInformation/index.vue
+66 -16
View File
@@ -17,7 +17,14 @@
:style="backdrop(item.taskStatus)"
:class="{'flow-group-process-content-dis':!leftArrow(index + 1)}">
<div class="flow-group-process-content-top">
{{item.taskKeyName}}
<el-tooltip placement="top">
<div slot="content">
{{item.taskKeyName}}
</div>
<div>
{{item.taskKeyName}}
</div>
</el-tooltip>
</div>
<el-tooltip placement="top">
<div slot="content">
@@ -30,7 +37,7 @@
v-if="item.userNames && item.userNames.length > 0">
<div v-if="item.userNames && item.userNames.length > 0"
v-for="val in item.userNames">
<div>{{val}}</div>
<div class="flow-group-process-content-bottom-text">{{val}}</div>
</div>
</div>
</el-tooltip>
@@ -103,6 +110,16 @@
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
v-if="$route.query.prcType == '3'"
prop="parentUserName"
label="任务分发人"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.parentUserName }}</span>
</template>
</el-table-column>
<el-table-column
prop="commitText"
label="意见内容"
@@ -219,11 +236,6 @@
}
},
mounted() {
if (this.$route.query.oldAndNew == 'new') {
this.getProcessList()
} else {
this.processNum()
}
this.processTable()
},
methods: {
@@ -248,6 +260,11 @@
_this: this
}, res => {
this.histortData = res
if (this.$route.query.oldAndNew == 'new') {
this.getProcessList()
} else {
this.processNum()
}
this.loading = false
}, e => {
})
@@ -267,6 +284,29 @@
val.userNames = val.userNames.split(',')
}
})
if (this.$route.query.prcType == 'buss1'){
if (this.histortData && this.histortData.length > 0){
if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC3'){
this.nameList.forEach(val => {
if (val.taskKey == 'BussLibrary3') {
val.taskStatus = 'todo'
}
})
}else if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC1'){
this.nameList.forEach(val => {
if (val.taskKey == 'BussLibrary1') {
val.taskStatus = 'todo'
}
})
}else if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC6'){
this.nameList.forEach(val => {
if (val.taskKey == 'BussLibrary6') {
val.taskStatus = 'todo'
}
})
}
}
}
this.$nextTick(() => {
let flowGroupProcess = document.getElementsByClassName('flow-group-process')
let num = (flowGroupProcess[0].offsetWidth - 100) / 248
@@ -415,7 +455,7 @@
line-height: 40px;
font-weight: 600;
float: inline-start;
margin-top: 18px;
margin-top: 28px;
}
.flow-group-process-end {
@@ -430,7 +470,7 @@
line-height: 40px;
font-weight: 600;
float: inline-end;
margin-top: 20px;
margin-top: 28px;
}
.flow-group-process-end-left {
@@ -529,21 +569,31 @@
.flow-group-process-content-top {
width: 100%;
height: 40px;
line-height: 40px;
margin-top: 10px;
margin-bottom: 10px;
font-size: 12px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1; /* 超出几行省略 */
overflow: hidden;
}
.flow-group-process-content-bottom {
width: 100%;
font-size: 12px;
line-height: 1.4;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2; /* 超出几行省略 */
height: 54px;
overflow: hidden;
.flow-group-process-content-bottom-text{
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1; /* 超出几行省略 */
overflow: hidden;
}
}
.flow-group-process-arrow-dis {
src/pages/home2/components/todoList/index.vue
+21
View File
@@ -188,6 +188,16 @@ export default {
}
break
case 'buss1':
let oldAndNewBuss = ''
const currentDateBuss = new Date('2024-01-25 23:59:59').getTime();
const dateBuss = new Date(row.creatTime);
const timestampBuss = dateBuss.getTime();
if (currentDateBuss > timestampBuss){
oldAndNewBuss = 'old'
}else{
oldAndNewBuss = 'new'
}
query.oldAndNew = oldAndNewBuss
if (row.taskInfo === '企标编写') {
name = 'bussLibrary2'
}else if (row.taskInfo === '企标编写汇总'){
@@ -219,6 +229,7 @@ export default {
}else if (row.taskInfo === '发布'){
name = 'bussLibrary13'
}
break
case 'buss2':
name = 'bussLibraryProduct'
@@ -317,6 +328,16 @@ export default {
}
break;
case '3':
let oldAndNewBuss1 = ''
const currentDateBuss1 = new Date('2024-01-25 23:59:59').getTime();
const dateBuss1 = new Date(row.creatTime);
const timestampBuss1 = dateBuss1.getTime();
if (currentDateBuss1 > timestampBuss1){
oldAndNewBuss1 = 'old'
}else{
oldAndNewBuss1 = 'new'
}
query.oldAndNew = oldAndNewBuss1
if (row.taskInfo === '任务分发') {
name = 'bzzqyjStep2'
} else if (row.taskInfo === '意见反馈'){
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue
+63 -30
View File
@@ -186,9 +186,9 @@
<div v-if="!isTrue" style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;" class="fileClass">
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -212,19 +212,37 @@
clearable
/>
<div style="display: flex;justify-content: space-between;margin-left: 12px;">
<div style="width: 80%;margin-top: 13px">
<div
v-for="(item,index) in LSBBBUSSFileList"
:key="index"
style="color: #409eff;cursor:pointer"
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<div v-if="isTrue" style="width: 80%;margin-top: 13px">
<div
v-for="(item,index) in LSBBBUSSFileList"
:key="index"
style="color: #409eff;cursor:pointer"
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="margin-left: 7px;">
<i class="el-icon-view" style="font-size: 18px" title="预览" @click="viewOnlyOffice(item)" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
</div>
<div v-if="!isTrue" style="width: 80%;margin-top: 13px">
<div
v-for="(item,index) in LSBBBUSSFileList"
:key="index"
style="color: #409eff;cursor:pointer"
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
<el-button
type="primary"
@@ -256,9 +274,9 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -290,9 +308,9 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -577,9 +595,9 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -745,9 +763,9 @@
class="fileClass"
>
<span style="" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</el-form-item>
</el-col>
@@ -775,9 +793,9 @@
class="fileClass"
>
<span style="" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -802,6 +820,7 @@
<script>
import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle'
import { onlyOfficeUrl } from '@/sysConfig'
export default {
name: 'FormEditList',
@@ -1023,6 +1042,20 @@ export default {
}
},
methods: {
viewOnlyOffice (item) {
const key = new Date().getTime()
let oldFileName = item.name
let index1 = oldFileName.lastIndexOf('.')
let fileSuffix = oldFileName.substring(index1+1, oldFileName.length)
fileSuffix = fileSuffix.toLowerCase()
oldFileName = oldFileName.substring(0, index1)
if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){
window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix +
'&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName)
}else{
this.$message.warning('此文件不支持onlyoffice预览')
}
},
filterOp (data) {
if (!data) {
return ''
src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue
+51 -25
View File
@@ -184,9 +184,9 @@
@click="handleFilePreviewOne(item,'onlineEdit')"
/>
</span>
<span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div v-if="!isTrue" style="width: 80%;margin-top: 13px">
@@ -203,9 +203,9 @@
>
{{ item.name }}
</span>
<span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -229,12 +229,23 @@
clearable
/>
<div style="display: flex;justify-content: space-between;margin-left: 12px;">
<div style="width: 80%;margin-top: 13px">
<div v-if="isTrue" style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<span style="margin-left: 7px;">
<i class="el-icon-view" style="font-size: 18px" title="预览" @click="viewOnlyOffice(item)" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div v-if="!isTrue" style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -263,9 +274,9 @@
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -292,9 +303,9 @@
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -547,9 +558,9 @@
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -715,9 +726,9 @@
class="fileClass"
>
<span style="" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</el-form-item>
</el-col>
@@ -740,9 +751,9 @@
<div style="width: 80%;margin-top: 13px">
<div v-for="(item,index) in madelSubList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
<span style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -767,6 +778,7 @@
<script>
import { mapGetters } from 'vuex'
import { onlyOfficeUrl } from '@/sysConfig'
import ProcessTitle from '../../../components/ProcessTitle'
import CurrentOrder from '@/pages/processCenter/pages/components/CurrentOrder';
@@ -999,6 +1011,20 @@ export default {
}
},
methods: {
viewOnlyOffice (item) {
const key = new Date().getTime()
let oldFileName = item.name
let index1 = oldFileName.lastIndexOf('.')
let fileSuffix = oldFileName.substring(index1+1, oldFileName.length)
fileSuffix = fileSuffix.toLowerCase()
oldFileName = oldFileName.substring(0, index1)
if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){
window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix +
'&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName)
}else{
this.$message.warning('此文件不支持onlyoffice预览')
}
},
queryOrder () {
this.$refs.CurrentOrderRef.open(this.form.standSort, this.form.standNum)
},
src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue
+18 -18
View File
@@ -104,9 +104,9 @@
<el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
<div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="FBGBUSSFileList.length>0" v-for="(value,index) in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -116,9 +116,9 @@
<el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
<div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="LSBBBUSSFileList.length>0" v-for="(value,index) in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -130,9 +130,9 @@
<el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
<div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="BZSMBUSSFileList.length>0" v-for="(value,index) in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -142,9 +142,9 @@
<el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="QTWJBUSSFileList.length>0" v-for="(value,index) in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -288,9 +288,9 @@
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="GLWJBUSSFileList.length>0" v-for="(value,index) in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -436,9 +436,9 @@
<el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
</el-form-item>
</el-col>
src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue
+63 -29
View File
@@ -146,9 +146,9 @@
@click="handleFilePreviewOne(item,'onlineEdit')"
/>
</span>
<span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
@@ -161,9 +161,9 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== '' && item.id.startsWith('ATT')" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
@@ -173,17 +173,36 @@
<!-- </div>-->
</el-form-item>
<el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
<div
v-for="(item,index) in LSBBBUSSFileList"
v-if="LSBBBUSSFileList.length > 0"
:key="index"
style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px"
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<div v-if="isTrue">
<div
v-for="(item,index) in LSBBBUSSFileList"
v-if="LSBBBUSSFileList.length > 0"
:key="index"
style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px"
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<span style="margin-left: 7px;">
<i class="el-icon-view" style="font-size: 18px" title="预览" @click="viewOnlyOffice(item)" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div v-if="!isTrue">
<div
v-for="(item,index) in LSBBBUSSFileList"
v-if="LSBBBUSSFileList.length > 0"
:key="index"
style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px"
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<!-- <div v-if="LSBBBUSSFileList.length>0" v-for="(value,index) in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -201,9 +220,9 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
<!-- <div v-if="BZSMBUSSFileList.length>0" v-for="(value,index) in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -219,9 +238,9 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
<!-- <div v-if="QTWJBUSSFileList.length>0" v-for="(value,index) in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -421,9 +440,9 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
<!-- <div v-if="GLWJBUSSFileList.length>0" v-for="(value,index) in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -583,9 +602,9 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')" />-->
<!-- </span>-->
</div>
</el-form-item>
</el-col>
@@ -597,6 +616,7 @@
<script>
import { mapGetters } from 'vuex'
import ProcessTitle from '../../../components/ProcessTitle'
import { onlyOfficeUrl } from '@/sysConfig'
import axios from 'axios';
export default {
@@ -741,6 +761,20 @@ export default {
this.getDataAsync()
},
methods: {
viewOnlyOffice (item) {
const key = new Date().getTime()
let oldFileName = item.name
let index1 = oldFileName.lastIndexOf('.')
let fileSuffix = oldFileName.substring(index1+1, oldFileName.length)
fileSuffix = fileSuffix.toLowerCase()
oldFileName = oldFileName.substring(0, index1)
if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){
window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix +
'&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName)
}else{
this.$message.warning('此文件不支持onlyoffice预览')
}
},
filterOp (data) {
if (!data) {
return ''
src/pages/processCenter/pages/creatProcess/qbrk/common/formListIn.vue
+15 -15
View File
@@ -115,9 +115,9 @@
<el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
<div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="FBGBUSSFileList.length>0" v-for="(value,index) in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -127,9 +127,9 @@
<el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
<div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="LSBBBUSSFileList.length>0" v-for="(value,index) in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -141,9 +141,9 @@
<el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
<div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="BZSMBUSSFileList.length>0" v-for="(value,index) in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -153,9 +153,9 @@
<el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="QTWJBUSSFileList.length>0" v-for="(value,index) in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
@@ -298,9 +298,9 @@
<el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
<div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
<span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name }}</span>
<span style="margin-left: 7px;" v-if="item.id !== ''">
<i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
</span>
<!-- <span style="margin-left: 7px;" v-if="item.id !== ''">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>-->
<!-- </span>-->
</div>
<!-- <div v-if="GLWJBUSSFileList.length>0" v-for="(value,index) in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee" @click="downloadFile(value)">-->
<!-- &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue
+20 -2
View File
@@ -172,9 +172,12 @@
class="fileClass"
>
<span style="" :title="item.name" @click="handleFilePreview2(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')" />
<span style="margin-left: 7px;">
<i class="el-icon-view" style="font-size: 18px" title="预览" @click="viewOnlyOffice(item)" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -1513,6 +1516,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import { onlyOfficeUrl } from '@/sysConfig'
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
import {
saveTaskFirst,
@@ -3090,6 +3094,20 @@ export default {
}, e => {
})
},
viewOnlyOffice (item) {
const key = new Date().getTime()
let oldFileName = item.name
let index1 = oldFileName.lastIndexOf('.')
let fileSuffix = oldFileName.substring(index1+1, oldFileName.length)
fileSuffix = fileSuffix.toLowerCase()
oldFileName = oldFileName.substring(0, index1)
if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){
window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix +
'&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName)
}else{
this.$message.warning('此文件不支持onlyoffice预览')
}
},
beginImportFile (file) {
const filename = file.name
const index1 = filename.lastIndexOf('.')
src/pages/processCenter/pages/creatProcess/qbrk/step1.vue
+22 -3
View File
@@ -253,12 +253,15 @@
:key="index"
style="color: #409eff;cursor:pointer;margin-left: 12px;"
class="fileClass"
@click="handleFilePreview(item)"
>
<!-- @click="handleFilePreview(item)"-->
<span style="" :title="item.name" @click="handleFilePreview2(item,'preview')"> {{ item.name }}</span>
<span v-if="item.id !== ''" style="margin-left: 7px;">
<i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')" />
<span style="margin-left: 7px;">
<i class="el-icon-view" style="font-size: 18px" title="预览" @click="viewOnlyOffice(item)" />
</span>
<!-- <span v-if="item.id !== ''" style="margin-left: 7px;">-->
<!-- <i class="el-icon-download" title="下载" @click="handleFilePreview2(item,'down')" />-->
<!-- </span>-->
</div>
</div>
<div style="width: 20%;">
@@ -1776,6 +1779,7 @@ import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
import treeSelectModule from '@/components/treeSelect/treeSelectModule.vue';
import { selectByIdAtt } from '@/api/flow/index.js'
import ReceiptDescription from '@/components/hzwlComponents/ReceiptDescription'
import { onlyOfficeUrl } from '@/sysConfig'
const Base64 = require('js-base64').Base64;
@@ -2700,6 +2704,20 @@ export default {
XCSJBUSS: this.dateFormatter(),
} // 标准信息
},
viewOnlyOffice (item) {
const key = new Date().getTime()
let oldFileName = item.name
let index1 = oldFileName.lastIndexOf('.')
let fileSuffix = oldFileName.substring(index1+1, oldFileName.length)
fileSuffix = fileSuffix.toLowerCase()
oldFileName = oldFileName.substring(0, index1)
if (fileSuffix == 'pdf' || fileSuffix == 'doc' || fileSuffix == 'docx'){
window.open(onlyOfficeUrl + '/viewHistoryOnlyOffice?oldFileName=' + oldFileName + '&fileType=' + fileSuffix +
'&attId=' + item.id + '&key=' + key + '&userName=' + this.$store.getters.userInfo.uName)
}else{
this.$message.warning('此文件不支持onlyoffice预览')
}
},
filterObj (obj) {
if (obj && obj !== '') {
if (obj instanceof Array) {
@@ -3833,6 +3851,7 @@ export default {
} else {
attId = file.response.data.id
}
console.log(file);
if (file.name == this.form.standName) {
let fileName = ''
let fileNam2 = ''
src/pages/processCenter/pages/processDetail/index.vue
+79 -29
View File
@@ -24,7 +24,14 @@
:style="backdrop(item.taskStatus)"
:class="{'flow-group-process-content-dis':!leftArrow(index + 1)}">
<div class="flow-group-process-content-top">
{{item.taskKeyName}}
<el-tooltip placement="top">
<div slot="content">
{{item.taskKeyName}}
</div>
<div>
{{item.taskKeyName}}
</div>
</el-tooltip>
</div>
<el-tooltip placement="top">
<div slot="content">
@@ -37,7 +44,7 @@
v-if="item.userNames && item.userNames.length > 0">
<div v-if="item.userNames && item.userNames.length > 0"
v-for="val in item.userNames">
<div>{{val}}</div>
<div class="flow-group-process-content-bottom-text">{{val}}</div>
</div>
</div>
</el-tooltip>
@@ -159,6 +166,16 @@
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template>
</el-table-column>
<el-table-column
v-if="$route.query.flowType == '3'"
prop="parentUserName"
label="任务分发人"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.parentUserName }}</span>
</template>
</el-table-column>
<el-table-column
prop="commitText"
label="意见内容"
@@ -335,6 +352,29 @@
val.userNames = val.userNames.split(',')
}
})
if (this.$route.query.flowType == 'buss1'){
if (this.detailData && this.detailData.length > 0){
if (this.detailData[this.detailData.length - 1].taskKey == 'BussLibraryC3'){
this.nameList.forEach(val => {
if (val.taskKey == 'BussLibrary3') {
val.taskStatus = 'todo'
}
})
}else if (this.detailData[this.detailData.length - 1].taskKey == 'BussLibraryC1'){
this.nameList.forEach(val => {
if (val.taskKey == 'BussLibrary1') {
val.taskStatus = 'todo'
}
})
}else if (this.detailData[this.detailData.length - 1].taskKey == 'BussLibraryC6'){
this.nameList.forEach(val => {
if (val.taskKey == 'BussLibrary6') {
val.taskStatus = 'todo'
}
})
}
}
}
this.$nextTick(() => {
let flowGroupProcess = document.getElementsByClassName('flow-group-process')
let num = (flowGroupProcess[0].offsetWidth - 100) / 248
@@ -343,8 +383,6 @@
let offsetWidth = flowGroupProcess[0].offsetWidth
flowGroupProcess[0].style.width = (offsetWidth - (offsetWidth - 100 - width) + 40) + 'px'
console.log(offsetWidth);
console.log(flowGroupProcess);
})
}, e => {
})
@@ -361,12 +399,12 @@
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) {
this.getProcessList()
} else {
this.processNum()
}
this.processTable()
// if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) {
// this.getProcessList()
// } else {
// this.processNum()
// }
this.processTable(1)
} else {
this.$message.warning(res.message)
}
@@ -1361,12 +1399,12 @@
if (res.success) {
this.drawerModal = false
this.$message.success('调整成功')
if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) {
/* if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) {
this.getProcessList()
} else {
this.processNum()
}
this.processTable()
}*/
this.processTable(1)
} else {
this.$message.warning(res.message)
}
@@ -1412,7 +1450,7 @@
})
},
// 请求列表
processTable() {
processTable(num) {
let url = ''
let query = {}
if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) {
@@ -1434,6 +1472,13 @@
_this: this
}, res => {
this.detailData = res
if (num && num == 1){
if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) {
this.getProcessList()
} else {
this.processNum()
}
}
}, e => {
})
},
@@ -1639,12 +1684,7 @@
}
},
mounted() {
if (this.$route.query.oldAndNew == 'new' && (this.$route.query.flowType == '3' || this.$route.query.flowType == 'buss1')) {
this.getProcessList()
} else {
this.processNum()
}
this.processTable()
this.processTable(1)
this.getApproveShow()
}
}
@@ -1711,7 +1751,7 @@
line-height: 40px;
font-weight: 600;
float: inline-start;
margin-top: 18px;
margin-top: 28px;
}
.flow-group-process-end {
@@ -1726,7 +1766,7 @@
line-height: 40px;
font-weight: 600;
float: inline-end;
margin-top: 20px;
margin-top: 28px;
}
.flow-group-process-end-left {
@@ -1825,21 +1865,31 @@
.flow-group-process-content-top {
width: 100%;
height: 40px;
line-height: 40px;
margin-top: 10px;
margin-bottom: 10px;
font-size: 12px;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1; /* 超出几行省略 */
overflow: hidden;
}
.flow-group-process-content-bottom {
width: 100%;
font-size: 12px;
line-height: 1.4;
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 2; /* 超出几行省略 */
height: 54px;
overflow: hidden;
.flow-group-process-content-bottom-text{
word-break: break-all;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1; /* 超出几行省略 */
overflow: hidden;
}
}
.flow-group-process-arrow-dis {
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+1 -1
View File
@@ -349,7 +349,7 @@ export default {
break
case 'buss1':
let oldAndNewBuss = ''
const currentDateBuss = new Date('2024-01-25 23:59:59').getTime();
const currentDateBuss = new Date('2024-03-24 23:59:59').getTime();
const dateBuss = new Date(row.creatTime);
const timestampBuss = dateBuss.getTime();
if (currentDateBuss > timestampBuss){