From 8cfccdb522093ef2a0471331b950f413b3ed7708 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Fri, 24 Jun 2022 13:22:25 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055957=20=E3=80=9030?= =?UTF-8?q?=E5=8F=B7=E9=9C=80=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98=E3=80=91?= =?UTF-8?q?=E6=B8=85=E5=8D=95=E5=BA=93=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localProductsOrProjectLibrary/pages/details.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue index 3800f6098..30aff555b 100644 --- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue +++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue @@ -39,9 +39,9 @@ 项目经理: {{ localProEO.uname }} - 项目计划开始时间: 项目计划开始日期: {{ $moment(localProEO.projectStartDate).format('YYYY-MM-DD') }} - 项目计划完成时间: 项目计划完成日期: {{ $moment(localProEO.projectEndDate).format('YYYY-MM-DD') }} From 894d891b4692b81b73a51378f5f4e65ebd669343 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Fri, 24 Jun 2022 15:49:00 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055897=20=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=87=BA=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=A0=87=E5=87=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personal/pages/my-questions/index.vue | 24 ++++++++++++++----- .../regulatoryRepository/standQA/index.vue | 24 ++++++++++++++----- 2 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index a6abfb1d9..efd2df19f 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1321,6 +1321,7 @@ export default { answerList: [], standList: [], questionsList: [], + standMap: new Map() } }, mounted(){ @@ -1352,6 +1353,12 @@ export default { } }, methods:{ + refreshStandMap(){ + this.standMap = new Map() + this.standList.forEach(item=>{ + this.standMap.set(item.standardId,item) + }) + }, checkedRole(data){ if(data[0].id){ let asdId = sessionStorage.getItem('queId') @@ -1666,15 +1673,16 @@ export default { queBtn(){ this.fileList = [] // 清空提问 - this.standType = "INLAND" + const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand) + this.standType = selectedStand.classification this.questionForm = { - pubQue : '',//公共问题 - classification: 'INLAND', //标准类型 + pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 + classification: selectedStand.classification, //标准类型 problemDescription: '', //问题 questioner: this.$store.getters.userInfo.userId, //提问人 - standardEncdoing: '', //标准编号 - standardName: '', //标准名称 - standardId:'', //标准id + standardEncdoing: selectedStand.standardEncdoing, //标准编号 + standardName: selectedStand.standardName, //标准名称 + standardId: selectedStand.standardId, //标准id fileList: '', } this.dialogVisible = true @@ -1720,6 +1728,7 @@ export default { _this: this }, res => { this.standList = res.data + this.refreshStandMap() }) }, //问题查询 @@ -1742,6 +1751,7 @@ export default { _this: this, }, res => { this.standList = res.data + this.refreshStandMap() this.questionClick() }) }, @@ -1754,6 +1764,7 @@ export default { _this: this }, res => { this.standList = res.data + this.refreshStandMap() this.questionClick() }, e =>{ @@ -1765,6 +1776,7 @@ export default { _this: this }, res =>{ this.standList = res.data + this.refreshStandMap() this.questionClick() }, e => { diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 23df9e6a4..573318d95 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -777,6 +777,7 @@ export default { standList: [], standIdList: [], questionsList: [], + standMap: new Map() } }, mounted(){ @@ -819,6 +820,12 @@ export default { }); }, methods:{ + refreshStandMap(){ + this.standMap = new Map() + this.standList.forEach(item=>{ + this.standMap.set(item.standardId,item) + }) + }, changeInput:debounce(function(val){ if(val.length){ this.$http.get('lawss/AskQuestions/resemblance',{ @@ -1040,15 +1047,16 @@ export default { //提问按钮 queBtn(){ this.fileList = [] - this.standType = "INLAND" + const selectedStand = this.activestand == '0' ? this.standList[0] : this.standMap.get(this.activestand) + this.standType = selectedStand.classification this.questionForm = { - pubQue : '',//公共问题 - classification: 'INLAND', //标准类型 + pubQue : selectedStand.classification === "OTHER" ? selectedStand.standardId : '',//公共问题 + classification: selectedStand.classification, //标准类型 problemDescription: '', //问题 questioner: this.$store.getters.userInfo.userId, //提问人 - standardEncdoing: '', //标准编号 - standardName: '', //标准名称 - standardId:'', //标准id + standardEncdoing: selectedStand.standardEncdoing, //标准编号 + standardName: selectedStand.standardName, //标准名称 + standardId: selectedStand.standardId, //标准id fileList: '', } this.dialogVisible = true @@ -1076,6 +1084,7 @@ export default { _this: this }, res => { this.standList = res.data + this.refreshStandMap() }) }, //问题查询 @@ -1107,6 +1116,7 @@ export default { _this: this }, res =>{ this.standList = res.data + this.refreshStandMap() if(this.$route.query.queId){ this.activestand = this.standList[0].standardId this.queSearch() @@ -1129,6 +1139,7 @@ export default { }) if(queNumber === 0){ this.standList = res.data + this.refreshStandMap() } }, e => { @@ -1235,6 +1246,7 @@ export default { this.standSearch2() break } + this.queSearch() }, e => { }) From 93fb5c965911f22764ab51aa3e9d88143853d9ee Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Fri, 24 Jun 2022 16:46:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055690=20=E3=80=90?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E3=80=91=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E5=B8=A6=E5=85=A5=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E6=89=B9=E5=87=86=E8=8A=82=E7=82=B9=EF=BC=8C?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E9=A9=B3=E5=9B=9E=E6=8C=89=E9=92=AE=E7=9A=84?= =?UTF-8?q?=E7=9E=AC=E9=97=B4=20=E8=B5=B7=E8=8D=89=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 23ef0725e..57fb6d5f8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -1288,21 +1288,21 @@ export default { if (this.form.zrgcs.length === 0) { this.form.zrgcs = ""; } - let qcdwName = [] - if(this.form.qcdw && this.form.qcdw.length > 0){ - this.form.qcdw.map(item => { - this.qcdwOptions.forEach(items => { - if(item === items.value){ - qcdwName.push(items.label) - } - }) - }) - } + // let qcdwName = [] + // if(this.form.qcdw && this.form.qcdw.length > 0){ + // this.form.qcdw.map(item => { + // this.qcdwOptions.forEach(items => { + // if(item === items.value){ + // qcdwName.push(items.label) + // } + // }) + // }) + // } this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' this.form.menuIds = this.form.treeListId; this.form.BBFDTBZ = this.form.bfbdtbzh - this.form.qcdw = qcdwName - this.form.qcdw = qcdwName.splice(',') + // this.form.qcdw = qcdwName + // this.form.qcdw = qcdwName.splice(',') const json = JSON.stringify(this.form); this.$http.post("lawss/activiti/completeTask", { taskIds: this.taskIds, From 0141c6317650b7df6984b5c87e5d109c5a4497b1 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Fri, 24 Jun 2022 17:11:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056043=20=E3=80=90?= =?UTF-8?q?=E4=B8=A5=E9=87=8D=E3=80=91=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=B5=81=E7=A8=8B=20=E9=99=A4=E5=8F=91?= =?UTF-8?q?=E8=B5=B7=E8=8A=82=E7=82=B9=E5=A4=96=E7=9A=84=E5=AE=A1=E6=89=B9?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=A4=96=EF=BC=8C=E5=85=B6=E4=BB=96=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=8A=82=E7=82=B9=20=E6=88=AA=E6=AD=A2=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmqdqr/step1-4.vue | 15 +++++++++++++++ .../pages/creatProcess/xmqdqr/step2.vue | 15 +++++++++++++++ .../pages/creatProcess/xmqdqr/step3.vue | 15 +++++++++++++++ .../pages/creatProcess/xmqdqr/step4.vue | 15 +++++++++++++++ 4 files changed, 60 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue index cdc5a06fb..2a6d7edcf 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step1-4.vue @@ -38,6 +38,16 @@ clearable > + + + + @@ -635,6 +645,11 @@ export default { }, data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7; + }, + }, lawInfoTableLoading: true, lawInfoTable:[], textState: [], diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 2a5b97e61..eaf8cca6e 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -38,6 +38,16 @@ clearable > + + + + @@ -659,6 +669,11 @@ export default { }, data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7; + }, + }, lawInfoTableLoading: true, lawInfoTable:[], textState: [], diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 4d91dab2f..f8f41520f 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -38,6 +38,16 @@ clearable > + + + + @@ -659,6 +669,11 @@ export default { }, data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7; + }, + }, lawInfoTableLoading: true, lawInfoTable:[], textState: [], diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index ef94c6db9..72de88509 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -38,6 +38,16 @@ clearable > + + + + @@ -650,6 +660,11 @@ export default { }, data() { return { + pickerOptions: { + disabledDate(time) { + return time.getTime() < Date.now() - 8.64e7; + }, + }, lawInfoTableLoading: true, lawInfoTable:[], textState: [], From 8a804d53f3b58bcce1e8f1343d9c1010b5090eed Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Fri, 24 Jun 2022 17:26:42 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055982=20=E3=80=9030?= =?UTF-8?q?=E5=8F=B7=E9=9C=80=E8=A7=A3=E5=86=B3=E9=97=AE=E9=A2=98=E3=80=91?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E8=BE=93=E5=85=A5=E6=A1=86=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/newStyle.less | 2 ++ src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 6 +++++- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 6 ++++++ src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/bzrk/step4.vue | 4 ++++ src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 6 ++++++ 6 files changed, 27 insertions(+), 1 deletion(-) diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index 0f2f85177..299f05416 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -315,6 +315,8 @@ tr.el-table__row{ padding: 13px 10px; height: 49px; border: none; + font-family: 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; + font-weight: lighter; } } .el-input-number{ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index b9b90b73d..dff140a52 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -122,6 +122,8 @@ @@ -132,6 +134,8 @@ @@ -3540,7 +3544,7 @@ export default { } .prc-content-border { - /deep/ .el-input__inner { + /deep/ .el-textarea__inner,.el-input__inner { padding-left: 30px; } } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index 57fb6d5f8..c987f87f1 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -115,6 +115,8 @@ @@ -134,6 +138,8 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index f63a72d6a..71a74f6c0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -126,6 +126,8 @@ v-else disabled v-model="form.standName" + type="textarea" + autosize placeholder="请输入标准中文名称" clearable > @@ -136,6 +138,8 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 6320d00ae..e2ab398b5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -127,6 +127,8 @@ @@ -137,6 +139,8 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue index 23abc4899..6585114e2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -115,6 +115,8 @@ @@ -134,6 +138,8 @@ From c24c6cc74f56035cd98e78092e1e0a9c748bec37 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Fri, 24 Jun 2022 17:38:04 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2055660=20=E3=80=90?= =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E3=80=91=E6=A0=87=E5=87=86=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E9=99=84=E5=BD=95=E7=9A=84=E6=9D=A1?= =?UTF-8?q?=E6=AC=BE=EF=BC=8C=E8=B5=B7=E8=8D=89=E7=9A=84=E7=BC=96=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=8F=B3=E4=BE=A7=E5=92=8C=E5=BA=95=E4=BE=A7=E7=9A=84?= =?UTF-8?q?=E6=BB=91=E5=8A=A8=E6=A0=8F=E7=95=99=E4=B8=80=E4=B8=AA=E5=B0=B1?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index f9bf983b4..b7dbeeff7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -413,7 +413,7 @@
-
+
无内容
@@ -426,7 +426,7 @@
-
+
无内容