-
+
@@ -117,7 +117,7 @@
if (value.length > 0) {
this.conList.forEach(val => {
value.forEach(res => {
- if (res === val.id) {
+ if (res === val.collectEO.id) {
val.checked = true
}
})
@@ -183,7 +183,7 @@
this.$confirm({
content: _this.$t('confirmCancelCollection'),
onOk() {
- deleteAction(_this.url.deleteBatch, { ids: val.id }).then((res) => {
+ deleteAction(_this.url.deleteBatch, { ids: val.collectEO.id }).then((res) => {
if (res.success) {
_this.$message.success(_this.$t('OperationSuccessful'))
_this.getList()
@@ -216,13 +216,13 @@
}
this.loading = true
getAction(this.url.getInfoList, query).then((res) => {
- if (res.success) {
+ if (res.success && res.result) {
if (res.result.current > 1 && res.result.records.length == 0) {
this.pageNo = 1
this.getList()
return
}
- this.conList = res.result.records
+ this.conList = res.result ? res.result.records : []
if (this.conList && this.conList.length > 0) {
this.conList.forEach(val => {
if (val.content) {
@@ -233,7 +233,7 @@
if (this.checkboxList && this.checkboxList.length > 0) {
let contentList = []
for (let j = 0; j < this.conList.length; j++) {
- contentList.push(this.conList[j].id)
+ contentList.push(this.conList[j].collectEO.id)
}
this.checkboxList = this.checkboxList.filter(val => {
return !contentList.join(',').includes(val)
diff --git a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
index 2ff41bc7f..48adc3d86 100644
--- a/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
+++ b/jero-web/src/views/processCenter/components/regulatoryCirculationHistory.vue
@@ -10,7 +10,7 @@
ref="table"
:loading="loading"
:pagination="false"
- :scroll="{x: true}"
+ :scroll="{x: '100%'}"
:data-source="dataSource"
:columns="columns"
>
@@ -41,31 +41,36 @@
title: this.$t('OperationContent'),
dataIndex: 'taskDefinitionKeyName',
align: 'center',
- width: '20%'
+ width: '20%',
+ ellipsis: true
},
{
title: this.$t('opinion'),
dataIndex: 'approvalOpinion',
align: 'center',
- width: '20%'
+ width: '20%',
+ ellipsis: true
},
{
title: this.$t('Operator'),
dataIndex: 'createBy',
align: 'center',
- width: '20%'
+ width: '20%',
+ ellipsis: true
},
{
title: this.$t('role'),
dataIndex: 'operatorRoleName',
align: 'center',
- width: '20%'
+ width: '20%',
+ ellipsis: true
},
{
title: this.$t('OperationTime'),
dataIndex: 'createTime',
align: 'center',
width: '20%',
+ ellipsis: true,
customRender: function(t, r, index) {
return moment(t).format('YYYY-MM-DD HH:mm:ss')
}
diff --git a/jero-web/src/views/processCenter/processForm/processDetails/index.vue b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
index b249d372e..5c3d172af 100644
--- a/jero-web/src/views/processCenter/processForm/processDetails/index.vue
+++ b/jero-web/src/views/processCenter/processForm/processDetails/index.vue
@@ -13,7 +13,8 @@
-
+
@@ -33,7 +34,8 @@
},
data() {
return {
- processStep: null
+ processStep: null,
+ isTrue: false
}
},
created() {
@@ -41,6 +43,11 @@
},
mounted() {
this.processNum()
+ if (this.$route.query.prcType == '6') {
+ this.isTrue = true
+ } else {
+ this.isTrue = false
+ }
},
methods: {
back() {