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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yanyizhou
2021-12-14 09:57:08 +08:00
parent 673a762afa e7bd4e5b3c
commit 0106d2dfb5
8 changed files with 1028 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue
+164 -12
View File
@@ -56,6 +56,28 @@
</div>
</div>
</el-form-item>
<el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.modelNameList"
clearable
></el-input>
<div v-if="form.modelList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.modelList" :key="index" @click="fileUpload" style="margin-right: 5px; padding-left: 10px;">
{{ item.name }}
</div>
</div>
<div v-else class="addButton" style="padding-left: 10px">
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="small">
点击上传
</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -97,12 +119,12 @@
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>责任领导</h4>
<h4>责任部门对接人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任领导"
placeholder="选择责任部门对接人"
@click.native="choiceZRRS">
</el-input>
</div>
@@ -253,7 +275,7 @@
</div>
</el-drawer>
<Role-tree
is-title="选择责任领导"
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -297,6 +319,26 @@
</div>
</div>
</el-drawer>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传附件">
<el-upload
multiple
class="upload-demo"
drag
:action="fileUrl"
ref="importfile"
name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:on-remove="importFileRemove"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
</el-dialog>
</div>
</template>
@@ -311,6 +353,9 @@ export default {
name: "bzzqyjStep1-1",
data() {
return {
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
OCRoptions: [],
addFjList: [],
fzShow: false,
fzlistModel: false,
@@ -330,7 +375,11 @@ export default {
standType: '',
standId: '',
fjList: [],
fjListId: ''
fjListId: '',
fjListId: '',
textType: '',
modelList: [],
modelNameList: ''
},
formRules: {
cid: [
@@ -401,6 +450,11 @@ export default {
ProcessTitle
},
mounted() {
this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
_this: this
}, res => {
this.OCRoptions = res.data
})
this.getData()
this.sarStandCompareHis()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -415,6 +469,78 @@ export default {
}
},
methods: {
beginImportFile (file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
// eslint-disable-next-line no-unreachable
if (file.size / 1024 / 1024 <= 200) {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
return false
}
return true
},
importFileRemove (file, fileList) {
let list = ''
this.form.modelList = []
fileList.forEach(item => {
this.form.modelList.push(item)
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.modelNameList = list
},
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
this.form.modelList.push(response.data)
let list = ''
this.form.modelList.forEach(item => {
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.modelNameList = list
this.$message({
showClose: true,
message: response.message,
type: 'success'
})
} else {
this.$message.error('程序异常，上传失败')
}
},
fileUpload () {
this.fileMadel = true
},
setWBType(type) {
let text = ''
for (let a = 0; a < this.OCRoptions.length; a++) {
if (this.OCRoptions[a].attrField === type) {
text = this.OCRoptions[a].attrName
}
}
return text
},
updataFj(item) {
let id
let type = item.fileName.split('.')
@@ -426,15 +552,36 @@ export default {
window.open('/static/pdf/phone/viewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
},
addfjList() {
this.$http.get('lawss/sarStandFile/queryFileInfo', {
this.$http.get('lawss/sarStandFile/queryFileInfoNew', {
type: '0',
standId: this.form.standId
}, {}, res => {
this.fjList = res.data
}, {
_this: this
}, res => {
this.OCRLoading = false
if (res.ok) {
if (res.data.length > 0) {
this.fjList = res.data
this.fzlistModel = true
} else {
this.$message.warning('当前标准没有' + text + '文件')
this.fjList = []
}
}
})
this.fzlistModel = true
// this.$http.get('lawss/sarStandFile/queryFileInfo', {
// standId: this.form.standId
// }, {}, res => {
// this.fjList = res.data
// this.fzlistModel = true
// })
},
handleSelection2(data) {
this.addFjList = data
if (data.length > 1) {
this.$message.warning('最多选择1条附件')
} else {
this.addFjList = data
}
},
closeDrawer2() {
this.fzlistModel = false
@@ -443,11 +590,16 @@ export default {
enterDrawer2() {
this.fzlistModel = false
this.form.fjList = this.addFjList
let idList
this.form.textType = this.setWBType(this.addFjList[0].standFileClassify)
this.form.textValue = this.addFjList[0].standFileClassify
let idList = []
let nameList = []
this.addFjList.forEach(item => {
idList += item.id + ','
idList.push(item.id)
nameList.push(item.fileName)
})
this.form.fjListId = idList
this.form.fjListName = nameList.join(',')
this.form.fjListId = idList.join(',')
},
// 点击查看
handlePreview(item) {
src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue
+168 -10
View File
@@ -56,6 +56,34 @@
</div>
</div>
</el-form-item>
<!-- <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">-->
<!-- <el-input-->
<!-- disabled-->
<!-- v-model="form.textType"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
<el-input
disabled
style="display: none;"
v-model="form.modelNameList"
clearable
></el-input>
<div v-if="form.modelList.length > 0" class="fileClass" style="display: flex;">
<div v-for="(item, index) in form.modelList" :key="index" @click="fileUpload" style="margin-right: 5px; padding-left: 10px;">
{{ item.name }}
</div>
</div>
<div v-else class="addButton" style="padding-left: 10px">
<el-button
type="primary"
class="common-button-primary"
@click="fileUpload"
size="small">
点击上传
</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -97,12 +125,12 @@
<el-timeline-item timestamp="指派责任人" placement="top" :color="roleForm.dockUserList ? '#66b1ff' : ''">
<el-card>
<el-form-item prop="dockUserList" style="margin-bottom: 0">
<h4>责任领导</h4>
<h4>责任部门对接人</h4>
<div style="margin-top: 10px;width: 300px;">
<el-input v-model="roleForm.dockUserList" style="display: none;"/>
<el-input
v-model="roleForm.dockUserListName"
placeholder="选择责任领导"
placeholder="选择责任部门对接人"
@click.native="choiceZRRS">
</el-input>
</div>
@@ -254,7 +282,7 @@
</div>
</el-drawer>
<Role-tree
is-title="选择责任领导"
is-title="选择责任部门对接人"
:is-visible.sync="modalshowflag2"
@checkedRole="checkedRole2"
:nodeList="nodeList2"
@@ -286,7 +314,15 @@
@selection-change="handleSelection2"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="附件名" align="center" prop="fileOldName"></el-table-column>
<el-table-column label="附件名" align="center" prop="fileName"></el-table-column>
<el-table-column
prop="standFileClassify"
label="文本状态"
align="center">
<template slot-scope="scope">
<div>{{ setWBType(scope.row.standFileClassify) }}</div>
</template>
</el-table-column>
</el-table>
</div>
</div>
@@ -298,6 +334,26 @@
</div>
</div>
</el-drawer>
<el-dialog width='400px' :visible.sync="fileMadel" title="上传附件">
<el-upload
multiple
class="upload-demo"
drag
:action="fileUrl"
ref="importfile"
name="file"
accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:on-remove="importFileRemove"
:show-file-list="true"
>
<div style="padding: 20px 0">
<i class="el-icon-upload" style="color: #3399ff"></i>
<p>点击或拖拽上传文件</p>
</div>
</el-upload>
</el-dialog>
</div>
</template>
@@ -312,6 +368,9 @@ export default {
name: "bzzqyjStep1",
data() {
return {
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
OCRoptions: [],
addFjList: [],
fzShow: false,
fzlistModel: false,
@@ -332,7 +391,11 @@ export default {
standId: '',
fjList: [],
fjListName: '',
fjListId: ''
fjListId: '',
textValue: '',
textType: '',
modelList: [],
modelNameList: ''
},
formRules: {
cid: [
@@ -401,6 +464,11 @@ export default {
ProcessTitle
},
mounted() {
this.$http.get('lawss/sarStandAttrDetails/getListData', '', {
_this: this
}, res => {
this.OCRoptions = res.data
})
this.sarStandCompareHis()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
@@ -414,6 +482,78 @@ export default {
}
},
methods: {
beginImportFile (file) {
var filename = file.name
var index1 = filename.lastIndexOf('.')
var index2 = filename.length
var fileSuffix = filename.substring(index1, index2)
// const fileSuffix = file.name.split('.')[1] // 后缀名
// 判断上传文件格式
if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
return true
} else {
this.$message.error('文件' + file.name + '格式不正确，请上传PPT,DOCX,XLS文件')
return false
}
// 判断文件上传大小
// eslint-disable-next-line no-unreachable
if (file.size / 1024 / 1024 <= 200) {
return true
} else {
this.$message.error('文件' + file.name + '大小不超过200M')
return false
}
return true
},
importFileRemove (file, fileList) {
let list = ''
this.form.modelList = []
fileList.forEach(item => {
this.form.modelList.push(item)
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.modelNameList = list
},
// 导入标准数据成功后执行
importFileSuccess (response, file) {
if (response.ok) {
this.form.modelList.push(response.data)
let list = ''
this.form.modelList.forEach(item => {
if (list.length > 0) {
list += ','
list += item.name
} else {
list+= item.name
}
})
this.form.modelNameList = list
this.$message({
showClose: true,
message: response.message,
type: 'success'
})
} else {
this.$message.error('程序异常，上传失败')
}
},
fileUpload () {
this.fileMadel = true
},
setWBType(type) {
let text = ''
for (let a = 0; a < this.OCRoptions.length; a++) {
if (this.OCRoptions[a].attrField === type) {
text = this.OCRoptions[a].attrName
}
}
return text
},
updataFj(item) {
let id
let type = item.fileName.split('.')
@@ -427,14 +567,30 @@ export default {
addfjList() {
this.$http.get('lawss/sarStandFile/queryFileInfo', {
standId: this.form.standId
}, {}, res => {
this.fjList = res.data
}, {
_this: this
}, res => {
this.OCRLoading = false
if (res.ok) {
if (res.data.length > 0) {
this.fjList = res.data
this.fzlistModel = true
} else {
this.$message.warning('当前标准没有文件')
this.fjList = []
}
}
})
this.fzlistModel = true
// this.$http.get('lawss/sarStandFile/queryFileInfo', {
// standId: this.form.standId
// }, {}, res => {
// this.fjList = res.data
// this.fzlistModel = true
// })
},
handleSelection2(data) {
if (data.length > 5) {
this.$message.warning('最多选择5条附件')
if (data.length > 1) {
this.$message.warning('最多选择1条附件')
} else {
this.addFjList = data
}
@@ -446,6 +602,8 @@ export default {
enterDrawer2() {
this.fzlistModel = false
this.form.fjList = this.addFjList
this.form.textType = this.setWBType(this.addFjList[0].standFileClassify)
this.form.textValue = this.addFjList[0].standFileClassify
let idList = []
let nameList = []
this.addFjList.forEach(item => {
src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+20 -4
View File
@@ -46,7 +46,17 @@
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
<div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
</div>
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
<el-form-item label="责任人" prop="responUserList" class="add-form-item form-item-disabled">
@@ -192,7 +202,10 @@ export default {
fjList: [],
fjListId: '',
responUserList: "",
responUserListName: ""
responUserListName: "",
textType: '',
modelList: [],
modelNameList: '',
},
formRules: {
responUserList: [
@@ -339,11 +352,14 @@ export default {
this.form.endTime = data.endTime
this.form.cname = data.cname
this.form.fjList = data.fjList
this.form.fjListId = data.fjListId
// this.form.fjListId = data.fjListId
this.form.textType = data.textType
this.form.modelList = data.modelList
this.form.modelNameList = data.modelNameList
if (data.fjListId === '') {
this.form.fjListId = ''
} else {
this.form.fjListId = data.form.fjListId || data.fjListId
this.form.fjListId = data.fjListId || data.form.fjListId
}
this.json = data
}).catch(e => {
src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+609 -455
View File
File diff suppressed because it is too large Load Diff
src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+39 -1
View File
@@ -46,12 +46,22 @@
style="display: none;"
></el-input>
<div style="display: flex;">
<div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
<div class="fileClass" @click="updataFj(item)" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
{{ item.fileName }}
<el-button type="primary" class="common-button-primary" size="mini" @click="downloadFile(item.attId)">下载</el-button>
</div>
</div>
</el-form-item>
<el-form-item label="其他附件" prop="model" class="add-form-item form-item-disabled">
<div v-if="form.modelList.length > 0" style="display: flex;">
<div v-for="(item, index) in form.modelList" class="fileClass" :key="index" style="margin-right: 5px;" @click="updataFj(item)">
{{ item.name }}
</div>
</div>
<div v-else>
- -
</div>
</el-form-item>
</el-col>
</el-row>
</div>
@@ -96,6 +106,9 @@
prop="oldText"
align="center"
label="修改前">
<template slot-scope="scope">
<el-button size="mini" type="primary" :disabled="scope.row.chapterNumber.length === 0" @click="itermsConditionsOpen(scope.row.oldText)" class="common-button-primary">查看修改前内容</el-button>
</template>
</el-table-column>
<el-table-column
prop="newText"
@@ -213,6 +226,15 @@
:is-visible.sync="drawerModal"
@checkedRole="checkedRole"
></Role-tree>
<el-dialog
title="查看修改前内容"
:visible.sync="itermsConditionsFlag"
size="800px">
<div style="height: 500px;overflow: auto;" v-html="itermsConditionsTitle"></div>
<div slot="footer">
<el-button class="common-button-default" size="mini" icon="el-icon-close" @click="itermsConditionsClose">关闭</el-button>
</div>
</el-dialog>
</div>
</template>
@@ -227,6 +249,8 @@ export default {
name: "bzzqyjStep4",
data() {
return {
itermsConditionsFlag: false,
itermsConditionsTitle: '',
drawerModal: false,
histortData: [],
data: [],
@@ -254,6 +278,9 @@ export default {
cname: '', // 名称
fjList: [],
fjListId: '',
textType: '',
modelList: [],
modelNameList: '',
},
formRules: {
responUserList: [
@@ -269,6 +296,13 @@ export default {
ProcessTitle
},
methods: {
itermsConditionsClose () {
this.itermsConditionsFlag = false
},
itermsConditionsOpen (row) {
this.itermsConditionsFlag = true
this.itermsConditionsTitle = row
},
downloadFile (attId) {
window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
},
@@ -381,7 +415,11 @@ export default {
this.form.cid = data.cid || data.form.cid
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.form.textType = data.textType
this.form.modelList = data.modelList
this.form.modelNameList = data.modelNameList
this.json = data
console.log(data);
this.data = data.info || data.data
}).catch(e => {
})
src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+3 -3
View File
@@ -581,7 +581,7 @@ export default {
}
break;
case '3':
if (row.taskInfo === '责任对接人选择责任人') {
if (row.taskInfo === '责任部门对接人选择责任人') {
this.$router.push({
name: 'bzzqyjStep2',
query: {
@@ -592,7 +592,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任人填写征求意见'){
} else if (row.taskInfo === '责任人反馈'){
this.$router.push({
name: 'bzzqyjStep3',
query: {
@@ -603,7 +603,7 @@ export default {
prcType: row.prcType
}
})
} else if (row.taskInfo === '责任对接人审批') {
} else if (row.taskInfo === '责任部门对接人汇总并选择审批人') {
this.$router.push({
name: 'bzzqyjStep4',
query: {
src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+1 -1
View File
@@ -2809,7 +2809,7 @@ export default {
this.OCRData = res.data
} else {
this.$message.warning('当前标准没有' + text + '文件')
this.this.OCRData = []
this.OCRData = []
}
}
})
src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+24 -23
View File
@@ -3500,27 +3500,23 @@ export default {
this.selectConfiguraStand()
}
},
// 分页点击后方法
pageChange (page) {
if (this.tableFlag !== '') {
this.tableFlag.page = page
this.sarConfigStandSearch.page = this.tableFlag.page
} else {
this.sarBussionessSearch.page = page
this.sarConfigStandSearch.page = this.sarBussionessSearch.page
}
// this.selectConfiguraStand()
this.getBussionStandTable(this.tableFlag)
},
// 分页每页显示数改变后方法
pageSizeChange (pageSize) {
this.sarBussionessSearch.pageSize = pageSize
this.getBussionStandTable(this.tableFlag)
// this.sarConfigStandSearch.pageSize = this.$store.getters.userInfo.configContent
this.sarConfigStandSearch.pageSize = this.sarBussionessSearch.pageSize
this.selectConfiguraStand()
// 此处需要调用接口，修改个人配置
},
// 分页点击后方法
pageChange(page) {
if (this.tableFlag !== '') {
this.tableFlag.page = page
} else {
this.sarBussionessSearch.page = page
}
this.sarBussionessSearch.page = page
this.getBussionStandTable(this.sarBussionessSearch)
},
// 分页每页显示数改变后方法
pageSizeChange(pageSize) {
this.sarBussionessSearch.pageSize = this.$store.getters.userInfo.configContent
this.getBussionStandTable(this.tableFlag)
this.selectConfiguraStand()
// 此处需要调用接口，修改个人配置
},
// 查询处于游离态的标准
selectConfiguraStand () {
// this.sarConfigStandSearch.menuId = 'others'
@@ -3540,7 +3536,7 @@ export default {
item.pageSize = this.$store.getters.userInfo.configContent
}
this.sarBussionessSearch.pageSize = this.$store.getters.userInfo.configContent
const data = item || this.lawsStandInfoSearch
const data = item || this.sarBussionessSearch
const formData = {...data}
if (!item) {
formData.menuId = this.sarBussionessSearch.menuId
@@ -3606,7 +3602,10 @@ export default {
}
res.data.list[i].isSubmit = false
}
this.standinfoList = []
this.standinfoList = res.data.list
console.log(this.standinfoList)
console.log(res.data.list)
this.total = res.data.count
if ((this.standinfoList.length === 0 || this.standinfoList === []) && this.sarBussionessSearch.page !== 1) {
this.pageChange(1)
@@ -4030,7 +4029,9 @@ export default {
}
res.data.list[i].isSubmit = false
}
this.stahndinfoList = res.data.list
this.stahndinfoList = []
this.stahndinfoList = res.data.list
console.log(this.stahndinfoList)
this.total = res.data.count
if ((this.stahndinfoList.length === 0 || this.stahndinfoList === []) && this.sarBussionessSearch.page !== 1) {
this.pageChange(1)