diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 36144e893..3fbdc9c8b 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -151,6 +151,11 @@ path: '/standInvolveProject', menuId: '8a9c87fe06244fb9d55e78fb281f625b' }, + { + title: '问答库', // 把 标准涉及项目 这几个字 改成 标准合规评估结果 + path: '/standQA', + menuId: '' + }, // { // title: '零部件编号申请', // path: '/partCodeApply', diff --git a/src/pages/home2/components/release/index.vue b/src/pages/home2/components/release/index.vue index b78c54f8b..e380ef56a 100644 --- a/src/pages/home2/components/release/index.vue +++ b/src/pages/home2/components/release/index.vue @@ -16,7 +16,6 @@ border style="cursor:pointer;" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> - style="width: 100%"> + label="标准编号"> + + + +
更多 ⋙
+ 加载中... + @@ -48,8 +62,13 @@ export default { mixins: [], data() { return { - putTime: '', - standardReleaseList: [], //标准发布数据 + loading: false, + pageVerify: false, + page: 1, + pageSize: 10, + total: 0, + putTime: '', + standardReleaseList: [], //标准发布数据 } }, computed: {}, @@ -60,13 +79,33 @@ export default { // this.addDate() }, methods: { + pageChange(page) { + this.page = page + this.pageSize = this.$store.getters.userInfo.configContent + this.getAdvice() + }, + // 分页每页显示数改变后方法 + pageSizeChange(pageSize) { + this.pageSize = this.$store.getters.userInfo.configContent + this.getAdvice() + // 此处需要调用接口，修改个人配置 + }, + togo () { + if(this.total && this.total > 10){ + this.pageVerify = true + this.pageSize = this.$store.getters.userInfo.configContent + }else { + this.pageVerify = false + } + this.getAdvice() + }, // 点击查看 handlePreview (item) { let routeUrl = this.$router.resolve({ name: 'OtherStandardDetails', params: { - id: item.id, - pageType: item.standType + '_STAND' + id: item.standardId, + pageType: item.resourceType + '_STAND' } }) window.open(routeUrl.href, '_blank') @@ -77,18 +116,21 @@ export default { }, //获取数据 getAdvice() { - let obj = {} - obj.limit = 10 - this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, { - _this: this - }, res => { - let arr = res.data - arr.forEach(item => { - if(item.standName !== ""){ - this.standardReleaseList.push(item) - } - }) + this.loading = true + this.$http.get("/lawss/NewsFeed/getNewsFeed", { + messageType: 'GNWBZFG', + page: this.page, + pageSize: this.pageSize + }, { + _this: this,loading: 'loading' + }, res => { + this.standardReleaseList = res.data.records + this.total = res.data.total + this.loading = false }, e => { + this.loading = false + this.standardReleaseList = [] + this.total = 0 }) }, }, @@ -103,6 +145,18 @@ export default { } /deep/.el-table td > .cell{ font-size: 13px; + } + /deep/.more { + position: absolute; + right: 0; + bottom: 2px; + font-size: 12px; + float: right; + color: #4788c0; + &:hover { + color: #3a8ee6; + cursor: pointer; + } } width: 100%; .time-title { diff --git a/src/pages/home2/components/releaseBuss/index.vue b/src/pages/home2/components/releaseBuss/index.vue new file mode 100644 index 000000000..b0648aee3 --- /dev/null +++ b/src/pages/home2/components/releaseBuss/index.vue @@ -0,0 +1,178 @@ + + + + + + diff --git a/src/pages/home2/components/releaseQA/index.vue b/src/pages/home2/components/releaseQA/index.vue new file mode 100644 index 000000000..15fbe4b0a --- /dev/null +++ b/src/pages/home2/components/releaseQA/index.vue @@ -0,0 +1,183 @@ + + + + + + diff --git a/src/pages/home2/components/releaseUs/index.vue b/src/pages/home2/components/releaseUs/index.vue new file mode 100644 index 000000000..2a5308321 --- /dev/null +++ b/src/pages/home2/components/releaseUs/index.vue @@ -0,0 +1,194 @@ + + + + + + diff --git a/src/pages/home2/components/searchGroup/index.vue b/src/pages/home2/components/searchGroup/index.vue index 4c1023c35..1b2c2761a 100644 --- a/src/pages/home2/components/searchGroup/index.vue +++ b/src/pages/home2/components/searchGroup/index.vue @@ -14,21 +14,6 @@ :value="item.value" > - - - - -
- 一般检索 + 一般检索(标题) + 一般检索(全文) 高级检索
@@ -93,10 +79,10 @@ export default { computed: {}, watch: {}, methods: { - checkStateTypeFunc(data){ - this.checkStateType = data - this.$forceUpdate() - }, + // checkStateTypeFunc(data){ + // this.checkStateType = data + // this.$forceUpdate() + // }, checkStateFunc(data){ if(data === 'All'){ this.showType = true @@ -104,13 +90,13 @@ export default { this.showType = false } }, - search() { + search(checkStateType) { this.$router.push({ name: 'StandardSearch', params: { selectKey: this.checkState, searchValue: this.checkContent || undefined, - allType: this.checkStateType, + allType: checkStateType, } }) }, diff --git a/src/pages/home2/components/solicitopinions/index.vue b/src/pages/home2/components/solicitopinions/index.vue index 0ed6e33f3..dbc3843a4 100644 --- a/src/pages/home2/components/solicitopinions/index.vue +++ b/src/pages/home2/components/solicitopinions/index.vue @@ -37,11 +37,7 @@ label="结束时间"> -
- 更多 ⋙ -
+
更多 ⋙
@@ -97,6 +93,18 @@ export default { diff --git a/src/pages/personal/pages/my-questions/components/questionItemInfo.vue b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue new file mode 100644 index 000000000..cc88ae26f --- /dev/null +++ b/src/pages/personal/pages/my-questions/components/questionItemInfo.vue @@ -0,0 +1,80 @@ + + + + + + diff --git a/src/pages/personal/pages/my-questions/components/questions-item.vue b/src/pages/personal/pages/my-questions/components/questions-item.vue index cbff2eb72..660898090 100644 --- a/src/pages/personal/pages/my-questions/components/questions-item.vue +++ b/src/pages/personal/pages/my-questions/components/questions-item.vue @@ -1,24 +1,22 @@ - + @@ -27,26 +25,17 @@ export default { name: "questions-item", props: ['question'], computed: { - resType() { - const matcher = { - INLAND_STAND: '国内标准', - FOREIGN_STAND: '国外标准', - FOREIGN_LAWS: '国内外政策', - BUSINESS: '企业标准' - } - return matcher[this.question.resType] - } }, data(){ return{ + userName: this.$store.getters.userInfo.userName, } }, watch:{ question: { immediate: true, deep: true, - handler(val) { - this.question = val + handler(val){ } } } @@ -56,10 +45,10 @@ export default { diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index a17b81c72..6ab4f5065 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -4,115 +4,1703 @@
- + - + - + - 查询 + 查询 - 清空 + 清空 - 提问 + 提问
- - -
- - - - - - - - - - - - - -
- - -
+
+ + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+ + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+ + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+
+ 暂无数据 +
+
+
+ + + +
+ + +
+ + +
+ + +
+ + + + 国内标准 + 海外标准 + 企业标准 + 公共 + +
+ + + + +
+ 选择标准 + + + + + + +
+ +
将文件拖到此处，或点击上传
+
+ + + +
+ 相似历史问题： +
+
+ + 取 消 + 提 交 + + + + +
+ + + + + + + + + + + + + + 查询 + + + + + 清空 + + + + 数据获取中 + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + + + + + + + + +
+ + + + +
+ 取消 + 确定
- - -
-
- - +
+
diff --git a/src/pages/phone/databaseSearch.vue b/src/pages/phone/databaseSearch.vue index 71bb66fae..3db81c197 100644 --- a/src/pages/phone/databaseSearch.vue +++ b/src/pages/phone/databaseSearch.vue @@ -23,7 +23,9 @@
-
{{item.title}}
+
+ +
标准类别: @@ -38,6 +40,12 @@
+
+
没有更多数据了...
+
点击加载更多
+ + 加载中... +
@@ -48,28 +56,48 @@ export default { return{ scrolled: '', moreFlag: false, + loadingFlag: false, searchKey: '', standList: [], loading: true, + listFlag: false, page: 1, + addFlag: 0, } }, + watch:{ + scrolled:{ + handler(val){ + if(val === 0){ + console.log('滚动条消失'); + } + } + }, + }, methods: { scrool(){ - let scrolled = this.$refs.cardBox.scrollTop + this.scrolled = this.$refs.cardBox.scrollTop + // console.log(this.scrolled); //获得可视区的高度 const windowHeight = this.$refs.cardBox.clientHeight //获取滚动条的总高度 const scrollHeight = this.$refs.cardBox.scrollHeight - let windowScrolled = scrolled + windowHeight - this.scrolled = scrolled - if(scrollHeight - windowScrolled < 600 ){ - //把距离顶部的距离加上可视区域的高度 等于或者大于滚动条的总高度就是到达底部 + let windowScrolled = this.scrolled + windowHeight + if(scrollHeight - windowScrolled < 100 && this.scrolled !== 0){ + //把距离顶部的距离加上可视区域的高度 this.moreFlag = true - this.page++ + }else{ + this.moreFlag = false } }, - onSearch(){ + moreList(){ + this.moreFlag = false + this.loadingFlag = true + this.page++ + this.standSearch() + }, + standSearch(){ + this.listFlag = false this.moreFlag = false this.$http.post('search/searchCenter/searchSarBykey',{ selectIndex: 'fulltextserch', @@ -80,12 +108,36 @@ export default { },{ _this: this, }, res => { - if(this.standList.length){ - this.standList = this.standList.concat(res.data.list) + if(res.data.list.length){ + if(this.standList.length){ + this.standList = this.standList.concat(res.data.list) + }else{ + this.standList = res.data.list + } + this.loading = false }else{ - this.standList = res.data.list + this.listFlag = true } - console.log(this.standList); + }, e => { + console.log(e) + }) + }, + //点击搜索触发事件 + onSearch(){ + this.moreFlag = false + this.loading = true + this.standList = [] + this.page = 1 + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'fulltextserch', + selectValue: this.searchKey, + selectType: 'titleSearch', + page: this.page, + pageSize: 20 + },{ + _this: this, + }, res => { + this.standList = res.data.list this.loading = false }, e => { console.log(e) @@ -107,7 +159,7 @@ export default { }, mounted(){ this.searchKey = this.$route.query.searchKey - this.onSearch() + this.standSearch() this.$refs.cardBox.addEventListener('scroll', this.scrool); }, }; @@ -205,5 +257,28 @@ export default { top: 40%; left: 37%; } + .bottom-box{ + height: 40px; + width: 91%; + position: absolute; + bottom: 0; + text-align: center; + color: #3170A8; + .list-box{ + color: #3170A8; + text-align: center; + } + .van-loading { + position: absolute; + left: 37%; + } + } + .card-content:last-child{ + margin-bottom: 30px; + } + .van-button--normal{ + float: left; + margin-left: 35%; + } } diff --git a/src/pages/phone/domesticStand.vue b/src/pages/phone/domesticStand.vue index d06bfed97..0021f28aa 100644 --- a/src/pages/phone/domesticStand.vue +++ b/src/pages/phone/domesticStand.vue @@ -17,14 +17,15 @@ -
+
加载中...
{{item.lawsNumber}}
-
{{item.standSortShow + '  ' + item.standNumber + '-' + item.standYear }}
+
{{item.standSort + '  ' + item.standNumber + '-' + item.standYear }}
+
{{item.standSort + '  ' + item.standNumber }}
{{item.standName}}
@@ -63,14 +64,25 @@ {{ textStatusMap[item.textStatus] }} + + + + + + + + + + +
- 发布日期： - {{ item.issueTime ? $moment(item.issueTime).format("YYYY-MM-DD") : "" }} - 实施日期： {{item.XCXSSRQLAWS}} - 实施日期： {{item.putTime}} + 发布日期： + {{ item.issueTime ? (item.issueTime !== '' ? $moment(item.issueTime).format("YYYY-MM-DD") : " ") : " " }} + 实施日期： {{item.XCXSSRQLAWS}} + 实施日期： {{item.SSRQ}}
@@ -79,6 +91,11 @@
+
+
没有更多数据了...
+
点击加载更多
+ 加载中... +
@@ -87,10 +104,15 @@ export default { name: "domesticStand", data(){ return{ + scrolled: '', + moreFlag: false, + loadingFlag: false, + listFlag: false, searchKey: '', titleType: '', titleName: '', loading: true, + page: 1, standList: [], standStateOptions: [], //标准文本状态 lawsTextStateOptions: [], //政策文本状态 @@ -101,58 +123,145 @@ export default { } }, methods:{ + scrool(){ + this.scrolled = this.$refs.cardBox.scrollTop + //获得可视区的高度 + const windowHeight = this.$refs.cardBox.clientHeight + //获取滚动条的总高度 + const scrollHeight = this.$refs.cardBox.scrollHeight + let windowScrolled = this.scrolled + windowHeight + if(scrollHeight - windowScrolled < 100 && this.scrolled !== 0){ + //把距离顶部的距离加上可视区域的高度 + this.moreFlag = true + }else{ + this.moreFlag = false + } + }, + moreList(){ + this.moreFlag = false + this.loadingFlag = true + this.page++ + this.standSearch() + }, onSearch(){ + this.moreFlag = false + this.loading = true + this.standList = [] + this.page = 1 if(this.titleType === 'INLAND'){ - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ - page: 1, - pageSize: 20, - standType: 'INLAND' + // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // page: this.page, + // standNumber: this.searchKey, + // pageSize: 20, + // standType: 'INLAND' + // },{ + // _this: this + // },res=>{ + // if (res.ok){ + // this.standList = res.data.list + // this.loading = false + // }else { + // this.$message.error(res.message) + // } + // },e=>{ + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'stand', + selectValue: this.searchKey, + selectType: 'titleSearch', + standType: 'INLAND', + page: this.page, + pageSize: 20 },{ - _this: this - },res=>{ + _this: this, + }, res => { if (res.ok){ this.standList = res.data.list this.loading = false }else { this.$message.error(res.message) } - },e=>{ + }, e => { + console.log(e) }) }else if(this.titleType === 'FOREIGN'){ - this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ - page: 1, - pageSize: 20, - standType: 'FOREIGN' + // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // page: 1, + // pageSize: 20, + // standNumber: this.searchKey, + // standType: 'FOREIGN' + // },{ + // _this: this + // },res=>{ + // if (res.ok){ + // this.standList = res.data.list + // this.loading = false + // }else { + // this.$message.error(res.message) + // } + // },e=>{ + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'stand', + selectValue: this.searchKey, + selectType: 'titleSearch', + standType: 'FOREIGN', + page: this.page, + pageSize: 20 },{ - _this: this - },res=>{ + _this: this, + }, res => { if (res.ok){ this.standList = res.data.list this.loading = false }else { this.$message.error(res.message) } - },e=>{ + }, e => { + console.log(e) }) + }else if(this.titleType === 'POLICY'){ - this.$http.get('lawss/sarLawsInfo/page',{ - page: 1, - pageSize: 20, - },{ - _this: this - }, res => { - if (res.ok){ - this.standList = res.data.list - this.loading = false - }else { - this.$message.error(res.message) - } - }, e =>{ - console.log(e); - }) + // this.$http.get('lawss/sarLawsInfo/page',{ + // page: 1, + // pageSize: 20, + // lawsNumber: this.searchKey, + // },{ + // _this: this + // }, res => { + // if (res.ok){ + // this.standList = res.data.list + // this.loading = false + // }else { + // this.$message.error(res.message) + // } + // }, e =>{ + // console.log(e); + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'laws', + selectValue: this.searchKey, + selectType: 'titleSearch', + type: 'laws', + page: this.page, + pageSize: 20 + },{ + _this: this, + }, res => { + if (res.ok){ + this.standList = res.data.list + this.loading = false + }else { + this.$message.error(res.message) + } + }, e => { + console.log(e) + }) + }else{ this.$http.get("/lawss/NewsFeed/getNewsFeed", { messageType: 'ZYBZFG', + standard: this.searchKey, page: 1, paeSize: 10 }, { @@ -169,6 +278,198 @@ export default { }); } }, + standSearch(){ + this.listFlag = false + this.moreFlag = false + if(this.titleType === 'INLAND'){ + // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // page: this.page, + // pageSize: 20, + // standNumber: this.searchKey, + // standType: 'INLAND' + // },{ + // _this: this + // },res=>{ + // if (res.ok){ + // if(res.data.list.length){ + // if(this.standList.length){ + // this.standList = this.standList.concat(res.data.list) + // }else{ + // this.standList = res.data.list + // } + // this.loading = false + // }else{ + // this.listFlag = true + // } + // }else { + // this.$message.error(res.message) + // } + // },e=>{ + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'stand', + selectValue: this.searchKey, + selectType: 'titleSearch', + standType: 'INLAND', + page: this.page, + pageSize: 20 + },{ + _this: this, + }, res => { + if(res.ok){ + if(res.data.list.length){ + if(this.standList.length){ + this.standList = this.standList.concat(res.data.list) + }else{ + this.standList = res.data.list + } + this.loading = false + }else{ + this.loading = false + this.listFlag = true + } + }else{ + this.$message.error(res.message) + } + }, e => { + console.log(e) + }) + + }else if(this.titleType === 'FOREIGN'){ + // this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage',{ + // page: 1, + // pageSize: 20, + // standNumber: this.searchKey, + // standType: 'FOREIGN' + // },{ + // _this: this + // },res=>{ + // if (res.ok){ + // if(res.data.list.length){ + // if(this.standList.length){ + // this.standList = this.standList.concat(res.data.list) + // }else{ + // this.standList = res.data.list + // } + // this.loading = false + // }else{ + // this.listFlag = true + // } + // }else { + // this.$message.error(res.message) + // } + // },e=>{ + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'stand', + selectValue: this.searchKey, + selectType: 'titleSearch', + standType: 'FOREIGN', + page: this.page, + pageSize: 20 + },{ + _this: this, + }, res => { + if(res.ok){ + if(res.data.list.length){ + if(this.standList.length){ + this.standList = this.standList.concat(res.data.list) + }else{ + this.standList = res.data.list + } + this.loading = false + }else{ + this.loading = false + this.listFlag = true + } + }else{ + this.$message.error(res.message) + } + }, e => { + console.log(e) + }) + }else if(this.titleType === 'POLICY'){ + // this.$http.get('lawss/sarLawsInfo/page',{ + // lawsNumber: this.searchKey, + // page: 1, + // pageSize: 20, + // },{ + // _this: this + // }, res => { + // if (res.ok){ + // if(res.data.list.length){ + // if(this.standList.length){ + // this.standList = this.standList.concat(res.data.list) + // }else{ + // this.standList = res.data.list + // } + // this.loading = false + // }else{ + // this.listFlag = true + // } + // }else { + // this.$message.error(res.message) + // } + // }, e =>{ + // console.log(e); + // }) + this.$http.post('search/searchCenter/searchSarBykey',{ + selectIndex: 'laws', + selectValue: this.searchKey, + selectType: 'titleSearch', + type: 'laws', + page: this.page, + pageSize: 20 + },{ + _this: this, + }, res => { + if(res.ok){ + if(res.data.list.length){ + if(this.standList.length){ + this.standList = this.standList.concat(res.data.list) + }else{ + this.standList = res.data.list + } + this.loading = false + }else{ + this.loading = false + this.listFlag = true + } + }else{ + this.$message.error(res.message) + } + }, e => { + console.log(e) + }) + }else{ + this.$http.get("/lawss/NewsFeed/getNewsFeed", { + messageType: 'ZYBZFG', + standard: this.searchKey, + page: 1, + paeSize: 10 + }, { + _this: this + }, res => { + if (res.ok){ + if(res.data.length){ + if(this.standList.length){ + this.standList = this.standList.concat(res.data) + }else{ + this.standList = res.data + } + this.loading = false + }else{ + this.loading = false + this.listFlag = true + } + }else { + this.$message.error(res.message) + } + }, e => { + console.log(e); + }); + } + }, //返回上一个页面 back(){ this.$router.push('/phoneHome') @@ -193,7 +494,8 @@ export default { mounted() { this.titleType = this.$route.query.standType this.titleName = this.titleType === 'INLAND' ? '国内标准法规库' : (this.titleType === 'FOREIGN' ? '海外标准法规库' : this.titleType === 'POLICY' ? '国内外政策库' : '标准化动态库' ) - this.onSearch() + this.standSearch() + this.$refs.cardBox.addEventListener('scroll', this.scrool); //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this @@ -249,8 +551,9 @@ export default { color: #FFFFFF; } .card-box{ - height: 100%; + height: 85%; position: relative; + overflow-y: scroll; top: 100px; } .card-content{ @@ -298,6 +601,25 @@ export default { top: 40%; left: 37%; } + .bottom-box{ + height: 40px; + width: 91%; + position: absolute; + bottom: 0; + text-align: center; + color: #3170A8; + .list-box{ + color: #3170A8; + text-align: center; + } + .van-loading { + position: absolute; + left: 37%; + } + } + .card-content:last-child{ + margin-bottom: 30px; + } } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 279f5ffa9..3563153bd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2298,6 +2298,7 @@ // this.sarStandardsInfoEO.country = item.country.split(","); // } this.fileInfoHandle() + this.isSubmit = true this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') @@ -2313,10 +2314,12 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { + this.isSubmit = false this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result }).catch(e => { + this.isSubmit = false this.saveLoading = false }) }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index c6675e43b..1647257d6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2339,6 +2339,7 @@ // } this.fileInfoHandle() this.saveLoading = true + this.isSubmit = true let _formData = new FormData() _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) @@ -2355,10 +2356,12 @@ })) saveTaskForPub(_formData).then(res => { this.saveLoading = false + this.isSubmit = false this.$message.success('保存成功') this.bpnId = res.result }).catch(e => { this.saveLoading = false + this.isSubmit = false }) }, fileInfoHandle(){ @@ -2475,6 +2478,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.topId = this.pId @@ -2490,7 +2494,7 @@ // this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 this.isSubmit = false - this.submitLoading = false + this.saveLoading = false this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) // this.processCreateBuss(json) // if(this.formTongGuo.approvalOpinion === '1'){ @@ -2502,6 +2506,8 @@ // this.processCreateLaws(json) // } }else { + this.isSubmit = false + this.saveLoading = false this.$message.success(res.message) } }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 8b1c360f5..018bb827c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2340,6 +2340,7 @@ // this.sarStandardsInfoEO.country = item.country.split(","); // } this.fileInfoHandle() + this.isSubmit = true this.saveLoading = true let _formData = new FormData() _formData.append('id', this.bpnId || '') @@ -2356,10 +2357,12 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { + this.isSubmit = false this.saveLoading = false this.$message.success('保存成功') this.bpnId = res.result }).catch(e => { + this.isSubmit = false this.saveLoading = false }) }, @@ -2479,6 +2482,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true this.form.commentText = this.formTongGuo.commentText this.form.approvalOpinion = this.formTongGuo.approvalOpinion this.form.topId = this.pId @@ -2494,6 +2498,7 @@ // this.$message.success(res.message) // 流程提交之后，应该流转至待办任务页面 this.isSubmit = false + this.saveLoading = false this.processCreateBuss(json) // if(this.formTongGuo.approvalOpinion === '1'){ // this.$message.warning("驳回成功") @@ -2504,6 +2509,8 @@ // this.processCreateLaws(json) // } }else { + this.isSubmit = false + this.saveLoading = false this.$message.success(res.message) } }) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 68faaa91e..c61b5cab7 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -326,7 +326,7 @@ {{ scope.row.standCode }} - {{ + {{ scope.row.standCode }} {{ diff --git a/src/pages/regulatoryRepository/standQA/components/answerItem.vue b/src/pages/regulatoryRepository/standQA/components/answerItem.vue new file mode 100644 index 000000000..2f6d9e2fc --- /dev/null +++ b/src/pages/regulatoryRepository/standQA/components/answerItem.vue @@ -0,0 +1,190 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue new file mode 100644 index 000000000..4ce7073a7 --- /dev/null +++ b/src/pages/regulatoryRepository/standQA/components/questionItemInfo.vue @@ -0,0 +1,76 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/standQA/components/questions-item.vue b/src/pages/regulatoryRepository/standQA/components/questions-item.vue new file mode 100644 index 000000000..660898090 --- /dev/null +++ b/src/pages/regulatoryRepository/standQA/components/questions-item.vue @@ -0,0 +1,57 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/standQA/components/stand-item.vue b/src/pages/regulatoryRepository/standQA/components/stand-item.vue new file mode 100644 index 000000000..585498bb7 --- /dev/null +++ b/src/pages/regulatoryRepository/standQA/components/stand-item.vue @@ -0,0 +1,53 @@ + + + + + + diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue new file mode 100644 index 000000000..5b9c4f4c1 --- /dev/null +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -0,0 +1,1195 @@ + + + + + + diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue index 74a5a45ff..f9e76fc3c 100644 --- a/src/pages/searchCenter/pages/standardSearch.vue +++ b/src/pages/searchCenter/pages/standardSearch.vue @@ -2740,18 +2740,28 @@