diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 7cb9d901e..c82eb09dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -56,6 +56,28 @@ + + +
+
+ {{ item.name }} +
+
+
+ + 点击上传 + +
+
@@ -97,12 +119,12 @@ -

责任领导

+

责任部门对接人

@@ -253,7 +275,7 @@ + + +
+ +

点击或拖拽上传文件

+
+
+
@@ -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) { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index d78716bf4..adb01fa52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -56,6 +56,34 @@
+ + + + + + + + +
+
+ {{ item.name }} +
+
+
+ + 点击上传 + +
+
@@ -97,12 +125,12 @@ -

责任领导

+

责任部门对接人

@@ -254,7 +282,7 @@ - + + + + @@ -298,6 +334,26 @@ + + +
+ +

点击或拖拽上传文件

+
+
+
@@ -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 => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue index a6c61d6db..3a573f99c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue @@ -46,7 +46,17 @@ style="display: none;" >
-
{{ item.fileName }}
+
{{ item.fileName }}
+
+
+ +
+
+ {{ item.name }} +
+
+
+ - -
@@ -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 => { diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 4cfba66a0..f2baded1b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -1,86 +1,96 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 56a4700cd..1a73bdd22 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -46,12 +46,22 @@ style="display: none;" >
-
+
{{ item.fileName }} 下载
+ +
+
+ {{ item.name }} +
+
+
+ - - +
+
@@ -96,6 +106,9 @@ prop="oldText" align="center" label="修改前"> + + +
+
+ 关闭 +
+
@@ -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 => { }) diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index e27239ae9..a1eb3947f 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -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: { diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 82cac54c8..dbd4ae948 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -2809,7 +2809,7 @@ export default { this.OCRData = res.data } else { this.$message.warning('当前标准没有' + text + '文件') - this.this.OCRData = [] + this.OCRData = [] } } }) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index a28fb7f1d..817edbb80 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -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)