Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
super_liu
@@ -96,17 +96,40 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="chapterName"
|
||||
label="章节名称">
|
||||
label="章节名称"
|
||||
width="170px">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commentText"
|
||||
align="center"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.commentText"></el-input>
|
||||
</template>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改前">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改后">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
<template slot-scope="scope">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</div>
|
||||
@@ -288,6 +311,9 @@
|
||||
chapterNumber: '',
|
||||
chapterName: '',
|
||||
commentText: '',
|
||||
oldText: '',
|
||||
newText: '',
|
||||
reason: '',
|
||||
id: id,
|
||||
responUserName: this.$store.getters.userInfo.userName,
|
||||
responUser: this.$store.getters.userInfo.userId,
|
||||
@@ -305,7 +331,7 @@
|
||||
} else {
|
||||
var a = 0
|
||||
var b = 0
|
||||
var c = 0
|
||||
// var c = 0
|
||||
for (let s1 = 0; s1 < this.data.length; s1++) {
|
||||
if (!this.data[s1].chapterNumber) {
|
||||
a++
|
||||
@@ -313,17 +339,19 @@
|
||||
if (!this.data[s1].chapterName) {
|
||||
b++
|
||||
}
|
||||
if (!this.data[s1].commentText) {
|
||||
c++
|
||||
}
|
||||
// if (!this.data[s1].commentText) {
|
||||
// c++
|
||||
// }
|
||||
}
|
||||
if (a > 0) {
|
||||
this.$message.warning('请输入章节编号')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请输入章节名称')
|
||||
} else if (c > 0) {
|
||||
this.$message.warning('请输入意见内容')
|
||||
} else {
|
||||
}
|
||||
// else if (c > 0) {
|
||||
// this.$message.warning('请输入意见内容')
|
||||
// }
|
||||
else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.commentText = this.commentText
|
||||
|
||||
@@ -80,8 +80,24 @@
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="commentText"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<el-table-column
|
||||
prop="oldText"
|
||||
align="center"
|
||||
label="修改前">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newText"
|
||||
align="center"
|
||||
label="修改后">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="reason"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
|
||||
@@ -81,15 +81,47 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commentText"
|
||||
align="center"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.commentText"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.commentText }}
|
||||
</div>
|
||||
</template>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改前">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.oldText }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改后">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.newText"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.newText }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="name"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
<template slot-scope="scope">
|
||||
<div v-if="scope.row.state == '2'">
|
||||
<el-input style="margin: 10px 0;" v-model="scope.row.reason"></el-input>
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ scope.row.reason }}
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
@@ -273,7 +305,7 @@
|
||||
} else {
|
||||
var a = 0
|
||||
var b = 0
|
||||
var c = 0
|
||||
// var c = 0
|
||||
for (let s1 = 0; s1 < this.data.length; s1++) {
|
||||
if (!this.data[s1].chapterNumber) {
|
||||
a++
|
||||
@@ -281,17 +313,19 @@
|
||||
if (!this.data[s1].chapterName) {
|
||||
b++
|
||||
}
|
||||
if (!this.data[s1].commentText) {
|
||||
c++
|
||||
}
|
||||
// if (!this.data[s1].commentText) {
|
||||
// c++
|
||||
// }
|
||||
}
|
||||
if (a > 0) {
|
||||
this.$message.warning('请输入章节编号')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请输入章节名称')
|
||||
} else if (c > 0) {
|
||||
this.$message.warning('请输入意见内容')
|
||||
} else {
|
||||
}
|
||||
// else if (c > 0) {
|
||||
// this.$message.warning('请输入意见内容')
|
||||
// }
|
||||
else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.oldinfo = this.oldData
|
||||
@@ -320,6 +354,7 @@
|
||||
this.form.cid = data.cid
|
||||
this.form.endTime = data.endTime
|
||||
this.form.cname = data.cname
|
||||
console.log(data);
|
||||
this.oldData = JSON.parse(JSON.stringify(data.summaryList))
|
||||
data.summaryList.forEach( item => {
|
||||
if (item.state) {
|
||||
|
||||
@@ -91,7 +91,23 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commentText"
|
||||
align="center"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<el-table-column
|
||||
prop="oldText"
|
||||
align="center"
|
||||
label="修改前">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newText"
|
||||
align="center"
|
||||
label="修改后">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="reason"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
@@ -294,43 +310,21 @@
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning('请输入征求意见搞')
|
||||
} else {
|
||||
var a = 0
|
||||
var b = 0
|
||||
var c = 0
|
||||
for (let s1 = 0; s1 < this.data.length; s1++) {
|
||||
if (!this.data[s1].chapterNumber) {
|
||||
a++
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
if (!this.data[s1].chapterName) {
|
||||
b++
|
||||
}
|
||||
if (!this.data[s1].commentText) {
|
||||
c++
|
||||
}
|
||||
}
|
||||
if (a > 0) {
|
||||
this.$message.warning('请输入章节编号')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请输入章节名称')
|
||||
} else if (c > 0) {
|
||||
this.$message.warning('请输入意见内容')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
},
|
||||
handleSubmitNo() {
|
||||
|
||||
@@ -90,8 +90,24 @@
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="commentText"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<el-table-column
|
||||
prop="oldText"
|
||||
align="center"
|
||||
label="修改前">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newText"
|
||||
align="center"
|
||||
label="修改后">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="reason"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
@@ -294,43 +310,21 @@
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning('请输入征求意见搞')
|
||||
} else {
|
||||
var a = 0
|
||||
var b = 0
|
||||
var c = 0
|
||||
for (let s1 = 0; s1 < this.data.length; s1++) {
|
||||
if (!this.data[s1].chapterNumber) {
|
||||
a++
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
if (!this.data[s1].chapterName) {
|
||||
b++
|
||||
}
|
||||
if (!this.data[s1].commentText) {
|
||||
c++
|
||||
}
|
||||
}
|
||||
if (a > 0) {
|
||||
this.$message.warning('请输入章节编号')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请输入章节名称')
|
||||
} else if (c > 0) {
|
||||
this.$message.warning('请输入意见内容')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
},
|
||||
handleSubmitNo() {
|
||||
|
||||
@@ -91,7 +91,23 @@
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="commentText"
|
||||
align="center"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<el-table-column
|
||||
prop="oldText"
|
||||
align="center"
|
||||
label="修改前">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newText"
|
||||
align="center"
|
||||
label="修改后">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="reason"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
@@ -294,43 +310,21 @@
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning('请输入征求意见搞')
|
||||
} else {
|
||||
var a = 0
|
||||
var b = 0
|
||||
var c = 0
|
||||
for (let s1 = 0; s1 < this.data.length; s1++) {
|
||||
if (!this.data[s1].chapterNumber) {
|
||||
a++
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
if (!this.data[s1].chapterName) {
|
||||
b++
|
||||
}
|
||||
if (!this.data[s1].commentText) {
|
||||
c++
|
||||
}
|
||||
}
|
||||
if (a > 0) {
|
||||
this.$message.warning('请输入章节编号')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请输入章节名称')
|
||||
} else if (c > 0) {
|
||||
this.$message.warning('请输入意见内容')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
},
|
||||
handleSubmitNo() {
|
||||
|
||||
@@ -90,8 +90,24 @@
|
||||
label="章节名称">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
align="center"
|
||||
prop="commentText"
|
||||
label="修改意见内容（包括理由或依据）">
|
||||
<el-table-column
|
||||
prop="oldText"
|
||||
align="center"
|
||||
label="修改前">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="newText"
|
||||
align="center"
|
||||
label="修改后">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="reason"
|
||||
align="center"
|
||||
label="修改理由">
|
||||
</el-table-column>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="department"
|
||||
@@ -294,43 +310,21 @@
|
||||
if (this.data.length < 1) {
|
||||
this.$message.warning('请输入征求意见搞')
|
||||
} else {
|
||||
var a = 0
|
||||
var b = 0
|
||||
var c = 0
|
||||
for (let s1 = 0; s1 < this.data.length; s1++) {
|
||||
if (!this.data[s1].chapterNumber) {
|
||||
a++
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
if (!this.data[s1].chapterName) {
|
||||
b++
|
||||
}
|
||||
if (!this.data[s1].commentText) {
|
||||
c++
|
||||
}
|
||||
}
|
||||
if (a > 0) {
|
||||
this.$message.warning('请输入章节编号')
|
||||
} else if (b > 0) {
|
||||
this.$message.warning('请输入章节名称')
|
||||
} else if (c > 0) {
|
||||
this.$message.warning('请输入意见内容')
|
||||
} else {
|
||||
this.isSubmit = true
|
||||
var json = this.json
|
||||
json.actionFlag = 0
|
||||
json.commentText = this.commentText
|
||||
this.$http.post('lawss/activiti/completeTask', {
|
||||
json: JSON.stringify(json),
|
||||
taskId: this.taskIds,
|
||||
userId: this.$store.getters.userInfo.userId
|
||||
}, {}, res => {
|
||||
if (res.success) {
|
||||
this.$message.success('提交成功')
|
||||
this.$router.push('/processCenter')
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
this.isSubmit = false
|
||||
})
|
||||
}
|
||||
},
|
||||
handleSubmitNo() {
|
||||
|
||||
Reference in New Issue
Block a user