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

commit

Browse Source
This commit is contained in:
zhutianqi
2021-08-04 10:44:24 +08:00
parent 5276910972
commit 9ab466cf5d
3 changed files with 69 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
-2
View File
@@ -728,10 +728,8 @@
handleSubmit() { handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => { this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) { if (valid) {
console.log(1);
this.$refs['Form'].validate((valid) => { this.$refs['Form'].validate((valid) => {
if (valid) { if (valid) {
console.log(2);
let b = 0 let b = 0
for (let a = 0; a < this.itemList.length; a++) { for (let a = 0; a < this.itemList.length; a++) {
if (!this.itemList[a].zrUserId) { if (!this.itemList[a].zrUserId) {
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+22 -2
View File
@@ -198,6 +198,7 @@
</el-table> </el-table>
</div> </div>
<ProcessFooter <ProcessFooter
show-save
show-submit show-submit
:submitLoading="isSubmit" :submitLoading="isSubmit"
:saveLoading="saveLoading" :saveLoading="saveLoading"
@@ -220,7 +221,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, saveTaskForPub} from 'api/process'
export default { export default {
name: "bzjdStep2", name: "bzjdStep2",
@@ -306,7 +307,26 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {}, handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('pId', this.pId)
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
itemList: this.itemList,
sarType: this.sarType
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() { handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => { this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) { if (valid) {
src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+47 -54
View File
@@ -32,54 +32,52 @@
<el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button> <el-button v-if="ideaKey" type="primary" class="common-button-primary" size="mini" @click="selectStandardPro('add')">添加</el-button>
<el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button> <el-button type="primary" class="common-button-primary" size="mini" @click="exportAll">导出</el-button>
</div> </div>
<div class="container" style="position:relative;"> <div class="container">
<div style="position: absolute;top: 0;left: 0;bottom: 0;right: 0;"> <el-table
<el-table :data="standinfoList"
:data="standinfoList" height="100%"
height="100%" border
border style="width: 100%"
style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
:header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}"> fontWeight: 'bold', height: '48px'}">
<el-table-column <el-table-column
prop="partCode" prop="partCode"
label="章节编号" label="章节编号"
align="center" align="center"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="content" prop="content"
align="center" align="center"
label="修改意见内容(包括理由或依据)" label="修改意见内容(包括理由或依据)"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="deptName" prop="deptName"
align="center" align="center"
label="提出部门" label="提出部门"
> >
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="userName" prop="userName"
align="center" align="center"
label="提出人" label="提出人"
> >
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey"> <el-table-column label="操作" align="center" width="50" fixed="right" v-if="ideaKey">
<template slot-scope="scope"> <template slot-scope="scope">
<div @click.stop style="display: inline-block"> <div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand"> <el-dropdown trigger="click" @command="handleCommand">
<i v-if="scope.row.userId === $store.getters.userInfo.userId" class="iconfont">&#xe61e;</i> <i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">编辑</el-dropdown-item> <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item> <el-dropdown-item v-if="scope.row.userId === $store.getters.userInfo.userId" :command="[scope.row, '删除']">删除</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>
</el-dropdown> </el-dropdown>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div>
</div> </div>
<pagination <pagination
style="position: static;width: 100%;" style="position: static;width: 100%;"
@@ -174,15 +172,9 @@
_this: this _this: this
}, res => { }, res => {
this.standinfoList = res.data.records this.standinfoList = res.data.records
console.log(this.standinfoList);
this.total = res.data.total this.total = res.data.total
this.spinShow = false this.spinShow = false
res.data.records.forEach(item => {
if (item.ideaKey == 1) {
this.ideaKey = false
} else {
this.ideaKey = true
}
})
}, e => { }, e => {
}) })
}, },
@@ -388,6 +380,7 @@
display: flex; display: flex;
margin:10px 0; margin:10px 0;
flex-direction: column; flex-direction: column;
padding: 0;
.el-tabs{ .el-tabs{
height: 100%; height: 100%;
display: flex; display: flex;