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

52548 标准征求意见：意见汇总报批节点 数据不归档 保存

Browse Source
This commit is contained in:
宋伟佳
2022-04-13 14:23:21 +08:00
parent 7d9d1d6a1f
commit df42065e29
6 changed files with 80 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+3 -1
View File
@@ -661,13 +661,14 @@ export default {
bpnId: this.$route.query.bpnId bpnId: this.$route.query.bpnId
}).then(res => { }).then(res => {
let mes = JSON.parse(res.mes) let mes = JSON.parse(res.mes)
console.log(mes);
this.bpnId = this.$route.query.bpnId this.bpnId = this.$route.query.bpnId
if (mes.form.endTime) { if (mes.form.endTime) {
mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD')) mes.form.endTime = new Date(this.$moment(mes.form.endTime).format('YYYY-MM-DD'))
} else { } else {
mes.form.endTime = '' mes.form.endTime = ''
} }
this.addFjList = mes.filesId this.addFjList = mes.filesId || mes.form.filesId || ''
this.form.fjListName = mes.filesName this.form.fjListName = mes.filesName
this.form = mes.form this.form = mes.form
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
@@ -878,6 +879,7 @@ export default {
handleSave () { handleSave () {
this.saveLoading = true this.saveLoading = true
let _formData = new FormData() let _formData = new FormData()
this.form.filesId = this.addFjList
_formData.append('id', this.bpnId || '') _formData.append('id', this.bpnId || '')
_formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUser', this.$store.getters.userInfo.userId)
_formData.append('createUserName', this.$store.getters.userInfo.userName) _formData.append('createUserName', this.$store.getters.userInfo.userName)
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue
-13
View File
@@ -169,19 +169,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </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>
</div> </div>
<div class="content" v-show="active === '2'"> <div class="content" v-show="active === '2'">
<el-table <el-table
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+4
View File
@@ -205,6 +205,7 @@ export default {
data() { data() {
return { return {
commentText2: '', commentText2: '',
onlyKey: '',
drawerModal: false, drawerModal: false,
histortData: [], histortData: [],
commentText: "", commentText: "",
@@ -329,6 +330,7 @@ export default {
handleSave() { handleSave() {
this.saveLoading = true; this.saveLoading = true;
let _formData = new FormData(); let _formData = new FormData();
this.form.onlyKey = this.onlyKey
_formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
_formData.append("prcType", "3"); _formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds); _formData.append("taskIds", this.taskIds);
@@ -349,6 +351,7 @@ export default {
if (valid) { if (valid) {
this.isSubmit = true; this.isSubmit = true;
var json = this.json; var json = this.json;
json.onlyKey = this.onlyKey
json.commentText = this.commentText2; json.commentText = this.commentText2;
json.responUserList = this.form.responUserList; json.responUserList = this.form.responUserList;
json.responUserListName = this.form.responUserListName; json.responUserListName = this.form.responUserListName;
@@ -376,6 +379,7 @@ export default {
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey
this.commentText2 = data.commentText2 || '' this.commentText2 = data.commentText2 || ''
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+11 -2
View File
@@ -349,6 +349,7 @@ export default {
data() { data() {
return { return {
standId: '', standId: '',
onlyKey: '',
modaltitle2: '', modaltitle2: '',
addType: '', addType: '',
commentText4: '', commentText4: '',
@@ -623,6 +624,7 @@ export default {
let _formData = new FormData(); let _formData = new FormData();
let json = this.json let json = this.json
json.info = this.data json.info = this.data
json.onlyKey = this.onlyKey
json.spId = this.form.spId json.spId = this.form.spId
json.spName = this.form.spName json.spName = this.form.spName
_formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
@@ -630,8 +632,9 @@ export default {
_formData.append("taskIds", this.taskIds); _formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({ _formData.append("json", JSON.stringify({
form: json, form: json,
commentText: this.commentText4 commentText4: this.commentText4
})); }));
console.log(json);
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false; this.saveLoading = false;
this.$message.success("保存成功"); this.$message.success("保存成功");
@@ -649,6 +652,7 @@ export default {
json.commentText = this.commentText4 json.commentText = this.commentText4
json.spId = this.form.spId json.spId = this.form.spId
json.info = this.data json.info = this.data
json.onlyKey = this.onlyKey
json.spName = this.form.spName json.spName = this.form.spName
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
@@ -702,7 +706,12 @@ export default {
this.acceptShow = false this.acceptShow = false
this.submitShow = true this.submitShow = true
} }
this.commentText4 = data.commentText || data.commentText4 || '' this.commentText4 = data.commentText4 || ''
if(data.onlyKey){
this.onlyKey = data.onlyKey
}else{
this.onlyKey = data.form.onlyKey
}
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+4 -1
View File
@@ -351,6 +351,7 @@
return { return {
clickFlag: false, clickFlag: false,
commentText5: '', commentText5: '',
onlyKey: '',
options: [], options: [],
itemId: '', itemId: '',
modalshowflag2: false, modalshowflag2: false,
@@ -557,6 +558,7 @@
let _formData = new FormData(); let _formData = new FormData();
let json = this.form; let json = this.form;
json.data = this.data; json.data = this.data;
json.onlyKey = this.onlyKey
_formData.append("id", this.bpnId || ""); _formData.append("id", this.bpnId || "");
_formData.append("prcType", "3"); _formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds); _formData.append("taskIds", this.taskIds);
@@ -593,6 +595,7 @@
this.isSubmit = true; this.isSubmit = true;
var json = this.json; var json = this.json;
json.oldinfo = this.oldData; json.oldinfo = this.oldData;
json.onlyKey = this.onlyKey
json.commentText = this.commentText5; json.commentText = this.commentText5;
json.introduce = true; json.introduce = true;
this.$http.post("lawss/activiti/completeTask", { this.$http.post("lawss/activiti/completeTask", {
@@ -617,8 +620,8 @@
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.commentText5 = data.commentText5 || '' this.commentText5 = data.commentText5 || ''
this.onlyKey = data.form ? data.form.onlyKey :data.onlyKey
this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )
src/pages/processCenter/pages/phone/bzzqyj/step4-2.vue
+58 -62
View File
@@ -305,70 +305,66 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json let json = this.json
json.commentText = this.commentText42 json.info = this.data
json.bzFlag = '0' json.commentText = this.commentText42
this.$http.post('lawss/activiti/completeTask', { json.bzFlag = '0'
json: JSON.stringify(json), this.$http.post('lawss/activiti/completeTask', {
taskId: this.taskIds, json: JSON.stringify(json),
userId: this.$store.getters.userInfo.account taskId: this.taskIds,
}, {}, res => { userId: this.$store.getters.userInfo.userId
if (res.success) { }, {}, res => {
this.$message.success('提交成功') if (res.success) {
this.$router.push('/processCenter') this.$message.success('提交成功')
} this.$router.push('/processCenter')
this.isSubmit = false }
}) this.isSubmit = false
}, })
handleSubmitNo() { },
if (this.commentText42) { handleSubmitNo() {
var json = this.json if (this.commentText42) {
json.bzFlag = '1' var json = this.json
json.commentText = this.commentText42 json.bzFlag = '1'
this.$http.post('lawss/activiti/completeTask', { json.commentText = this.commentText42
json: JSON.stringify(json), this.$http.post('lawss/activiti/completeTask', {
taskId: this.taskIds, json: JSON.stringify(json),
userId: this.$store.getters.userInfo.account taskId: this.taskIds,
}, {}, res => { userId: this.$store.getters.userInfo.userId
if (res.success) { }, {}, res => {
this.$message.success('提交成功') if (res.success) {
this.$router.push('/processCenter') this.$message.success('提交成功')
} this.$router.push('/processCenter')
})
} else {
this.$message.warning('请输入反馈意见')
} }
})
} else {
this.$message.warning('请输入反馈意见')
}
}, },
getData() { getData() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
inboundLiaisonDetail({ inboundLiaisonDetail({
taskIds: this.taskIds, taskIds: this.taskIds,
pId: this.pId pId: this.pId
}).then(res => { }).then(res => {
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
if (data.fjListId === '') { this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser
this.form.fjListId = '' this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName
} else { this.commentText42 = data.commentText42 || ''
this.form.fjListId = data.form.fjListId || data.fjListId this.form.cid = data.cid || data.form.cid
} this.form.endTime = data.endTime || data.form.endTime
this.commentText42 = data.commentText42 || '' this.form.textType = data.textType || data.form.textType
this.form.cid = data.cid || data.form.cid this.form.modelList = data.modelList || data.form.modelList
this.form.endTime = data.endTime || data.form.endTime this.form.bzfgId = data.bzfgId || ''
this.form.cname = data.cname || data.form.cname this.json = data
this.form.textType = data.textType || data.form.textType this.data = data.info || data.data
this.form.modelList = data.modelList || data.form.modelList }).catch(e => {
this.form.modelNameList = data.modelNameList || data.form.modelNameList })
this.form.bzfgId = data.bzfgId || '' })
this.json = data },
this.data = data.info || data.data
}).catch(e => {
})
})
},
}, },
mounted() { mounted() {
this.getHistoryData() this.getHistoryData()