commit
This commit is contained in:
zhutianqi
@@ -252,7 +252,6 @@
|
|||||||
pId: this.pId
|
pId: this.pId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let data = JSON.parse(res.mesg)
|
let data = JSON.parse(res.mesg)
|
||||||
console.log(data);
|
|
||||||
this.form.title = data.title || data.form.title
|
this.form.title = data.title || data.form.title
|
||||||
this.form.date = data.date || data.form.date
|
this.form.date = data.date || data.form.date
|
||||||
this.json = data || data.form
|
this.json = data || data.form
|
||||||
|
|||||||
@@ -333,13 +333,12 @@
|
|||||||
this.saveLoading = true
|
this.saveLoading = true
|
||||||
let _formData = new FormData()
|
let _formData = new FormData()
|
||||||
_formData.append('taskIds', this.taskIds)
|
_formData.append('taskIds', this.taskIds)
|
||||||
_formData.append('pId', this.pId)
|
|
||||||
_formData.append('json', JSON.stringify({
|
_formData.append('json', JSON.stringify({
|
||||||
form: this.form,
|
form: this.form,
|
||||||
roleForm: this.roleForm,
|
roleForm: this.roleForm,
|
||||||
commentText: this.commentText,
|
commentText: this.commentText,
|
||||||
itemList: this.itemList,
|
itemList: this.itemList,
|
||||||
sarType: this.sarType
|
standInData: this.sarType
|
||||||
}))
|
}))
|
||||||
saveTaskForPub(_formData).then(res => {
|
saveTaskForPub(_formData).then(res => {
|
||||||
this.saveLoading = false
|
this.saveLoading = false
|
||||||
@@ -394,14 +393,19 @@
|
|||||||
pId: this.pId
|
pId: this.pId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let data = JSON.parse(res.mesg)
|
let data = JSON.parse(res.mesg)
|
||||||
this.form.itemsNum = data.itemsNum
|
console.log(data);
|
||||||
this.form.itemsName = data.itemsName
|
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||||
this.form.itemsNum1 = data.itemsNum1
|
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||||
this.form.itemsName1 = data.itemsName1
|
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||||
this.sarType = data.standInData
|
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||||
|
this.sarType = data.standInData || data.sarType
|
||||||
this.json = data
|
this.json = data
|
||||||
var arr = []
|
let arr
|
||||||
arr = JSON.parse(data.itemList)
|
if (typeof(data.itemList) === 'string') {
|
||||||
|
arr = JSON.parse(data.itemList)
|
||||||
|
} else {
|
||||||
|
arr = data.itemList
|
||||||
|
}
|
||||||
arr.forEach(item => {
|
arr.forEach(item => {
|
||||||
item.zxUserId = ''
|
item.zxUserId = ''
|
||||||
item.zxUserIdName = ''
|
item.zxUserIdName = ''
|
||||||
|
|||||||
@@ -288,6 +288,7 @@
|
|||||||
</el-table>
|
</el-table>
|
||||||
</div>
|
</div>
|
||||||
<ProcessFooter
|
<ProcessFooter
|
||||||
|
show-save
|
||||||
show-submit
|
show-submit
|
||||||
:submitLoading="isSubmit"
|
:submitLoading="isSubmit"
|
||||||
:saveLoading="saveLoading"
|
:saveLoading="saveLoading"
|
||||||
@@ -377,7 +378,7 @@
|
|||||||
import ProcessHeader from '../../components/ProcessHeader'
|
import ProcessHeader from '../../components/ProcessHeader'
|
||||||
import ProcessFooter from '../../components/ProcessFooter'
|
import ProcessFooter from '../../components/ProcessFooter'
|
||||||
import ProcessTitle from '../../components/ProcessTitle'
|
import ProcessTitle from '../../components/ProcessTitle'
|
||||||
import {inboundLiaisonDetail,processCreateStand} from 'api/process'
|
import {inboundLiaisonDetail,processCreateStand,saveTaskForPub} from 'api/process'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "bzjdStep3",
|
name: "bzjdStep3",
|
||||||
@@ -488,7 +489,24 @@
|
|||||||
handleTabs(name) {
|
handleTabs(name) {
|
||||||
this.active = name
|
this.active = name
|
||||||
},
|
},
|
||||||
handleSave() {},
|
handleSave() {
|
||||||
|
this.saveLoading = true
|
||||||
|
let _formData = new FormData()
|
||||||
|
_formData.append('taskIds', this.taskIds)
|
||||||
|
_formData.append('json', JSON.stringify({
|
||||||
|
form: this.form,
|
||||||
|
roleForm: this.roleForm,
|
||||||
|
commentText: this.commentText,
|
||||||
|
itemList: this.itemList,
|
||||||
|
standInData: this.sarType
|
||||||
|
}))
|
||||||
|
saveTaskForPub(_formData).then(res => {
|
||||||
|
this.saveLoading = false
|
||||||
|
this.$message.success('保存成功')
|
||||||
|
}).catch(e => {
|
||||||
|
this.saveLoading = false
|
||||||
|
})
|
||||||
|
},
|
||||||
handleSubmit() {
|
handleSubmit() {
|
||||||
this.$refs['bzzqyjForm'].validate((valid) => {
|
this.$refs['bzzqyjForm'].validate((valid) => {
|
||||||
if (valid) {
|
if (valid) {
|
||||||
@@ -558,11 +576,12 @@
|
|||||||
pId: this.pId
|
pId: this.pId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let data = JSON.parse(res.mesg)
|
let data = JSON.parse(res.mesg)
|
||||||
this.form.itemsNum = data.itemsNum
|
console.log(data);
|
||||||
this.form.itemsName = data.itemsName
|
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||||
this.form.itemsNum1 = data.itemsNum1
|
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||||
this.form.itemsName1 = data.itemsName1
|
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||||
this.sarType = data.standInData
|
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||||
|
this.sarType = data.standInData || data.sarType
|
||||||
this.json = data
|
this.json = data
|
||||||
let itemList
|
let itemList
|
||||||
if (typeof (data.itemList) == 'string') {
|
if (typeof (data.itemList) == 'string') {
|
||||||
|
|||||||
@@ -378,11 +378,11 @@
|
|||||||
pId: this.pId
|
pId: this.pId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let data = JSON.parse(res.mesg)
|
let data = JSON.parse(res.mesg)
|
||||||
this.form.itemsNum = data.itemsNum
|
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||||
this.form.itemsName = data.itemsName
|
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||||
this.form.itemsNum1 = data.itemsNum1
|
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||||
this.form.itemsName1 = data.itemsName1
|
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||||
this.sarType = data.standInData
|
this.sarType = data.standInData || data.sarType
|
||||||
this.json = data
|
this.json = data
|
||||||
this.itemList = data.itemList
|
this.itemList = data.itemList
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|||||||
@@ -378,11 +378,11 @@
|
|||||||
pId: this.pId
|
pId: this.pId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let data = JSON.parse(res.mesg)
|
let data = JSON.parse(res.mesg)
|
||||||
this.form.itemsNum = data.itemsNum
|
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||||
this.form.itemsName = data.itemsName
|
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||||
this.form.itemsNum1 = data.itemsNum1
|
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||||
this.form.itemsName1 = data.itemsName1
|
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||||
this.sarType = data.standInData
|
this.sarType = data.standInData || data.sarType
|
||||||
this.json = data
|
this.json = data
|
||||||
this.itemList = data.itemList
|
this.itemList = data.itemList
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|||||||
@@ -377,11 +377,11 @@
|
|||||||
pId: this.pId
|
pId: this.pId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let data = JSON.parse(res.mesg)
|
let data = JSON.parse(res.mesg)
|
||||||
this.form.itemsNum = data.itemsNum
|
this.form.itemsNum = data.itemsNum || data.form.itemsNum
|
||||||
this.form.itemsName = data.itemsName
|
this.form.itemsName = data.itemsName || data.form.itemsName
|
||||||
this.form.itemsNum1 = data.itemsNum1
|
this.form.itemsNum1 = data.itemsNum1 || data.form.itemsNum1
|
||||||
this.form.itemsName1 = data.itemsName1
|
this.form.itemsName1 = data.itemsName1 || data.form.itemsName1
|
||||||
this.sarType = data.standInData
|
this.sarType = data.standInData || data.sarType
|
||||||
this.json = data
|
this.json = data
|
||||||
this.itemList = data.itemList
|
this.itemList = data.itemList
|
||||||
this.loading = false
|
this.loading = false
|
||||||
|
|||||||
@@ -263,7 +263,6 @@
|
|||||||
this.form.endTime = data.endTime
|
this.form.endTime = data.endTime
|
||||||
this.form.cname = data.cname
|
this.form.cname = data.cname
|
||||||
this.json = data
|
this.json = data
|
||||||
console.log(data);
|
|
||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -317,7 +317,6 @@
|
|||||||
pId: this.pId
|
pId: this.pId
|
||||||
}).then(res => {
|
}).then(res => {
|
||||||
let data = JSON.parse(res.mesg)
|
let data = JSON.parse(res.mesg)
|
||||||
console.log(data);
|
|
||||||
this.form.cid = data.cid
|
this.form.cid = data.cid
|
||||||
this.form.endTime = data.endTime
|
this.form.endTime = data.endTime
|
||||||
this.form.cname = data.cname
|
this.form.cname = data.cname
|
||||||
|
|||||||
Reference in New Issue
Block a user