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

Merge branch 'develop' into 'test'

Browse Source 
Develop

See merge request !92
This commit is contained in:
王夏晖
2021-08-19 01:12:03 +00:00
parent eb58024698 a573125a5e
commit 6b35f041bc
11 changed files with 275 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+39 -11
View File
@@ -96,17 +96,40 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="chapterName" prop="chapterName"
label="章节名称"> label="章节名称"
width="170px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input> <el-input style="margin: 10px 0;" v-model="scope.row.chapterName"></el-input>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="commentText" prop="commentText"
align="center"
label="修改意见内容（包括理由或依据）"> label="修改意见内容（包括理由或依据）">
<template slot-scope="scope"> <el-table-column
<el-input style="margin: 10px 0;" v-model="scope.row.commentText"></el-input> prop="name"
</template> 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-column>
</el-table> </el-table>
</div> </div>
@@ -288,6 +311,9 @@
chapterNumber: '', chapterNumber: '',
chapterName: '', chapterName: '',
commentText: '', commentText: '',
oldText: '',
newText: '',
reason: '',
id: id, id: id,
responUserName: this.$store.getters.userInfo.userName, responUserName: this.$store.getters.userInfo.userName,
responUser: this.$store.getters.userInfo.userId, responUser: this.$store.getters.userInfo.userId,
@@ -305,7 +331,7 @@
} else { } else {
var a = 0 var a = 0
var b = 0 var b = 0
var c = 0 // var c = 0
for (let s1 = 0; s1 < this.data.length; s1++) { for (let s1 = 0; s1 < this.data.length; s1++) {
if (!this.data[s1].chapterNumber) { if (!this.data[s1].chapterNumber) {
a++ a++
@@ -313,17 +339,19 @@
if (!this.data[s1].chapterName) { if (!this.data[s1].chapterName) {
b++ b++
} }
if (!this.data[s1].commentText) { // if (!this.data[s1].commentText) {
c++ // c++
} // }
} }
if (a > 0) { if (a > 0) {
this.$message.warning('请输入章节编号') this.$message.warning('请输入章节编号')
} else if (b > 0) { } else if (b > 0) {
this.$message.warning('请输入章节名称') this.$message.warning('请输入章节名称')
} else if (c > 0) { }
this.$message.warning('请输入意见内容') // else if (c > 0) {
} else { // this.$message.warning('请输入意见内容')
// }
else {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.commentText = this.commentText json.commentText = this.commentText
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+16
View File
@@ -80,8 +80,24 @@
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center"
prop="commentText" prop="commentText"
label="修改意见内容（包括理由或依据）"> 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>
<el-table-column <el-table-column
prop="department" prop="department"
src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+50 -15
View File
@@ -81,15 +81,47 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="commentText" prop="commentText"
align="center"
label="修改意见内容（包括理由或依据）"> label="修改意见内容（包括理由或依据）">
<template slot-scope="scope"> <el-table-column
<div v-if="scope.row.state == '2'"> prop="name"
<el-input style="margin: 10px 0;" v-model="scope.row.commentText"></el-input> align="center"
</div> label="修改前">
<div v-else> <template slot-scope="scope">
{{ scope.row.commentText }} <div v-if="scope.row.state == '2'">
</div> <el-input style="margin: 10px 0;" v-model="scope.row.oldText"></el-input>
</template> </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>
<el-table-column <el-table-column
prop="department" prop="department"
@@ -273,7 +305,7 @@
} else { } else {
var a = 0 var a = 0
var b = 0 var b = 0
var c = 0 // var c = 0
for (let s1 = 0; s1 < this.data.length; s1++) { for (let s1 = 0; s1 < this.data.length; s1++) {
if (!this.data[s1].chapterNumber) { if (!this.data[s1].chapterNumber) {
a++ a++
@@ -281,17 +313,19 @@
if (!this.data[s1].chapterName) { if (!this.data[s1].chapterName) {
b++ b++
} }
if (!this.data[s1].commentText) { // if (!this.data[s1].commentText) {
c++ // c++
} // }
} }
if (a > 0) { if (a > 0) {
this.$message.warning('请输入章节编号') this.$message.warning('请输入章节编号')
} else if (b > 0) { } else if (b > 0) {
this.$message.warning('请输入章节名称') this.$message.warning('请输入章节名称')
} else if (c > 0) { }
this.$message.warning('请输入意见内容') // else if (c > 0) {
} else { // this.$message.warning('请输入意见内容')
// }
else {
this.isSubmit = true this.isSubmit = true
var json = this.json var json = this.json
json.oldinfo = this.oldData json.oldinfo = this.oldData
@@ -320,6 +354,7 @@
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
console.log(data);
this.oldData = JSON.parse(JSON.stringify(data.summaryList)) this.oldData = JSON.parse(JSON.stringify(data.summaryList))
data.summaryList.forEach( item => { data.summaryList.forEach( item => {
if (item.state) { if (item.state) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+30 -36
View File
@@ -91,7 +91,23 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="commentText" prop="commentText"
align="center"
label="修改意见内容（包括理由或依据）"> 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>
<el-table-column <el-table-column
prop="department" prop="department"
@@ -294,43 +310,21 @@
if (this.data.length < 1) { if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞') this.$message.warning('请输入征求意见搞')
} else { } else {
var a = 0 this.isSubmit = true
var b = 0 var json = this.json
var c = 0 json.actionFlag = 0
for (let s1 = 0; s1 < this.data.length; s1++) { json.commentText = this.commentText
if (!this.data[s1].chapterNumber) { this.$http.post('lawss/activiti/completeTask', {
a++ 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) { this.isSubmit = false
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
})
}
} }
}, },
handleSubmitNo() { handleSubmitNo() {
src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+30 -36
View File
@@ -90,8 +90,24 @@
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center"
prop="commentText" prop="commentText"
label="修改意见内容（包括理由或依据）"> 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>
<el-table-column <el-table-column
prop="department" prop="department"
@@ -294,43 +310,21 @@
if (this.data.length < 1) { if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞') this.$message.warning('请输入征求意见搞')
} else { } else {
var a = 0 this.isSubmit = true
var b = 0 var json = this.json
var c = 0 json.actionFlag = 0
for (let s1 = 0; s1 < this.data.length; s1++) { json.commentText = this.commentText
if (!this.data[s1].chapterNumber) { this.$http.post('lawss/activiti/completeTask', {
a++ 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) { this.isSubmit = false
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
})
}
} }
}, },
handleSubmitNo() { handleSubmitNo() {
src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+30 -36
View File
@@ -91,7 +91,23 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="commentText" prop="commentText"
align="center"
label="修改意见内容（包括理由或依据）"> 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>
<el-table-column <el-table-column
prop="department" prop="department"
@@ -294,43 +310,21 @@
if (this.data.length < 1) { if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞') this.$message.warning('请输入征求意见搞')
} else { } else {
var a = 0 this.isSubmit = true
var b = 0 var json = this.json
var c = 0 json.actionFlag = 0
for (let s1 = 0; s1 < this.data.length; s1++) { json.commentText = this.commentText
if (!this.data[s1].chapterNumber) { this.$http.post('lawss/activiti/completeTask', {
a++ 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) { this.isSubmit = false
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
})
}
} }
}, },
handleSubmitNo() { handleSubmitNo() {
src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+30 -36
View File
@@ -90,8 +90,24 @@
label="章节名称"> label="章节名称">
</el-table-column> </el-table-column>
<el-table-column <el-table-column
align="center"
prop="commentText" prop="commentText"
label="修改意见内容（包括理由或依据）"> 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>
<el-table-column <el-table-column
prop="department" prop="department"
@@ -294,43 +310,21 @@
if (this.data.length < 1) { if (this.data.length < 1) {
this.$message.warning('请输入征求意见搞') this.$message.warning('请输入征求意见搞')
} else { } else {
var a = 0 this.isSubmit = true
var b = 0 var json = this.json
var c = 0 json.actionFlag = 0
for (let s1 = 0; s1 < this.data.length; s1++) { json.commentText = this.commentText
if (!this.data[s1].chapterNumber) { this.$http.post('lawss/activiti/completeTask', {
a++ 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) { this.isSubmit = false
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
})
}
} }
}, },
handleSubmitNo() { handleSubmitNo() {
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+33 -5
View File
@@ -1302,11 +1302,39 @@ export default {
}, res => { }, res => {
if (this.sarAccessInfoList.length !== 0) { if (this.sarAccessInfoList.length !== 0) {
if (res.ok) { if (res.ok) {
this.$message.success('新增成功') if (res.data === "数据库为空，添加成功"){
this.isNext = true this.$message.success('新增成功')
this.$router.push({ this.isNext = true
name: 'AccessStandardsAndRegulations' this.$router.push({
}) name: 'AccessStandardsAndRegulations'
})
}
else if (res.data === "其他清单添加成功"){
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
}
else if (res.data === "车型类别清单添加成功"){
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
}else if(res.data === "车型类别清单添加失败"){
this.$message.error('已存在此车型类别清单，新增失败')
}
else if (res.data === "国家/地区清单添加成功"){
this.$message.success('新增成功')
this.isNext = true
this.$router.push({
name: 'AccessStandardsAndRegulations'
})
}else if(res.data === "国家/地区清单添加失败"){
this.$message.error('已存在此国家/地区清单，新增失败')
}
} }
} else { } else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/projectAddEit.vue
+9 -5
View File
@@ -1252,11 +1252,15 @@ export default {
}, res => { }, res => {
if (this.sarAccessInfoList.length !== 0) { if (this.sarAccessInfoList.length !== 0) {
if (res.ok) { if (res.ok) {
this.$message.success('新增成功') if (res.data === "车型类别清单添加成功") {
this.isNext = true this.$message.success('新增成功')
this.$router.push({ this.isNext = true
name: 'AccessStandardsAndRegulations' this.$router.push({
}) name: 'AccessStandardsAndRegulations'
})
}else{
this.$message.error('已存在此车型类别清单，新增失败')
}
} }
}else { }else {
this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)') this.$message.error('请选中需要添加到 清单条目 的(标准号/政策编号)')
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+4 -3
View File
@@ -2983,7 +2983,8 @@ export default {
// 查询二级菜单 // 查询二级菜单
selectMenu() { selectMenu() {
this.$http.get('sarResource/ts-resource/getList', { this.$http.get('sarResource/ts-resource/getList', {
sorDivide: 'INLAND_STAND' sorDivide: 'INLAND_STAND',
userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
this.treeList = res.data this.treeList = res.data
@@ -3207,7 +3208,7 @@ export default {
const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId
window.open(exportURL) window.open(exportURL)
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
this.exportLoading = false this.exportLoading = false
@@ -3238,7 +3239,7 @@ export default {
// this.$message.success('导出信息成功') // this.$message.success('导出信息成功')
// //
window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + window.open(interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) 'exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId)
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
this.exportLoading = false this.exportLoading = false
} }
src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+4 -8
View File
@@ -2691,7 +2691,8 @@ export default {
// 查询二级菜单 // 查询二级菜单
selectMenu () { selectMenu () {
this.$http.get('sarResource/ts-resource/getList', { this.$http.get('sarResource/ts-resource/getList', {
sorDivide: 'FOREIGN_STAND' sorDivide: 'FOREIGN_STAND',
userId: this.$store.getters.userInfo.userId
}, {}, res => { }, {}, res => {
if (res.ok) { if (res.ok) {
this.treeList = res.data this.treeList = res.data
@@ -2841,14 +2842,14 @@ export default {
if (this.saveExportType === 'apart') { if (this.saveExportType === 'apart') {
if (this.selectedList != null && this.selectedList !== '') { if (this.selectedList != null && this.selectedList !== '') {
const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' + const exportURL = interfaceUrl + 'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?' +
'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType 'exportType=' + this.saveExportType + '&exportContent=' + this.selectedList.join(',') + '&exportName=' + this.exportName + '&standType=' + this.standType + '&userId=' + this.$store.getters.userInfo.userId
window.open(exportURL) window.open(exportURL)
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} }
} else if (this.saveExportType === 'all') { } else if (this.saveExportType === 'all') {
let exportEOStr = JSON.stringify(this.SarExportSearchEo) let exportEOStr = JSON.stringify(this.SarExportSearchEo)
window.open(interfaceUrl+'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType) window.open(interfaceUrl+'sarStandardsInfo/sar-standards-info/exportStandardsInfoExcel?exportType=' + this.saveExportType + '&exportContent=' + exportEOStr + '&exportName=' + this.exportName + '&standType=' + this.standType+ '&userId=' + this.$store.getters.userInfo.userId)
this.$message.success('导出信息成功') this.$message.success('导出信息成功')
} }
this.exportModelFlag = false this.exportModelFlag = false
@@ -3302,11 +3303,6 @@ export default {
} }
formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList);
console.log("======")
console.log(formData.advanceSearchVOStr);
this.SarExportSearchEo = formData this.SarExportSearchEo = formData
this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {