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

Merge branch 'develop' into 'FOTON'

Browse Source 
Develop

See merge request LAWS/laws-system-front-FOTON!272
This commit is contained in:
王夏晖
2021-12-31 10:30:19 +08:00
parent 233b0ae32c 0179e6e2a7
commit acd4fb92e8
16 changed files with 87 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzdy/step1-1.vue
+4 -3
View File
@@ -114,7 +114,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText1">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -262,6 +262,7 @@
name: "bzdyStep1-1", name: "bzdyStep1-1",
data() { data() {
return { return {
commentText1: '',
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -368,7 +369,7 @@
} }
this.form = mes.form this.form = mes.form
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText = mes.commentText this.commentText1 = mes.commentText1
}) })
}, },
checkedRole2 (data) { checkedRole2 (data) {
@@ -561,7 +562,7 @@
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
var json = Object.assign(this.form, this.roleForm) var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText json.commentText = this.commentText1
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: res.data, taskId: res.data,
src/pages/processCenter/pages/creatProcess/bzdy/step1.vue
+5 -6
View File
@@ -114,7 +114,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText1">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -264,6 +264,7 @@ export default {
name: "bzdyStep1", name: "bzdyStep1",
data() { data() {
return { return {
commentText1: '',
pickerOptions: { pickerOptions: {
disabledDate(time) { disabledDate(time) {
return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的 return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
@@ -533,10 +534,8 @@ export default {
_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 commentText1: this.commentText1
})) }))
console.log(this.form);
return
saveTaskFirst(_formData).then(res => { saveTaskFirst(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
this.$message.success('保存成功') this.$message.success('保存成功')
@@ -559,12 +558,12 @@ export default {
json: JSON.stringify({ json: JSON.stringify({
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText commentText1: this.commentText1
}) })
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
var json = Object.assign(this.form, this.roleForm) var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText json.commentText = this.commentText1
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: res.data, taskId: res.data,
src/pages/processCenter/pages/creatProcess/bzdy/step2.vue
+5 -3
View File
@@ -97,7 +97,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText2">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -196,6 +196,7 @@
name: "bzdyStep2", name: "bzdyStep2",
data() { data() {
return { return {
commentText2: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
histortData: [], histortData: [],
@@ -313,7 +314,7 @@
_formData.append('taskIds', this.taskIds) _formData.append('taskIds', this.taskIds)
_formData.append('json', JSON.stringify({ _formData.append('json', JSON.stringify({
form: this.form, form: this.form,
commentText: this.commentText, commentText2: this.commentText2,
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -327,7 +328,7 @@
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText2
json.responUserList = this.form.responUserList json.responUserList = this.form.responUserList
json.responUserListName = this.form.responUserListName json.responUserListName = this.form.responUserListName
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
@@ -360,6 +361,7 @@
this.json = data || data.form this.json = data || data.form
this.form.responUserList = data.form? data.form.responUserList : '' this.form.responUserList = data.form? data.form.responUserList : ''
this.form.responUserListName = data.form? data.form.responUserListName : '' this.form.responUserListName = data.form? data.form.responUserListName : ''
this.commentText2 = data.commentText2
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step4.vue
+6 -4
View File
@@ -135,7 +135,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText4">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -230,6 +230,7 @@
name: "bzdyStep4", name: "bzdyStep4",
data() { data() {
return { return {
commentText4: '',
newDocUser: '', newDocUser: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
@@ -333,7 +334,7 @@
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.actionFlag = 0 json.actionFlag = 0
json.commentText = this.commentText json.commentText = this.commentText4
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
@@ -347,11 +348,11 @@
}) })
}, },
handleSubmitNo() { handleSubmitNo() {
if (this.commentText) { if (this.commentText4) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.actionFlag = 1 json.actionFlag = 1
json.commentText = this.commentText json.commentText = this.commentText4
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
@@ -384,6 +385,7 @@
this.form.modelList = data.form ? data.form.modelList : data.modelList this.form.modelList = data.form ? data.form.modelList : data.modelList
this.form.fjList = data.fjList || data.form.fjList this.form.fjList = data.fjList || data.form.fjList
this.newDocUser = data.form ? data.form.docUser : data.docUser this.newDocUser = data.form ? data.form.docUser : data.docUser
this.commentText4 = data.commentText4
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+5 -3
View File
@@ -124,7 +124,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText5">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -237,6 +237,7 @@
name: "bzdyStep5", name: "bzdyStep5",
data() { data() {
return { return {
commentText5: '',
newDocUser: '', newDocUser: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
@@ -373,7 +374,7 @@
_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.commentText, commentText5: this.commentText5,
})) }))
saveTaskForPub(_formData).then(res => { saveTaskForPub(_formData).then(res => {
this.saveLoading = false this.saveLoading = false
@@ -387,7 +388,7 @@
if (valid) { if (valid) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText5
json.hzfileId = this.form.hzfileId json.hzfileId = this.form.hzfileId
json.hzfileName = this.form.hzfileName json.hzfileName = this.form.hzfileName
json.docUser = this.newDocUser json.docUser = this.newDocUser
@@ -419,6 +420,7 @@
this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.newDocUser = data.form ? data.form.docUser : data.docUser this.newDocUser = data.form ? data.form.docUser : data.docUser
this.commentText5 = data.commentText5
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step6.vue
+6 -5
View File
@@ -119,7 +119,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText6">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -233,6 +233,7 @@
name: "bzdyStep6", name: "bzdyStep6",
data() { data() {
return { return {
commentText6: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
histortData: [], histortData: [],
@@ -360,12 +361,11 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {},
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.actionFlag = 0 json.actionFlag = 0
json.commentText = this.commentText json.commentText = this.commentText6
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -379,11 +379,11 @@
}) })
}, },
handleSubmitNo() { handleSubmitNo() {
if (this.commentText) { if (this.commentText6) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.actionFlag = 1 json.actionFlag = 1
json.commentText = this.commentText json.commentText = this.commentText6
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -412,6 +412,7 @@
this.tableData = data.responUserList || data.form.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText6 = data.commentText6
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step7.vue
+6 -4
View File
@@ -119,7 +119,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText7">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -233,6 +233,7 @@
name: "bzdyStep7", name: "bzdyStep7",
data() { data() {
return { return {
commentText7: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
histortData: [], histortData: [],
@@ -365,7 +366,7 @@
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.actionFlag = 0 json.actionFlag = 0
json.commentText = this.commentText json.commentText = this.commentText7
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskIds: this.taskIds, taskIds: this.taskIds,
@@ -379,10 +380,10 @@
}) })
}, },
handleSubmitNo() { handleSubmitNo() {
if (this.commentText) { if (this.commentText7) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText7
json.actionFlag = 1 json.actionFlag = 1
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
@@ -412,6 +413,7 @@
this.tableData = data.responUserList || data.form.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText7 = data.commentText7
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step8.vue
+6 -4
View File
@@ -119,7 +119,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText8">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -233,6 +233,7 @@
name: "bzdyStep8", name: "bzdyStep8",
data() { data() {
return { return {
commentText8: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
histortData: [], histortData: [],
@@ -365,7 +366,7 @@
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.actionFlag = 0 json.actionFlag = 0
json.commentText = this.commentText json.commentText = this.commentText8
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -379,10 +380,10 @@
}) })
}, },
handleSubmitNo() { handleSubmitNo() {
if (this.commentText) { if (this.commentText8) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText8
json.actionFlag = 1 json.actionFlag = 1
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
@@ -412,6 +413,7 @@
this.tableData = data.responUserList || data.form.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText8 = data.commentText8
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzdy/step9.vue
+6 -5
View File
@@ -119,7 +119,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText9">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -233,6 +233,7 @@
name: "bzdyStep9", name: "bzdyStep9",
data() { data() {
return { return {
commentText9: '',
drawerModal: false, drawerModal: false,
foldFormFlag: false, foldFormFlag: false,
histortData: [], histortData: [],
@@ -360,12 +361,11 @@
handleTabs(name) { handleTabs(name) {
this.active = name this.active = name
}, },
handleSave() {},
handleSubmit() { handleSubmit() {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.actionFlag = 0 json.actionFlag = 0
json.commentText = this.commentText json.commentText = this.commentText9
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -379,10 +379,10 @@
}) })
}, },
handleSubmitNo() { handleSubmitNo() {
if (this.commentText) { if (this.commentText9) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText9
json.actionFlag = 1 json.actionFlag = 1
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
@@ -412,6 +412,7 @@
this.tableData = data.responUserList || data.form.responUserList this.tableData = data.responUserList || data.form.responUserList
this.form.hzfileId = data.hzfileId || data.form.hzfileId this.form.hzfileId = data.hzfileId || data.form.hzfileId
this.form.hzfileName = data.hzfileName || data.form.hzfileName this.form.hzfileName = data.hzfileName || data.form.hzfileName
this.commentText9 = data.commentText9
}).catch(e => { }).catch(e => {
}) })
}) })
src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue
+5 -4
View File
@@ -196,7 +196,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText1">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -493,6 +493,7 @@
name: "bzjdStep1-1", name: "bzjdStep1-1",
data() { data() {
return { return {
commentText1: '',
itemsNum: '', itemsNum: '',
BDtext: false, BDtext: false,
pickerOptions: { pickerOptions: {
@@ -835,7 +836,7 @@
mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
this.form = mes.form this.form = mes.form
this.roleForm = mes.roleForm this.roleForm = mes.roleForm
this.commentText = mes.commentText this.commentText1 = mes.commentText1
this.itemList = mes.itemList this.itemList = mes.itemList
this.sarType = mes.sarType this.sarType = mes.sarType
}) })
@@ -1008,7 +1009,7 @@
_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, commentText1: this.commentText1,
itemList: this.itemList, itemList: this.itemList,
sarType: this.sarType sarType: this.sarType
})) }))
@@ -1077,7 +1078,7 @@
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
var json = Object.assign(this.form, this.roleForm) var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText json.commentText = this.commentText1
json.standInData = this.sarType json.standInData = this.sarType
json.itemList = this.itemList json.itemList = this.itemList
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
src/pages/processCenter/pages/creatProcess/bzjd/step1.vue
+5 -4
View File
@@ -203,7 +203,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText1">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -503,6 +503,7 @@ export default {
name: "bzjdStep1", name: "bzjdStep1",
data() { data() {
return { return {
commentText1: '',
itemsNum: '', itemsNum: '',
BDtext: false, BDtext: false,
pickerOptions: { pickerOptions: {
@@ -1017,7 +1018,7 @@ export default {
_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, commentText1: this.commentText1,
itemList: this.itemList, itemList: this.itemList,
sarType: this.sarType sarType: this.sarType
})) }))
@@ -1089,14 +1090,14 @@ export default {
json: JSON.stringify({ json: JSON.stringify({
form: this.form, form: this.form,
roleForm: this.roleForm, roleForm: this.roleForm,
commentText: this.commentText, commentText1: this.commentText1,
itemList: this.itemList, itemList: this.itemList,
sarType: this.sarType sarType: this.sarType
}) })
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
var json = Object.assign(this.form, this.roleForm) var json = Object.assign(this.form, this.roleForm)
json.commentText = this.commentText json.commentText = this.commentText1
json.standInData = this.sarType json.standInData = this.sarType
json.itemList = this.itemList json.itemList = this.itemList
json.itemListOld = this.itemListOld json.itemListOld = this.itemListOld
src/pages/processCenter/pages/creatProcess/bzjd/step2.vue
+5 -4
View File
@@ -172,7 +172,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText2">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -282,6 +282,7 @@
name: "bzjdStep2", name: "bzjdStep2",
data() { data() {
return { return {
commentText2: '',
drawerModal: false, drawerModal: false,
//折叠的标志，true为折叠，false为不折叠 //折叠的标志，true为折叠，false为不折叠
foldFormFlag: false, foldFormFlag: false,
@@ -427,7 +428,7 @@
_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, commentText2: this.commentText2,
itemList: this.itemList, itemList: this.itemList,
standInData: this.sarType standInData: this.sarType
})) }))
@@ -453,7 +454,7 @@
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.itemList = this.itemList json.itemList = this.itemList
json.commentText = this.commentText json.commentText = this.commentText2
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -486,7 +487,7 @@
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText this.commentText2 = data.commentText2
if (data.form) { if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || '' this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step3.vue
+5 -4
View File
@@ -203,7 +203,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText3">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -464,6 +464,7 @@
name: "bzjdStep3", name: "bzjdStep3",
data() { data() {
return { return {
commentText3: '',
BDtext: false, BDtext: false,
itemsNum: '', itemsNum: '',
similarityDegree: '', similarityDegree: '',
@@ -743,7 +744,7 @@
_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, commentText3: this.commentText3,
itemList: this.itemList, itemList: this.itemList,
standInData: this.sarType standInData: this.sarType
})) }))
@@ -823,7 +824,7 @@
} else { } else {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText3
json.itemList = this.itemList json.itemList = this.itemList
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
@@ -857,7 +858,7 @@
this.acceptShow = false this.acceptShow = false
this.submitShow = true this.submitShow = true
} }
this.commentText = data.commentText this.commentText3 = data.commentText3
this.todoId = res.id this.todoId = res.id
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
src/pages/processCenter/pages/creatProcess/bzjd/step4.vue
+6 -5
View File
@@ -197,7 +197,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText4">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -306,6 +306,7 @@
name: "bzjdStep4", name: "bzjdStep4",
data() { data() {
return { return {
commentText4: '',
itemsNum: '', itemsNum: '',
similarityDegree: '', similarityDegree: '',
BDmodel: false, BDmodel: false,
@@ -439,7 +440,7 @@
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.resolveFlag = 1 json.resolveFlag = 1
json.commentText = this.commentText json.commentText = this.commentText4
json.AOLIGEI = this.AOLIGEI json.AOLIGEI = this.AOLIGEI
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
@@ -454,11 +455,11 @@
}) })
}, },
handleSubmitNo () { handleSubmitNo () {
if (this.commentText) { if (this.commentText4) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.resolveFlag = 2 json.resolveFlag = 2
json.commentText = this.commentText json.commentText = this.commentText4
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -483,7 +484,7 @@
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText this.commentText4 = data.commentText4
if (data.form) { if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || '' this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step5.vue
+6 -5
View File
@@ -197,7 +197,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText5">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -312,6 +312,7 @@
name: "bzjdStep5", name: "bzjdStep5",
data() { data() {
return { return {
commentText5: '',
itemsNum: '', itemsNum: '',
similarityDegree: '', similarityDegree: '',
BDmodel: false, BDmodel: false,
@@ -427,7 +428,7 @@
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.zrApplyFlag = 1 json.zrApplyFlag = 1
json.commentText = this.commentText json.commentText = this.commentText5
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -441,11 +442,11 @@
}) })
}, },
handleSubmitNo () { handleSubmitNo () {
if (this.commentText) { if (this.commentText5) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.zrApplyFlag = 2 json.zrApplyFlag = 2
json.commentText = this.commentText json.commentText = this.commentText5
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -470,7 +471,7 @@
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText this.commentText5 = data.commentText5
if (data.form) { if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || '' this.form.itemsNum1 = data.form.itemsNum1 || ''
src/pages/processCenter/pages/creatProcess/bzjd/step6.vue
+6 -5
View File
@@ -197,7 +197,7 @@
:rows="3" :rows="3"
resize="none" resize="none"
placeholder="请输入意见" placeholder="请输入意见"
v-model="commentText"> v-model="commentText6">
</el-input> </el-input>
</div> </div>
</el-collapse-item> </el-collapse-item>
@@ -310,6 +310,7 @@
name: "bzjdStep6", name: "bzjdStep6",
data() { data() {
return { return {
commentText6: '',
itemsNum: '', itemsNum: '',
similarityDegree: '', similarityDegree: '',
BDmodel: false, BDmodel: false,
@@ -425,7 +426,7 @@
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.gcApplyFlag = 1 json.gcApplyFlag = 1
json.commentText = this.commentText json.commentText = this.commentText6
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -439,11 +440,11 @@
}) })
}, },
handleSubmitNo () { handleSubmitNo () {
if (this.commentText) { if (this.commentText6) {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.gcApplyFlag = 2 json.gcApplyFlag = 2
json.commentText = this.commentText json.commentText = this.commentText6
this.$http.post('lawss/activiti/completeTask', { this.$http.post('lawss/activiti/completeTask', {
json: JSON.stringify(json), json: JSON.stringify(json),
taskId: this.taskIds, taskId: this.taskIds,
@@ -468,7 +469,7 @@
let data = JSON.parse(res.mesg) let data = JSON.parse(res.mesg)
this.form.itemsNum = data.itemsNum || data.form.itemsNum this.form.itemsNum = data.itemsNum || data.form.itemsNum
this.form.itemsName = data.itemsName || data.form.itemsName this.form.itemsName = data.itemsName || data.form.itemsName
this.commentText = data.commentText this.commentText6 = data.commentText6
if (data.form) { if (data.form) {
this.form.itemsName1 = data.form.itemsName1 || '' this.form.itemsName1 = data.form.itemsName1 || ''
this.form.itemsNum1 = data.form.itemsNum1 || '' this.form.itemsNum1 = data.form.itemsNum1 || ''