diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 9891456b5..e3d0515b3 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -707,5 +707,13 @@ module.exports = {
enclosure:'enclosure',
// 认证
parameterTemplate: 'parameter Template',
- contentDescription: 'content Description'
+ contentDescription: 'content Description',
+ circulationInformation:'Circulation information',
+ circulationHistory:'circulation History',
+ agree:'agree',
+ disagree:'disagree',
+ feedbackMessage:'Feedback Message',
+ result:'result',
+ opinion:'opinion',
+ operationNode:'operation node',
}
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index f9c2dad5c..3f7cecf84 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -712,5 +712,13 @@ module.exports = {
enclosure:'附件',
// 认证
parameterTemplate: '参数模板',
- contentDescription: '内容说明'
+ contentDescription: '内容说明',
+ circulationInformation:'流转信息',
+ circulationHistory:'流转历史',
+ agree:'同意',
+ disagree:'不同意',
+ feedbackMessage:'反馈意见',
+ result:'结果',
+ opinion:'意见',
+ operationNode:'操作节点',
}
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/circulationHistory.vue b/jero-web/src/views/processCenter/components/circulationHistory.vue
new file mode 100644
index 000000000..464baaa39
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/circulationHistory.vue
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/examineInformation.vue b/jero-web/src/views/processCenter/components/examineInformation.vue
new file mode 100644
index 000000000..41762d42d
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/examineInformation.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+
+
+
+
+
+ {{$t('reviewResults')}}
+
+
+
+
+ {{$t('agree')}}
+
+
+ {{$t('disagree')}}
+
+
+ {{$t('issue')}}
+
+
+
+
+
+
+
+
+
+
+ {{$t('feedbackMessage')}}
+
+
+
+
+
+
+
+
+
+
+
+ {{$t('enclosure')}}
+
+
+
+ {{ (formInline.enclosure === 'null' || formInline.enclosure === '' ||
+ formInline.enclosure == null) ? $t('clickUpload') : $t('viewUploadedFiles')
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/components/headerProcess.vue b/jero-web/src/views/processCenter/components/headerProcess.vue
index ae3e3f070..a0347c8c7 100644
--- a/jero-web/src/views/processCenter/components/headerProcess.vue
+++ b/jero-web/src/views/processCenter/components/headerProcess.vue
@@ -62,6 +62,9 @@
},
submit() {
this.$emit('submit')
+ },
+ backTo() {
+
}
}
}
@@ -72,7 +75,7 @@
position: fixed;
top: 0;
width: 100%;
-
+ z-index: 999;
.process-header-top {
height: 56px;
line-height: 56px;
@@ -125,6 +128,7 @@
font-size: 20px;
font-width: 600;
color: #040B29;
+
.back-to {
margin-right: 10px;
}
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue
index 22324ccbc..e2ca839ee 100644
--- a/jero-web/src/views/processCenter/components/standardContent.vue
+++ b/jero-web/src/views/processCenter/components/standardContent.vue
@@ -38,7 +38,7 @@
},
data() {
return {
- queryForm: {}
+ queryForm: {},
}
},
mounted() {
diff --git a/jero-web/src/views/processCenter/components/standardContentList.vue b/jero-web/src/views/processCenter/components/standardContentList.vue
new file mode 100644
index 000000000..84d4c2233
--- /dev/null
+++ b/jero-web/src/views/processCenter/components/standardContentList.vue
@@ -0,0 +1,239 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
index 8bda99e05..2bd442bfc 100644
--- a/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/handshakeProcess/index.vue
@@ -7,16 +7,21 @@
@terminationProcess="terminationProcess"
@submit="submit"
/>
-
@@ -25,13 +30,19 @@
import headerProcess from '../../components/headerProcess'
import projectInformation from '../../components/projectInformation'
import standardContent from '../../components/standardContent'
+ import standardContentList from '../../components/standardContentList'
+ import examineInformation from '../../components/examineInformation'
+ import circulationHistory from '../../components/circulationHistory'
export default {
name: 'handshakeProcess',
components: {
headerProcess,
projectInformation,
- standardContent
+ standardContent,
+ standardContentList,
+ examineInformation,
+ circulationHistory
},
data() {
return {
@@ -138,7 +149,10 @@
\ No newline at end of file