From 735be50bcb34de3d25c766e29f734dc2fc7d9b82 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 26 Jul 2021 11:29:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=BA=93=20?=
=?UTF-8?q?=E6=B3=A8=E9=87=8A=20=E6=97=A5=E6=9C=9F=20=E5=9B=BD=E5=AE=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 54 ++++++++---------
.../pages/creatProcess/bzrk/step2.vue | 60 +++++++++----------
.../pages/creatProcess/bzrk/step3.vue | 58 +++++++++---------
.../pages/creatProcess/bzrk/step4.vue | 50 ++++++++--------
.../domesticStandardsAndRegulations/index.vue | 1 +
.../foreignStandardsAndRegulations/index.vue | 1 +
6 files changed, 113 insertions(+), 111 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 3f8d70f52..6e3df92b6 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -158,14 +158,6 @@
value-format="yyyy-MM-dd">
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 02be6a045..89cf5239d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -147,15 +147,6 @@
value-format="yyyy-MM-dd">
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
index 27cbe6975..f15c752aa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -145,14 +145,6 @@
placeholder="请选择标准实施日期(标准文本)">
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+ disabled
+ v-model="form.xcxssrq"
+ type="date"
+ placeholder="请选择新车型实施日期(标准文本">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
index 392f83413..4dde65c7c 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -149,13 +149,6 @@
placeholder="请选择标准实施日期(标准文本)">
-
-
-
-
-
+
-
-
-
-
-
-
-
-
+ v-model="form.xcxssrq"
+ type="date"
+ placeholder="请选择新车型实施日期(标准文本">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index 8deefea47..cd4fc4fdc 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -524,6 +524,7 @@
Date: Mon, 26 Jul 2021 13:37:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E5=9E=8B?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E7=9B=B8=E5=85=B3bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../localProductsOrProjectLibrary/index.vue | 3 +-
.../pages/details.vue | 42 ++++++++++++++-----
2 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index 8fe0f3fb0..1b966f002 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1278,13 +1278,14 @@ export default {
}, res => {
if (this.localProTableSearch.prodectCode === 'Maintenance') {
this.localProTableList = res.data.Maintenance.records
+ this.total = res.data.Maintenance.total
}
else if (this.localProTableSearch.prodectCode === 'notMaintenance')
{
this.localProTableList = res.data.notMaintenance.records
+ this.total = res.data.notMaintenance.total
}
- this.total = res.data.count
// this.localProTableList.map((item) => {
// this.xmztOptions.map((opr) => {
// if (item.productBrand === opr.value) {
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
index d50c934ca..9cf6991c4 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/pages/details.vue
@@ -78,47 +78,56 @@
>
+
+ {{ scope.row.ssrq ? $moment(scope.row.ssrq).format('YYYY-MM-DD') : '-' }}
+
+
+ {{scope.row.xcxssrqgj ? $moment(scope.row.xcxssrqgj).format('YYYY-MM-DD') : '-' }}
+
+
+ {{ scope.row.zccssrqgj ? $moment(scope.row.zccssrqgj).format('YYYY-MM-DD') : '-' }}
+
@@ -451,10 +460,8 @@ export default {
_this: this
}, res => {
if (res.ok) {
- this.$message.success(res.message)
+ // this.$message.success(res.message)
this.getDataList()
- }else {
- this.$message.warning(res.message)
}
}, e => {
});
@@ -502,6 +509,17 @@ export default {
this.$message.warning("请选择一条数据进行带入");
}
},
+ // 点击查看
+ handlePreview (item) {
+ let routeUrl = this.$router.resolve({
+ name: 'OtherStandardDetails',
+ params: {
+ id: item.id,
+ pageType: 'INLAND_STAND'
+ }
+ })
+ window.open(routeUrl.href, '_blank')
+ },
back () {
this.$router.push(this.$store.state.detailMap)
this.$store.commit('setDetailMap', '')
@@ -568,6 +586,7 @@ export default {
}
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + ids + '&exportName=' + this.exportName
+ console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
window.open(exportURL)
this.$message.success('导出信息成功')
}
@@ -575,6 +594,7 @@ export default {
console.log(this.selectList);
const exportURL = interfaceUrl + 'sarStandProjectLibrary/exportStandAttrInfoExcel?' +
'exportType' + this.saveExportType + '&ids=' + this.selectList.join(',') + '&exportName=' + this.exportName
+ console.log(exportURL + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM")
window.open(exportURL)
this.$message.success('导出信息成功')
}