diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 79f6eacee..9a68b51e8 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -69,6 +69,44 @@ + - +

@@ -2076,7 +2114,9 @@ export default { console.log('1943',child1) const list = [] if (child1 && child1.length > 1) { - list.push(child1[0]) + for (let i = 0; i < child1.length; i++) { + list.push(child1[i]) + } return list } return child1 diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index a70f42992..19e5fbd11 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -49,7 +49,7 @@ /> @@ -360,7 +360,8 @@ export default { name: item.oldFileName, uid: item.uid, status: item.status, - id: item.id + id: item.id, + fileSuffix: item.fileSuffix }); }); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 7128517c9..a10230dd2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -274,75 +274,77 @@ - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -429,7 +429,8 @@ export default { name: item.oldFileName, uid: item.uid, status: item.status, - id: item.id + id: item.id, + fileSuffix: item.fileSuffix }); }); }); diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index a4475fb17..4de50bcb7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -1836,9 +1836,11 @@ export default { /** val === '1' (国外) val === '0'( 国内 )*/ // 国内英文名称不必填 国外必填 ,标准性质国内不体现 if (val === '1') { + this.rules.standName[0].required = false this.rules.standEnName[0].required = true; this.rules.standNature[0].required = false } else { + this.rules.standName[0].required = true this.rules.standNature[0].required = true this.rules.standEnName[0].required = false; } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 8101bf075..78340e107 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -26,7 +26,7 @@ - + 国内标准入库 海外标准入库 @@ -1692,6 +1692,23 @@ export default { }, }, methods: { + // 标准来源改变事件 + standInChange(val) { + this.verifySarStandard = false + + /** val === '1' (国外) val === '0'( 国内 )*/ + // 国内英文名称不必填 国外必填 ,标准性质国内不体现 + if (val === '1') { + this.rules.standName[0].required = false + this.rules.standNature[0].required = false + this.rules.standEnName[0].required = true; + } else { + this.rules.standName[0].required = true + this.rules.standNature[0].required = true + this.rules.standEnName[0].required = false; + } + this.standardSearchForm.standType = val === '0' ? 'INLAND' : 'FOREIGN' + }, getBusStandFileByAttId(attId) { return new Promise((resolve, reject) => { getBusStandFileByAttId({ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index c8f404d14..011c25da2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -170,32 +170,32 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue index 8438138d2..33a90a927 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step6.vue @@ -226,6 +226,8 @@ background :page-sizes="[20, 40, 60]" :total="total" + :page-size="pageSize" + @size-change="handleSizeChange" @current-change="handleCurrentChange" > @@ -753,6 +755,9 @@ export default { handleCurrentChange(currentPage) { this.currentPage = currentPage; }, + handleSizeChange(size) { + this.pageSize = size; + }, //保存事件 handleSave() { this.saveLoading = true; diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue index b84453434..0fcf27ebd 100644 --- a/src/pages/searchCenter/pages/advancedSearch.vue +++ b/src/pages/searchCenter/pages/advancedSearch.vue @@ -305,21 +305,7 @@ - - + @@ -332,21 +318,7 @@ - - +