diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 10c9a1e9c..7c63493a8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -78,6 +78,21 @@ + + + + + + + + + { + this.countryOptions=res.data.COUNTRY//国家地区 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 9d7c27f09..00e18e759 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -31,6 +31,19 @@ 海外标准入库 + + + + + + + { + this.countryOptions=res.data.COUNTRY//国家地区 this.standSortOptions = res.data.STANDCLASSIFY // 标准类别 this.standNatureOptions = res.data.SARPROPERTY // 标准性质 this.standStateOptions = res.data.WBZTCLASS // 文本状态 diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 8a5111bd2..b8055e223 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -3093,6 +3093,7 @@ export default { }, // 表格排序 sortChange (sortObj) { + console.log(sortObj.column+"======"+sortObj.column.property+"======"+sortObj.column.order); if (sortObj.column.order !== 'normal') { this.nowOrder = '' this.orderBy = '' @@ -3125,7 +3126,7 @@ export default { this.nowOrder=1 } break - case 'standStateShow' : + case 'textStatus' : this.orderBy = 5; this.nowOrder = sortObj.column.order if (this.nowOrder === 'ascending'){ @@ -3134,6 +3135,16 @@ export default { this.nowOrder=1 } break + case 'SSRQ' : + this.orderBy = 6; + this.nowOrder = sortObj.column.order + if (this.nowOrder === 'ascending'){ + this.nowOrder=2 + }else if (this.nowOrder === 'descending') { + this.nowOrder=1 + } + break + } } this.getDomesticStandardTable()