|
|
@@ -20,8 +20,8 @@
|
|
|
start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
</el-form-item>-->
|
|
|
<el-form-item label="上级组织" label-width="120px" v-if="false">
|
|
|
- <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false" v-model="selectedorg"
|
|
|
- placeholder="请选择组织"></el-cascader>
|
|
|
+ <el-cascader :options="orgtreelist" :props="orgtreeprops" change-on-select :show-all-levels="false"
|
|
|
+ v-model="selectedorg" placeholder="请选择组织"></el-cascader>
|
|
|
</el-form-item>
|
|
|
|
|
|
<el-form-item>
|
|
|
@@ -43,14 +43,9 @@
|
|
|
</router-link>
|
|
|
|
|
|
<el-popover placement="top" title="提示">
|
|
|
- <el-alert
|
|
|
- title=""
|
|
|
- description="确认要删除吗?"
|
|
|
- trigger="click"
|
|
|
- type="warning"
|
|
|
- :closable="false">
|
|
|
+ <el-alert title="" description="确认要删除吗?" trigger="click" type="warning" :closable="false">
|
|
|
</el-alert>
|
|
|
- <br/>
|
|
|
+ <br />
|
|
|
<div style="text-align: right; margin: 0">
|
|
|
<el-button type="primary" size="mini" @click="deleteEntity(scope.row)">删除</el-button>
|
|
|
</div>
|
|
|
@@ -59,8 +54,9 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
|
|
|
- <el-table-column v-for="column in tableColumns" :key="column.Id"
|
|
|
- v-if="column.prop != 'CreateOn'" :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip></el-table-column>
|
|
|
+ <el-table-column v-for="column in tableColumns" :key="column.Id" v-if="column.prop != 'CreateOn'"
|
|
|
+ :prop="column.prop" sortable min-width="100" :label="column.label" align="center" show-overflow-tooltip>
|
|
|
+ </el-table-column>
|
|
|
|
|
|
<!--<el-table-column prop="CreateOn" sortable min-width="150" label="生成时间" align="center" show-overflow-tooltip>
|
|
|
<template slot-scope="scope">
|
|
|
@@ -69,7 +65,8 @@
|
|
|
</el-table-column>-->
|
|
|
</el-table>
|
|
|
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="currentPage"
|
|
|
- :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper" :total="currentItemCount">
|
|
|
+ :page-sizes="[10, 15, 20, 25]" :page-size="size" layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="currentItemCount">
|
|
|
</el-pagination>
|
|
|
</el-card>
|
|
|
|
|
|
@@ -80,7 +77,7 @@
|
|
|
<el-col :span="12">
|
|
|
<el-form-item label="生成时间">
|
|
|
<el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
|
|
|
- start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
+ start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
|
|
|
@@ -137,7 +134,9 @@
|
|
|
</div>
|
|
|
</template>
|
|
|
<script>
|
|
|
- import { mapGetters } from 'vuex'
|
|
|
+ import {
|
|
|
+ mapGetters
|
|
|
+ } from 'vuex'
|
|
|
import api from '@/api/system/auditsetting'
|
|
|
|
|
|
export default {
|
|
|
@@ -147,14 +146,14 @@
|
|
|
})
|
|
|
},
|
|
|
name: 'oilauditsetting',
|
|
|
-
|
|
|
- data () {
|
|
|
+ data() {
|
|
|
return {
|
|
|
dialogVisible: false,
|
|
|
// 列表数据
|
|
|
entityList: [],
|
|
|
// 分页参数
|
|
|
size: 10,
|
|
|
+
|
|
|
currentPage: 1,
|
|
|
currentItemCount: 0,
|
|
|
ACode: "",
|
|
|
@@ -184,8 +183,7 @@
|
|
|
ModifiedUserId: '',
|
|
|
ModifiedBy: ''
|
|
|
},
|
|
|
- tableColumns: [
|
|
|
- {
|
|
|
+ tableColumns: [{
|
|
|
prop: 'OrganizeName',
|
|
|
label: '单位名称',
|
|
|
width: 100,
|
|
|
@@ -233,36 +231,60 @@
|
|
|
]
|
|
|
}
|
|
|
},
|
|
|
- created () {
|
|
|
+ created() {
|
|
|
// 查询条件初始值备份
|
|
|
Object.assign(this.searchFormReset, this.searchForm)
|
|
|
// 查询列表
|
|
|
- if (this.$route.query.step == 1){
|
|
|
- //企业法规处审核
|
|
|
- this.ACode = "FIRST_TRIAL"
|
|
|
- } else if (this.$route.query.step == 2) {
|
|
|
- //二级单位复审
|
|
|
- this.ACode = "SECOND_TRIAL"
|
|
|
- } else if (this.$route.query.step == 3) {
|
|
|
- //业务处室接收
|
|
|
- this.ACode = "PROF_RECE"
|
|
|
- } else if (this.$route.query.step == 4) {
|
|
|
- //业务处室专业审核
|
|
|
- this.ACode = "PROF_AUDIT"
|
|
|
- } else if (this.$route.query.step == 5) {
|
|
|
- //集中评审
|
|
|
- this.ACode = "PROF_CONCENT"
|
|
|
- } else if (this.$route.query.step == 6) {
|
|
|
- //企业法规处审核
|
|
|
- this.ACode = "PROF_REGULATION"
|
|
|
- }
|
|
|
+ if (this.$route.query.step == 1) {
|
|
|
+ //企业法规处审核
|
|
|
+ this.ACode = "FIRST_TRIAL"
|
|
|
+ } else if (this.$route.query.step == 2) {
|
|
|
+ //二级单位复审
|
|
|
+ this.ACode = "SECOND_TRIAL"
|
|
|
+ } else if (this.$route.query.step == 3) {
|
|
|
+ //业务处室接收
|
|
|
+ this.ACode = "PROF_RECE"
|
|
|
+ } else if (this.$route.query.step == 4) {
|
|
|
+ //业务处室专业审核
|
|
|
+ this.ACode = "PROF_AUDIT"
|
|
|
+ } else if (this.$route.query.step == 5) {
|
|
|
+ //集中评审
|
|
|
+ this.ACode = "PROF_CONCENT"
|
|
|
+ } else if (this.$route.query.step == 6) {
|
|
|
+ //企业法规处审核
|
|
|
+ this.ACode = "PROF_REGULATION"
|
|
|
+ }
|
|
|
this.initDatas()
|
|
|
// his.getDictOptions()
|
|
|
},
|
|
|
+ watch: {
|
|
|
+ $route(val) {
|
|
|
+ if (val.query.step == 1) {
|
|
|
+ //企业法规处审核
|
|
|
+ this.ACode = "FIRST_TRIAL"
|
|
|
+ } else if (val.query.step == 2) {
|
|
|
+ //二级单位复审
|
|
|
+ this.ACode = "SECOND_TRIAL"
|
|
|
+ } else if (val.query.step == 3) {
|
|
|
+ //业务处室接收
|
|
|
+ this.ACode = "PROF_RECE"
|
|
|
+ } else if (val.query.step == 4) {
|
|
|
+ //业务处室专业审核
|
|
|
+ this.ACode = "PROF_AUDIT"
|
|
|
+ } else if (val.query.step == 5) {
|
|
|
+ //集中评审
|
|
|
+ this.ACode = "PROF_CONCENT"
|
|
|
+ } else if (val.query.step == 6) {
|
|
|
+ //企业法规处审核
|
|
|
+ this.ACode = "PROF_REGULATION"
|
|
|
+ }
|
|
|
+ this.initDatas()
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
- initDatas () {
|
|
|
+ initDatas() {
|
|
|
// 分页及列表条件
|
|
|
-
|
|
|
+
|
|
|
let params = {
|
|
|
_currentPage: this.currentPage,
|
|
|
_size: this.size,
|
|
|
@@ -298,7 +320,7 @@
|
|
|
})
|
|
|
}, */
|
|
|
|
|
|
- searchCommand (command) {
|
|
|
+ searchCommand(command) {
|
|
|
if (command === 'search') {
|
|
|
this.dialogVisible = true
|
|
|
} else if (command === 'clear') {
|
|
|
@@ -306,7 +328,7 @@
|
|
|
}
|
|
|
},
|
|
|
// 列表排序功能
|
|
|
- orderby (column) {
|
|
|
+ orderby(column) {
|
|
|
if (column.order === 'ascending') {
|
|
|
this.Column.Order = 'asc'
|
|
|
} else if (column.order === 'descending') {
|
|
|
@@ -315,27 +337,27 @@
|
|
|
this.Column.Prop = column.prop
|
|
|
this.initDatas()
|
|
|
},
|
|
|
- clearSearch () {
|
|
|
+ clearSearch() {
|
|
|
Object.assign(this.searchForm, this.searchFormReset)
|
|
|
// this.searchForm = this.searchFormReset;
|
|
|
this.CreateOn = ''
|
|
|
this.initDatas()
|
|
|
},
|
|
|
- handleSearch () {
|
|
|
+ handleSearch() {
|
|
|
this.currentPage = 1
|
|
|
this.dialogVisible = false
|
|
|
this.initDatas()
|
|
|
},
|
|
|
- handleCurrentChange (value) {
|
|
|
+ handleCurrentChange(value) {
|
|
|
this.currentPage = value
|
|
|
this.initDatas()
|
|
|
},
|
|
|
- handleSizeChange (value) {
|
|
|
+ handleSizeChange(value) {
|
|
|
this.size = value
|
|
|
this.currentPage = 1
|
|
|
this.initDatas()
|
|
|
},
|
|
|
- deleteEntity (row) {
|
|
|
+ deleteEntity(row) {
|
|
|
row.deleteConfirmFlag = false
|
|
|
api.deleteEntity(row.Id, this.$axios).then(res => {
|
|
|
if (res.data.code === 0) {
|
|
|
@@ -355,7 +377,7 @@
|
|
|
})
|
|
|
},
|
|
|
|
|
|
- jstimehandle (val) {
|
|
|
+ jstimehandle(val) {
|
|
|
if (val === '') {
|
|
|
return '----'
|
|
|
} else if (val === '0001-01-01T08:00:00+08:00') {
|
|
|
@@ -368,7 +390,7 @@
|
|
|
}
|
|
|
},
|
|
|
|
|
|
- formatDateTime (date) {
|
|
|
+ formatDateTime(date) {
|
|
|
var y = date.getFullYear()
|
|
|
var m = date.getMonth() + 1
|
|
|
m = m < 10 ? ('0' + m) : m
|
|
|
@@ -381,6 +403,7 @@
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss">
|
|
|
@@ -388,5 +411,5 @@
|
|
|
margin: 1rem 0 2rem;
|
|
|
text-align: right;
|
|
|
}
|
|
|
-</style>
|
|
|
|
|
|
+</style>
|