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:
shenyanpei
2021-12-15 17:49:51 +08:00
parent 2515b6b376 fd68df6737
commit ca3628f7c6
11 changed files with 385 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+11 -5
View File
@@ -24,7 +24,7 @@
<el-collapse-transition> <el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<el-row :gutter="24"> <el-row :gutter="24">
<el-col :span="12"> <el-col :span="24">
<el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled"> <el-form-item label="调研标题" prop="title" class="add-form-item form-item-disabled">
<el-input <el-input
v-model="form.title" v-model="form.title"
@@ -255,7 +255,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, queryTaskFirst, getBusStandFileByAttId } from 'api/process' import { saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel } from 'api/process'
export default { export default {
name: "bzdyStep1-1", name: "bzdyStep1-1",
@@ -290,9 +290,9 @@
date: [ date: [
{ type: 'date', required: true, message: '请选择完成时间', trigger: 'change' } { type: 'date', required: true, message: '请选择完成时间', trigger: 'change' }
], ],
modelNameList: [ // modelNameList: [
{ required: true, message: '请上传调研结果', trigger: 'change' }, // { required: true, message: '请上传调研结果', trigger: 'change' },
] // ]
}, },
roleForm: { roleForm: {
startUserName: this.$store.getters.userInfo.userName, startUserName: this.$store.getters.userInfo.userName,
@@ -575,6 +575,12 @@
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('流程发起成功') this.$message.success('流程发起成功')
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+13 -2
View File
@@ -257,12 +257,13 @@ 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'
import { getBusStandFileByAttId } from 'api/process' import { getBusStandFileByAttId,taskDel } from 'api/process'
export default { export default {
name: "bzdyStep1", name: "bzdyStep1",
data() { data() {
return { return {
bpnId: '',
foldFormFlag: false, foldFormFlag: false,
fileMadel2: false, fileMadel2: false,
commentText: '', commentText: '',
@@ -571,6 +572,14 @@ export default {
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('流程发起成功') this.$message.success('流程发起成功')
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
this.isSubmit = false this.isSubmit = false
@@ -590,7 +599,9 @@ export default {
}) })
} }
}, },
mounted () {}, mounted () {
this.bpnId = this.$route.query.bpnId
},
} }
</script> </script>
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+163 -124
View File
@@ -1,6 +1,6 @@
<template> <template>
<div class="bzjdStep1-1"> <div class="bzjdStep1-1">
<!-- 标准征求意见流程--> <!-- 标准解读流程-->
<ProcessHeader toggle> <ProcessHeader toggle>
<template slot="proName">标准解读流程</template> <template slot="proName">标准解读流程</template>
<template slot="proNode">发起流程</template> <template slot="proNode">发起流程</template>
@@ -20,120 +20,64 @@
<ProcessTitle> <ProcessTitle>
<template slot="title">基础信息</template> <template slot="title">基础信息</template>
</ProcessTitle> </ProcessTitle>
<el-collapse-transition> <el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === false"> <div class="prc-content-border" v-if="foldFormFlag === false">
<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="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton"> <div class="addButton">
<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>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled"> <el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.itemsNum" v-model="form.itemsNum"
placeholder="请输入标准编号" placeholder="请输入标准编号"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled"> <el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.itemsName" v-model="form.itemsName"
placeholder="请输入标准名称" placeholder="请输入标准名称"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="对比拆分数据" class="add-form-item form-item-disabled">
<el-input <div class="addButton">
disabled <el-button size="small" :disabled="!form.itemsNum" type="primary" @click="addDbList">导入</el-button>
v-model="form.itemsNum1" </div>
clearable </el-form-item>
></el-input> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
</el-form-item> <el-input
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> disabled
<el-input v-model="form.itemsNum1"
disabled clearable
v-model="form.itemsNum1" ></el-input>
clearable </el-form-item>
></el-input> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
</el-form-item> <el-input
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> disabled
<el-input v-model="form.itemsName1"
disabled clearable
v-model="form.itemsName1" ></el-input>
clearable </el-form-item>
></el-input> <el-form-item label="截止日期" prop="endTime" class="add-form-item form-item-disabled">
</el-form-item> <el-date-picker
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> v-model="form.endTime"
<el-input type="date"
disabled placeholder="请选择截止日期"
v-model="form.itemsName1" value-format="yyyy-MM-dd">
clearable </el-date-picker>
></el-input> </el-form-item>
</el-form-item> </el-col>
</el-col> </el-row>
</el-row> </div>
</div> </el-collapse-transition>
</el-collapse-transition> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form> </el-form>
</div> </div>
<ProcessTitle> <ProcessTitle>
@@ -426,6 +370,49 @@
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button> <el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-drawer
title="对比拆分数据库"
:visible.sync="listModel3"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content content2">
<div class="table-wrap">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<el-table
ref="selection"
:data="standInfoList3"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
border
@selection-change="handleSelection3"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
prop="oldStandNum"
label="标准号/政策号"
width="170"
align="center">
</el-table-column>
<el-table-column
prop="oldStandName"
label="标准名称/政策名称"
show-overflow-tooltip
align="center">
</el-table-column>
</el-table>
</div>
</div>
</div>
<loading :loading="spinShow3">数据加载中……</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer3">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer3">导入</el-button>
</div>
</div>
</el-drawer>
</div> </div>
</template> </template>
@@ -434,11 +421,15 @@
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, queryTaskFirst } from 'api/process' import { saveTaskFirst, queryTaskFirst,taskDel } from 'api/process'
export default { export default {
name: "bzjdStep1-1", name: "bzjdStep1-1",
data() { data() {
return { return {
listModel3: false,
standInfoList3: [],
spinShow3: false,
selectedList3: [],
//折叠的标志，true为折叠，false为不折叠 //折叠的标志，true为折叠，false为不折叠
foldFormFlag: false, foldFormFlag: false,
itermsConditionsFlag: false, itermsConditionsFlag: false,
@@ -535,6 +526,51 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
handleSelection3 (data) {
this.selectedList3 = [];
for (let i = 0; i < data.length; i++) {
this.selectedList3.push(data[i].id);
}
},
getDbList () {
this.$http.get('lawss/sarStandCompareHis/page', {
page: 1,
pageSize: 9999,
newNumOrName: this.form.itemsNum
}, {
_this: this
}, res => {
this.standInfoList3 = res.data.list
console.log(res);
}, e => {
})
},
addDbList () {
this.listModel3 = true
},
closeDrawer3 () {
this.listModel3 = false
},
enterDrawer3 () {
if (this.selectedList3.length === 1) {
let deposit = new Map();
this.standInfoList3.forEach(item => {
deposit.set(item.id, item);
});
let bringData = [];
for (let i = 0; i < this.selectedList3.length; i++) {
bringData.push(deposit.get(this.selectedList3[i]));
}
this.form.itemsNum1 = bringData[0].oldStandNum
this.form.itemsName1 = bringData[0].oldStandName
this.form.oldNumber = bringData[0].oldStandId
this.listModel3 = false
} else if (this.selectedList3.length > 1) {
this.$message.warning("只能选择一条数据进行导入");
} else {
this.$message.warning("请选择一条数据进行导入");
}
},
//折叠/展开基础信息方法 //折叠/展开基础信息方法
foldForm() { foldForm() {
this.foldFormFlag = !this.foldFormFlag this.foldFormFlag = !this.foldFormFlag
@@ -679,20 +715,14 @@
} }
this.form.itemsNum = bringData[0].showNumber this.form.itemsNum = bringData[0].showNumber
this.form.itemsName = bringData[0].standName this.form.itemsName = bringData[0].standName
// if (bringData[0].splitStatus === '0') {
// this.form.itemsNum = bringData[0].standNumSplit
// this.form.itemsName = bringData[0].standNameSplit
// } else {
// this.form.itemsNum = bringData[0].showNumber
// this.form.itemsName = bringData[0].standName
// }
this.form.standId = bringData[0].standId this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
this.statusId = bringData[0].id this.statusId = bringData[0].id
this.form.statusId = bringData[0].id this.form.statusId = bringData[0].id
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel3 = true
this.getDbList()
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: bringData[0].id, infoId: bringData[0].id,
page: 1, page: 1,
@@ -857,6 +887,12 @@
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('流程发起成功') this.$message.success('流程发起成功')
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
}) })
@@ -927,6 +963,9 @@
height: calc(~'100% - 107px'); height: calc(~'100% - 107px');
overflow: auto; overflow: auto;
} }
.content2 {
height: calc(~'100% - 57px') !important;
}
.standardForComments { .standardForComments {
height: 100%; height: 100%;
background: #fff; background: #fff;
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+114 -98
View File
@@ -46,28 +46,19 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="对比拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" :disabled="!form.itemsNum" type="primary" @click="addDbList">导入</el-button>
</div>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.itemsNum1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.itemsName1" v-model="form.itemsName1"
@@ -88,63 +79,6 @@
</el-collapse-transition> </el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<el-collapse-transition>
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准拆分数据" class="add-form-item form-item-disabled">
<div class="addButton">
<el-button size="small" type="primary" @click="addZqyjList">导入</el-button>
</div>
</el-form-item>
<el-form-item label="标准号/政策号" prop="itemsNum" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
clearable
></el-input>
</el-form-item>
<el-form-item label="标准名称/政策名称" prop="itemsName" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-collapse-transition>
</el-form> </el-form>
</div> </div>
<ProcessTitle> <ProcessTitle>
@@ -446,6 +380,49 @@
@checkedRole="saveUserInfo" @checkedRole="saveUserInfo"
:nodeList="nodeList" :nodeList="nodeList"
></Role-tree> ></Role-tree>
<el-drawer
title="对比拆分数据库"
:visible.sync="listModel3"
size="900px"
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content content2">
<div class="table-wrap">
<div style="position: absolute;height: calc(100% - 10px);width: 100%;">
<el-table
ref="selection"
:data="standInfoList3"
tooltip-effect="dark"
style="width: 100%;padding:0 0 20px 0;"
height="100%"
border
@selection-change="handleSelection3"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column
prop="oldStandNum"
label="标准号/政策号"
width="170"
align="center">
</el-table-column>
<el-table-column
prop="oldStandName"
label="标准名称/政策名称"
show-overflow-tooltip
align="center">
</el-table-column>
</el-table>
</div>
</div>
</div>
<loading :loading="spinShow3">数据加载中……</loading>
<div class="demo-drawer-footer">
<el-button size="mini" @click="closeDrawer3">取消</el-button>
<el-button type="primary" size="mini" @click="enterDrawer3">导入</el-button>
</div>
</div>
</el-drawer>
</div> </div>
</template> </template>
@@ -454,12 +431,18 @@
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, taskDel} from 'api/process'
export default { export default {
name: "bzjdStep1", name: "bzjdStep1",
data() { data() {
return { return {
bpnId: '',
listModel3: false,
standInfoList3: [],
spinShow3: false,
selectedList3: [],
//折叠的标志，true为折叠，false为不折叠 //折叠的标志，true为折叠，false为不折叠
foldFormFlag: false, foldFormFlag: false,
itermsConditionsFlag: false, itermsConditionsFlag: false,
@@ -562,6 +545,50 @@ export default {
ProcessTitle ProcessTitle
}, },
methods: { methods: {
handleSelection3 (data) {
this.selectedList3 = [];
for (let i = 0; i < data.length; i++) {
this.selectedList3.push(data[i].id);
}
},
getDbList () {
this.$http.get('lawss/sarStandCompareHis/page', {
page: 1,
pageSize: 9999,
newNumOrName: this.form.itemsNum
}, {
_this: this
}, res => {
this.standInfoList3 = res.data.list
}, e => {
})
},
addDbList () {
this.listModel3 = true
},
closeDrawer3 () {
this.listModel3 = false
},
enterDrawer3 () {
if (this.selectedList3.length === 1) {
let deposit = new Map();
this.standInfoList3.forEach(item => {
deposit.set(item.id, item);
});
let bringData = [];
for (let i = 0; i < this.selectedList3.length; i++) {
bringData.push(deposit.get(this.selectedList3[i]));
}
this.form.itemsNum1 = bringData[0].oldStandNum
this.form.itemsName1 = bringData[0].oldStandName
this.form.oldNumber = bringData[0].id
this.listModel3 = false
} else if (this.selectedList3.length > 1) {
this.$message.warning("只能选择一条数据进行导入");
} else {
this.$message.warning("请选择一条数据进行导入");
}
},
//折叠/展开基础信息方法 //折叠/展开基础信息方法
foldForm() { foldForm() {
this.foldFormFlag = !this.foldFormFlag this.foldFormFlag = !this.foldFormFlag
@@ -582,14 +609,6 @@ export default {
} }
}) })
window.open(routeUrl.href, '_blank') window.open(routeUrl.href, '_blank')
// this.$store.commit('setDetailMap', this.$route.path)
// this.$router.push({
// name: 'ItemSplitInfo',
// query: {
// infoId: row.id,
// result: row.result,
// }
// })
}, },
setMap(data) { setMap(data) {
data.forEach(item => { data.forEach(item => {
@@ -651,7 +670,6 @@ export default {
item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ item.ZCCSSRQ = item.attrInfoMap.ZCCSSRQ
} }
}) })
this.total2 = res.data.count this.total2 = res.data.count
this.$http.get('sys/dictype/getDicTypeListCode', '', { this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this _this: this
@@ -711,13 +729,6 @@ export default {
} }
this.form.itemsNum = bringData[0].showNumber this.form.itemsNum = bringData[0].showNumber
this.form.itemsName = bringData[0].standName this.form.itemsName = bringData[0].standName
// if (bringData[0].splitStatus === '0') {
// this.form.itemsNum = bringData[0].standNumSplit
// this.form.itemsName = bringData[0].standNameSplit
// } else {
// this.form.itemsNum = bringData[0].showNumber
// this.form.itemsName = bringData[0].standName
// }
this.form.standId = bringData[0].standId this.form.standId = bringData[0].standId
this.sarType = bringData[0].standType this.sarType = bringData[0].standType
this.standId = bringData[0].standId this.standId = bringData[0].standId
@@ -725,7 +736,8 @@ export default {
this.form.statusId = bringData[0].id this.form.statusId = bringData[0].id
this.form.fileType = bringData[0].fileType this.form.fileType = bringData[0].fileType
this.listModel = false; this.listModel = false;
this.listModel2 = true this.listModel3 = true
this.getDbList()
this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', { this.$http.get('lawss/sarFileSplitItems/getSplitItemsByPage', {
infoId: bringData[0].id, infoId: bringData[0].id,
page: 1, page: 1,
@@ -767,13 +779,6 @@ export default {
for (let i = 0; i < this.selectedList2.length; i++) { for (let i = 0; i < this.selectedList2.length; i++) {
bringData.push(deposit.get(this.selectedList2[i])); bringData.push(deposit.get(this.selectedList2[i]));
} }
// if (bringData[0].splitStatus === '0') {
// this.form.itemsNum1 = bringData[0].standNumSplit
// this.form.itemsName1 = bringData[0].standNameSplit
// } else {
// this.form.itemsNum1 = bringData[0].showNumber
// this.form.itemsName1 = bringData[0].standName
// }
if (bringData[0].standYear) { if (bringData[0].standYear) {
this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear this.form.itemsNum1 = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear
} else { } else {
@@ -897,6 +902,14 @@ export default {
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('流程发起成功') this.$message.success('流程发起成功')
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
}) })
@@ -972,6 +985,9 @@ export default {
height: calc(~'100% - 107px'); height: calc(~'100% - 107px');
overflow: auto; overflow: auto;
} }
.content2 {
height: calc(~'100% - 57px') !important;
}
.standardForComments { .standardForComments {
height: 100%; height: 100%;
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+2 -66
View File
@@ -40,28 +40,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.itemsNum1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.itemsName1" v-model="form.itemsName1"
@@ -74,56 +60,6 @@
</el-collapse-transition> </el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
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.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form> </el-form>
</div> </div>
<ProcessTitle> <ProcessTitle>
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+59 -68
View File
@@ -40,28 +40,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.itemsNum1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.itemsName1" v-model="form.itemsName1"
@@ -74,56 +60,6 @@
</el-collapse-transition> </el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
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.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form> </el-form>
</div> </div>
<ProcessTitle> <ProcessTitle>
@@ -131,6 +67,7 @@
</ProcessTitle> </ProcessTitle>
<div class="action-bar"> <div class="action-bar">
<el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button> <el-button type="primary" :disabled="acceptShow" class="common-button-primary add-button" size="mini" @click="choiceZRR">批量编辑</el-button>
<el-button type="primary" v-if="form.itemsNum1" class="common-button-primary add-button" size="mini" @click="checkBD">查看比对</el-button>
</div> </div>
<el-table border <el-table border
ref="selection" ref="selection"
@@ -488,6 +425,29 @@
</div> </div>
</el-dialog> </el-dialog>
<loading :loading="loading">加载中...</loading> <loading :loading="loading">加载中...</loading>
<el-dialog
title="查看比对内容"
:visible.sync="BDmodel"
size="1100px">
<div style="height: 600px;overflow: auto;display: flex;">
<div>
<div v-for="(item1, index1) in leftData" :key="item1.id" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px;">
<div style="line-height: 20px;">
<span style="margin-right: 5px;">{{ item1.itemsNum }}</span><span v-html="item1.itemsName"></span>
<div style="margin-top: 5px;" v-html="item1.itemsText"></div>
</div>
</div>
</div>
<div>
<div v-for="(item2, index2) in rightData" :key="item2.id" style="margin: 5px; border: 1px solid #ccc; border-radius: 5px; padding: 5px;">
<div style="line-height: 20px;">
<span style="margin-right: 5px;">{{ item2.itemsNum }}</span><span v-html="item2.itemsName"></span>
<div style="margin-top: 5px;" v-html="item2.itemsText"></div>
</div>
</div>
</div>
</div>
</el-dialog>
</div> </div>
</template> </template>
@@ -503,6 +463,11 @@
name: "bzjdStep3", name: "bzjdStep3",
data() { data() {
return { return {
BDmodel: false,
oldNumber: '',
leftData: [],
rightData: [],
modalshowflag2: false, modalshowflag2: false,
itemId: '', itemId: '',
drawerModal: false, drawerModal: false,
@@ -571,6 +536,30 @@
ProcessTitle ProcessTitle
}, },
methods: { methods: {
getBDList () {
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
standHisId: this.oldNumber,
leftOrRight: 'LEFT'
}, {
_this: this
}, res => {
this.leftData = res.data
}, e => {
})
this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', {
standHisId: this.oldNumber,
leftOrRight: 'RIGHT'
}, {
_this: this
}, res => {
this.rightData = res.data
}, e => {
})
},
checkBD () {
this.BDmodel = true
this.getBDList()
},
itemEdit (row) { itemEdit (row) {
this.itemId = row.id this.itemId = row.id
this.modalshowflag2 = true this.modalshowflag2 = true
@@ -819,6 +808,7 @@
this.form.itemsName1 = data.itemsName1 || '' this.form.itemsName1 = data.itemsName1 || ''
this.form.itemsNum1 = data.itemsNum1 || '' this.form.itemsNum1 = data.itemsNum1 || ''
} }
this.oldNumber = data.oldNumber || ''
this.sarType = data.standInData || data.sarType this.sarType = data.standInData || data.sarType
this.json = data this.json = data
let itemList let itemList
@@ -839,8 +829,6 @@
item.itemsTitle = item.itermsConditions item.itemsTitle = item.itermsConditions
item.applyArctic = item.applyArctic || [] item.applyArctic = item.applyArctic || []
}) })
this.itemList = itemList this.itemList = itemList
this.loading = false this.loading = false
}).catch(e => { }).catch(e => {
@@ -872,6 +860,9 @@
padding: 0 20px 0; padding: 0 20px 0;
} }
} }
.myText {
line-height: 20px;
}
.myDataPick { .myDataPick {
/deep/.el-form-item__content { /deep/.el-form-item__content {
margin-left: 0px !important; margin-left: 0px !important;
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+2 -66
View File
@@ -40,28 +40,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.itemsNum1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.itemsName1" v-model="form.itemsName1"
@@ -74,56 +60,6 @@
</el-collapse-transition> </el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
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.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form> </el-form>
</div> </div>
<ProcessTitle> <ProcessTitle>
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+2 -66
View File
@@ -40,28 +40,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.itemsNum1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.itemsName1" v-model="form.itemsName1"
@@ -74,56 +60,6 @@
</el-collapse-transition> </el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
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.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form> </el-form>
</div> </div>
<ProcessTitle> <ProcessTitle>
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+2 -66
View File
@@ -40,28 +40,14 @@
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'"> <el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled">
<el-input <el-input
disabled disabled
v-model="form.itemsNum1" v-model="form.itemsNum1"
clearable clearable
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'"> <el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input <el-input
disabled disabled
v-model="form.itemsName1" v-model="form.itemsName1"
@@ -74,56 +60,6 @@
</el-collapse-transition> </el-collapse-transition>
<el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button> <el-button v-if="foldFormFlag === false" style="width: 100%" icon="el-icon-caret-top" @click="foldForm">隐藏基础信息</el-button>
<el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button> <el-button v-if="foldFormFlag === true" style="width: 100%" icon="el-icon-caret-bottom" @click="foldForm">展开基础信息</el-button>
<div class="prc-content-border" v-if="foldFormFlag === true" style="display: none">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="标准编号" prop="cid" class="add-form-item form-item-disabled">
<el-input
disabled
v-model="form.itemsNum"
placeholder="请输入标准编号"
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.itemsName"
placeholder="请输入标准名称"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准号/政策号" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsNum1"
clearable
></el-input>
</el-form-item>
<el-form-item label="上一版本标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'INLAND'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
<el-form-item label="相对标准名称/政策名称" class="add-form-item form-item-disabled" v-if="sarType === 'FOREIGN'">
<el-input
disabled
v-model="form.itemsName1"
clearable
></el-input>
</el-form-item>
</el-col>
</el-row>
</div>
</el-form> </el-form>
</div> </div>
<ProcessTitle> <ProcessTitle>
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+7 -1
View File
@@ -347,7 +347,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, queryTaskFirst} from 'api/process' import {saveTaskFirst, queryTaskFirst,taskDel} from 'api/process'
export default { export default {
name: "bzzqyjStep1-1", name: "bzzqyjStep1-1",
@@ -771,6 +771,12 @@ export default {
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('流程发起成功') this.$message.success('流程发起成功')
let taskId = {
id: this.$route.query.bpnId
}
taskDel(taskId).then(res=>{
return res
})
this.$router.push('/processCenter') this.$router.push('/processCenter')
} }
}) })
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+10 -1
View File
@@ -362,12 +362,13 @@
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, taskDel} from 'api/process'
export default { export default {
name: "bzzqyjStep1", name: "bzzqyjStep1",
data() { data() {
return { return {
bpnId: '',
fileUrl: 'api/att/attFile/upload', fileUrl: 'api/att/attFile/upload',
fileMadel: false, fileMadel: false,
OCRoptions: [], OCRoptions: [],
@@ -792,6 +793,14 @@ export default {
}, {}, res => { }, {}, res => {
if (res.success) { if (res.success) {
this.$message.success('流程发起成功') this.$message.success('流程发起成功')
if (this.bpnId !== '') {
let taskId = {
id: this.bpnId
}
taskDel(taskId).then(res=>{
return res
})
}
this.$router.push('/processCenter') this.$router.push('/processCenter')
this.isSubmit = false this.isSubmit = false
} else { } else {