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:
super_liu
2021-12-31 17:58:14 +08:00
parent bd45404610 3d5d3235c7
commit aba636c07b
31 changed files with 203 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/CustomFormComponents/InputForAllStandards2.vue
+1 -1
View File
@@ -335,7 +335,7 @@
page: 1,
pageSize: this.$store.getters.userInfo.configContent,
total: 0,
standType: 'ALL',
standType: 'INLAND',
quoteIdList: '',
validFlag: '0'
}
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+4 -3
View File
@@ -114,7 +114,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText1">
</el-input>
</div>
</el-collapse-item>
@@ -262,6 +262,7 @@
name: "bzdyStep1-1",
data() {
return {
commentText1: '',
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -368,7 +369,7 @@
}
this.form = mes.form
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.commentText1 = mes.commentText1 || ''
})
},
checkedRole2 (data) {
@@ -561,7 +562,7 @@
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText
json.commentText = this.commentText1
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: res.data,
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+5 -4
View File
@@ -114,7 +114,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText1">
</el-input>
</div>
</el-collapse-item>
@@ -264,6 +264,7 @@ export default {
name: "bzdyStep1",
data() {
return {
commentText1: '',
pickerOptions: {
disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -533,7 +534,7 @@ export default {
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText1: this.commentText1
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -557,12 +558,12 @@ export default {
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText1: this.commentText1
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText
json.commentText = this.commentText1
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: res.data,
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+5 -3
View File
@@ -97,7 +97,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText2">
</el-input>
</div>
</el-collapse-item>
@@ -196,6 +196,7 @@
name: "bzdyStep2",
data() {
return {
commentText2: '',
drawerModal: false,
foldFormFlag: false,
histortData: [],
@@ -313,7 +314,7 @@
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
commentText2: this.commentText2,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -327,7 +328,7 @@
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText2
json.responUserList = this.form.responUserList
json.responUserListName = this.form.responUserListName
this.$http.post('lawss/activiti/completeTask', {
@@ -360,6 +361,7 @@
this.json = data || data.form
this.form.responUserList = data.form? data.form.responUserList : ''
this.form.responUserListName = data.form? data.form.responUserListName : ''
this.commentText2 = data.commentText2 || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+36 -22
View File
@@ -110,14 +110,14 @@
点击上传
</el-button>
</el-form-item>
<el-form-item label="回执说明" prop="dyhz" class="add-form-item form-item-disabled">
<el-form-item label="调研回执" prop="dyhz" class="add-form-item form-item-disabled">
<el-input
v-model="form.dyhz"
:disabled="acceptShow"
style="height: 150px"
type="textarea"
:autosize="{ minRows: 1, maxRows: 5}"
placeholder="请输入回执说明"
placeholder="请输入调研回执"
clearable
></el-input>
<!-- 用来把多行的那个标记取消掉 resize="none"-->
@@ -127,19 +127,19 @@
</div>
</el-form>
</div>
<!-- <el-collapse accordion>-->
<!-- <el-collapse-item title="回执说明">-->
<!-- <div style="margin: 10px 0;">-->
<!-- <el-input-->
<!-- type="textarea"-->
<!-- :rows="3"-->
<!-- resize="none"-->
<!-- placeholder="请输入意见"-->
<!-- v-model="commentText">-->
<!-- </el-input>-->
<!-- </div>-->
<!-- </el-collapse-item>-->
<!-- </el-collapse>-->
<el-collapse accordion>
<el-collapse-item title="回执说明">
<div style="margin: 10px 0;">
<el-input
type="textarea"
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText3">
</el-input>
</div>
</el-collapse-item>
</el-collapse>
</div>
<div class="content" v-show="active === '2'">
<el-table
@@ -220,15 +220,16 @@
<el-dialog width='400px' :visible.sync="fileMadel" title="上传文件">
<el-upload
class="upload-demo"
multiple
drag
:action="fileUrl"
ref="importfile"
:file-list="form.fileList"
name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:show-file-list="false"
:on-remove="importFileRemove"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
@@ -250,6 +251,7 @@
name: "bzdyStep3",
data() {
return {
commentText3: '',
newDocUser: '',
drawerModal: false,
foldFormFlag: false,
@@ -264,6 +266,7 @@
acceptShow: false,
todoId: '',
form: {
fileList: [],
dyhz: '',
title: '', // 调研标题
date: '', // 完成时间
@@ -279,7 +282,7 @@
{ required: true, message: '请上传调研结果', trigger: 'change' },
],
dyhz: [
{ required: true, message: '请输入回执说明', trigger: 'change' },
{ required: true, message: '请输入调研回执', trigger: 'change' },
]
},
json: {},
@@ -351,6 +354,13 @@
let id = item.id
window.location.href = '/api/att/attFile/downloadFile?fileId=' + id
},
importFileRemove (file, fileList) {
if (fileList) {
this.form.fileList = []
}
this.form.fileId = ''
this.form.fileName = ''
},
// 导入按钮 上传之前的钩子
beginImportFile (file) {
var filename = file.name
@@ -379,9 +389,11 @@
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
this.form.fileList = []
this.fileMadel = false
this.form.fileId = response.data.id
this.form.fileName = response.data.name
this.form.fileList.push(response.data)
this.$message({
showClose: true,
message: response.message,
@@ -398,11 +410,11 @@
handleSave() {
this.saveLoading = true
let _formData = new FormData()
this.form.docUser = this.newDocUser
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
// commentText: this.commentText,
docUser: this.newDocUser,
commentText3: this.commentText3,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -430,7 +442,7 @@
this.json.dyhz = this.form.dyhz
this.isSubmit = true
var json = this.json
// json.commentText = this.commentText
json.commentText = this.commentText3
json.fileId = this.form.fileId
json.fileName = this.form.fileName
json.docUser = this.newDocUser
@@ -465,6 +477,7 @@
this.acceptShow = false
this.submitShow = true
}
this.commentText3 = data.commentText3 || ''
this.todoId = res.id
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
@@ -476,7 +489,8 @@
this.form.fileName = data.form? data.form.fileName : ''
this.form.fileId = data.form ? data.form.fileId : ''
this.form.dyhz = data.form ? data.form.dyhz : ''
this.newDocUser = data.form ? data.form.docUser : data.docUser
this.newDocUser = data.docUser
this.form.fileList = data.form ? data.form.fileList : []
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+6 -4
View File
@@ -135,7 +135,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText4">
</el-input>
</div>
</el-collapse-item>
@@ -230,6 +230,7 @@
name: "bzdyStep4",
data() {
return {
commentText4: '',
newDocUser: '',
drawerModal: false,
foldFormFlag: false,
@@ -333,7 +334,7 @@
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
json.commentText = this.commentText4
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -347,11 +348,11 @@
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText4) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
json.commentText = this.commentText4
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -384,6 +385,7 @@
this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList
this.newDocUser = data.form ? data.form.docUser : data.docUser
this.commentText4 = data.commentText4 || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+5 -3
View File
@@ -124,7 +124,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText5">
</el-input>
</div>
</el-collapse-item>
@@ -237,6 +237,7 @@
name: "bzdyStep5",
data() {
return {
commentText5: '',
newDocUser: '',
drawerModal: false,
foldFormFlag: false,
@@ -373,7 +374,7 @@
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: json,
commentText: this.commentText,
commentText5: this.commentText5,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -387,7 +388,7 @@
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText5
json.hzfileId = this.form.hzfileId
json.hzfileName = this.form.hzfileName
json.docUser = this.newDocUser
@@ -419,6 +420,7 @@
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.newDocUser = data.form ? data.form.docUser : data.docUser
this.commentText5 = data.commentText5 || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+6 -5
View File
@@ -119,7 +119,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText6">
</el-input>
</div>
</el-collapse-item>
@@ -233,6 +233,7 @@
name: "bzdyStep6",
data() {
return {
commentText6: '',
drawerModal: false,
foldFormFlag: false,
histortData: [],
@@ -360,12 +361,11 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
json.commentText = this.commentText6
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -379,11 +379,11 @@
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText6) {
this.isSubmit = true
var json = this.json
json.actionFlag = 1
json.commentText = this.commentText
json.commentText = this.commentText6
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -412,6 +412,7 @@
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText6 = data.commentText6 || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+6 -4
View File
@@ -119,7 +119,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText7">
</el-input>
</div>
</el-collapse-item>
@@ -233,6 +233,7 @@
name: "bzdyStep7",
data() {
return {
commentText7: '',
drawerModal: false,
foldFormFlag: false,
histortData: [],
@@ -365,7 +366,7 @@
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
json.commentText = this.commentText7
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -379,10 +380,10 @@
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText7) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText7
json.actionFlag = 1
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -412,6 +413,7 @@
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText7 = data.commentText7 || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+6 -4
View File
@@ -119,7 +119,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText8">
</el-input>
</div>
</el-collapse-item>
@@ -233,6 +233,7 @@
name: "bzdyStep8",
data() {
return {
commentText8: '',
drawerModal: false,
foldFormFlag: false,
histortData: [],
@@ -365,7 +366,7 @@
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
json.commentText = this.commentText8
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -379,10 +380,10 @@
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText8) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText8
json.actionFlag = 1
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -412,6 +413,7 @@
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText8 = data.commentText8 || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+6 -5
View File
@@ -119,7 +119,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText9">
</el-input>
</div>
</el-collapse-item>
@@ -233,6 +233,7 @@
name: "bzdyStep9",
data() {
return {
commentText9: '',
drawerModal: false,
foldFormFlag: false,
histortData: [],
@@ -360,12 +361,11 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
json.commentText = this.commentText9
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -379,10 +379,10 @@
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText9) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText9
json.actionFlag = 1
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -412,6 +412,7 @@
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText9 = data.commentText9 || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+5 -4
View File
@@ -196,7 +196,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText1">
</el-input>
</div>
</el-collapse-item>
@@ -493,6 +493,7 @@
name: "bzjdStep1-1",
data() {
return {
commentText1: '',
itemsNum: '',
BDtext: false,
pickerOptions: {
@@ -835,7 +836,7 @@
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.commentText1 = mes.commentText1 || ''
this.itemList = mes.itemList
this.sarType = mes.sarType
})
@@ -1008,7 +1009,7 @@
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
commentText1: this.commentText1,
itemList: this.itemList,
sarType: this.sarType
}))
@@ -1077,7 +1078,7 @@
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText
json.commentText = this.commentText1
json.standInData = this.sarType
json.itemList = this.itemList
this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+6 -5
View File
@@ -203,7 +203,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText1">
</el-input>
</div>
</el-collapse-item>
@@ -421,7 +421,7 @@
</div>
</div>
</div>
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 :style="PLmodalType === 2 ? 'width: 100%;' : ''">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
v-model="plForm.technicalRequir"
@@ -503,6 +503,7 @@ export default {
name: "bzjdStep1",
data() {
return {
commentText1: '',
itemsNum: '',
BDtext: false,
pickerOptions: {
@@ -1017,7 +1018,7 @@ export default {
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
commentText1: this.commentText1,
itemList: this.itemList,
sarType: this.sarType
}))
@@ -1089,14 +1090,14 @@ export default {
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
commentText1: this.commentText1,
itemList: this.itemList,
sarType: this.sarType
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText
json.commentText = this.commentText1
json.standInData = this.sarType
json.itemList = this.itemList
json.itemListOld = this.itemListOld
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+5 -4
View File
@@ -172,7 +172,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText2">
</el-input>
</div>
</el-collapse-item>
@@ -282,6 +282,7 @@
name: "bzjdStep2",
data() {
return {
commentText2: '',
drawerModal: false,
//折叠的标志，true为折叠，false为不折叠
foldFormFlag: false,
@@ -427,7 +428,7 @@
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
commentText2: this.commentText2,
itemList: this.itemList,
standInData: this.sarType
}))
@@ -453,7 +454,7 @@
this.isSubmit = true
var json = this.json
json.itemList = this.itemList
json.commentText = this.commentText
json.commentText = this.commentText2
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -486,7 +487,7 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText
this.commentText2 = data.commentText2 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+11 -6
View File
@@ -203,7 +203,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText3">
</el-input>
</div>
</el-collapse-item>
@@ -291,7 +291,7 @@
:wrapperClosable="false"
size="800px">
<div class="demo-drawer-content">
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150>
<el-form :model="plForm" class="label-input-form" ref="plForm" label-width=150 style="width: 100%;">
<el-form-item label="核心技术要求" prop="technicalRequir" class="add-form-item" v-if="!form.itemsNum1">
<el-input
v-model="plForm.technicalRequir"
@@ -464,6 +464,8 @@
name: "bzjdStep3",
data() {
return {
AOLIGEI: '',
commentText3: '',
BDtext: false,
itemsNum: '',
similarityDegree: '',
@@ -743,9 +745,10 @@
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText,
commentText3: this.commentText3,
itemList: this.itemList,
standInData: this.sarType
standInData: this.sarType,
AOLIGEI: this.AOLIGEI
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
@@ -823,8 +826,9 @@
} else {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText3
json.itemList = this.itemList
json.AOLIGEI = this.AOLIGEI
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -857,7 +861,8 @@
this.acceptShow = false
this.submitShow = true
}
this.commentText = data.commentText
this.AOLIGEI = data.AOLIGEI
this.commentText3 = data.commentText3 || ''
this.todoId = res.id
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+6 -6
View File
@@ -197,7 +197,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText4">
</el-input>
</div>
</el-collapse-item>
@@ -306,6 +306,7 @@
name: "bzjdStep4",
data() {
return {
commentText4: '',
itemsNum: '',
similarityDegree: '',
BDmodel: false,
@@ -439,8 +440,7 @@
this.isSubmit = true
var json = this.json
json.resolveFlag = 1
json.commentText = this.commentText
json.AOLIGEI = this.AOLIGEI
json.commentText = this.commentText4
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -454,11 +454,11 @@
})
},
handleSubmitNo () {
if (this.commentText) {
if (this.commentText4) {
this.isSubmit = true
var json = this.json
json.resolveFlag = 2
json.commentText = this.commentText
json.commentText = this.commentText4
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -483,7 +483,7 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText
this.commentText4 = data.commentText4 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+6 -5
View File
@@ -197,7 +197,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText5">
</el-input>
</div>
</el-collapse-item>
@@ -312,6 +312,7 @@
name: "bzjdStep5",
data() {
return {
commentText5: '',
itemsNum: '',
similarityDegree: '',
BDmodel: false,
@@ -427,7 +428,7 @@
this.isSubmit = true
var json = this.json
json.zrApplyFlag = 1
json.commentText = this.commentText
json.commentText = this.commentText5
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -441,11 +442,11 @@
})
},
handleSubmitNo () {
if (this.commentText) {
if (this.commentText5) {
this.isSubmit = true
var json = this.json
json.zrApplyFlag = 2
json.commentText = this.commentText
json.commentText = this.commentText5
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -470,7 +471,7 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText
this.commentText5 = data.commentText5 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+6 -5
View File
@@ -197,7 +197,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText6">
</el-input>
</div>
</el-collapse-item>
@@ -310,6 +310,7 @@
name: "bzjdStep6",
data() {
return {
commentText6: '',
itemsNum: '',
similarityDegree: '',
BDmodel: false,
@@ -425,7 +426,7 @@
this.isSubmit = true
var json = this.json
json.gcApplyFlag = 1
json.commentText = this.commentText
json.commentText = this.commentText6
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -439,11 +440,11 @@
})
},
handleSubmitNo () {
if (this.commentText) {
if (this.commentText6) {
this.isSubmit = true
var json = this.json
json.gcApplyFlag = 2
json.commentText = this.commentText
json.commentText = this.commentText6
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -468,7 +469,7 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText
this.commentText6 = data.commentText6 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+4 -6
View File
@@ -114,7 +114,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText1">
</el-input>
</div>
</el-collapse-item>
@@ -207,7 +207,6 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
>
</ProcessFooter>
@@ -376,6 +375,7 @@ export default {
name: "bzzqyjStep1-1",
data() {
return {
commentText1: '',
textTypeList: [],
pickerOptions: {
disabledDate(time) {
@@ -661,7 +661,7 @@ export default {
mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
this.form = mes.form
this.roleForm = mes.roleForm
this.commentText = mes.commentText
this.commentText1 = mes.commentText1 || ''
})
},
addZqyjList() {
@@ -804,8 +804,6 @@ export default {
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
@@ -817,7 +815,7 @@ export default {
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText
json.commentText = this.commentText1
json.filesId = this.roleForm.dockUserList
json.filesName = this.roleForm.dockUserListName
this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+5 -4
View File
@@ -114,7 +114,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText1">
</el-input>
</div>
</el-collapse-item>
@@ -384,6 +384,7 @@ export default {
name: "bzzqyjStep1",
data() {
return {
commentText1: '',
textTypeList: [],
drawerTitle2: '',
type2: '',
@@ -812,7 +813,7 @@ export default {
_formData.append('json', JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText1: this.commentText1
}))
saveTaskFirst(_formData).then(res => {
this.saveLoading = false
@@ -836,12 +837,12 @@ export default {
json: JSON.stringify({
form: this.form,
roleForm: this.roleForm,
commentText: this.commentText
commentText1: this.commentText1
})
}, {}, res => {
if (res.ok) {
var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText
json.commentText = this.commentText1
json.filesId = this.addFjList
json.filesName = this.form.fjListName
this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+5 -3
View File
@@ -97,7 +97,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText2">
</el-input>
</div>
</el-collapse-item>
@@ -195,6 +195,7 @@ export default {
name: "bzzqyjStep2",
data() {
return {
commentText2: '',
drawerModal: false,
histortData: [],
commentText: "",
@@ -325,7 +326,7 @@ export default {
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: this.form,
commentText: this.commentText
commentText2: this.commentText2
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
@@ -340,7 +341,7 @@ export default {
if (valid) {
this.isSubmit = true;
var json = this.json;
json.commentText = this.commentText;
json.commentText = this.commentText2;
json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName;
json.introduce = false;
@@ -367,6 +368,7 @@ export default {
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.commentText2 = data.commentText2 || ''
this.form.cid = data.cid
this.form.endTime = data.endTime
this.form.cname = data.cname
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+11 -5
View File
@@ -184,7 +184,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText3">
</el-input>
</div>
</el-collapse-item>
@@ -336,6 +336,8 @@
name: "bzzqyjStep3",
data() {
return {
onlyKey: '',
commentText3: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
options: [],
@@ -560,12 +562,13 @@
let _formData = new FormData();
let json = this.form
json.data = this.data
json.onlyKey = this.onlyKey
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText: this.commentText
commentText3: this.commentText3
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
@@ -591,7 +594,8 @@
if (this.data.length < 1) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.onlyKey = this.onlyKey
json.commentText = this.commentText3
json.info = []
json.form = this.form
json.department = this.$store.getters.userInfo.orgName
@@ -632,10 +636,11 @@
else {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText3
json.info = this.data
json.form = this.form
json.department = this.$store.getters.userInfo.orgName
json.onlyKey = this.onlyKey
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -659,7 +664,6 @@
}, {}, res => {
if (res.ok) {
this.options = res.data.list
console.log(res);
}
}, e => {
})
@@ -679,6 +683,7 @@
this.acceptShow = false
this.submitShow = true
}
this.commentText3 = data.commentText3 || ''
this.form.fjList = data.fjList || data.form.fjList || []
if (data.fjListId === '') {
this.form.fjListId = ''
@@ -692,6 +697,7 @@
this.form.endTime = data.endTime || data.form.endTime
this.todoId = res.id
this.json = data
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.getItemList(data.standId,data.textType)
this.data = data.info || data.data || data.form.data || []
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+6 -7
View File
@@ -163,7 +163,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText41">
</el-input>
</div>
</el-collapse-item>
@@ -274,6 +274,7 @@
name: "bzzqyjStep4-1",
data() {
return {
commentText41: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
@@ -401,14 +402,12 @@
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText41
json.bzfgId = this.form.bzfgId
json.bzfgName = this.form.bzfgName
json.spFlag = '0'
@@ -429,10 +428,10 @@
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText41) {
var json = this.json
json.spFlag = '1'
json.commentText = this.commentText
json.commentText = this.commentText41
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -467,7 +466,7 @@
this.form.textType = data.textType || data.form.textType
this.form.modelList = data.modelList || data.form.modelList
this.form.modelNameList = data.modelNameList || data.form.modelNameList
console.log(data);
this.commentText41 = data.commentText41 || ''
this.form.bzfgId = data.startUser
this.form.bzfgName = data.startUserName
// this.form.bzfgId = data.bzfgId || ''
src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+6 -6
View File
@@ -155,7 +155,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText42">
</el-input>
</div>
</el-collapse-item>
@@ -266,6 +266,7 @@
name: "bzzqyjStep4-2",
data() {
return {
commentText42: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
@@ -393,12 +394,10 @@
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText42
json.bzFlag = '0'
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
@@ -413,10 +412,10 @@
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText42) {
var json = this.json
json.bzFlag = '1'
json.commentText = this.commentText
json.commentText = this.commentText42
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -445,6 +444,7 @@
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText42 = data.commentText42 || ''
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+4 -4
View File
@@ -191,7 +191,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText4">
</el-input>
</div>
</el-collapse-item>
@@ -346,6 +346,7 @@ export default {
name: "bzzqyjStep4",
data() {
return {
commentText4: '',
acceptShow: false,
idList: [],
options: [],
@@ -587,15 +588,13 @@ export default {
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
this.$refs['bzzqyjForm'].validate((valid) => {
if (valid) {
this.isSubmit = true
var json = this.json
json.actionFlag = 0
json.commentText = this.commentText
json.commentText = this.commentText4
json.spId = this.form.spId
json.spName = this.form.spName
this.$http.post('lawss/activiti/completeTask', {
@@ -655,6 +654,7 @@ export default {
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText4 = data.commentText4 || ''
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+5 -4
View File
@@ -186,7 +186,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText5">
</el-input>
</div>
</el-collapse-item>
@@ -335,6 +335,7 @@
name: "bzzqyjStep5",
data() {
return {
commentText5: '',
options: [],
itemId: '',
modalshowflag2: false,
@@ -523,7 +524,7 @@
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
form: json,
commentText: this.commentText
commentText5: this.commentText5
}));
saveTaskForPub(_formData).then(res => {
this.saveLoading = false;
@@ -537,7 +538,7 @@
this.isSubmit = true;
var json = this.json;
json.oldinfo = this.oldData;
json.commentText = this.commentText;
json.commentText = this.commentText5;
json.introduce = true;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
@@ -558,7 +559,7 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg);
this.commentText5 = data.commentText5 || ''
this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') {
this.form.fjListId = ''
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+6 -7
View File
@@ -175,7 +175,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText6">
</el-input>
</div>
</el-collapse-item>
@@ -241,7 +241,6 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
@@ -280,6 +279,7 @@ export default {
name: "bzzqyjStep6",
data() {
return {
commentText6: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
@@ -441,13 +441,11 @@ export default {
handleTabs(name) {
this.active = name;
},
handleSave() {
},
handleSubmit() {
this.isSubmit = true;
var json = this.json;
json.hqFlag = '0';
json.commentText = this.commentText;
json.commentText = this.commentText6;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -461,11 +459,11 @@ export default {
});
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText6) {
this.isSubmit = true;
var json = this.json;
json.hqFlag = '1';
json.commentText = this.commentText;
json.commentText = this.commentText6;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -494,6 +492,7 @@ export default {
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText6 = data.commentText6 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+6 -7
View File
@@ -175,7 +175,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText7">
</el-input>
</div>
</el-collapse-item>
@@ -241,7 +241,6 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
@@ -280,6 +279,7 @@ export default {
name: "bzzqyjStep7",
data() {
return {
commentText7: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
@@ -438,13 +438,11 @@ export default {
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.bdFlag = '0'
json.commentText = this.commentText
json.commentText = this.commentText7
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -458,11 +456,11 @@ export default {
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText7) {
this.isSubmit = true
var json = this.json
json.bdFlag = '1'
json.commentText = this.commentText
json.commentText = this.commentText7
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -491,6 +489,7 @@ export default {
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText7 = data.commentText7 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+7 -7
View File
@@ -175,7 +175,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText8">
</el-input>
</div>
</el-collapse-item>
@@ -254,7 +254,7 @@
submitBTNText="同意"
>
</ProcessFooter>
<Role-tree
<Role-tree
check-box
is-title="转办处理人"
:is-visible.sync="drawerModal"
@@ -283,6 +283,7 @@ export default {
name: "bzzqyjStep8",
data() {
return {
commentText8: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
@@ -441,13 +442,11 @@ export default {
handleTabs(name) {
this.active = name
},
handleSave() {
},
handleSubmit() {
this.isSubmit = true
var json = this.json
json.directorFlag = '0'
json.commentText = this.commentText
json.commentText = this.commentText8
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -461,11 +460,11 @@ export default {
})
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText8) {
this.isSubmit = true
var json = this.json
json.directorFlag = '1'
json.commentText = this.commentText
json.commentText = this.commentText8
this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -494,6 +493,7 @@ export default {
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText8 = data.commentText8 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+6 -7
View File
@@ -175,7 +175,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText9">
</el-input>
</div>
</el-collapse-item>
@@ -244,7 +244,6 @@
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@save="handleSave"
@submit="handleSubmit"
show-back
@back="handleSubmitNo"
@@ -283,6 +282,7 @@ export default {
name: "bzzqyjStep9",
data() {
return {
commentText9: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
@@ -441,13 +441,11 @@ export default {
handleTabs(name) {
this.active = name;
},
handleSave() {
},
handleSubmit() {
this.isSubmit = true;
var json = this.json;
json.presidentFlag = '0';
json.commentText = this.commentText;
json.commentText = this.commentText9;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskId: this.taskIds,
@@ -461,11 +459,11 @@ export default {
});
},
handleSubmitNo() {
if (this.commentText) {
if (this.commentText9) {
this.isSubmit = true;
var json = this.json;
json.presidentFlag = '1';
json.commentText = this.commentText;
json.commentText = this.commentText9;
this.$http.post("lawss/activiti/completeTask", {
json: JSON.stringify(json),
taskIds: this.taskIds,
@@ -494,6 +492,7 @@ export default {
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
}
this.commentText9 = data.commentText9 || ''
this.form.cid = data.cid || data.form.cid;
this.form.endTime = data.endTime || data.form.endTime;
this.form.cname = data.cname || data.form.cname;
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+1 -1
View File
@@ -682,7 +682,7 @@ export default {
})
} else if (row.taskInfo === '责任对接人审批') {
this.$router.push({
name: 'phoneBzdyStep4',
name: 'bzdyStep4',
query: {
taskIds: row.taskIds,
prcId: row.prcId,