From 9334dde64242a5b9dc9ba59371fb88cab68402eb Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 14 Apr 2023 10:03:40 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E9=97=AE=E7=AD=94=E5=BA=93=E6=8F=90?= =?UTF-8?q?=E9=97=AE=E6=8C=89=E9=92=AEloading=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index.vue | 2 +- src/pages/regulatoryRepository/standQA/index.vue | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 28a50229b..3447d6e1e 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -828,7 +828,7 @@ 选择标准 - {{ questionForm.standSortShow }} {{questionForm.standNumber }} {{ questionForm.standYear === '' ? '' : '-' }} {{ questionForm.standYear }} + {{ questionForm.standSortShow }} {{questionForm.standNumber }}{{ questionForm.standYear === '' ? '' : '-' }}{{ questionForm.standYear }} {{questionForm.standardName}} diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 8f02d804b..a951bf09e 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -103,7 +103,7 @@ 选择标准 - {{ questionForm.standSortShow }} {{questionForm.standNumber }}-{{ questionForm.standYear }} + {{ questionForm.standSortShow }} {{questionForm.standNumber }}{{ questionForm.standYear === '' ? '' : '-' }}{{ questionForm.standYear }} {{questionForm.standardName}} @@ -1057,16 +1057,21 @@ export default { }, //提交问题 queSubmit(){ - this.isSubmit = true + // this.isSubmit = true if(this.standType === 'OTHER'){ this.questionForm.standardId = this.questionForm.pubQue this.questionForm.standardName = this.questionForm.pubQue this.questionForm.standardEncdoing = this.questionForm.pubQue } + if(!this.questionForm.standardId){ + this.$message.warning('请选择至少一条标准') + return + } if(this.questionForm.standardId){ this.questionForm.fileList = this.fileList this.$refs['queForm'].validate((valid) => { if(valid){ + this.isSubmit = true this.$http.postData('lawss/AskQuestions/insertAskQuestions',{ ...this.questionForm }, { _this: this From 159ff50cd823c9e897bab1dadeadebef82c5c4e7 Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Fri, 14 Apr 2023 17:26:12 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=8B=86=E5=88=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 62e0b2512..b9394c01a 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -652,6 +652,7 @@ multiple :action="importExcelUrl" ref="importfile" + :headers="headers" name="file" drag :on-success="importItemsSuccess" @@ -805,6 +806,9 @@ export default { }, data () { return { + headers:{ + token: JSON.parse(localStorage.getItem('userInfo')).token + }, editFlag: '', splitStatus: this.$route.query.splitStatus, auditFlag: this.$route.query.auditFlag, @@ -1462,7 +1466,7 @@ export default { if (!this.jurisdictionCheck()) { return } - window.open('/api/att/attFile/uploadModalFile?fileName=标准拆分导入模板.zip') + window.open('/api/lawss/sarFileSplitItems/exportTemplate') }, // 导入事件 importItemInfo () { From 7b414980dd950d577c8b7b13e63c26757a420c0e Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 17 Apr 2023 09:52:44 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzrk/step2.vue | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzrk/step2.vue b/src/pages/processCenter/pages/phone/bzrk/step2.vue index fd258e003..a1a4f8246 100644 --- a/src/pages/processCenter/pages/phone/bzrk/step2.vue +++ b/src/pages/processCenter/pages/phone/bzrk/step2.vue @@ -151,87 +151,87 @@
-
+
{{ value.name }}
-
+
- -
发布稿（原文） -
+
{{ value.name }}
-
+
- -
发布稿（译文） -
+
{{ value.name }}
-
+
- -
-
+
{{ value.name }}
-
+
- -
-
+
{{ value.name }}
-
+
- -
-
+
{{ value.name }}
-
+
- -
-
+
{{ value.name }}
-
+
- -
-
+
{{ value.name }}
-
+
- -
-
+
{{ value.name }}
-
+
- -
-
+
{{ value.name }}
-
+
- -
@@ -1005,8 +1005,14 @@ export default { /deep/ .el-form-item__label{ width: 112px !important; } + /deep/ .van-field__label{ + width: 112px !important; + } /deep/ .el-form-item__content{ margin-left: 112px !important; + .wrap,.el-radio-group{ + padding-left: 10px; + } } /deep/.el-select .el-input .el-select__caret { font-size: 0; @@ -1023,8 +1029,12 @@ export default { min-height: 300px; padding: 10px; } - - + /deep/ .van-field__control{ + padding-left: 10px !important; + } + .paddingLeft{ + padding-left: 10px;; + } position: relative; height: 100%; From 35baf683e1e6a81989c449db4b977096adca95e7 Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 17 Apr 2023 10:09:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?= =?UTF-8?q?=E5=87=86-=E5=88=86=E8=A7=A3=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=A0=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index e3f64f0ca..5a88ecd24 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3577,7 +3577,11 @@ export default { type: 'warning' }).then(() => { if (this.selectedItemList != null && this.selectedItemList.length > 0) { - window.open('/api/lawss/sarStandItems/exportStandardItemExcel?idList=' + this.selectedItemList.join(',')) + const ids = this.selectedItemList.reduce((init,item,index,arr)=>{ + init.push(item.id) + return init + },[]) + window.open('/api/lawss/sarStandItems/exportStandardItemExcel?idList=' + ids.join(',')) this.$message.success('导出成功') } else if (this.standItemList.length > 0) { window.open('/api/lawss/sarStandItems/exportStandardItemExcel?standId=' + this.$route.params.id + '&fileType=' + this.fileType) From 93b31912192371abd8fada35c45b9935784e5a7c Mon Sep 17 00:00:00 2001 From: gaojiabao Date: Mon, 17 Apr 2023 10:48:57 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=98=E6=9B=B4=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=A6=E6=83=85=20=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/details/otherStandardDetails/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 5a88ecd24..9905aa133 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -3581,10 +3581,10 @@ export default { init.push(item.id) return init },[]) - window.open('/api/lawss/sarStandItems/exportStandardItemExcel?idList=' + ids.join(',')) + window.open('/api/lawss/sarFileSplitItems/exportStandardItemExcel?idList=' + ids.join(',')) this.$message.success('导出成功') } else if (this.standItemList.length > 0) { - window.open('/api/lawss/sarStandItems/exportStandardItemExcel?standId=' + this.$route.params.id + '&fileType=' + this.fileType) + window.open('/api/lawss/sarFileSplitItems/exportStandardItemExcel?standId=' + this.$route.params.id + '&fileType=' + this.fileType) } else { this.$message.warning('暂无可导出的数据') } From 8f779cd47ae1d96e01e9cec83950e1a9dbbc0f6c Mon Sep 17 00:00:00 2001 From: zyn Date: Mon, 17 Apr 2023 16:09:17 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=B0=81=E8=A3=85axios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axios/index.js | 50 ++++++++++++++++++- .../home2/components/releaseQA2/index.vue | 41 +++++++++------ .../personal/pages/my-questions/index.vue | 29 +++++++---- 3 files changed, 92 insertions(+), 28 deletions(-) diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 82c0c5fe3..6d9d0f0fb 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -536,5 +536,53 @@ export default { }).catch(err => { exeFun.call(this, err) }) - } + }, + + _getData (url, params, config = {}) { + return new Promise((resolve,reject)=>{ + // 参数包含this + let _this = config._this || false + // 参数包含loading + let loading = config.loading || false + if (_this && loading) { + _this[loading] = true + } + + _axios.get(api() + url + '?_t=' + new Date().getTime(), { params }).then(res => { + resolve(res.data) + }).catch(err => { + reject(err) + }).finally(()=>{ + if (_this && loading) { _this[loading] = false } + }) + }) + }, + + _postData (url, param, config = {}) { + return new Promise((resolve,reject) => { + var _formData = formData(param) + // 参数包含this + let _this = config._this || false + // 参数包含loading + let loading = config.loading || false + // 是否显示操作提示 + let showTips = config.showTips === undefined ? true : config.showTips + if (_this && loading) { _this[loading] = true } + + _axios.post(api() + url + '?' + new Date().getTime(), _formData).then(res => { + if (res.data.ok !== undefined && showTips) { + let type = res.data.ok ? 'success' : 'warning' + if (_this && res.data.message !== '' && res.data.message !== null) { + Message[type](res.data.message) + } + } + resolve(res.data) + }).catch(err => { + reject(err) + }).finally(()=>{ + if (_this && loading) { _this[loading] = false } + }) + }) + }, + } diff --git a/src/pages/home2/components/releaseQA2/index.vue b/src/pages/home2/components/releaseQA2/index.vue index d148dfa74..52d4f1b93 100644 --- a/src/pages/home2/components/releaseQA2/index.vue +++ b/src/pages/home2/components/releaseQA2/index.vue @@ -124,26 +124,35 @@ export default { }, methods: { getDate(){ - this.loading = true + // this.loading = true let form = this.form form.userId = this.$store.getters.userInfo.account form.pageSize = this.pageSize form.page = this.currentPage - return new Promise((resolve,reject)=>{ - this.$http.get('lawss/AskQuestions/getAskQuestionsPage', form, {_this: this }, res => { - if(res.data){ - const data = res.data - this.data = data.records - this.total = data.total - this.currentPage = data.current - this.pageSize = data.size - } - this.loading = false - resolve(res) - }, e => { - this.loading = false - reject(e) - }) + // return new Promise((resolve,reject)=>{ + // this.$http.get('lawss/AskQuestions/getAskQuestionsPage', form, {_this: this }, res => { + // if(res.data){ + // const data = res.data + // this.data = data.records + // this.total = data.total + // this.currentPage = data.current + // this.pageSize = data.size + // } + // this.loading = false + // resolve(res) + // }, e => { + // this.loading = false + // reject(e) + // }) + // }) + this.$http._getData('lawss/AskQuestions/getAskQuestionsPage', form, {_this: this, loading: 'loading' }).then(res => { + if(res.data){ + const data = res.data + this.data = data.records + this.total = data.total + this.currentPage = data.current + this.pageSize = data.size + } }) }, onSubmit(){ diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 3447d6e1e..65ee3d817 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1984,17 +1984,24 @@ export default { { _this: this }, val => { - this.$http.post('lawss/activiti/completeTask',{ - taskIds: val.data, - userId : this.$store.getters.userInfo.userId, - json: JSON.stringify(res.data), - }, - { - _this: this - }, res => { - this.submitGetData(); - }, e => { - }) + // this.$http.post('lawss/activiti/completeTask',{ + // taskIds: val.data, + // userId : this.$store.getters.userInfo.userId, + // json: JSON.stringify(res.data), + // }, + // { + // _this: this + // }, res => { + // this.submitGetData(); + // }, e => { + // }) + this.$http._postData('lawss/activiti/completeTask',{ + taskIds: val.data, + userId : this.$store.getters.userInfo.userId, + json: JSON.stringify(res.data), + }).then(res => { + this.submitGetData(); + }) }, e => { }) }, e => {