diff --git a/src/components/mySelect/index.vue b/src/components/mySelect/index.vue index d741c70e5..63858ef55 100644 --- a/src/components/mySelect/index.vue +++ b/src/components/mySelect/index.vue @@ -3,7 +3,7 @@
- +
{{ item.label }} +
@@ -76,65 +77,29 @@ .active { background-color: rgb(245, 247, 250); } - /*ul {*/ - /* position: absolute;*/ - /* z-index: 9999;*/ - /* background-color: rgb(255, 255, 255);*/ - /* box-shadow: rgba(0, 0, 0, 0.1) 0px 2px 12px 0px;*/ - /* box-sizing: border-box;*/ - /* border-width: 1px;*/ - /* border-style: solid;*/ - /* border-color: rgb(228, 231, 237);*/ - /* border-image: initial;*/ - /* border-radius: 4px;*/ - /* box-sizing: border-box;*/ - /* list-style: none;*/ - /* padding: 6px 0px;*/ - /* margin: 0px;*/ - /* display: block;*/ - /* list-style-type: disc;*/ - /* margin-block-start: 1em;*/ - /* margin-block-end: 1em;*/ - /* margin-inline-start: 0px;*/ - /* margin-inline-end: 0px;*/ - /* width: 100%;*/ - /* li {*/ - /* list-style:none;*/ - /* height: 34px;*/ - /* line-height: 34px;*/ - /* padding: 0 20px;*/ - /* }*/ - /* li:hover {*/ - /* background-color: rgb(245, 247, 250);*/ - /* }*/ - /*}*/ - /*.mySelect {*/ - /* width: 100%;*/ - /* position: relative;*/ - /* option {*/ - /* height: 34px;*/ - /* line-height: 34px;*/ - /* padding: 0 20px;*/ - /* }*/ - /*}*/ - /*.mySelect:focus + .myIcon{*/ - /* transform:rotate(180deg);*/ - /* -ms-transform:rotate(180deg); !* IE 9 *!*/ - /* -moz-transform:rotate(180deg); !* Firefox *!*/ - /* -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/ - /* -o-transform:rotate(180deg);*/ - /*}*/ - /*.mySelect:focus-within + .myIcon{*/ - /* transform:rotate(180deg);*/ - /* -ms-transform:rotate(180deg); !* IE 9 *!*/ - /* -moz-transform:rotate(180deg); !* Firefox *!*/ - /* -webkit-transform:rotate(180deg); !* Safari 和 Chrome *!*/ - /* -o-transform:rotate(180deg);*/ - /*}*/ - /*.myIcon {*/ - /* position: absolute;*/ - /* right: 7px;*/ - /* top: calc(~'50% - 7px');*/ - /* transition: all .3s;*/ - /*}*/ + .mySelect { + width: 100%; + position: relative; + } + .mySelect:focus + .myIcon{ + transform:rotate(180deg); + -ms-transform:rotate(180deg); /* IE 9 */ + -moz-transform:rotate(180deg); /* Firefox */ + -webkit-transform:rotate(180deg); /* Safari 和 Chrome */ + -o-transform:rotate(180deg); + } + .mySelect:focus-within + .myIcon{ + transform:rotate(180deg); + -ms-transform:rotate(180deg); /* IE 9 */ + -moz-transform:rotate(180deg); /* Firefox */ + -webkit-transform:rotate(180deg); /* Safari 和 Chrome */ + -o-transform:rotate(180deg); + } + .myIcon { + cursor: pointer; + position: absolute; + right: 7px; + top: calc(~'50% - 7px'); + transition: all .3s; + } diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue index 6dbb4e219..af18030c8 100644 --- a/src/pages/config/pages/attributeCustom/components/stand.vue +++ b/src/pages/config/pages/attributeCustom/components/stand.vue @@ -353,7 +353,7 @@ export default { showRegionId: '', selVal: '', isSearch: '1', - sarType: '', + sarType: 'STAND', isWarn: '1' }, attrTypeOptions: [ @@ -561,7 +561,7 @@ export default { queryDisplayLocationList (sarType) { return new Promise((resolve, reject) => { this.$http.get('lawssBase/utArea/getAreaList', { - sarType: 'INLAND_STAND' + sarType: sarType }, { _this: this }, res => { diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 3f07616db..fd2a4796b 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -51,12 +51,20 @@ prop="showNumber" label="标准号/政策号" align="center"> + + { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 8df138551..e585ffffa 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -235,8 +235,7 @@ width="170" align="center"> - - + - - + { this.$set(this.textStatusMap, item.value, item.label) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index 45d18b0dc..489a91441 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -272,14 +272,14 @@ choiceZRRS (row, type, index) { this.type = type if (type === 1) { - this.drawerTitle = '选择责任部门对接人' + this.drawerTitle = '选择执行人' this.nodeList2 = [] this.zxIndex= index this.nodeList2.push(row) this.modalshowflag2 = true } else { // 批量 - this.drawerTitle = '批量选择责任部门对接人' + this.drawerTitle = '批量选择执行人' if (this.zxIdList.length > 0) { this.nodeList2 = [] this.modalshowflag2 = true diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 32977c38e..b00082a3f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -810,7 +810,7 @@ - +

修订申请人

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 06d10b06c..af104870f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -220,13 +220,13 @@ @@ -361,6 +361,23 @@ } }, methods: { + // 点击查看 + handlePreview (item) { + let pageType + if (item.standType === 'FOREIGN') { + pageType = 'FOREIGN_STAND' + } else { + pageType = 'INLAND_STAND' + } + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: pageType + } + }) + window.open(routeUrl.href, '_blank') + }, getData () { queryTaskFirst({ bpnId: this.$route.query.bpnId diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 1f82da739..cbfc3ee3e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -221,13 +221,13 @@ @@ -361,6 +361,23 @@ export default { } }, methods: { + // 点击查看 + handlePreview (item) { + let pageType + if (item.standType === 'FOREIGN') { + pageType = 'FOREIGN_STAND' + } else { + pageType = 'INLAND_STAND' + } + let routeUrl = this.$router.resolve({ + name: 'OtherStandardDetails', + params: { + id: item.id, + pageType: pageType + } + }) + window.open(routeUrl.href, '_blank') + }, addZqyjList() { this.title = '国内外标准库' this.listModel = true diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue index 883ef6927..2d70086ad 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue @@ -119,13 +119,15 @@ - + 导出 - - - 高级查询 - - + 高级查询 -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 确认 - -
-
-
-
-
@@ -358,6 +266,101 @@
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ {{ $t("m.dataAcquisition") }} @@ -368,6 +371,7 @@ export default { name: "AccessStandardDetails", data() { return { + isAdvancedSearch: false, // 高级检索状态 showSelectBox: true, textStatusMap: {}, @@ -519,11 +523,6 @@ export default { // this.$router.push(this.$store.state.detailMap) // this.$store.commit('setDetailMap', '') }, - selectSuper() { - this.page = 1; - this.standardForm.page = 1; - this.selectInfoMore(); - }, // 搜索 selectProductBtn() { this.page = 1; @@ -535,11 +534,6 @@ export default { this.standardForm.zrbm = '' this.standardForm.standName = '' this.standardForm.responseUnit = '' - this.standardFormList.standName = '' - this.standardFormList.typeApplicable = '' - this.standardFormList.nylx = '' - this.standardFormList.zrbm = '' - this.standardFormList.sycpx = '' this.selectInfobyAccid() this.selectInfoMore() }, @@ -701,18 +695,31 @@ export default { * 高级检索 */ selectMoreBtn() { - this.showSelectBox = !this.showSelectBox + this.isAdvancedSearch = true + this.standardFormList.standName = '' + this.standardFormList.typeApplicable = '' + this.standardFormList.nylx = '' + this.standardFormList.zrbm = '' + this.standardFormList.sycpx = '' this.showTableFlag = false - if (!this.showSelectBox) { - // this.standardForm = {} - // this.standardForm.issueTime = '' - // this.standardForm.textStatus = '' - // this.standardForm.modifyTime = '' - } this.page = 1 this.standardForm.page = 1 this.selectInfoMore() }, + queryInfo() { + this.page = 1; + this.standardForm.page = 1; + this.selectInfoMore(); + this.isAdvancedSearch = false + }, + backInfo() { + this.standardFormList.standName = '' + this.standardFormList.typeApplicable = '' + this.standardFormList.nylx = '' + this.standardFormList.zrbm = '' + this.standardFormList.sycpx = '' + this.isAdvancedSearch = false + }, // 获取工作组信息下拉框信息 getGzzOption() { this.$http.get("lawss/sarGroupMenu/queryGroup", "", { @@ -927,10 +934,8 @@ export default { } } } - .labelBox { - /deep/ .el-form-item__label { - padding-right: 5px; - } + .labelForm { + margin-top: 20px; } /deep/ .relateClass { & > button { @@ -964,7 +969,7 @@ export default { } /deep/.showBox{ - width: 165px; + width: 300px; } .iconClass { width: 18px; @@ -989,7 +994,6 @@ export default { cursor: pointer } } - .relateClass { .el-dialog__body { max-height: 460px; diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue index 42cb7de2a..cb8e18827 100644 --- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue +++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/otherAddEit.vue @@ -104,13 +104,15 @@ - + - +
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue index 01f2866bd..22cb60d74 100644 --- a/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue +++ b/src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue @@ -203,6 +203,7 @@ + 查看 @@ -224,7 +225,7 @@ destroy-on-close :wrapperClosable="false" class="seeHisToryDraw" - size="1000px" + size="600px" >
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index df7562c04..445de500b 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -1,1156 +1,3047 @@ diff --git a/src/router/index.js b/src/router/index.js index 40040f9a2..590a4b6f0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1708,6 +1708,7 @@ const routes = [ meta: { requireAuth: true, title: '征求意见详情', + parentPath: '/standardForComments', // isBoolean: true, // menuId: '' }