diff --git a/src/api/api.js b/src/api/api.js
index fe429af..8a49a1a 100644
--- a/src/api/api.js
+++ b/src/api/api.js
@@ -35,8 +35,16 @@ const getTreeList = (params) => getAction('/laws/standard/lawsTreeNode/enterpris
// 标准入库/变更流程------------
// 国内法规标准-获取表单模型
const getDomesticStandardFormModal = (params) => getAction('/laws/standard/domestic/getFormModel', params)
+// 海外标准-获取表单
+const getOverseasStandardForm = (params) => getAction('/laws/standard/overseas/getFormModel', params)
// 获取流程详情数据
const queryStandardECProcessData = (params) => getAction('/process/fb/processFbEntryChange/queryProcessInfoVO', params)
+// 转办
+const turnToStandardECProcess = (params) => postAction('/process/fb/processFbEntryChange/transfer', params)
+// 同意
+const agreeStandardECProcess = (params) => postAction('/process/fb/processFbEntryChange/agree', params)
+// 驳回
+const rejectStandardECProcess = (params) => postAction('/process/fb/processFbEntryChange/reject', params)
export {
queryPermissionsByUser,
@@ -51,5 +59,9 @@ export {
getTreeList,
getDomesticStandardFormModal,
- queryStandardECProcessData
+ getOverseasStandardForm,
+ queryStandardECProcessData,
+ turnToStandardECProcess,
+ agreeStandardECProcess,
+ rejectStandardECProcess
}
diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index fbe980d..f8a4ed9 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -73,13 +73,14 @@
}
.van-field__value {
margin-top: 0.24rem;
- border: 0.02rem solid #C9CDD4;
border-radius: 0.04rem;
.van-field__control {
background: #F2F3F5;
padding: 0.24rem;
box-sizing: border-box;
+ border: 0.02rem solid #C9CDD4;
+ overflow: hidden;
}
.van-field__control:disabled {
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index 440e189..f850169 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -28,6 +28,9 @@ module.exports = {
selectUser: '选择人员',
finishDate: '完成日期',
rangeOfApplication: '适用范围',
+ standardNumber: '标准编号',
+ standardName: '标准名称',
+ // 标准法规入库/变更流程
standardEntryOrChange: {
source: '来源',
operationType: '操作类型'
@@ -74,5 +77,11 @@ module.exports = {
leadershipAndNecessity: '立项标准的领先性与必要性',
initiatedProject: '立项目的及预期效果等',
uploadAttachment: '上传附件'
+ },
+ // 标准征求意见流程
+ standardConsultation: {
+ standardText: '标准文本',
+ relevantDocument: '相关文件',
+ closingDateForComments: '征求意见结束日期'
}
}
diff --git a/src/components/ProcessCommonLayout.vue b/src/components/ProcessCommonLayout.vue
index f54c73e..df41341 100644
--- a/src/components/ProcessCommonLayout.vue
+++ b/src/components/ProcessCommonLayout.vue
@@ -41,6 +41,8 @@
+
+
diff --git a/src/router/index.js b/src/router/index.js
index 90c0262..5dd262e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -27,16 +27,6 @@ const routes = [
hasBack: false
}
},
- // 标准法规入库/变更流程
- {
- path: '/standardEntryOrChangeProcess',
- name: 'StandardEntryOrChangeProcess',
- meta: {
- hasNavBar: true,
- hasBack: true
- },
- component: () => import('@/views/standardEntryOrChangeProcess/StandardEntryOrChangeProcess')
- },
{ // 流程中节点不支持的页面
path: '/noMobile',
name: 'NoMobile',
diff --git a/src/router/workCenter/index.js b/src/router/workCenter/index.js
index 663b5db..88a9e82 100644
--- a/src/router/workCenter/index.js
+++ b/src/router/workCenter/index.js
@@ -9,5 +9,26 @@ export default [
hasNavBar: true, // 这个属性控制页面是否显示上面的导航栏
leftArrow: true // 这个属性控制页面上面的导航栏 是否有返回按钮
}
+ },
+ // 标准法规入库/变更流程
+ {
+ path: '/workCenter/standardEntryOrChangeProcess',
+ name: 'StandardEntryOrChangeProcess',
+ meta: {
+ hasNavBar: true,
+ hasBack: true
+ },
+ component: () => import('@/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess')
+ },
+
+ // 征求意见流程
+ {
+ path: '/workCenter/standardConsultationProcess',
+ name: 'StandardConsultationProcess',
+ meta: {
+ hasNavBar: true,
+ hasBack: true
+ },
+ component: () => import('@/views/workCenter/standardConsultation/StandardConsultationProcess')
}
]
diff --git a/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue b/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue
new file mode 100644
index 0000000..941ac72
--- /dev/null
+++ b/src/views/workCenter/standardConsultation/StandardConsultationProcess.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
{{ $t('processInformation') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
{{ $t('basicServiceInformation') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
similarity index 57%
rename from src/views/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
rename to src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
index 86d7429..a27c75e 100644
--- a/src/views/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
+++ b/src/views/workCenter/standardEntryOrChangeProcess/StandardEntryOrChangeProcess.vue
@@ -1,5 +1,5 @@
-
+
@@ -79,9 +79,9 @@
{{ $t('processApprovalInfo') }}
-
+
-
@@ -96,24 +97,35 @@
- {{ $t('turnTo') }}
- {{ $t('agree') }}
- {{ $t('reject') }}
+ {{ $t('turnTo') }}
+ {{ $t('agree') }}
+ {{ $t('reject') }}
+
+