政务人员工作台待办审批、更多的跳转、项目库修改跳转方式

prod
吕天方 10 months ago
parent dc878c3fc1
commit 48088f5d42

@ -5,8 +5,8 @@ VUE_APP_TITLE = 金鸡湖现代服务业品牌管理系统
ENV = 'development' ENV = 'development'
# 金鸡湖现代服务业品牌管理系统/开发环境 # 金鸡湖现代服务业品牌管理系统/开发环境
VUE_APP_BASE_API = 'http://192.168.0.105:9040' # VUE_APP_BASE_API = 'http://192.168.0.105:9040'
# VUE_APP_BASE_API = 'http://39.101.188.84:9040' VUE_APP_BASE_API = 'http://39.101.188.84:9040'
# 路由懒加载 # 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true VUE_CLI_BABEL_TRANSPILE_MODULES = true

@ -33,8 +33,8 @@
</el-dropdown> </el-dropdown>
</div> </div>
</div> </div>
<div class="crumbs-box" v-if="breadcrumbShow"> <div class="crumbs-box" v-show="breadcrumbShow">
<breadcrumb id="breadcrumb-container" class="breadcrumb-container" /> <breadcrumb v-if="breadcrumbShow" id="breadcrumb-container" class="breadcrumb-container" />
</div> </div>
</div> </div>
</template> </template>

@ -182,7 +182,7 @@
<!-- <el-radio-group v-model="form.isFrame"> <!-- <el-radio-group v-model="form.isFrame">
<el-radio label="0">Excel批量导入</el-radio> <el-radio label="0">Excel批量导入</el-radio>
</el-radio-group> --> </el-radio-group> -->
<el-radio-group v-model="form.isFrame" @input="changeIsFrame"> <el-radio-group v-model="form.isFrame">
<el-radio label="0">所有企业</el-radio> <el-radio label="0">所有企业</el-radio>
<el-radio label="1">部分企业</el-radio> <el-radio label="1">部分企业</el-radio>
</el-radio-group> </el-radio-group>

@ -238,16 +238,18 @@ export default {
}; };
}, },
mounted() { mounted() {
if(this.$route.params.approvalStatusStr) {
this.queryParams.approvalStatusStr = this.$route.params.approvalStatusStr
this.radio = this.$route.params.approvalStatusStr
}
this.cancalDebounce(); this.cancalDebounce();
// console.log(this.deptId,"deptId"); // console.log(this.deptId,"deptId");
window.addEventListener('resize', this.cancalDebounce); window.addEventListener('resize', this.cancalDebounce);
this.getList();
}, },
destroyed() { destroyed() {
window.removeEventListener('resize', this.cancalDebounce); window.removeEventListener('resize', this.cancalDebounce);
}, },
created() {
this.getList();
},
methods: { methods: {
// //
cancalDebounce(){ cancalDebounce(){

@ -84,8 +84,9 @@
<el-radio-button label="">全部</el-radio-button> <el-radio-button label="">全部</el-radio-button>
<el-radio-button label="1,8">初审</el-radio-button> <el-radio-button label="1,8">初审</el-radio-button>
<el-radio-button label="2,7">复审</el-radio-button> <el-radio-button label="2,7">复审</el-radio-button>
<!-- <el-radio-button label="3,6">专家评审</el-radio-button> -->
<el-radio-button label="3,6">专家评审</el-radio-button> <el-radio-button label="3,6">专家评审</el-radio-button>
<el-radio-button label="4">市级评审</el-radio-button> <!-- <el-radio-button label="4">市级评审</el-radio-button> -->
<el-radio-button label="5">评定通过</el-radio-button> <el-radio-button label="5">评定通过</el-radio-button>
</el-radio-group> </el-radio-group>
</el-col> </el-col>
@ -206,17 +207,17 @@
<span v-if="scope.row.status == 9" class="approval_status9"></span> <span v-if="scope.row.status == 9" class="approval_status9"></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申报时间" align="center" prop="createTime" min-width="160"> <el-table-column label="申报时间" align="center" prop="createTime" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="updateTime" label="更新时间" min-width="160"> <el-table-column prop="updateTime" label="更新时间" min-width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="140" fixed="right"> <el-table-column label="操作" align="center" width="200" fixed="right">
<!-- 0: 草稿 8初审拒绝 7复审拒绝 6专家评审拒绝 9评定不通过 --> <!-- 0: 草稿 8初审拒绝 7复审拒绝 6专家评审拒绝 9评定不通过 -->
<!-- v-if="userType == '01' && (scope.row.status == 0 || scope.row.status == 8||scope.row.status == 7||scope.row.status == 6||scope.row.status == 9)" --> <!-- v-if="userType == '01' && (scope.row.status == 0 || scope.row.status == 8||scope.row.status == 7||scope.row.status == 6||scope.row.status == 9)" -->
<template slot-scope="scope"> <template slot-scope="scope">

@ -381,9 +381,13 @@ export default {
}, },
// //
goToProject(id){ goToProject(id){
this.$router.replace({ // this.$router.push({
path: '/project/index', // path: '/project/index',
query: { projectId: id } // params: { projectId: id }
// })
this.$router.push({
name: 'ProjectList',
params: { projectId: id }
}) })
}, },
// //

@ -286,8 +286,8 @@ export default {
}; };
}, },
mounted() { mounted() {
if(this.$route.query.projectId) { if(this.$route.params.projectId) {
this.formInline.projectClassify = this.$route.query.projectId; this.formInline.projectClassify = this.$route.params.projectId + '';
this.pagination = { ...this.pagination,...this.formInline }; this.pagination = { ...this.pagination,...this.formInline };
} }
this.cancalDebounce(); this.cancalDebounce();

@ -91,9 +91,13 @@ export default {
}, },
goback(id){ goback(id){
// console.log(id,"id"); // console.log(id,"id");
this.$router.replace({ // this.$router.replace({
path: '/project/index', // path: '/project/index',
query: { projectId: id } // query: { projectId: id }
// })
this.$router.push({
name: 'ProjectList',
params: { projectId: id }
}) })
}, },
// //

@ -31,23 +31,73 @@
<div class="main-right"> <div class="main-right">
<div class="right-header"> <div class="right-header">
<div class="title">待办提醒</div> <div class="title">待办提醒</div>
<el-button type="text">>> 更多记录</el-button> <el-button @click="MoreRecords" type="text" v-if="backlogArray.length > 0">>> 更多记录</el-button>
</div> </div>
<div class="right-main"> <div class="right-main" v-if="backlogArray.length > 0">
<div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'"> <div class="main-items" v-for="(item,index) in backlogArray" :key="index" :class="index % 2 == 0 ? '':'main-item'">
<div>{{ item.projectName }}</div> <div>{{ item.projectName }}</div>
<div>审批知识产权材料</div> <div>审批知识产权材料</div>
<div>去审</div> <div @click="handleApproval(item)"></div>
</div> </div>
</div> </div>
<div class="right-main" v-else>
<el-divider content-position="center">暂未待审核</el-divider>
</div>
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
</main> </main>
<!-- 申报审核对话框 -->
<el-dialog title="申报审核" :visible.sync="open" width="600px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="100px" label-position="left">
<el-row>
<el-col :span="24">
<el-form-item label="审批状态" prop="approvalStatus">
<el-radio-group v-model="form.approvalStatus">
<el-radio label="1">审批通过</el-radio>
<el-radio label="2">审批驳回</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审批意见" prop="approvalOpinions">
<el-input v-model="form.approvalOpinions" type="textarea" placeholder="请输入审批意见" maxlength="200"></el-input>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="审批附件" prop="fileList">
<el-upload
class="upload-demo"
:show-file-list="false"
action=""
accept=".xlsx,.XLSX,.XSL,.doc,.xls,.ppt,.pdf,.png,.jpg,.jpeg,.rar,.zip,.docx"
:http-request="handleFileUpload"
:file-list="fileList"
>
<el-button slot="trigger" size="small" type="success">上传文件</el-button>
<div slot="tip" class="el-upload__tip">请上传格式为<span style="color: red;">doc/xls/ppt/pdf/png/jpg/jpeg/rar/zip/docx/xlsx</span>的文件</div>
</el-upload>
<ul v-if="fileList.length >0" class="upload_ul">
<li v-for="item in uploadList" :key="item.url" class="upload_li">
<img src="@/assets/images/uploadBgc.jpg" class="li_img" alt="">
<span class="icon_name">{{ item.name }}</span>
<el-button type="text" style="color: red;" @click="deleteUpload(item)"></el-button>
</li>
</ul>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel"> </el-button>
<el-button type="primary" @click="submitForm"> </el-button>
</div>
</el-dialog>
</div> </div>
</template> </template>
<script> <script>
import { approvalList } from "@/api/onlineDeclartion/pendingReview" import { approvalList, approvalEdit, uploadFile } from "@/api/onlineDeclartion/pendingReview"
export default { export default {
data() { data() {
return { return {
@ -56,7 +106,25 @@ export default {
pagination: { pagination: {
pageNum:1, pageNum:1,
pageSize:10, pageSize:10,
approvalStatusStr: 0,
},
//
open: false,
//
form: {
approvalOpinions: ''
},
//
rules: {
approvalStatus: [
{ required: true, message: "请选择审批状态", trigger: "blur" }
],
approvalOpinions: [
{ required: true, message: "名录维护方式不能为空", trigger: "blur" }
],
}, },
fileList: [],
uploadList: [],
} }
}, },
mounted(){ mounted(){
@ -65,10 +133,76 @@ export default {
methods:{ methods:{
getList(){ getList(){
approvalList(this.pagination).then(res=>{ approvalList(this.pagination).then(res=>{
console.log(res); // console.log(res);
this.backlogArray = res.rows this.backlogArray = res.rows
}) })
},
//
MoreRecords(){
this.$router.push({
name: 'PendingReview',
params: { approvalStatusStr: "0" }
})
},
handleApproval(row) {
this.reset();
this.form.declarationRecordsId = row.declarationRecordsId
this.open = true;
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
approvalOpinions: '',
approvalStatus: '1',
approvalAttachment: '',
};
this.resetForm("form");
this.uploadList = []
},
handleFileUpload(params) {
const file = params.file
let form = new FormData()
form.append('file', file)
uploadFile(form).then(response => {
this.fileList = []
this.fileList.push(file)
this.form.fileList = this.fileList
let data = {}
data.name = response.originalFilename;
data.url = response.url;
this.uploadList.push(data)
// console.log('this.fileList: ', this.fileList);
})
},
deleteUpload(value) {
this.uploadList = this.uploadList.filter(item => {
return item.url != value.url
})
},
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.uploadList.forEach((item,index) => {
if(this.uploadList.length-1 == index){
this.form.approvalAttachment+=`${item.url}`
} else {
this.form.approvalAttachment+=`${item.url},`
} }
})
// console.log("sdas", this.form);
approvalEdit(this.form).then(response => {
this.$modal.msgSuccess("审核完成");
this.open = false;
this.getList();
});
}
});
},
}, },
} }
</script> </script>

Loading…
Cancel
Save