Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
zhutianqi
@@ -1296,7 +1296,7 @@
|
||||
import ProcessFooter from '../../components/ProcessFooter'
|
||||
import ProcessTitle from '../../components/ProcessTitle'
|
||||
import CustomSelectArray from '@/components/CustomFormComponents/SelectArray'
|
||||
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId} from "api/process";
|
||||
import {saveTaskFirst, queryTaskFirst, getBusStandFileByAttId,taskDel,processBack} from "api/process";
|
||||
import TreeSelect from '@/components/treeSelect/treeSelect.vue';
|
||||
import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue';
|
||||
import TreeSelectModule from "@/components/treeSelect/treeSelectModule.vue";
|
||||
@@ -1634,6 +1634,8 @@
|
||||
txlbOptions: [], // 体系类别
|
||||
data: [], // 标准列表数据
|
||||
ListForm: {}, // 新增数据
|
||||
|
||||
bpnId: ''
|
||||
}
|
||||
},
|
||||
watch:{
|
||||
@@ -2819,7 +2821,7 @@
|
||||
saveTaskFirst(_formData).then(res => {
|
||||
this.saveLoading = false
|
||||
this.$message.success('保存成功')
|
||||
// this.bpnId = res.result
|
||||
this.bpnId = res.result
|
||||
}).catch(e => {
|
||||
this.saveLoading = false
|
||||
})
|
||||
@@ -2878,7 +2880,17 @@
|
||||
json.applyUpdUserId = this.form.applyUpdUserId
|
||||
json.prcCreateUser = this.form.prcCreateUser
|
||||
json.prcCreateUserName = this.form.prcCreateUserName
|
||||
this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
|
||||
this.$http.post('lawss/activiti/startProcessRollBack', {
|
||||
createUser: this.$store.getters.userInfo.userId,
|
||||
createUserName: this.$store.getters.userInfo.uName,
|
||||
json: JSON.stringify({
|
||||
taskInfo: '申请人发起',
|
||||
form: this.form,
|
||||
roleForm: this.roleForm,
|
||||
commentText: this.commentText
|
||||
}),
|
||||
type: '1',
|
||||
}, {
|
||||
_this: this
|
||||
}, res => {
|
||||
if (res.ok) {
|
||||
@@ -2892,6 +2904,14 @@
|
||||
if (res.success) {
|
||||
this.$message.success(res.message)
|
||||
this.isSubmit = false
|
||||
if (this.bpnId !== '') {
|
||||
let taskId = {
|
||||
id: this.bpnId
|
||||
}
|
||||
taskDel(taskId).then(res => {
|
||||
return res
|
||||
})
|
||||
}
|
||||
// 流程提交之后，应该流转至待办任务页面
|
||||
this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
|
||||
}
|
||||
@@ -2933,12 +2953,12 @@
|
||||
},
|
||||
},
|
||||
mounted () {
|
||||
this.bpnId = this.$route.query.bpnId
|
||||
this.getTaskId()
|
||||
this.getTree()
|
||||
this.$http.get('sys/dictype/getDicTypeListCode', '', {
|
||||
_this: this
|
||||
}, res => {
|
||||
console.log(res.data.ENERGYTYPES)
|
||||
this.countryOptions=res.data.COUNTRY//国家地区
|
||||
this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
|
||||
this.standNatureOptions = res.data.SARPROPERTY // 标准性质
|
||||
|
||||
@@ -701,11 +701,6 @@
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
|
||||
@@ -629,11 +629,6 @@
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
|
||||
@@ -1153,11 +1153,6 @@
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
|
||||
@@ -613,11 +613,6 @@
|
||||
:no-data-text="listNoDataText"
|
||||
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
|
||||
>
|
||||
<!-- <el-table-column-->
|
||||
<!-- type="selection"-->
|
||||
<!-- width="55"-->
|
||||
<!-- align="center">-->
|
||||
<!-- </el-table-column>-->
|
||||
<el-table-column
|
||||
prop="name"
|
||||
label="任务步骤"
|
||||
|
||||
+2
@@ -2499,6 +2499,7 @@ export default {
|
||||
type: 'success',
|
||||
message: "删除成功"
|
||||
})
|
||||
this.getBussionStandTable()
|
||||
this.selectMenuList()
|
||||
}else {
|
||||
this.$message({
|
||||
@@ -3812,6 +3813,7 @@ export default {
|
||||
this.sarBussionessSearch.advanceSearchVOStr = ''
|
||||
this.sarBussionessSearch.standEnName=''
|
||||
this.isAdvancedSearch = false
|
||||
this.getBussionStandTable()
|
||||
} else if (flag === 2) {
|
||||
// 标准条目搜索
|
||||
// 标准条目搜索
|
||||
|
||||
@@ -387,7 +387,7 @@
|
||||
<el-dialog :visible.sync="exportModelFlag" title="导出文件" width="300px">
|
||||
<el-form :inline="true" class="label-input-form search-area">
|
||||
<el-form-item label="导出名称" class="search-item">
|
||||
<el-input v-model="exportName" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
|
||||
<el-input v-model="exportName" @keyup.native="btKeyUp" placeholder="请输入导出文件名称" :maxlength="30" clearable label="导出名称"/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<span slot="footer" class="demo-drawer-footer">
|
||||
@@ -2471,6 +2471,10 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 限制导出框输入的字符
|
||||
btKeyUp(e) {
|
||||
e.target.value = e.target.value.replace(/[`~!@#$%^&*()\+=<>?"{}|,\/;'\\[\]·~！@#￥%……&*（）——\+={}|《》？：“”【】、；‘’，。、. <>]/g,"");
|
||||
},
|
||||
// 左右拖动事件
|
||||
dragControllerLR: function() {
|
||||
var resize = document.getElementById("resize");
|
||||
|
||||
Reference in New Issue
Block a user