-
@@ -342,7 +342,7 @@
:action="fileUrl"
ref="importfile"
name="file"
- accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx"
+ accept=".ZIP, .zip, .docx, .DOCX, .xls, .xlsx, .pdf, .PDF"
:before-upload="beginImportFile"
:on-success="importFileSuccess"
:on-remove="importFileRemove"
@@ -362,12 +362,13 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
-import {saveTaskFirst} from 'api/process'
+import {saveTaskFirst, taskDel} from 'api/process'
export default {
name: "bzzqyjStep1",
data() {
return {
+ bpnId: '',
fileUrl: 'api/att/attFile/upload',
fileMadel: false,
OCRoptions: [],
@@ -489,10 +490,10 @@ export default {
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') {
+ if (fileSuffix === '.ppt' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.PPT' || fileSuffix === '.xls' || fileSuffix === '.xlsx' || fileSuffix === '.pdf' || fileSuffix === '.PDF') {
return true
} else {
- this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS文件')
+ this.$message.error('文件' + file.name + '格式不正确,请上传PPT,DOCX,XLS,PDF文件')
return false
}
// 判断文件上传大小
@@ -557,7 +558,7 @@ export default {
updataFj(item) {
let id
let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
+ if (type[1] === 'pdf' || type[1] === 'PDF') {
id = item.attId
} else {
id = item.oriAttId
@@ -653,7 +654,7 @@ export default {
sarStandCompareHis() {
this.spinShow = true
var formData = this.standCommonlySearch
- this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, {
+ this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1', formData, {
_this: this
}, res => {
this.standInfoList = res.data.list
@@ -792,6 +793,14 @@ export default {
}, {}, res => {
if (res.success) {
this.$message.success('流程发起成功')
+ if (this.bpnId !== '') {
+ let taskId = {
+ id: this.bpnId
+ }
+ taskDel(taskId).then(res=>{
+ return res
+ })
+ }
this.$router.push('/processCenter')
this.isSubmit = false
} else {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
index 3a573f99c..028661cc1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step2.vue
@@ -255,14 +255,7 @@ export default {
})
},
updataFj (item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 5dc8a02c7..e0062beed 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -464,14 +464,7 @@
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
index 8a5edbd2d..6cbadc4ec 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue
@@ -365,14 +365,7 @@
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
index 5caae05e7..7eaad4088 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-2.vue
@@ -357,14 +357,7 @@
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 9ec1b19d8..1468ea86b 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -550,14 +550,7 @@ export default {
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 995ed952d..5e1e6bcca 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -473,14 +473,7 @@
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index d5dd0855d..884d04912 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -364,14 +364,7 @@ export default {
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
@@ -481,7 +474,6 @@ 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.oldData = JSON.parse(JSON.stringify(data.info))
var arr = []
data.info.forEach(item => {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 6e959ee91..3fe206cb5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -361,14 +361,7 @@ export default {
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 31006296c..b3d4a40f9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -361,14 +361,7 @@ export default {
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get('lawss/activiti/get_list_by_instance', {
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 95c0b267d..6055e3d72 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -361,14 +361,7 @@ export default {
})
},
updataFj(item) {
- let id
- let type = item.fileName.split('.')
- if (type[1] === 'pdf') {
- id = item.attId
- } else {
- id = item.oriAttId
- }
- window.open('/static/pdf/phone/bzzqyjViewer.html?file=' + encodeURIComponent('/api/att/attFile/getFileInfo?fileId=' + id))
+ window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
},
getHistoryData() {
this.$http.get("lawss/activiti/get_list_by_instance", {
diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
index dddcfb8de..13a80e735 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
@@ -226,7 +226,7 @@
sortable="custom"
align="center">
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
+
diff --git a/src/pages/processCenter/pages/phone/xmpg/step2.vue b/src/pages/processCenter/pages/phone/xmpg/step2.vue
index 703717f69..2357a6426 100644
--- a/src/pages/processCenter/pages/phone/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/phone/xmpg/step2.vue
@@ -207,7 +207,7 @@
width="130"
align="center">
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
- {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD HH:mm:ss") : "" }}
-
+
-
+
-
+
{{ item.name }}
@@ -416,7 +416,7 @@
align="center">
-
+
{{ item.name }}
@@ -504,7 +504,7 @@
-
+
-
+
{{ item.name }}
@@ -847,10 +847,14 @@
standerArea: '', // 标准化工作领域
mark: '', // 备注
wgNetInfos: [], // 秘书联系方式
+ wgNetInfosDel: '',
wgMeetingInfos: [], // 参会记录
+ wgMeetingInfosDel: '',
wgDepts: [], // 集团参与
- wgStandorpolicyInfos: [], // 标准政策
+ wgDeptsDel: '',
wgPayInfos: [], // 支付信息
+ wgPayInfosDel: '',
+ wgStandorpolicyInfos: [], // 标准政策
},
addFormRules: {
number: [
@@ -1025,8 +1029,22 @@
this.addDrawer2 = false
}, // 关闭添加标准事件
updateFile (item) {
- window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
+ const attId = item.attId
+ if (attId) {
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+ } else {
+ this.$message.warning('文件不存在,下载失败')
+ }
},
+ clickButtonToUpload (file) {
+ const attId = file.attId
+ if (attId) {
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+ } else {
+ this.$message.warning('文件不存在,下载失败')
+ }
+ },
+
checkRole(type, index, row) {
if (row) {
this.nodeList = []
@@ -1235,6 +1253,14 @@
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
+ for (let s = 0; s < this.delNetInfos.length; s++) {
+ if (this.addForm.wgNetInfosDel) {
+ this.addForm.wgNetInfosDel += ','
+ this.addForm.wgNetInfosDel += this.delNetInfos[s].id
+ } else {
+ this.addForm.wgNetInfosDel = this.delNetInfos[s].id
+ }
+ }
for (let a = 0; a < this.addForm.wgNetInfos.length; a++) {
this.delNetInfos.forEach(item => {
if (this.addForm.wgNetInfos[a].joinId === item.joinId) {
@@ -1256,6 +1282,14 @@
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
+ for (let s = 0; s < this.delDepts.length; s++) {
+ if (this.addForm.wgDeptsDel) {
+ this.addForm.wgDeptsDel += ','
+ this.addForm.wgDeptsDel += this.delDepts[s].id
+ } else {
+ this.addForm.wgDeptsDel = this.delDepts[s].id
+ }
+ }
for (let a = 0; a < this.addForm.wgDepts.length; a++) {
this.delDepts.forEach(item => {
if (this.addForm.wgDepts[a].joinId === item.joinId) {
@@ -1277,6 +1311,14 @@
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
+ for (let s = 0; s < this.delPayInfos.length; s++) {
+ if (this.addForm.wgPayInfosDel) {
+ this.addForm.wgPayInfosDel += ','
+ this.addForm.wgPayInfosDel += this.delPayInfos[s].id
+ } else {
+ this.addForm.wgPayInfosDel = this.delPayInfos[s].id
+ }
+ }
for (let a = 0; a < this.addForm.wgPayInfos.length; a++) {
this.delPayInfos.forEach(item => {
if (this.addForm.wgPayInfos[a].joinId === item.joinId) {
@@ -1298,6 +1340,14 @@
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
+ for (let s = 0; s < this.delMeetingInfos.length; s++) {
+ if (this.addForm.wgMeetingInfosDel) {
+ this.addForm.wgMeetingInfosDel += ','
+ this.addForm.wgMeetingInfosDel += this.delMeetingInfos[s].id
+ } else {
+ this.addForm.wgMeetingInfosDel = this.delMeetingInfos[s].id
+ }
+ }
for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) {
this.delMeetingInfos.forEach(item => {
if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) {
diff --git a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
index 243d764c0..966207c0f 100644
--- a/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
+++ b/src/pages/regulatoryRepository/workingGroup/components/workingGroup2/index.vue
@@ -156,7 +156,7 @@
width="150">
-
+
-
+
-
+
@@ -235,7 +235,7 @@
-
+
-
+
-
+
-
+
{{ item.name }}
@@ -416,7 +416,7 @@
align="center">
-
+
{{ item.name }}
@@ -504,7 +504,7 @@
-
+
-
+
{{ item.name }}
@@ -767,10 +767,14 @@
standerArea: '', // 标准化工作领域
mark: '', // 备注
wgNetInfos: [], // 秘书联系方式
+ wgNetInfosDel: '',
wgMeetingInfos: [], // 参会记录
+ wgMeetingInfosDel: '',
wgDepts: [], // 集团参与
- wgStandorpolicyInfos: [], // 标准政策
+ wgDeptsDel: '',
wgPayInfos: [], // 支付信息
+ wgPayInfosDel: '',
+ wgStandorpolicyInfos: [], // 标准政策
},
addFormRules: {
number: [
@@ -902,7 +906,12 @@
this.addDrawer2 = false
}, // 关闭添加标准事件
updateFile (item) {
- window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id
+ const attId = item.attId
+ if (attId) {
+ window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId
+ } else {
+ this.$message.warning('文件不存在,下载失败')
+ }
},
checkRole(type, index, row) {
if (row) {
@@ -1112,6 +1121,14 @@
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
+ for (let s = 0; s < this.delNetInfos.length; s++) {
+ if (this.addForm.wgNetInfosDel) {
+ this.addForm.wgNetInfosDel += ','
+ this.addForm.wgNetInfosDel += this.delNetInfos[s].id
+ } else {
+ this.addForm.wgNetInfosDel = this.delNetInfos[s].id
+ }
+ }
for (let a = 0; a < this.addForm.wgNetInfos.length; a++) {
this.delNetInfos.forEach(item => {
if (this.addForm.wgNetInfos[a].joinId === item.joinId) {
@@ -1133,6 +1150,14 @@
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
+ for (let s = 0; s < this.delDepts.length; s++) {
+ if (this.addForm.wgDeptsDel) {
+ this.addForm.wgDeptsDel += ','
+ this.addForm.wgDeptsDel += this.delDepts[s].id
+ } else {
+ this.addForm.wgDeptsDel = this.delDepts[s].id
+ }
+ }
for (let a = 0; a < this.addForm.wgDepts.length; a++) {
this.delDepts.forEach(item => {
if (this.addForm.wgDepts[a].joinId === item.joinId) {
@@ -1154,6 +1179,14 @@
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
+ for (let s = 0; s < this.delPayInfos.length; s++) {
+ if (this.addForm.wgPayInfosDel) {
+ this.addForm.wgPayInfosDel += ','
+ this.addForm.wgPayInfosDel += this.delPayInfos[s].id
+ } else {
+ this.addForm.wgPayInfosDel = this.delPayInfos[s].id
+ }
+ }
for (let a = 0; a < this.addForm.wgPayInfos.length; a++) {
this.delPayInfos.forEach(item => {
if (this.addForm.wgPayInfos[a].joinId === item.joinId) {
@@ -1175,6 +1208,14 @@
confirmButtonClass: 'common-button-primary',
roundButton: true
}).then(() => {
+ for (let s = 0; s < this.delMeetingInfos.length; s++) {
+ if (this.addForm.wgMeetingInfosDel) {
+ this.addForm.wgMeetingInfosDel += ','
+ this.addForm.wgMeetingInfosDel += this.delMeetingInfos[s].id
+ } else {
+ this.addForm.wgMeetingInfosDel = this.delMeetingInfos[s].id
+ }
+ }
for (let a = 0; a < this.addForm.wgMeetingInfos.length; a++) {
this.delMeetingInfos.forEach(item => {
if (this.addForm.wgMeetingInfos[a].joinId === item.joinId) {