+
+
+
+ 查看
+
+
+
+
+
+
-
- {{ scope.row.productName }}
-
+
+
+
- {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
+
- {{(scope.row.sopTime ? scope.row.sopTime.substring(0, 11): '')}}
+
- {{(scope.row.leftRight === '1' ? '左驾': '右驾')}}
+
@@ -234,6 +245,9 @@ export default {
},
data () {
return {
+ //默认返回已维护
+ ifMaintaince:"Maintenance",
+
deptUser: [],
// 查询条件
localProTableSearch: {
@@ -710,7 +724,7 @@ export default {
},
// 切换tabs
handleClick (tab, event) {
- this.localProEO.prodectCode = this.activeName
+ this.localProEO.prodectCode = this.ifMaintaince
this.insideHandleClick()
},
insideHandleClick (tab, event) {
@@ -1077,13 +1091,15 @@ export default {
},
// 查询本地产品
getLocalProductTable () {
- this.localProTableSearch.prodectCode = this.activeName
+ this.localProTableSearch.prodectCode = this.ifMaintaince
+ console.log(this.localProTableSearch.prodectCode)
this.localProTableSearch.dataType = this.insideTabsActiveName
this.SarExportSearchEo = this.localProTableSearch
- this.$http.get('lawss/sarProductInfo/getProductInfoPage', this.localProTableSearch, {
+ this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, {
_this: this, loading: 'loading'
}, res => {
- this.localProTableList = res.data.list
+ console.log(res.data)
+ this.localProTableList = res.data.Maintenance.records
this.total = res.data.count
// this.localProTableList.map((item) => {
// this.xmztOptions.map((opr) => {
From e5f18ec16c463805fe6f2054c2f5c8790fce4de7 Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Mon, 21 Jun 2021 14:10:22 +0800
Subject: [PATCH 03/19] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B5=81=E7=A8=8B?=
=?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=9A=84=E5=88=9D=E5=A7=8B=E5=8C=96=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tabComponents/alreadyProcess/index.vue | 16 ++++++++++++++++
.../tabComponents/alreadySend/index.vue | 17 +++++++++++++++++
.../tabComponents/monitorProcess/index.vue | 17 +++++++++++++++++
.../tabComponents/processCenter/index.vue | 1 -
.../tabComponents/taskDraft/index.vue | 14 ++++++++++++++
5 files changed, 64 insertions(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index 4cfd649b2..e65b520ec 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -179,6 +179,22 @@ export default {
this.queryProcess()
},
queryProcess () { // 查询待办流程
+ this.$http.postData('lawss/activiti/doneProcess', {
+ current: this.pageNo,
+ size: this.$store.getters.userInfo.configContent,
+ userId: this.$store.getters.userInfo.userId,
+ prcName: this.searchForm.prcName,
+ prcType: parseInt(this.searchForm.prcType) || '',
+ prcNum: this.searchForm.prcNum
+ }, {
+ loading: 'loading',
+ _this: this
+ }, res => {
+ console.log(res)
+ this.processList = res.list || []
+ this.total = res.count
+ }, e => {
+ })
},
selectProcessBtn () { // 搜索按钮
this.pageNo = 1
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index f788dbf12..b23c1234a 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
@@ -179,6 +179,23 @@ export default {
this.queryProcess()
},
queryProcess () { // 查询待办流程
+ this.$http.postData('lawss/activiti/IssuedProcess',
+ {
+ current: this.pageNo,
+ size: this.$store.getters.userInfo.configContent,
+ userId: this.$store.getters.userInfo.userId,
+ prcName: this.searchForm.prcName,
+ prcType: parseInt(this.searchForm.prcType) || '',
+ prcNum: this.searchForm.prcNum
+ },
+ {
+ loading: 'loading',
+ _this: this
+ }, res => {
+ this.processList = res.list
+ this.total = res.count
+ }, e => {
+ })
},
selectProcessBtn () { // 搜索按钮
this.pageNo = 1
diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
index 492b68d1d..66a405294 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
@@ -179,6 +179,23 @@ export default {
this.queryProcess()
},
queryProcess () { // 查询待办流程
+ this.$http.postData('lawss/activiti/allProcess',
+ {
+ current: this.pageNo,
+ size: this.$store.getters.userInfo.configContent,
+ userId: this.$store.getters.userInfo.userId,
+ prcName: this.searchForm.prcName,
+ prcType: parseInt(this.searchForm.prcType) || '',
+ prcNum: this.searchForm.prcNum
+ },
+ {
+ loading: 'loading',
+ _this: this
+ }, res => {
+ this.processList = res.list || []
+ this.total = res.count
+ }, e => {
+ })
},
selectProcessBtn () { // 搜索按钮
this.pageNo = 1
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index e9a545f17..f55bc97d9 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -199,7 +199,6 @@ export default {
}, e => {
})
},
-
selectProcessBtn () { // 搜索按钮
this.pageNo = 1
this.queryProcess()
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index 42fbdb731..a666b610f 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -179,6 +179,20 @@ export default {
this.queryProcess()
},
queryProcess () { // 查询待办流程
+ this.$http.postData('lawss/activiti/queryTaskDraft', {
+ current: this.pageNo,
+ size: parseInt(this.$store.getters.userInfo.configContent),
+ userId: this.$store.getters.userInfo.usid || this.$store.getters.userInfo.userId,
+ prcName: this.searchForm.prcName,
+ prcType: parseInt(this.searchForm.prcType) || ''
+ },
+ {
+ loading: 'loading',
+ _this: this
+ }, res => {
+ this.processList = res.list
+ this.total = res.count
+ })
},
selectProcessBtn () { // 搜索按钮
this.pageNo = 1
From 890b7ec2ba5e4c528862e22e1131f4dc132963b4 Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Mon, 21 Jun 2021 16:49:48 +0800
Subject: [PATCH 04/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step2.vue | 3 +-
.../pages/processDetail/index.vue | 1138 +++++++++++++++++
.../tabComponents/alreadyProcess/index.vue | 7 +
.../tabComponents/alreadySend/index.vue | 7 +
.../tabComponents/monitorProcess/index.vue | 11 +-
5 files changed, 1162 insertions(+), 4 deletions(-)
create mode 100644 src/pages/processCenter/pages/processDetail/index.vue
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 55f15899b..3fa77e054 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -703,8 +703,7 @@
pId: this.$route.query.prcId
}).then(res => {
if (res) {
- console.log(res);
- resolve()
+ this.form = JSON.parse(res.mesg)
}
}).catch(e => {
})
diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue
new file mode 100644
index 000000000..60d5e7e98
--- /dev/null
+++ b/src/pages/processCenter/pages/processDetail/index.vue
@@ -0,0 +1,1138 @@
+
+
+
- 办理
+ 查看
@@ -167,7 +167,7 @@ export default {
methods: {
handleCommand (command) {
switch (command[1]) {
- case '办理':
+ case '查看':
this.dealWith(command[0])
break
}
@@ -212,6 +212,13 @@ export default {
this.queryProcess()
},
dealWith (row) { // 办理
+ this.$router.push({
+ name: 'ProcessDetail',
+ query: {
+ prcNum: row.prcNum,
+ tabsName: 'MonitorProcess'
+ }
+ })
},
...mapMutations(['setProcess', 'setHandleInfo']),
...mapActions(['setMenu'])
From fbfadb43e310400c049ae32803ea821326ad0105 Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Mon, 21 Jun 2021 17:51:42 +0800
Subject: [PATCH 05/19] =?UTF-8?q?=E6=A0=87=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 3fa77e054..b936728b9 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -3,7 +3,7 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index e65b520ec..2351d1a65 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -211,6 +211,13 @@ export default {
this.queryProcess()
},
dealWith (row) { // 办理
+ this.$router.push({
+ name: 'ProcessDetail',
+ query: {
+ prcNum: row.prcNum,
+ tabsName: 'AlreadyProcess'
+ }
+ })
},
...mapMutations(['setProcess', 'setHandleInfo']),
...mapActions(['setMenu'])
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index b23c1234a..446f7a84e 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
@@ -212,6 +212,13 @@ export default {
this.queryProcess()
},
dealWith (row) { // 办理
+ this.$router.push({
+ name: 'ProcessDetail',
+ query: {
+ prcNum: row.prcNum,
+ tabsName: 'AlreadySend'
+ }
+ })
},
...mapMutations(['setProcess', 'setHandleInfo']),
...mapActions(['setMenu'])
diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
index 66a405294..24bd71036 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
@@ -124,7 +124,7 @@
+
+
+
+
+
+
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}
+
+
+
+
+ {{ scope.row.comment === '0' ? '同意' : scope.row.comment === '1' ? '不同意' : scope.row.comment === '3' ? '退回' : scope.row.comment === '4' ? '确认' :
+ (scope.row.comment === '2' ? scope.row.commentText : '')}}
+
+
+
+
+ {{ scope.row.endTime ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+
+ 基础信息
From 903112d4884e039c0ee2d8b2bbc899980e59b64a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 21 Jun 2021 18:05:44 +0800
Subject: [PATCH 06/19] =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84?=
=?UTF-8?q?=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/navMenu/index.vue | 14 +-
.../page/listOfCountries.vue | 1027 ++++++-----------
.../page/listOther.vue | 1007 ++++++----------
.../page/listProject.vue | 1008 ++++++----------
.../page/listTracking.vue | 999 ++++++----------
5 files changed, 1445 insertions(+), 2610 deletions(-)
diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue
index 59880e236..947c63e23 100644
--- a/src/components/navMenu/index.vue
+++ b/src/components/navMenu/index.vue
@@ -388,13 +388,13 @@ export default {
// // }
// ]
// },
- // {
- // title: '搜索中心',
- // path: '/advancedSearch',
- // 'icon-class': 'search',
- // menuId: 'K9BAYUPZBC',
- // isChildren: true // 判断没有子菜单
- // },
+ {
+ title: '搜索中心',
+ path: '/advancedSearch',
+ 'icon-class': 'search',
+ menuId: 'K9BAYUPZBC',
+ isChildren: true // 判断没有子菜单
+ },
// {
// title: '标准比对库',
// path: '/standardComparisonLibrary',
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
index 42cce532f..f32fddf4e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOfCountries.vue
@@ -1,676 +1,381 @@
-
-
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
index 2af54d069..ff422126d 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listOther.vue
@@ -1,661 +1,378 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 高级查询
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
-
-
-
-
-
-
- {{ scope.row.accessContent }}
-
-
-
-
- 未发布
- 已发布
-
-
-
-
- V{{ scope.row.version }}
-
-
-
-
- V{{ scope.row.version }}
-
-
-
-
-
-
-
-
-
-
-
- 数据获取中
-
+ {{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
-
-
-
-
-
- 查看
- 编辑
- 删除
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ scope.row.accessContent }}
+
+
+
+
+ 未发布
+ 已发布
+
+
+
+
+ V{{ scope.row.detailedListVesion }}
+
+
+
+
+ V{{ scope.row.applicationScope }}
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '' }}
+
+
+
+
+
+ 查看
+ 编辑
+ 删除
+
+
+
+
+
-
- 办理
+ 查看
@@ -167,7 +167,7 @@ export default {
methods: {
handleCommand (command) {
switch (command[1]) {
- case '办理':
+ case '查看':
this.dealWith(command[0])
break
}
@@ -211,7 +211,7 @@ export default {
pageSizeChange (pageSize) { // 数量改变
this.queryProcess()
},
- dealWith (row) { // 办理
+ dealWith (row) { // 查看
this.$router.push({
name: 'ProcessDetail',
query: {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
index 24bd71036..43a7c2803 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/monitorProcess/index.vue
@@ -124,7 +124,7 @@
-
-
+
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
index 596cd2efa..7dcda4ec7 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listProject.vue
@@ -1,667 +1,373 @@
-
-
-
-
-
-
-
-
-
-
-
-
- 高级查询
-
-
-
-
-
Date: Tue, 22 Jun 2021 13:11:10 +0800
Subject: [PATCH 10/19] =?UTF-8?q?update:tab=E9=A1=B5=E9=9D=A2=E7=BC=96?=
=?UTF-8?q?=E5=86=99=E3=80=81=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=AE=8C?=
=?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../localProductsOrProjectLibrary/index.vue | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
index bcf09c84c..c2080cfa8 100644
--- a/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
+++ b/src/pages/regulatoryRepository/localProductsOrProjectLibrary/index.vue
@@ -1098,8 +1098,15 @@ export default {
this.$http.get('sarStandProjectLibrary/queryProject', this.localProTableSearch, {
_this: this, loading: 'loading'
}, res => {
- console.log(res.data)
- this.localProTableList = res.data.Maintenance.records
+ // console.log(res.data)
+ if (this.localProTableSearch.prodectCode === 'Maintenance') {
+ this.localProTableList = res.data.Maintenance.records
+ }
+ else if (this.localProTableSearch.prodectCode === 'notMaintenance')
+ {
+ this.localProTableList = res.data.notMaintenance.records
+
+ }
this.total = res.data.count
// this.localProTableList.map((item) => {
// this.xmztOptions.map((opr) => {
From bb760d6bb4bc1d33cbb619ae78c33e79a5e802c4 Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Tue, 22 Jun 2021 13:37:47 +0800
Subject: [PATCH 11/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../processList/tabComponents/alreadyProcess/index.vue | 6 +++---
.../pages/processList/tabComponents/alreadySend/index.vue | 6 +++---
.../processList/tabComponents/monitorProcess/index.vue | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
index 2351d1a65..52aa76563 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadyProcess/index.vue
@@ -124,7 +124,7 @@
- 办理
+ 查看
@@ -167,7 +167,7 @@ export default {
methods: {
handleCommand (command) {
switch (command[1]) {
- case '办理':
+ case '查看':
this.dealWith(command[0])
break
}
@@ -210,7 +210,7 @@ export default {
pageSizeChange (pageSize) { // 数量改变
this.queryProcess()
},
- dealWith (row) { // 办理
+ dealWith (row) { // 查看
this.$router.push({
name: 'ProcessDetail',
query: {
diff --git a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
index 446f7a84e..ec7c033cb 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/alreadySend/index.vue
@@ -124,7 +124,7 @@
-
-
+
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
index 18d6d042e..234586d1c 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/page/listTracking.vue
@@ -1,661 +1,368 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 高级查询
-
-
-
-
-
From 03f58ab166acec9275efcde6b30a47d93e8cb93b Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Mon, 21 Jun 2021 18:35:11 +0800
Subject: [PATCH 07/19] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E6=B5=81=E7=A8=8B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step2.vue | 59 +++++++++++--------
1 file changed, 36 insertions(+), 23 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index b936728b9..aaa5948fa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -597,7 +597,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
- import {inboundLiaisonDetail} from 'api/process'
+ import {inboundLiaisonDetail,processCreateStand} from 'api/process'
export default {
name: "bzrkStep2",
data () {
@@ -728,30 +728,43 @@
},
handleSave() {},
handleSubmit() {
- var json = this.form
- json.zrUserId = this.$store.getters.userInfo.userId
- json.jlUserId = this.$store.getters.userInfo.userId
- json.applyUpdUserId = this.$store.getters.userInfo.userId
- json.prcCreateUser = this.$store.getters.userInfo.userId
- json.prcCreateUserName = this.$store.getters.userInfo.account
- this.$http.get('lawss/activiti/startProcess', {type: '1'}, {
- _this: this
- }, res => {
- if (res.ok) {
- this.$http.post('lawss/activiti/completeTask', {
- taskIds: res.data,
- userId : this.$store.getters.userInfo.userId,
- json: JSON.stringify(json)
- }, {
- _this: this
- }, res => {
- console.log(res);
- if (res.ok) {
- }
- })
+ const json = JSON.stringify(this.form);
+ console.log(json)
+ // this.$http.post('lawss/activiti/completeTask', {
+ // taskIds: res.data,
+ // userId : this.$store.getters.userInfo.userId,
+ // json: json
+ // }, {
+ // _this: this
+ // }, res => {
+ // console.log(res);
+ // if (res.ok) {
+ // this.processCreateStand(json)
+ // }
+ // })
+ },
+
+ /**
+ * @description: 流程入库
+ * @date: 2020-11-18 21:47:58
+ * @auth: chenxiaoxi
+ */
+ processCreateStand(json) {
+ const _formData = new FormData()
+ _formData.append('infoJson', json)
+ processCreateStand(_formData).then(res => {
+ if (res.result === '操作成功' || res.data === '入库成功') {
+ this.$message.success(res.data)
+ setTimeout(() => {
+ this.$router.push({
+ name: 'ProcessCenter'
+ })
+ }, 100)
+ } else {
+ this.$message.warning(res.message)
}
})
- }
+ },
},
mounted () {
this.getData()
From 68bcaee2c71d57b17f5f2960282071074a6a2563 Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Tue, 22 Jun 2021 09:30:03 +0800
Subject: [PATCH 08/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
=?UTF-8?q?=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/router/index.js | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/router/index.js b/src/router/index.js
index 22500369a..a782539a5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -222,6 +222,15 @@ const routes = [
title: '标准需求（翻译）申请流程'
}
},
+ {
+ path: '/processDetail',
+ name: 'ProcessDetail',
+ component: () => import('@/pages/processCenter/pages/processDetail/index.vue'),
+ meta: {
+ requireAuth: true,
+ title: '流程详情'
+ }
+ },
{
path: '/bzffStep1',
name: 'bzffStep1',
From 537cb139e0c563a49c5ce1a5367f894c867526c4 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 22 Jun 2021 10:12:52 +0800
Subject: [PATCH 09/19] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E7=94=A8?=
=?UTF-8?q?=E6=88=B7admin=20=E6=9A=82=E4=B8=8D=E5=8A=A0=E5=AF=86=E7=99=BB?=
=?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/processList/tabComponents/processCenter/index.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index f55bc97d9..a1ee99149 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -221,7 +221,10 @@ export default {
name: 'bzrkStep2',
query: {
taskIds: row.taskIds,
- prcId: row.prcId
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
}
})
}
From 21bc8229c53725db3e537f468c73c03648b51cf4 Mon Sep 17 00:00:00 2001
From: youyuzihan
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 高级查询
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+ 清空
+
+
+
+
+
+
-
-
-
-
-
-
- {{ scope.row.accessContent }}
-
-
-
-
- 未发布
- 已发布
-
-
-
-
- V{{ scope.row.version }}
-
-
-
-
- V{{ scope.row.version }}
-
-
-
-
-
-
-
-
-
-
-
- 数据获取中
-
+ {{ scope.row.modifyTime ? scope.row.modifyTime.split(' ')[0] : '' }}
-
-
-
-
-
- 查看
- 编辑
- 删除
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+ 未发布
+ 已发布
+
+
+
+
+ V{{ scope.row.detailedListVesion }}
+
+
+
+
+ V{{ scope.row.applicationScope }}
+
+
+
+
+
+
+
+
+
+
+
+ 数据获取中
+
+ {{ scope.row.updateTime ? scope.row.updateTime.split(' ')[0] : '' }}
+
+
+
+
+
+ 编辑
+ 删除
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -623,6 +623,7 @@
import ProcessHeader from '../../components/ProcessHeader'
import ProcessFooter from '../../components/ProcessFooter'
import ProcessTitle from '../../components/ProcessTitle'
+ import {saveTaskFirst} from "api/process";
export default {
name: "bzrkStep1",
data () {
@@ -737,7 +738,31 @@
handleTabs(name) {
this.active = name
},
- handleSave() {},
+ //保存
+ handleSave() {
+ this.saveLoading = true
+ let _formData = new FormData()
+ // _formData.append('id', this.bpnId)
+ _formData.append('createUser', this.$store.getters.userInfo.userId)
+ _formData.append('createUserName', this.$store.getters.userInfo.uName)
+ _formData.append('prcType', this.$route.query.type)
+ _formData.append('json', JSON.stringify({
+ prcForm: this.prcForm,
+ sarAccessInfoList: this.sarAccessInfoList,
+ sarAccessInfoListADMIN: this.sarAccessInfoListADMIN,
+ bzqdForm: this.bzqdForm,
+ listInfo: this.listInfo,
+ id: this.id
+ }))
+ saveTaskFirst(_formData).then(res => {
+ this.saveLoading = false
+ this.$message.success('保存成功')
+ // this.$router.push('/processCenter')
+ // this.bpnId = res.result
+ }).catch(e => {
+ this.saveLoading = false
+ })
+ },
handleSubmit() {
var json = this.form
json.zrUserId = this.$store.getters.userInfo.userId
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
new file mode 100644
index 000000000..17a7e98ea
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue
@@ -0,0 +1,843 @@
+
+
+ placeholder="请选择标准年份"
+ value-format="yyyy">
@@ -756,8 +757,8 @@
}, {
_this: this
}, res => {
- console.log(res);
- if (res.ok) {
+ if (res.success) {
+ this.$message.success(res.message)
}
})
}
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index bf4171d2c..463fabfb2 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -45,7 +45,8 @@
disabled
v-model="form.standYear"
type="year"
- placeholder="请选择标准年份">
+ placeholder="请选择标准年份"
+ value-format="yyyy">
From 130526f87310ef8c455e680ef4f35b03a8e59b8d Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Tue, 22 Jun 2021 16:36:50 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step2.vue | 96 ++++++++++++++++++-
1 file changed, 94 insertions(+), 2 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index bf4171d2c..0e94664d4 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -7,7 +7,8 @@
+ {
+ this.detailData = res
+ }, e => {})
+ },
getData() {
return new Promise((resolve, reject) => {
inboundLiaisonDetail({
@@ -791,6 +882,7 @@
},
mounted () {
this.getData()
+ this.processTable()
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
From 521418857e42f07eec88cf9bbb359ffd52a5befd Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Tue, 22 Jun 2021 16:41:43 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../pages/creatProcess/bzrk/step1.vue | 31 ++++++++++---------
1 file changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 1a6f59d44..3a1d1af18 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -7,7 +7,7 @@
+
+
+
+
+
+ 标准入库流程
+ 经理人审批
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
new file mode 100644
index 000000000..67d7ba459
--- /dev/null
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue
@@ -0,0 +1,843 @@
+
+
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+ 基础信息
+
+
+ 实施日期
+
+
+ 文本信息
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+ 国内标准入库
+ 海外标准入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.xgd }}
+
+
+ - -
+
+
+ {{ form.fbgbjbd }}
+
+
+ - -
+
+
+ {{ form.zbjbd }}
+
+
+ - -
+
+
+ {{ form.bpg }}
+
+
+ - -
+
+
+ {{ form.ssg }}
+
+
+ - -
+
+
+ {{ form.kwj }}
+
+
+ - -
+
+
+ {{ form.zqyjg }}
+
+
+ - -
+
+
+ {{ form.ca }}
+
+
+ - -
+
+
+ {{ form.jdwj }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.glwj }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+ 责任人
+
+
+
+ 责任人
+
+
+ 标准法规工程师
+
+
+ 责任对接人，标准法规部部门负责人
+
+
+
+
+
+ 标准入库流程
+ 经理人审批
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
index a1ee99149..349d54a99 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue
@@ -214,7 +214,11 @@ export default {
this.queryProcess()
},
dealWith (row) { // 办理
- switch(row.prcType) {
+ this.setHandleInfo(JSON.stringify(row))
+ const prcType = row.prcType
+ console.log(prcType)
+ console.log(row.taskInfo)
+ switch(prcType) {
case '1':
if (row.taskInfo === '标准法规业务经理审批') {
this.$router.push({
@@ -227,6 +231,28 @@ export default {
prcType: row.prcType
}
})
+ }else if (row.taskInfo === '责任人会签'){
+ this.$router.push({
+ name: 'step3',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
+ }else if (row.taskInfo === '申请人修订'){
+ this.$router.push({
+ name: 'step4',
+ query: {
+ taskIds: row.taskIds,
+ prcId: row.prcId,
+ prcNum: row.prcNum,
+ prcName: row.prcName,
+ prcType: row.prcType
+ }
+ })
}
}
},
diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
index a666b610f..b6842a975 100644
--- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
+++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue
@@ -209,6 +209,7 @@ export default {
this.queryProcess()
},
dealWith (row) { // 办理
+ //草稿办理待开发
},
...mapMutations(['setProcess', 'setHandleInfo']),
...mapActions(['setMenu'])
diff --git a/src/router/index.js b/src/router/index.js
index a782539a5..0872bd5bc 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -249,6 +249,24 @@ const routes = [
title: '标准入库流程'
}
},
+ {
+ path: '/bzrkStep3',
+ name: 'bzrkStep3',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step3.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准入库流程'
+ }
+ },
+ {
+ path: '/bzrkStep4',
+ name: 'bzrkStep4',
+ component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step4.vue'),
+ meta: {
+ requireAuth: true,
+ title: '标准入库流程'
+ }
+ },
{
path: '/bzrkStep2',
name: 'bzrkStep2',
From f2c6a2e3b566904d7930e090250b7664a31678fc Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 22 Jun 2021 15:35:22 +0800
Subject: [PATCH 14/19] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E4=B8=8D=E4=BC=9A=E7=AD=BE=E5=8D=95=E5=AE=9E=E4=BE=8B?=
=?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 7 ++++---
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 3 ++-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index dbe623393..a4cfc2651 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -44,7 +44,8 @@
+
+ 基础信息
+ 审批历史
+
+
+
+
+
+ 基础信息
+
+
+ 实施日期
+
+
+ 文本信息
+
+
+ 适用范围
+
+
+ 关联信息
+
+
+
+
+
+
+
+
+ 国内标准入库
+ 海外标准入库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.xgd }}
+
+
+ - -
+
+
+ {{ form.fbgbjbd }}
+
+
+ - -
+
+
+ {{ form.zbjbd }}
+
+
+ - -
+
+
+ {{ form.bpg }}
+
+
+ - -
+
+
+ {{ form.ssg }}
+
+
+ - -
+
+
+ {{ form.kwj }}
+
+
+ - -
+
+
+ {{ form.zqyjg }}
+
+
+ - -
+
+
+ {{ form.ca }}
+
+
+ - -
+
+
+ {{ form.jdwj }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ form.glwj }}
+
+
+ - -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 流程发起人
+
+
+ 责任人
+
+
+
+ 责任人
+
+
+ 标准法规工程师
+
+
+ 责任对接人，标准法规部部门负责人
+
+
+ 基础信息
- 审批历史
+ 审批历史
+
@@ -581,6 +582,75 @@
+
+
+
+
+
+
+
+
+
+
+ {{ 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 ? '已完成' : '未完成'}}
+
+
+
+ 流程列表加载中
+
+ 基础信息
- 审批历史
+ 流程信息
@@ -547,19 +547,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -629,7 +629,7 @@
name: "bzrkStep1",
data () {
return {
- textarea: '', // 意见
+ commentText: '', // 意见
title: '', // 新增编辑抽屉标题
ListModel: false, // 新增编辑抽屉开关
active: '1', // 默认显示
@@ -768,6 +768,7 @@
var json = this.form
json.zrUserId = this.$store.getters.userInfo.userId
json.jlUserId = this.$store.getters.userInfo.userId
+ json.commentText = this.commentText
json.applyUpdUserId = this.$store.getters.userInfo.userId
json.prcCreateUser = this.$store.getters.userInfo.userId
json.prcCreateUserName = this.$store.getters.userInfo.account
From 9558fad001e4d977a482ff499b1a8f2f2e79c501 Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Tue, 22 Jun 2021 16:44:32 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index 4262162d9..f0bc5a136 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -530,7 +530,7 @@
:rows="3"
resize="none"
placeholder="请输入意见"
- v-model="textarea">
+ v-model="commentText">
From c389384feb358942005fb4de32a3d1e6d864a9b6 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Tue, 22 Jun 2021 16:48:57 +0800
Subject: [PATCH 18/19] =?UTF-8?q?feat:=20=E6=A0=87=E5=87=86=E5=85=A5?=
=?UTF-8?q?=E5=BA=93=E6=84=8F=E8=A7=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
index f0bc5a136..ada10c0d7 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue
@@ -844,6 +844,8 @@
handleSave() {},
handleSubmit() {
const json = JSON.stringify(this.form);
+ json.commentText = this.commentText
+ json.approvalOpinion = this.approvalOpinion
console.log(json)
this.$http.post('lawss/activiti/completeTask', {
taskIds: this.taskIds,
From 789f3b05f397df07b483b4b87672cde7402bfcda Mon Sep 17 00:00:00 2001
From: yf <428080876@qq.com>
Date: Tue, 22 Jun 2021 17:07:10 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/processCenter/pages/creatProcess/bzrk/step1.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
index 3a1d1af18..663aee630 100644
--- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue
@@ -551,7 +551,7 @@