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

标准征求意见页面调整

Browse Source
This commit is contained in:
shenyanpei
2021-09-15 17:26:46 +08:00
parent a3edd332f6
commit c7f1466c42
10 changed files with 1991 additions and 1995 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+9 -28
View File
@@ -24,12 +24,10 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择征求意见" class="add-form-item form-item-disabled"> <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button> <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
</div> </div>
</el-form-item>
<el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -37,14 +35,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
v-model="form.endTime" v-model="form.endTime"
@@ -52,12 +42,10 @@
placeholder="请选择结束日期"> placeholder="请选择结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="选择标准附件" class="add-form-item form-item-disabled"> <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button> <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
</div> </div>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.fjListId" v-model="form.fjListId"
style="display: none;" style="display: none;"
@@ -519,15 +507,6 @@ export default {
this.total = res.data.count this.total = res.data.count
this.spinShow = false this.spinShow = false
}) })
// var form = this.standCommonlySearch
// this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
// _this: this
// }, res => {
// this.standInfoList = res.data.records
// this.total = res.data.total
// this.spinShow = false
// }, e => {
// })
}, },
pageChange(page) { pageChange(page) {
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
@@ -561,11 +540,10 @@ export default {
bringData.push(deposit.get(this.selectedList[i])); bringData.push(deposit.get(this.selectedList[i]));
} }
if (bringData[0].standYear) { if (bringData[0].standYear) {
this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName
} else { } else {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
} }
this.form.cname = bringData[0].standName;
this.listModel = false; this.listModel = false;
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行带入");
@@ -680,6 +658,9 @@ export default {
} }
} }
.el-input__icon {
width: 15px;
}
position: relative; position: relative;
height: 100%; height: 100%;
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+69 -67
View File
@@ -24,26 +24,16 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="选择征求意见" class="add-form-item form-item-disabled"> <el-form-item label="标准号/名称" prop="cid" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button> <el-button size="small" type="primary" @click="addZqyjList">选择标准</el-button>
</div> </div>
</el-form-item>
<el-form-item label="标准号" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> />
</el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item> </el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
@@ -52,18 +42,18 @@
placeholder="请选择结束日期"> placeholder="请选择结束日期">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="选择标准附件" class="add-form-item form-item-disabled"> <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton" style="padding-left: 10px">
<el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button> <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
</div> </div>
</el-form-item>
<el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.fjListId" v-model="form.fjListId"
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -195,7 +185,8 @@
</el-formItem> </el-formItem>
<el-formItem label="标准类别" prop="standSort" class="search-item"> <el-formItem label="标准类别" prop="standSort" class="search-item">
<el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable> <el-select v-model="standCommonlySearch.standSort" placeholder="根据标准类别查找" clearable>
<el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">{{ opt.label }} <el-option v-for="opt in standSortOptions" :value="opt.value === undefined ? '' :opt.value" :key="opt.value" :label="opt.label">
{{ opt.label }}
</el-option> </el-option>
</el-select> </el-select>
</el-formItem> </el-formItem>
@@ -211,11 +202,13 @@
size="mini" size="mini"
class="common-button-primary" class="common-button-primary"
@click="sarStandCompareHisInfo">查询</el-button> @click="sarStandCompareHisInfo">查询
</el-button>
<el-button <el-button
class="common-button-default" class="common-button-default"
size="mini" size="mini"
@click="clearSearchStand">清空</el-button> @click="clearSearchStand">清空
</el-button>
</el-formItem> </el-formItem>
</el-form> </el-form>
</div> </div>
@@ -235,8 +228,12 @@
<el-table-column type="selection" width="55" align="center"/> <el-table-column type="selection" width="55" align="center"/>
<el-table-column label="标准号" align="center"> <el-table-column label="标准号" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</div> <div v-if="scope.row.standYear" @click="handlePreview(scope.row)" class="table-jump">
<div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</div> {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
</div>
<div v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="cname" label="标准名称" align="center"> <el-table-column prop="cname" label="标准名称" align="center">
@@ -309,7 +306,7 @@
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 { saveTaskFirst } from 'api/process' import {saveTaskFirst} from 'api/process'
export default { export default {
name: "bzzqyjStep1", name: "bzzqyjStep1",
@@ -339,16 +336,13 @@ export default {
}, },
formRules: { formRules: {
cid: [ cid: [
{ required: true, message: '请输入标准编号', trigger: 'change' }, {required: true, message: '请输入标准编号', trigger: 'change'},
], ],
endTime: [ endTime: [
{ required: true, message: '请输入标准结束日期', trigger: 'change' }, {required: true, message: '请输入标准结束日期', trigger: 'change'},
],
cname: [
{ required: true, message: '请输入标准名称', trigger: 'change' },
], ],
fjListId: [ fjListId: [
{ required: true, message: '请选择附件', trigger: 'change' }, {required: true, message: '请选择附件', trigger: 'change'},
] ]
}, },
// 标准征求意见数据可库 // 标准征求意见数据可库
@@ -380,16 +374,16 @@ export default {
}, },
roleFormRules: { roleFormRules: {
dockUserList: [ dockUserList: [
{ required: true, message: '请选择责任部门对接人', trigger: 'change' }, {required: true, message: '请选择责任部门对接人', trigger: 'change'},
], ],
ministerUser: [ ministerUser: [
{ required: true, message: '请选择标准法规部部长', trigger: 'change' }, {required: true, message: '请选择标准法规部部长', trigger: 'change'},
], ],
directorUser: [ directorUser: [
{ required: true, message: '请选择技术管理中心主任', trigger: 'change' }, {required: true, message: '请选择技术管理中心主任', trigger: 'change'},
], ],
presidentUser: [ presidentUser: [
{ required: true, message: '请选择工程研究院院长', trigger: 'change' }, {required: true, message: '请选择工程研究院院长', trigger: 'change'},
] ]
}, },
nodeList: [], nodeList: [],
@@ -406,7 +400,7 @@ export default {
ProcessFooter, ProcessFooter,
ProcessTitle ProcessTitle
}, },
mounted () { mounted() {
this.sarStandCompareHis() this.sarStandCompareHis()
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
@@ -420,7 +414,7 @@ export default {
} }
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -430,7 +424,7 @@ export default {
} }
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
}, },
addfjList () { addfjList() {
this.$http.get('lawss/sarStandFile/queryFileInfo', { this.$http.get('lawss/sarStandFile/queryFileInfo', {
standId: this.form.standId standId: this.form.standId
}, {}, res => { }, {}, res => {
@@ -438,18 +432,18 @@ export default {
}) })
this.fzlistModel = true this.fzlistModel = true
}, },
handleSelection2 (data) { handleSelection2(data) {
if(data.length > 5) { if (data.length > 5) {
this.$message.warning('最多选择5条附件') this.$message.warning('最多选择5条附件')
} else { } else {
this.addFjList = data this.addFjList = data
} }
}, },
closeDrawer2 () { closeDrawer2() {
this.fzlistModel = false this.fzlistModel = false
this.addFjList = [] this.addFjList = []
}, },
enterDrawer2 () { enterDrawer2() {
this.fzlistModel = false this.fzlistModel = false
this.form.fjList = this.addFjList this.form.fjList = this.addFjList
let idList = [] let idList = []
@@ -462,7 +456,7 @@ export default {
this.form.fjListId = idList.join(',') this.form.fjListId = idList.join(',')
}, },
// 点击查看 // 点击查看
handlePreview (item) { handlePreview(item) {
let pageType let pageType
if (item.standType === 'FOREIGN') { if (item.standType === 'FOREIGN') {
pageType = 'FOREIGN_STAND' pageType = 'FOREIGN_STAND'
@@ -485,7 +479,7 @@ export default {
/** 标准征求意见库方法* /** 标准征求意见库方法*
* **********************************************/ * **********************************************/
// 清空 // 清空
clearSearchStand () { clearSearchStand() {
this.standCommonlySearch.page = 1 this.standCommonlySearch.page = 1
this.standCommonlySearch.standSort = '' this.standCommonlySearch.standSort = ''
this.standCommonlySearch.standNumber = '' this.standCommonlySearch.standNumber = ''
@@ -498,7 +492,7 @@ export default {
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
// 查询表格 // 查询表格
sarStandCompareHis () { sarStandCompareHis() {
this.spinShow = true this.spinShow = true
var formData = this.standCommonlySearch var formData = this.standCommonlySearch
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
@@ -508,22 +502,13 @@ export default {
this.total = res.data.count this.total = res.data.count
this.spinShow = false this.spinShow = false
}) })
// var form = this.standCommonlySearch
// this.$http.get('slrs/sar-public-idea/SelectAllPage', form, {
// _this: this
// }, res => {
// this.standInfoList = res.data.records
// this.total = res.data.total
// this.spinShow = false
// }, e => {
// })
}, },
pageChange (page) { pageChange(page) {
this.standCommonlySearch.page = page this.standCommonlySearch.page = page
this.sarStandCompareHis() this.sarStandCompareHis()
}, },
// 分页每页显示数改变后方法 // 分页每页显示数改变后方法
pageSizeChange (pageSize) { pageSizeChange(pageSize) {
this.$store.getters.userInfo.configContent = pageSize this.$store.getters.userInfo.configContent = pageSize
this.standCommonlySearch.size = pageSize this.standCommonlySearch.size = pageSize
this.sarStandCompareHis() this.sarStandCompareHis()
@@ -550,13 +535,12 @@ export default {
bringData.push(deposit.get(this.selectedList[i])); bringData.push(deposit.get(this.selectedList[i]));
} }
if (bringData[0].standYear) { if (bringData[0].standYear) {
this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + ' ' + bringData[0].standName
} else { } else {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + ' ' + bringData[0].standName
} }
this.form.standType = bringData[0].standType this.form.standType = bringData[0].standType
this.form.standId = bringData[0].id this.form.standId = bringData[0].id
this.form.cname = bringData[0].standName;
this.listModel = false; this.listModel = false;
} else if (this.selectedList.length > 1) { } else if (this.selectedList.length > 1) {
this.$message.warning("只能选择一条数据进行带入"); this.$message.warning("只能选择一条数据进行带入");
@@ -566,10 +550,10 @@ export default {
}, },
/*** **********************************************/ /*** **********************************************/
/** 流程节点负责人的选择 *****************************/ /** 流程节点负责人的选择 *****************************/
checkedRole2 (data) { checkedRole2(data) {
var idList = '' var idList = ''
var nameList = '' var nameList = ''
data.forEach( item => { data.forEach(item => {
if (nameList.length > 0) { if (nameList.length > 0) {
nameList += ',' nameList += ','
idList += ',' idList += ','
@@ -580,7 +564,7 @@ export default {
this.roleForm.dockUserList = idList this.roleForm.dockUserList = idList
this.roleForm.dockUserListName = nameList this.roleForm.dockUserListName = nameList
}, },
checkedRole (data) { checkedRole(data) {
if (this.type === 'ministerUser') { if (this.type === 'ministerUser') {
this.roleForm.ministerUser = data[0].id this.roleForm.ministerUser = data[0].id
this.roleForm.ministerUserName = data[0].name this.roleForm.ministerUserName = data[0].name
@@ -592,14 +576,14 @@ export default {
this.roleForm.presidentUserName = data[0].name this.roleForm.presidentUserName = data[0].name
} }
}, },
choiceZRRS () { choiceZRRS() {
this.nodeList2 = [] this.nodeList2 = []
if ( this.roleForm.dockUserList.length > 0) { if (this.roleForm.dockUserList.length > 0) {
this.nodeList2 = this.roleForm.dockUserList.split(',') this.nodeList2 = this.roleForm.dockUserList.split(',')
} }
this.modalshowflag2 = true this.modalshowflag2 = true
}, },
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
@@ -678,20 +662,27 @@ export default {
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
@import '~@/assets/styles/mixins'; @import '~@/assets/styles/mixins';
.bzzqyjStep1 { .bzzqyjStep1 {
.myForm { .myForm {
/deep/.el-form-item__content { /deep/ .el-form-item__content {
line-height: 10px; line-height: 10px;
} }
} }
/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;
} }
} }
.el-input__icon {
width: 15px;
}
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -699,6 +690,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;
@@ -706,12 +698,14 @@ 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 { .content {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@@ -719,34 +713,42 @@ export default {
height: calc(~'100% - 107px'); height: calc(~'100% - 107px');
overflow: auto; overflow: auto;
} }
.standardForComments { .standardForComments {
height: 100%; height: 100%;
background: #fff; background: #fff;
.el-divider--horizontal { .el-divider--horizontal {
display: block; display: block;
height: 1px; height: 1px;
width: 100%; width: 100%;
margin: 0; margin: 0;
} }
flex-direction: column; flex-direction: column;
.action-bar { .action-bar {
margin-bottom: 5px; margin-bottom: 5px;
padding: 0; padding: 0;
} }
.content { .content {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
.table-wrap { .table-wrap {
flex: auto; flex: auto;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
} }
& > .pagination { & > .pagination {
position: static; position: static;
/deep/.pagination-slot {
/deep/ .pagination-slot {
padding: 0; padding: 0;
} }
} }
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+2 -10
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,7 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled"> <el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+45 -34
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,9 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -68,11 +62,13 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="addModal" @click="addModal"
size="mini">新增</el-button> size="mini">新增
</el-button>
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="addDelete" @click="addDelete"
size="mini">删除</el-button> size="mini">删除
</el-button>
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@@ -210,7 +206,7 @@
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -227,12 +223,12 @@
</template> </template>
<script> <script>
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 {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process' import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from 'api/process'
export default { export default {
name: "bzzqyjStep3", name: "bzzqyjStep3",
data() { data() {
return { return {
@@ -266,7 +262,7 @@
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, {required: true, message: '请选择责任人', trigger: 'change'},
] ]
}, },
json: {} json: {}
@@ -278,7 +274,7 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -288,20 +284,21 @@
} }
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
}, },
getHistoryData () { getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
}, {}, res => { }, {}, res => {
this.histortData = res this.histortData = res
}, e => {}) }, e => {
})
}, },
handleSelectionChange (val) { handleSelectionChange(val) {
this.idList = [] this.idList = []
val.forEach( item => { val.forEach(item => {
this.idList.push(item.id) this.idList.push(item.id)
}) })
}, },
addDelete () { addDelete() {
if (this.idList.length > 0) { if (this.idList.length > 0) {
this.$confirm('删除选中数据, 是否继续?', '提示', { this.$confirm('删除选中数据, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
@@ -326,7 +323,7 @@
} }
}, },
addModal () { addModal() {
var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36);
var json = { var json = {
chapterNumber: '', chapterNumber: '',
@@ -396,6 +393,7 @@
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText
json.info = this.data json.info = this.data
json.form = this.form
json.department = this.$store.getters.userInfo.orgName json.department = this.$store.getters.userInfo.orgName
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
@@ -424,36 +422,44 @@
this.form.endTime = data.endTime || data.form.endTime this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname this.form.cname = data.cname || data.form.cname
this.json = data this.json = data
this.data = data.info || data.data || data.form.data|| [] this.data = data.info || data.data || data.form.data || []
}).catch(e => { }).catch(e => {
}) })
}) })
}, },
}, },
mounted () { mounted() {
this.getHistoryData() this.getHistoryData()
this.getData() this.getData()
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep3 {
/deep/.el-drawer__container { .bzdyStep3 {
/deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.fileClass { .fileClass {
cursor: pointer; cursor: pointer;
} }
.fileClass:hover{
.fileClass:hover {
color: #0c91e5; color: #0c91e5;
} }
.el-input__icon {
width: 15px;
}
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -461,6 +467,7 @@
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;
@@ -468,18 +475,21 @@
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 { .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;
@@ -487,6 +497,7 @@
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;
@@ -494,5 +505,5 @@
} }
} }
} }
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+35 -29
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,9 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -186,7 +180,7 @@
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -207,12 +201,12 @@
</template> </template>
<script> <script>
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 {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail, processCreateStand} from 'api/process'
export default { export default {
name: "bzzqyjStep4", name: "bzzqyjStep4",
data() { data() {
return { return {
@@ -245,7 +239,7 @@
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, {required: true, message: '请选择责任人', trigger: 'change'},
] ]
}, },
json: {} json: {}
@@ -257,7 +251,7 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -267,17 +261,19 @@
} }
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
}, },
getHistoryData () { getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
}, {}, res => { }, {}, res => {
this.histortData = res this.histortData = res
}, e => {}) }, e => {
})
}, },
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
},
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
@@ -295,7 +291,7 @@
this.isSubmit = false this.isSubmit = false
}) })
}, },
handleSubmitNo () { handleSubmitNo() {
if (this.commentText) { if (this.commentText) {
var json = this.json var json = this.json
json.actionFlag = 1 json.actionFlag = 1
@@ -334,30 +330,35 @@
}) })
}, },
}, },
mounted () { mounted() {
this.getHistoryData() this.getHistoryData()
this.getData() this.getData()
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep4 {
/deep/.el-drawer__container { .bzdyStep4 {
/deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.fileClass { .fileClass {
cursor: pointer; cursor: pointer;
} }
.fileClass:hover{
.fileClass:hover {
color: #0c91e5; color: #0c91e5;
} }
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -365,6 +366,7 @@
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;
@@ -372,18 +374,21 @@
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 { .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;
@@ -391,6 +396,7 @@
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;
@@ -398,5 +404,5 @@
} }
} }
} }
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+8 -14
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,9 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -248,7 +242,7 @@
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 { inboundLiaisonDetail, processCreateStand, saveTaskForPub } from "api/process"; import {inboundLiaisonDetail, processCreateStand, saveTaskForPub} from "api/process";
export default { export default {
name: "bzzqyjStep5", name: "bzzqyjStep5",
@@ -284,7 +278,7 @@ export default {
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: "请选择责任人", trigger: "change" } {required: true, message: "请选择责任人", trigger: "change"}
] ]
}, },
json: {} json: {}
@@ -296,7 +290,7 @@ export default {
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -410,7 +404,7 @@ export default {
item.type = false; item.type = false;
}); });
this.json = data; this.json = data;
this.data = data.summaryList this.data = data.info
if (data.introduce) { if (data.introduce) {
} else { } else {
this.$http.get("slrs/sar-public-idea-all/getPublicIdea", { this.$http.get("slrs/sar-public-idea-all/getPublicIdea", {
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+14 -19
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,9 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -229,7 +223,7 @@
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 { inboundLiaisonDetail, processCreateStand } from "api/process"; import {inboundLiaisonDetail, processCreateStand} from "api/process";
export default { export default {
name: "bzzqyjStep6", name: "bzzqyjStep6",
@@ -268,7 +262,7 @@ export default {
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: "请选择责任人", trigger: "change" } {required: true, message: "请选择责任人", trigger: "change"}
] ]
}, },
json: {} json: {}
@@ -280,7 +274,7 @@ export default {
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -387,13 +381,14 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg); let data = JSON.parse(res.mesg);
this.form.cid = data.cid this.form.fjList = data.fjList || data.form.fjList
this.form.endTime = data.endTime this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cname = data.cname this.form.cid = data.cid || data.form.cid;
this.form.fjList = data.fjList this.form.endTime = data.endTime || data.form.endTime;
this.form.fjListId = data.fjListId this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = [] var arr = []
data.summaryList.forEach( item => { data.info.forEach(item => {
if (item.state != '3') { if (item.state != '3') {
arr.push(item) arr.push(item)
} }
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+51 -41
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,9 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -68,11 +62,13 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')" @click="upload(data, '汇总单.xls')"
size="mini">导出汇总单</el-button> size="mini">导出汇总单
</el-button>
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')" @click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞</el-button> size="mini">导出征求意见搞
</el-button>
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@@ -203,7 +199,7 @@
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -224,12 +220,12 @@
</template> </template>
<script> <script>
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 {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail, processCreateStand} from 'api/process'
export default { export default {
name: "bzzqyjStep7", name: "bzzqyjStep7",
data() { data() {
return { return {
@@ -263,7 +259,7 @@
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, {required: true, message: '请选择责任人', trigger: 'change'},
] ]
}, },
json: {} json: {}
@@ -275,7 +271,7 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -285,18 +281,19 @@
} }
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
}, },
getHistoryData () { getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
}, {}, res => { }, {}, res => {
this.histortData = res this.histortData = res
}, e => {}) }, e => {
})
}, },
upload (row, title) { upload(row, title) {
var params = { var params = {
columnName: { columnName: {
chapterNumber : '章条编号', chapterNumber: '章条编号',
chapterName : '章节名称', chapterName: '章节名称',
commentText: '修改意见内容（包括理由或依据）', commentText: '修改意见内容（包括理由或依据）',
department: '提出部门', department: '提出部门',
responUserName: '提出人', responUserName: '提出人',
@@ -314,9 +311,10 @@
item.stateText = '不上报' item.stateText = '不上报'
} }
}) })
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {}) this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
})
}, },
stateText (row) { stateText(row) {
if (row === '1') { if (row === '1') {
return '上报' return '上报'
} else if (row === '2') { } else if (row === '2') {
@@ -326,7 +324,8 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
},
handleSubmit() { handleSubmit() {
if (this.data.length < 1) { if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞') this.$message.warning('请输入征求意见搞')
@@ -376,13 +375,14 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.cid = data.cid this.form.fjList = data.fjList || data.form.fjList
this.form.endTime = data.endTime this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cname = data.cname this.form.cid = data.cid || data.form.cid;
this.form.fjList = data.fjList this.form.endTime = data.endTime || data.form.endTime;
this.form.fjListId = data.fjListId this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = [] var arr = []
data.summaryList.forEach( item => { data.info.forEach(item => {
if (item.state != '3') { if (item.state != '3') {
arr.push(item) arr.push(item)
} }
@@ -394,30 +394,35 @@
}) })
}, },
}, },
mounted () { mounted() {
this.getHistoryData() this.getHistoryData()
this.getData() this.getData()
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep7 {
/deep/.el-drawer__container { .bzdyStep7 {
/deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.fileClass { .fileClass {
cursor: pointer; cursor: pointer;
} }
.fileClass:hover{
.fileClass:hover {
color: #0c91e5; color: #0c91e5;
} }
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -425,6 +430,7 @@
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;
@@ -432,18 +438,21 @@
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 { .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;
@@ -451,6 +460,7 @@
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;
@@ -458,5 +468,5 @@
} }
} }
} }
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+51 -41
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,9 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -68,11 +62,13 @@
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="upload(data, '汇总单.xls')" @click="upload(data, '汇总单.xls')"
size="mini">导出汇总单</el-button> size="mini">导出汇总单
</el-button>
<el-button type="primary" <el-button type="primary"
class="common-button-primary add-button" class="common-button-primary add-button"
@click="upload(oldData, '征求意见搞.xls')" @click="upload(oldData, '征求意见搞.xls')"
size="mini">导出征求意见搞</el-button> size="mini">导出征求意见搞
</el-button>
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
@@ -203,7 +199,7 @@
label="状态" label="状态"
align="center"> align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span> <span>{{ scope.row.endTime ? '已完成' : '未完成' }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@@ -224,12 +220,12 @@
</template> </template>
<script> <script>
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 {inboundLiaisonDetail,processCreateStand} from 'api/process' import {inboundLiaisonDetail, processCreateStand} from 'api/process'
export default { export default {
name: "bzzqyjStep8", name: "bzzqyjStep8",
data() { data() {
return { return {
@@ -263,7 +259,7 @@
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: '请选择责任人', trigger: 'change' }, {required: true, message: '请选择责任人', trigger: 'change'},
] ]
}, },
json: {} json: {}
@@ -275,7 +271,7 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -285,18 +281,19 @@
} }
window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id)) window.open('/static/pdf/web/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
}, },
getHistoryData () { getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', { this.$http.get('lawss/activiti/get_list_by_instance', {
prcNum: this.$route.query.prcNum, prcNum: this.$route.query.prcNum,
}, {}, res => { }, {}, res => {
this.histortData = res this.histortData = res
}, e => {}) }, e => {
})
}, },
upload (row, title) { upload(row, title) {
var params = { var params = {
columnName: { columnName: {
chapterNumber : '章条编号', chapterNumber: '章条编号',
chapterName : '章节名称', chapterName: '章节名称',
commentText: '修改意见内容（包括理由或依据）', commentText: '修改意见内容（包括理由或依据）',
department: '提出部门', department: '提出部门',
responUserName: '提出人', responUserName: '提出人',
@@ -314,9 +311,10 @@
item.stateText = '不上报' item.stateText = '不上报'
} }
}) })
this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {}) this.$http.downloadFile('/api/lawss/activiti/export_excel', params, title, res => {
})
}, },
stateText (row) { stateText(row) {
if (row === '1') { if (row === '1') {
return '上报' return '上报'
} else if (row === '2') { } else if (row === '2') {
@@ -326,7 +324,8 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
},
handleSubmit() { handleSubmit() {
if (this.data.length < 1) { if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞') this.$message.warning('请输入征求意见搞')
@@ -376,13 +375,14 @@
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.cid = data.cid this.form.fjList = data.fjList || data.form.fjList
this.form.endTime = data.endTime this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cname = data.cname this.form.cid = data.cid || data.form.cid;
this.form.fjList = data.fjList this.form.endTime = data.endTime || data.form.endTime;
this.form.fjListId = data.fjListId this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = [] var arr = []
data.summaryList.forEach( item => { data.info.forEach(item => {
if (item.state != '3') { if (item.state != '3') {
arr.push(item) arr.push(item)
} }
@@ -395,30 +395,35 @@
}) })
}, },
}, },
mounted () { mounted() {
this.getHistoryData() this.getHistoryData()
this.getData() this.getData()
} }
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@import '~@/assets/styles/style'; @import '~@/assets/styles/style';
.bzdyStep8 {
/deep/.el-drawer__container { .bzdyStep8 {
/deep/ .el-drawer__container {
.prc-content-border { .prc-content-border {
border: none; border: none;
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.fileClass { .fileClass {
cursor: pointer; cursor: pointer;
} }
.fileClass:hover{
.fileClass:hover {
color: #0c91e5; color: #0c91e5;
} }
position: relative; position: relative;
height: 100%; height: 100%;
.headerTabs { .headerTabs {
height: 52px; height: 52px;
display: flex; display: flex;
@@ -426,6 +431,7 @@
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;
@@ -433,18 +439,21 @@
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 { .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;
@@ -452,6 +461,7 @@
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;
@@ -459,5 +469,5 @@
} }
} }
} }
} }
</style> </style>
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+14 -19
View File
@@ -24,7 +24,7 @@
<div class="prc-content-border"> <div class="prc-content-border">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="24"> <el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled"> <el-form-item label="标准编号/名称" prop="cid" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.cid" v-model="form.cid"
@@ -32,14 +32,6 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称" prop="cname" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.cname"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled"> <el-form-item label="征求意见结束日期" prop="endTime" class="add-form-item form-item-disabled">
<el-date-picker <el-date-picker
disabled disabled
@@ -54,7 +46,9 @@
style="display: none;" style="display: none;"
></el-input> ></el-input>
<div style="display: flex;"> <div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div> <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
</div>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -229,7 +223,7 @@
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 { inboundLiaisonDetail, processCreateStand } from "api/process"; import {inboundLiaisonDetail, processCreateStand} from "api/process";
export default { export default {
name: "bzzqyjStep9", name: "bzzqyjStep9",
@@ -265,7 +259,7 @@ export default {
}, },
formRules: { formRules: {
responUserList: [ responUserList: [
{ required: true, message: "请选择责任人", trigger: "change" } {required: true, message: "请选择责任人", trigger: "change"}
] ]
}, },
json: {} json: {}
@@ -277,7 +271,7 @@ export default {
ProcessTitle ProcessTitle
}, },
methods: { methods: {
updataFj (item) { updataFj(item) {
let id let id
let type = item.fileName.split('.') let type = item.fileName.split('.')
if (type[1] === 'pdf') { if (type[1] === 'pdf') {
@@ -381,13 +375,14 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.cid = data.cid this.form.fjList = data.fjList || data.form.fjList
this.form.endTime = data.endTime this.form.fjListId = data.fjListId || data.form.fjListId
this.form.cname = data.cname this.form.cid = data.cid || data.form.cid;
this.form.fjList = data.fjList this.form.endTime = data.endTime || data.form.endTime;
this.form.fjListId = data.fjListId this.form.cname = data.cname || data.form.cname;
this.oldData = JSON.parse(JSON.stringify(data.info))
var arr = [] var arr = []
data.summaryList.forEach( item => { data.info.forEach(item => {
if (item.state != '3') { if (item.state != '3') {
arr.push(item) arr.push(item)
} }