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

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

Browse Source
This commit is contained in:
zhutianqi
2021-12-24 14:05:53 +08:00
parent fe28e0b569 6c9c4036f1
commit c1a8193935
12 changed files with 100 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/localTool/standCalendar/index.vue
-1
View File
@@ -520,7 +520,6 @@ export default {
localStorage.setItem('objs', JSON.stringify(item)) localStorage.setItem('objs', JSON.stringify(item))
this.fileListData = item this.fileListData = item
this.reData = item.files this.reData = item.files
console.log(item)
this.editMeetForm = item this.editMeetForm = item
this.editMeetForm.contents = [] this.editMeetForm.contents = []
if (this.editMeetForm.content !== '') { if (this.editMeetForm.content !== '') {
src/pages/processCenter/pages/creatProcess/bzhHd-rh/step1.vue
+6
View File
@@ -20,6 +20,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:" prop="comityName"> <el-form-item class="add-form-item" label="协会名称:" prop="comityName">
<el-select <el-select
clearable
@change="comityChange" @change="comityChange"
v-model="rh_pageData.comityName" v-model="rh_pageData.comityName"
placeholder="请选择标委会"> placeholder="请选择标委会">
@@ -34,6 +35,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne"> <el-form-item class="add-form-item" v-if="rh_pageData.comityName !== ''" prop="comityNameOne">
<el-select <el-select
clearable
@change="comityChangeOne" @change="comityChangeOne"
v-model="rh_pageData.comityNameOne" v-model="rh_pageData.comityNameOne"
placeholder="请选择分标委"> placeholder="请选择分标委">
@@ -48,6 +50,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''"> <el-form-item class="add-form-item" prop="comityNameTwo" v-if="rh_pageData.comityName !== '' && rh_pageData.comityNameOne !== ''">
<el-select <el-select
clearable
v-model="rh_pageData.comityNameTwo" v-model="rh_pageData.comityNameTwo"
placeholder="请选择工作组"> placeholder="请选择工作组">
<el-option <el-option
@@ -63,6 +66,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="会员角色:" prop="comityRole"> <el-form-item class="add-form-item" label="会员角色:" prop="comityRole">
<el-select <el-select
clearable
v-model="rh_pageData.comityRole" v-model="rh_pageData.comityRole"
placeholder="请选择会员角色"> placeholder="请选择会员角色">
<el-option <el-option
@@ -76,6 +80,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="协会状态:" prop="comityState"> <el-form-item class="add-form-item" label="协会状态:" prop="comityState">
<el-select <el-select
clearable
v-model="rh_pageData.comityState" v-model="rh_pageData.comityState"
placeholder="选择协会状态"> placeholder="选择协会状态">
<el-option <el-option
@@ -89,6 +94,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="入会性质:" prop="comityKind"> <el-form-item class="add-form-item" label="入会性质:" prop="comityKind">
<el-select <el-select
clearable
v-model="rh_pageData.comityKind" v-model="rh_pageData.comityKind"
placeholder="请选择入会性质"> placeholder="请选择入会性质">
<el-option <el-option
src/pages/processCenter/pages/creatProcess/bzhHy-ch/step1.vue
+3
View File
@@ -34,6 +34,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item class="add-form-item" label="协会名称:"> <el-form-item class="add-form-item" label="协会名称:">
<el-select <el-select
clearable
@change="comityChange" @change="comityChange"
v-model="ch_pageData.associaName" v-model="ch_pageData.associaName"
placeholder="请选择标委会"> placeholder="请选择标委会">
@@ -48,6 +49,7 @@
<el-col :span="8" v-if="ch_pageData.associaName !== ''"> <el-col :span="8" v-if="ch_pageData.associaName !== ''">
<el-form-item class="add-form-item"> <el-form-item class="add-form-item">
<el-select <el-select
clearable
@change="comityChangeOne" @change="comityChangeOne"
v-model="ch_pageData.associaNameOne" v-model="ch_pageData.associaNameOne"
placeholder="请选择分标委"> placeholder="请选择分标委">
@@ -62,6 +64,7 @@
<el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''"> <el-col :span="8" v-if="ch_pageData.associaName !== '' && ch_pageData.associaNameOne !== ''">
<el-form-item class="add-form-item"> <el-form-item class="add-form-item">
<el-select <el-select
clearable
v-model="ch_pageData.associaNameTwo" v-model="ch_pageData.associaNameTwo"
placeholder="请选择工作组"> placeholder="请选择工作组">
<el-option <el-option
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+2 -2
View File
@@ -1574,9 +1574,9 @@
{ required: false, message: '请输入标准英文名称', trigger: 'blur' }, { required: false, message: '请输入标准英文名称', trigger: 'blur' },
{ min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' } { min: 1, max: 500, message: '长度在 1 到 500 个字符', trigger: 'blur' }
], ],
/*standNature: [ standNature: [
{ required: true, message: '请选择标准性质', trigger: 'change' } { required: true, message: '请选择标准性质', trigger: 'change' }
],*/ ],
textStatus: [ textStatus: [
{ required: true, message: '请选择文本状态', trigger: 'change' } { required: true, message: '请选择文本状态', trigger: 'change' }
] ]
src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue
+80 -71
View File
@@ -10,46 +10,46 @@
</div> </div>
<div class="content" v-show="active === '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto;"> <div style="flex: auto; overflow: auto;">
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<div class="tableTitle"> <div class="tableTitle">
<div class="tableButton"> <div class="tableButton">
<el-button size="mini" type="primary" @click="addList">添加</el-button> <el-button size="mini" type="primary" @click="addList">添加</el-button>
<el-button size="mini" type="danger" @click="deleteList">批量删除</el-button> <el-button size="mini" type="danger" @click="deleteList">批量删除</el-button>
</div>
</div> </div>
<el-table </div>
:data="dataList" <el-table
border :data="dataList"
ref="entryTable" border
height="80%" ref="entryTable"
@selection-change="selectedDelete" height="80%"
style="width: 100%" @selection-change="selectedDelete"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', style="width: 100%"
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column prop="standSerialNumber" width="150" label="标准号" show-overflow-tooltip align="center"> <el-table-column prop="standSerialNumber" width="150" label="标准号" show-overflow-tooltip align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a> <a class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSerialNumber }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="standName" width="250" align="center" show-overflow-tooltip label="标准名称"> <el-table-column prop="standName" width="250" align="center" show-overflow-tooltip label="标准名称">
<template slot-scope="scope"> <template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a> <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/> <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/> <el-table-column prop="responsibleUnit" width="150" label="责任部门" align="center"/>
<el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/> <el-table-column prop="dutyEngineerName" width="150" label="责任工程师" align="center"/>
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="回执说明"> <el-collapse-item title="回执说明">
@@ -173,7 +173,7 @@
class="common-button-primary" class="common-button-primary"
size="mini" size="mini"
v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'" v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
@click="getTableByPage('')"> @click="getTableByPage">
查询 查询
</el-button> </el-button>
</el-form-item> </el-form-item>
@@ -326,8 +326,9 @@
import ProcessHeader from '../../components/ProcessHeader' import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter' import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle' import ProcessTitle from '../../components/ProcessTitle'
import { startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel,processBack } from '@/api/process.js' import {startProcess, completeTask, saveTaskFirst, queryTaskFirst, taskDel, processBack} from '@/api/process.js'
import { standUnqualified, dicTypeData } from '@/api/unqualProcess.js' import {standUnqualified, dicTypeData} from '@/api/unqualProcess.js'
export default { export default {
name: "wfhxzgStep1", name: "wfhxzgStep1",
data() { data() {
@@ -365,7 +366,7 @@ export default {
}, },
deleteDataList: [], deleteDataList: [],
roleFormRules: { roleFormRules: {
dockUserName: [{ required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}] dockUserName: [{required: true, message: "请选择标准法规工程师", trigger: ['blur', 'change']}]
}, },
nodeList: [], nodeList: [],
drawerTitle: '', //drawer标题 drawerTitle: '', //drawer标题
@@ -419,23 +420,23 @@ export default {
if (item.responsibleUnit !== null || item.responsibleUnit !== "") { if (item.responsibleUnit !== null || item.responsibleUnit !== "") {
let k = (item.responsibleUnit || "").split(',') let k = (item.responsibleUnit || "").split(',')
for (let i in this.zrbmOptions) { for (let i in this.zrbmOptions) {
for (let m = 0; m< k.length; m++) { for (let m = 0; m < k.length; m++) {
if (this.zrbmOptions[i].value === k[m]) { if (this.zrbmOptions[i].value === k[m]) {
k[m] = this.zrbmOptions[i].label k[m] = this.zrbmOptions[i].label
} }
item.responsibleUnit = k.join(',') item.responsibleUnit = k.join(',')
} }
} }
} }
this.$set(item,'engineer','') this.$set(item, 'engineer', '')
this.$set(item,'engineerId','') this.$set(item, 'engineerId', '')
this.$set(item,'dutyPeopleInfo','') this.$set(item, 'dutyPeopleInfo', '')
this.$set(item,'dutyPeople','') this.$set(item, 'dutyPeople', '')
this.$set(item,'dutyPeopleInfoId','') this.$set(item, 'dutyPeopleInfoId', '')
this.$set(item,'dutyPeopleId','') this.$set(item, 'dutyPeopleId', '')
this.$set(item,'fileText',[]) this.$set(item, 'fileText', [])
this.$set(item,'fileTextId',[]) this.$set(item, 'fileTextId', [])
this.$set(item,'fileTextPath',[]) this.$set(item, 'fileTextPath', [])
}) })
this.total = res.data.total this.total = res.data.total
this.loading = false this.loading = false
@@ -478,7 +479,7 @@ export default {
} }
}, },
// 点击查看 // 点击查看
handlePreview (item) { handlePreview(item) {
let routeUrl = this.$router.resolve({ let routeUrl = this.$router.resolve({
name: 'OtherStandardDetails', name: 'OtherStandardDetails',
params: { params: {
@@ -506,12 +507,12 @@ export default {
addList = this.dataList.findIndex(items => { addList = this.dataList.findIndex(items => {
return items.id === item.id return items.id === item.id
}) })
if(addList > -1){ if (addList > -1) {
// this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
this.$refs.searchTable.clearSelection() this.$refs.searchTable.clearSelection()
this.$message.warning('请勿添加重复数据') this.$message.warning('请勿添加重复数据')
} else{ } else {
this.dataList.push(item) this.dataList.push(item)
// this.$refs.accessTypeSelect.clearSelection() // this.$refs.accessTypeSelect.clearSelection()
this.$refs.entryTable.clearSelection() this.$refs.entryTable.clearSelection()
@@ -557,7 +558,7 @@ export default {
}, },
// 提交按钮 // 提交按钮
handleSubmit() { handleSubmit() {
this.dataList.forEach(item =>{ this.dataList.forEach(item => {
item.standId = item.standSerialNumber item.standId = item.standSerialNumber
}) })
let json = { let json = {
@@ -593,13 +594,13 @@ export default {
params.set('userId', this.$store.getters.userInfo.userId) params.set('userId', this.$store.getters.userInfo.userId)
params.set('taskIds', this.taskID) params.set('taskIds', this.taskID)
completeTask(params).then(res => { completeTask(params).then(res => {
if(res.success === true) { if (res.success === true) {
this.$message.success('提交成功') this.$message.success('提交成功')
if (this.bpnId !== '') { if (this.bpnId !== '') {
let taskId = { let taskId = {
id: this.bpnId id: this.bpnId
} }
taskDel(taskId).then(res=>{ taskDel(taskId).then(res => {
return res return res
}) })
} }
@@ -614,14 +615,14 @@ export default {
} }
}, },
// 流程阶段负责人选择 // 流程阶段负责人选择
choiceZRR (type, title, id) { choiceZRR(type, title, id) {
this.nodeList = [] this.nodeList = []
this.nodeList.push(id) this.nodeList.push(id)
this.type = type this.type = type
this.drawerTitle = title this.drawerTitle = title
this.modalshowflag = true this.modalshowflag = true
}, },
drawerCheck (data) { drawerCheck(data) {
this.unqualidiedData.forEach(item => { this.unqualidiedData.forEach(item => {
item.engineer = data[0].name item.engineer = data[0].name
item.engineerId = data[0].id item.engineerId = data[0].id
@@ -635,20 +636,18 @@ export default {
this.addList() this.addList()
}, },
// 清空 查询条件 // 清空 查询条件
clearAllSearch (search = true) { clearAllSearch() {
this.queryUnqualidiedData = { this.queryUnqualidiedData.standSerialNumber = ''
standSerialNumber: '', this.queryUnqualidiedData.productName = ''
productName: '', this.queryUnqualidiedData.responsibleUnit = ''
responsibleUnit: ''
}
this.getTableByPage() this.getTableByPage()
}, },
// 分页事件 // 分页事件
pageChange (page) { pageChange(page) {
this.pageNo = page this.pageNo = page
this.getTableByPage() this.getTableByPage()
}, },
pageSizeChange (pageSize) { pageSizeChange(pageSize) {
this.size = pageSize this.size = pageSize
this.getTableByPage(pageSize) this.getTableByPage(pageSize)
}, },
@@ -659,18 +658,22 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.wfhxzgStep1 { .wfhxzgStep1 {
/deep/.el-table--scrollable-y .el-table__body-wrapper { /deep/ .el-table--scrollable-y .el-table__body-wrapper {
height: calc(100% - 57px) !important; height: calc(100% - 57px) !important;
} }
/deep/.el-drawer__container {
/deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -678,6 +681,7 @@ export default {
position: absolute; position: absolute;
top: 0; top: 0;
right: 10px; right: 10px;
.headerTabsItem { .headerTabsItem {
border: 1px solid #c1c1c1; border: 1px solid #c1c1c1;
padding: 0 5px; padding: 0 5px;
@@ -685,21 +689,25 @@ export default {
line-height: 30px; line-height: 30px;
cursor: pointer; cursor: pointer;
} }
.active { .active {
border: 1px solid #E6A23C; border: 1px solid #E6A23C;
color: #fff; color: #fff;
background: #E6A23C; background: #E6A23C;
} }
} }
.content-center { .content-center {
padding: 10px 0px 10px 10px; padding: 10px 0px 10px 10px;
} }
.content { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
height: calc(~'100% - 103px'); height: calc(~'100% - 103px');
overflow: auto; overflow: auto;
.tableTitle { .tableTitle {
margin-bottom: 10px; margin-bottom: 10px;
height: 30px; height: 30px;
@@ -707,6 +715,7 @@ export default {
position: relative; position: relative;
font-size: 13px; font-size: 13px;
font-weight: bold; font-weight: bold;
.tableButton { .tableButton {
position: absolute; position: absolute;
right: 0; right: 0;
src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue
+2 -2
View File
@@ -44,7 +44,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/> <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -66,7 +66,7 @@
</el-table> </el-table>
</div> </div>
<el-collapse accordion> <el-collapse accordion>
<el-collapse-item title="审批意见"> <el-collapse-item title="回执说明">
<div style="margin: 10px 0;"> <div style="margin: 10px 0;">
<el-input <el-input
type="textarea" type="textarea"
src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue
+1 -1
View File
@@ -44,7 +44,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/> <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/> <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step5-1.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/> <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue
+1 -1
View File
@@ -32,7 +32,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/> <el-table-column prop="productName" width="250" label="项目名称" align="center" show-overflow-tooltip/>
<el-table-column prop="itemsNum" width="80" label="条款号" align="center"/> <el-table-column prop="itemsNum" label="条款号" align="center"/>
<el-table-column prop="itemsName" width="200" label="条款名称" align="center"/> <el-table-column prop="itemsName" width="200" label="条款名称" align="center"/>
<el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center"> <el-table-column prop="planCloseTime" width="120" label="整改完成时间" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
src/pages/processCenter/pages/phone/bzqdfb/step4.vue
+1 -1
View File
@@ -9,7 +9,7 @@
<div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div> <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>
<div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div> <div class="headerTabsItem" :class="active === '3' ? 'active' : ''" @click="handleTabs('3')">审批历史</div>
</div> </div>
<div class="content" v-show="active == '1'"> <div class="content" v-show="active === '1'">
<div style="flex: auto; overflow: auto"> <div style="flex: auto; overflow: auto">
<process-title> <process-title>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
src/pages/processCenter/pages/processDetail/index.vue
+2 -2
View File
@@ -83,7 +83,7 @@
sortable="custom" sortable="custom"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -91,7 +91,7 @@
label="完成时间" label="完成时间"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span> <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column