-
-
- 基础信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 带入
-
-
+
+ 基础信息
+ 人员信息
+
+
+ 拆分信息
+
+
+
+ @selection-change="handleSelectionChange"
+ row-key="id">
+
+
+
+
+
+
+
+ 查看条款内容
+
+
+
+
+
+
+
+
+ 数据获取中
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 带入
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+
+ 标准法规部部长
+
+
+
+
+
+
- {{ scope.row.standCode }}
+ {{ scope.row.standCode }}
- {{ scope.row.standName }}
+ {{ scope.row.standName }}
@@ -112,14 +112,14 @@
-
+
- {{ scope.row.standCode }}
+ {{ scope.row.standCode }}
- {{ scope.row.standName }}
+ {{ scope.row.standName }}
@@ -170,12 +170,12 @@
>
- {{ scope.row.standCode }}
+ {{ scope.row.standCode }}
- {{ scope.row.standName }}
+ {{ scope.row.standName }}
@@ -236,12 +236,12 @@
>
- {{ scope.row.standCode }}
+ {{ scope.row.standCode }}
- {{ scope.row.standName }}
+ {{ scope.row.standName }}
@@ -492,6 +492,17 @@ export default {
}, e => {
});
},
+ //点击查看详情
+ handlePreview(item) {
+ let routeUrl = this.$router.resolve({
+ name: 'OtherStandardDetails',
+ params: {
+ id: item.standId,
+ pageType: item.standType + '_STAND'
+ }
+ })
+ window.open(routeUrl.href, '_blank')
+ },
//获取政策预警数据(type用于区别分页器切换)
getPolicyDate() {
this.loading[this.field] = true
From 9ab2466e74ef247cb766a147ab3c6efab1ffd095 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 27 Aug 2021 14:48:01 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?=
=?UTF-8?q?=E5=BA=93=E6=96=87=E6=9C=AC=E7=8A=B6=E6=80=81=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/EnterpriseStandardDatabase.vue | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index d2758415a..1c3d17136 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -341,6 +341,20 @@
label="文本状态"
width="110"
>
+
+
+
+ {{scope.row.standStatusShow}}
+
+
+ {{scope.row.standStatusShow}}
+
+
+ {{scope.row.standStatusShow}}
+
+
+
+
@@ -1237,6 +1251,7 @@ export default {
children: 'children',
label: 'menuName'
},
+
advancedSearch:[],
nodeKey: 'id',
nodeKeyCode: 'code',
From dac4796046e7fb256441d60d45db7083dc114bde Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 27 Aug 2021 15:07:01 +0800
Subject: [PATCH 06/13] feat: There is no way the
---
src/pages/searchCenter/pages/advancedSearch.vue | 11 ++++++++++-
src/pages/searchCenter/pages/standardSearch.vue | 11 ++++++++++-
2 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index 23a60ebce..e731586ed 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -987,7 +987,8 @@
width="180"
:label="selectIndex === 'INLAND_STAND' ? '文本状态' : (this.selectIndex === 'INLAND_LAWS' ? '文件状态' : '文本状态')">
-
+
+
+
+
-
+
+
+
+
+
+
+ 查询
+
+ 清空
+
+
+
+
+
+
+
+ prop="showNumber"
+ label="标准号/政策号"
+ width="170"
+ align="center">
+
+
+
+ prop="standName"
+ label="标准名称/政策名称"
+ show-overflow-tooltip
+ align="center">
+
+
+
-
- 查看条款内容
-
+ prop="fileTypeShow"
+ label="文本状态"
+ align="center">
-
-
-
-
- 数据获取中
-
-
-
-
+
+
+
-
-
-
-
- 数据加载中……
+
-
-
-
-
+
+
+
+
From add1b5831e193f777e2ff7c5ff90579b5a66a1a9 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Fri, 27 Aug 2021 14:44:09 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?=
=?UTF-8?q?=E6=A0=87=E5=87=86=E5=8F=B7=E8=B7=B3=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/localTool/standardWarning.vue | 31 +++++++++++++++++--------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index f2d7528f7..59df5b758 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -47,14 +47,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ 流程发起人
-
-
-
- 标准法规部部长
-
-
-
-
-
+
-
-
-
-
+
+
-
-
-
-
-
-
- 查询
- 清空
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+ 数据加载中……
-
+
+
+
+
+ {{ formatIssueDate(scope.row.issueTime) }}
+
+
+
+
+ {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0, 10) : '-' }}
+
+
+
+
+ {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0, 10) : '-' }}
+
+
+
+
+ {{ textStatusMap[scope.row.textStatus] }}
+
+
+
-
-
+
+
+
+
- {{ scope.row.standSortShow }} {{
+ scope.row.standNumber
+ }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ formatIssueDate(scope.row.issueTime) }}
-
-
-
-
- {{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}
-
-
-
-
- {{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}
-
-
-
-
- {{ textStatusMap[scope.row.textStatus] }}
-
-
-
-
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}
- {{ scope.row.standSortShow }} {{ scope.row.standNumber }}
-
-
- 关闭
-
-
+ 关闭
+
+
+ 国外政策
- 国外政策
+
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
+ /deep/ .yellowClass{
+ color: #E6A23C;
+ }
+
+ /deep/ .redClass{
+ color: #F56C6C;
+ }
/deep/ p{
display: inline;
}
From 83f0c0ec833b27de6f70154f58428668da7bd933 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Fri, 27 Aug 2021 15:31:26 +0800
Subject: [PATCH 07/13] feat: There is no way the
---
src/pages/searchCenter/pages/advancedSearch.vue | 4 ++--
src/pages/searchCenter/pages/standardSearch.vue | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/pages/searchCenter/pages/advancedSearch.vue b/src/pages/searchCenter/pages/advancedSearch.vue
index e731586ed..fccb551d2 100644
--- a/src/pages/searchCenter/pages/advancedSearch.vue
+++ b/src/pages/searchCenter/pages/advancedSearch.vue
@@ -976,8 +976,8 @@
:label="$t('m.putTime')"
width="130">
-
{{ selectIndex === 'INLAND_STAND' ? scope.row.textStatusName : (selectIndex === 'INLAND_LAWS' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
@@ -2492,6 +2493,14 @@ export default {
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
+/deep/ .yellowClass{
+ color: #E6A23C !important;
+}
+
+/deep/ .redClass{
+ color: #F56C6C !important;
+}
+
#advancedSearch {
background: #fff;
@borderColor: #BFBFBF;
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 1edd98e0c..10b36e37d 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -116,7 +116,9 @@
width="200">
{{ getLawsState(scope.row.statecode) }}
- {{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
+
+ {{ selectIndex === 'stand' ? scope.row.textStatusName : (selectIndex === 'laws' ? scope.row.textStatusLawsName : scope.row.textStatusBussName) }}
- {{ $dateFormat(new Date(scope.row.SSRQ), "yyyy-MM-dd") }}
+
+
+
Date: Fri, 27 Aug 2021 16:04:10 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E8=87=AA=E5=AE=9A?=
=?UTF-8?q?=E4=B9=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../attributeCustom/components/stand.vue | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index 3953c3414..f36390630 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -104,7 +104,7 @@
label-width="150px"
>
-
+
-
+
-
+
-
+
-
+
{{ opt.label }}-->
-
+
-
+
-
+
{{ opt.label }}
-
+
-
+
Date: Fri, 27 Aug 2021 16:05:59 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86-getA?=
=?UTF-8?q?reaList-INLAND=5FSTAND?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../domesticStandardsAndRegulations/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
index e2a4a8fdc..06bb099c8 100644
--- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue
@@ -1686,7 +1686,7 @@ export default {
orgTableValName: '',
twoOptions: [],
threeOptions: [],
- sarType: 'STAND',
+ sarType: 'INLAND_STAND',
productModal: false, // 模态框是否打开
modalType: '',
productTitle: '', // 模态框标题
From a17c9dfc8d2b3ec964a0ea71e4f9d9f6df7ae66d Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Fri, 27 Aug 2021 16:16:51 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=9B=BD=E5=A4=96=E6=A0=87=E5=87=86-getA?=
=?UTF-8?q?reaList-FOREIGN=5FSTAND?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../foreignStandardsAndRegulations/index.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index 9a4e7820a..3ee6d83d5 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -4105,7 +4105,7 @@ export default {
queryDisplayLocation () {
return new Promise((resolve, reject) => {
this.$http.get('lawssBase/utArea/getAreaList', {
- sarType: 'INLAND_STAND'
+ sarType: 'FOREIGN_STAND'
}, {
_this: this
}, res => {
From f19f93d521a8dd329e7fb78b666165a6e9ddae9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 27 Aug 2021 18:21:04 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?=
=?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=E5=8E=86=E5=8F=B2=E6=95=B0?=
=?UTF-8?q?=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzzqyj/step3.vue | 6 +-
.../pages/creatProcess/bzzqyj/step5.vue | 929 ++++++++++--------
.../pages/creatProcess/bzzqyj/step6.vue | 895 +++++++++--------
.../pages/creatProcess/bzzqyj/step7.vue | 39 +-
.../pages/creatProcess/bzzqyj/step8.vue | 39 +-
.../pages/creatProcess/bzzqyj/step9.vue | 882 +++++++++--------
src/sysConfig/index.js | 8 +-
7 files changed, 1473 insertions(+), 1325 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index b3e076e97..43822317f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -328,11 +328,13 @@
handleSave() {
this.saveLoading = true;
let _formData = new FormData();
+ let json = this.form
+ json.data = this.data
_formData.append("id", this.bpnId || "");
_formData.append("prcType", "3");
_formData.append("taskIds", this.taskIds);
_formData.append("json", JSON.stringify({
- form: this.json,
+ form: json,
commentText: this.commentText
}));
saveTaskForPub(_formData).then(res => {
@@ -400,7 +402,7 @@
this.form.endTime = data.endTime || data.form.endTime
this.form.cname = data.cname || data.form.cname
this.json = data
- this.data = data.info || data.data || []
+ this.data = data.info || data.data || data.form.data|| []
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index e08b93f6e..cc5a6fc4f 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -1,450 +1,505 @@
-
+ {{ $dateFormat(new Date(selectIndex === 'INLAND_STAND' ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
diff --git a/src/pages/searchCenter/pages/standardSearch.vue b/src/pages/searchCenter/pages/standardSearch.vue
index 10b36e37d..219773ddf 100644
--- a/src/pages/searchCenter/pages/standardSearch.vue
+++ b/src/pages/searchCenter/pages/standardSearch.vue
@@ -109,6 +109,17 @@
+
+ {{ $dateFormat(new Date((selectIndex === 'stand') ? scope.row.SSRQ : scope.row.putTime), "yyyy-MM-dd") }}
+
+
+
+
-
-
- 标准征求意见流程
- 汇总填写处理意见
-
-
-
+
-
- 基础信息
- 审批历史
-
-
-
-
-
-
-
-
-
- 基础信息
-
-
-
- 征求意见列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.oldText }}
-
-
-
-
-
- {{ scope.row.newText }}
-
-
-
-
-
- {{ scope.row.reason }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
-
-
+
+
+ 标准征求意见流程
+ 汇总填写处理意见
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 6f79d2566..b559eec49 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -1,446 +1,477 @@
-
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+ 征求意见列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.oldText }}
+
+
+
+
+
+ {{ scope.row.newText }}
+
+
+
+
+
+ {{ scope.row.reason }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+
+
-
-
- 标准征求意见流程
- 责任人会签
-
-
-
+
@@ -2396,6 +2398,9 @@ export default {
this.standItemSearch.parts = ''
this.standItemSearch.nameOrRequest = ''
this.standItemSearch.fileType = ''
+ this.standItemSearch.itemsName=''
+ this.standItemSearch.ZCCSSRQ=''
+ this.standItemSearch.XCXSSRQ=''
this.selectSarStandItems()
},
inputChange() {
From 3a2291bf8f3d88316b777ab8dd50111b60891dd4 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 30 Aug 2021 12:11:55 +0800
Subject: [PATCH 13/13] feat: There is no way the
---
src/pages/config/pages/attributeCustom/components/stand.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/config/pages/attributeCustom/components/stand.vue b/src/pages/config/pages/attributeCustom/components/stand.vue
index f36390630..0ea9cfe17 100644
--- a/src/pages/config/pages/attributeCustom/components/stand.vue
+++ b/src/pages/config/pages/attributeCustom/components/stand.vue
@@ -261,7 +261,7 @@
-
- 基础信息
- 审批历史
-
-
-
-
-
-
-
-
-
- 基础信息
-
-
-
- 征求意见列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ stateText(scope.row.state) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
-
-
+
+
+ 标准征求意见流程
+ 责任人会签
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 61b4a50d7..dfadeae1d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -355,19 +355,34 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- this.form.cid = data.cid
- this.form.endTime = data.endTime
- this.form.cname = data.cname
- var arr = []
- data.summaryList.forEach( item => {
- if (item.state != '3') {
- arr.push(item)
- }
- })
- this.json = data
- this.data = arr
+ if (data.oldinfo === undefined) {
+ this.form.cid = data.cid;
+ this.form.endTime = data.endTime;
+ this.form.cname = data.cname;
+ var arr = [];
+ data.summaryList.forEach(item => {
+ if (item.state != "3") {
+ arr.push(item);
+ }
+ });
+ this.json = data;
+ this.data = arr;
+ this.oldData = data.oldinfo;
+ } else {
+ this.form.cid = data.oldinfo.cid;
+ this.form.endTime = data.oldinfo.endTime;
+ this.form.cname = data.oldinfo.cname;
+ var arr = [];
+ data.oldinfo.data.forEach(item => {
+ if (item.state != "3") {
+ arr.push(item);
+ }
+ });
+ this.json = data;
+ this.data = arr;
+ this.oldData = data.oldinfo;
+ }
- this.oldData = data.oldinfo
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 1144cfc97..8cc1a33ff 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -355,18 +355,33 @@
pId: this.pId
}).then(res => {
let data = JSON.parse(res.mesg)
- this.form.cid = data.cid
- this.form.endTime = data.endTime
- this.form.cname = data.cname
- var arr = []
- data.summaryList.forEach( item => {
- if (item.state != '3') {
- arr.push(item)
- }
- })
- this.json = data
- this.data = arr
- this.oldData = data.oldinfo
+ if (data.oldinfo === undefined) {
+ this.form.cid = data.cid;
+ this.form.endTime = data.endTime;
+ this.form.cname = data.cname;
+ var arr = [];
+ data.summaryList.forEach(item => {
+ if (item.state != "3") {
+ arr.push(item);
+ }
+ });
+ this.json = data;
+ this.data = arr;
+ this.oldData = data.oldinfo;
+ } else {
+ this.form.cid = data.oldinfo.cid;
+ this.form.endTime = data.oldinfo.endTime;
+ this.form.cname = data.oldinfo.cname;
+ var arr = [];
+ data.oldinfo.data.forEach(item => {
+ if (item.state != "3") {
+ arr.push(item);
+ }
+ });
+ this.json = data;
+ this.data = arr;
+ this.oldData = data.oldinfo;
+ }
}).catch(e => {
})
})
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index 72dfadb99..4703b35e0 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -1,440 +1,470 @@
-
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+ 征求意见列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ stateText(scope.row.state) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+
+
-
-
- 标准征求意见流程
- 工程研究总院院长批准
-
-
-
+
@@ -477,6 +478,7 @@
-
- 基础信息
- 审批历史
-
-
-
-
-
-
-
-
-
- 基础信息
-
-
-
- 征求意见列表
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ stateText(scope.row.state) }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
-
-
-
-
- {{ scope.row.commentText }}
-
-
-
-
- {{ scope.row.endTime ? '已完成' : '未完成'}}
-
-
-
-
-
+
+
+ 标准征求意见流程
+ 工程研究总院院长批准
+
+
+
+
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 1155aea99..d3cd25a02 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -4,10 +4,10 @@
* @date: 2018-09-04 17:47:46
*/
// 服务器地址
-// const devIp = '192.168.1.159'
+const devIp = '10.96.10.171'
+const devInterfacePORT = '9999'
+// const devIp = '10.5.103.101'
// const devInterfacePORT = '9999'
-const devIp = '62.234.136.153'
-const devInterfacePORT = '8038'
// 云端端口号
const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
const simpleFilePath = 'att/attFile/upload'
@@ -31,7 +31,7 @@ const processPort = '17210'
*****************************************************************/
// 生产环境配置
const prodIp = '62.234.136.153'
-const prodInterfacePORT = '8038'
+const prodInterfacePORT = '8033'
// 判断环境
From 820b215771734c44399336bd163cbe860e85046e Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Sun, 29 Aug 2021 19:16:04 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E5=9B=BD=E5=86=85=E5=A4=96=E6=A0=87?=
=?UTF-8?q?=E5=87=86=E8=AF=A6=E6=83=85=20=E5=88=86=E8=A7=A3=E5=8D=95?=
=?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=92=8C=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/details/otherStandardDetails/index.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue
index 139d7920a..ad3d8ac6a 100644
--- a/src/pages/details/otherStandardDetails/index.vue
+++ b/src/pages/details/otherStandardDetails/index.vue
@@ -467,6 +467,7 @@
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+ 征求意见列表
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ stateText(scope.row.state) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format("YYYY-MM-DD") : "" }}
+
+
+
+
+ {{ scope.row.commentText }}
+
+
+
+
+ {{ scope.row.endTime ? "已完成" : "未完成" }}
+
+
+
+
+