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

Merge branch 'develop' of http://gitlab.91isoft.com:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-08-09 16:07:00 +08:00
parent ef0242e7b6 52c5ecae01
commit 501708f03e
14 changed files with 144 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+24 -7
View File
@@ -135,6 +135,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -155,7 +156,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default {
name: "bzdyStep2",
@@ -229,7 +230,21 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
@@ -261,11 +276,13 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.form.model = data.model
this.form.modelName = data.modelName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step3.vue
+26 -9
View File
@@ -147,6 +147,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -180,7 +181,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
export default {
name: "bzdyStep3",
@@ -273,7 +274,21 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
@@ -305,13 +320,15 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.form.model = data.model
this.form.modelName = data.modelName
this.form.fileName = data.fileName || ''
this.form.fileId = data.fileId || ''
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
this.form.responUserList = data.form.responUserList
this.form.responUserListName = data.form.responUserListName
this.form.fileName = data.form.fileName || data.fileName || ''
this.form.fileId = data.form.fileId || data.fileId || ''
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+8 -7
View File
@@ -252,13 +252,14 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.form.file = data.fileId
this.form.fileName = data.fileName
this.form.model = data.model
this.form.modelName = data.modelName
console.log(data);
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.form.file = data.fileId || data.form.fileId
this.form.fileName = data.fileName || data.form.fileName
this.form.model = data.model || data.form.model
this.form.modelName = data.modelName || data.form.modelName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+22 -7
View File
@@ -174,6 +174,7 @@
</el-table>
</div>
<ProcessFooter
show-save
show-submit
:submitLoading="isSubmit"
:saveLoading="saveLoading"
@@ -297,7 +298,21 @@
handleTabs(name) {
this.active = name
},
handleSave() {},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({
form: this.form,
commentText: this.commentText,
}))
saveTaskForPub(_formData).then(res => {
this.saveLoading = false
this.$message.success('保存成功')
}).catch(e => {
this.saveLoading = false
})
},
handleSubmit() {
this.$refs['qbkwForm'].validate((valid) => {
if (valid) {
@@ -327,12 +342,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileId = data.hzfileId
this.form.hzfileName = data.hzfileName
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+6 -6
View File
@@ -341,12 +341,12 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
this.form.title = data.title
this.form.date = data.date
this.json = data
this.tableData = data.responUserList
this.form.hzfileName = data.hzfileName
this.form.hzfileId = data.hzfileId
this.form.title = data.title || data.form.title
this.form.date = data.date || data.form.date
this.json = data || data.form
this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName
}).catch(e => {
})
})
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
-1
View File
@@ -321,7 +321,6 @@
this.active = name
},
handleSave() {
this.saveLoading = true
let _formData = new FormData()
_formData.append('taskIds', this.taskIds)
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+3
View File
@@ -282,6 +282,7 @@ export default {
endTime: '', // 结束日期
cname: '', // 名称
standType: '',
standId: '',
},
formRules: {
cid: [
@@ -299,6 +300,7 @@ export default {
standSort: '',
standNumber: '',
standType: '',
standId: '',
page: 1,
pageSize: this.$store.getters.userInfo.configContent
},
@@ -456,6 +458,7 @@ export default {
this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber
}
this.form.standType = bringData[0].standType
this.form.standId = bringData[0].id
this.form.cname = bringData[0].standName;
this.listModel = false;
} else if (this.selectedList.length > 1) {