This commit is contained in:
zhutianqi
2021-12-31 10:48:36 +08:00
parent 0179e6e2a7
commit 8358a05226
26 changed files with 79 additions and 79 deletions
@@ -369,7 +369,7 @@
}
this.form = mes.form
this.roleForm = mes.roleForm
this.commentText1 = mes.commentText1
this.commentText1 = mes.commentText1 || ''
})
},
checkedRole2 (data) {
@@ -361,7 +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
this.commentText2 = data.commentText2 || ''
}).catch(e => {
})
})
@@ -385,7 +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
this.commentText4 = data.commentText4 || ''
}).catch(e => {
})
})
@@ -420,7 +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
this.commentText5 = data.commentText5 || ''
}).catch(e => {
})
})
@@ -412,7 +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
this.commentText6 = data.commentText6 || ''
}).catch(e => {
})
})
@@ -413,7 +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
this.commentText7 = data.commentText7 || ''
}).catch(e => {
})
})
@@ -413,7 +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
this.commentText8 = data.commentText8 || ''
}).catch(e => {
})
})
@@ -412,7 +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
this.commentText9 = data.commentText9 || ''
}).catch(e => {
})
})
@@ -836,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.commentText1 = mes.commentText1
this.commentText1 = mes.commentText1 || ''
this.itemList = mes.itemList
this.sarType = mes.sarType
})
@@ -487,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.commentText2 = data.commentText2
this.commentText2 = data.commentText2 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
@@ -858,7 +858,7 @@
this.acceptShow = false
this.submitShow = true
}
this.commentText3 = data.commentText3
this.commentText3 = data.commentText3 || ''
this.todoId = res.id
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
@@ -484,7 +484,7 @@
let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText4 = data.commentText4
this.commentText4 = data.commentText4 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
@@ -471,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.commentText5 = data.commentText5
this.commentText5 = data.commentText5 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
@@ -469,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.commentText6 = data.commentText6
this.commentText6 = data.commentText6 || ''
if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || ''
@@ -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', {
@@ -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', {
@@ -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
@@ -184,7 +184,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
v-model="commentText">
v-model="commentText3">
</el-input>
</div>
</el-collapse-item>
@@ -336,6 +336,7 @@
name: "bzzqyjStep3",
data() {
return {
commentText3: '',
itermsConditionsFlag: false,
itermsConditionsTitle: '',
options: [],
@@ -565,7 +566,7 @@
_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 +592,7 @@
if (this.data.length < 1) {
this.isSubmit = true
var json = this.json
json.commentText = this.commentText
json.commentText = this.commentText3
json.info = []
json.form = this.form
json.department = this.$store.getters.userInfo.orgName
@@ -679,6 +680,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 = ''
@@ -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 || ''
@@ -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
@@ -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
@@ -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 = ''
@@ -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;
@@ -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;
@@ -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;
@@ -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;