diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 79c453670..21b579ecc 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -854,23 +854,12 @@ export default { }, { _this: this }, res => { - console.log(res); - // if (res.success) { - // this.processCreateStand(json) - // } + if (res.success) { + this.$message.success(res.data) + }else { + this.$message.warning(res.data) + } }) - // 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) - // } - // }) }, /** @@ -883,7 +872,7 @@ export default { _formData.append('infoJson', json) processCreateStand(_formData).then(res => { if (res.result === '操作成功' || res.data === '入库成功') { - this.$message.success(res.data) + this.$message.success(res.message) setTimeout(() => { this.$router.push({ name: 'ProcessCenter' diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 4f01e999f..1643f0845 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -25,13 +25,13 @@ - + 国内标准入库 海外标准入库 - + - + @@ -76,14 +73,13 @@ - + - + - + - + @@ -156,7 +149,6 @@ @@ -164,7 +156,6 @@ @@ -174,7 +165,6 @@ @@ -182,7 +172,6 @@ @@ -190,7 +179,6 @@ @@ -289,7 +277,7 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + { - console.log(res); if (res.success) { - this.processCreateStand(json) + this.$message.success(res.data) + }else { + this.$message.warning(res.data) } }) - // 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) - // } - // }) }, /** diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue new file mode 100644 index 000000000..a48901ce0 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step5.vue @@ -0,0 +1,961 @@ + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 60d5e7e98..f9a21868b 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -100,8 +100,7 @@ label="审批意见" align="center"> import('@/pages/processCenter/pages/creatProcess/bzrk/step5.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzrkStep2', name: 'bzrkStep2',