diff --git a/src/api/standardRegulationLibraryApi.js b/src/api/standardRegulationLibraryApi.js
index 42a2b6c..c5112d4 100644
--- a/src/api/standardRegulationLibraryApi.js
+++ b/src/api/standardRegulationLibraryApi.js
@@ -136,6 +136,8 @@ const editStandardMasterPlan = (params) => postAction('/laws/StandardMasterPlan/
// 市场法规清单-根据id查询-用于编辑
const getMarketRegulationListById = (params) => getAction('', params)
+// 市场法规清单-根据id查询-无权限
+const getMarketRegulationListByIdNoPerm = (params) => getAction('', params)
// 市场法规清单-根据ids获取多个清单的清单列表-用于复制
const getMarketRegulationListByIds = (params) => getAction('', params)
// 市场法规清单-新增
@@ -224,6 +226,7 @@ export {
// 市场法规清单
getMarketRegulationListById,
+ getMarketRegulationListByIdNoPerm,
getMarketRegulationListByIds,
marketRegulationListAdd,
marketRegulationListEdit,
diff --git a/src/api/workCenter.js b/src/api/workCenter.js
index d2a14ac..df22f60 100644
--- a/src/api/workCenter.js
+++ b/src/api/workCenter.js
@@ -32,6 +32,22 @@ const newRegulationImportGetDataById = (taskId, params) => getAction(`/process/e
// 草稿的办理回显数据
const newRegulationImportGetDataDraft = (params) => getAction('/process/es/archive/draftHandle', params)
+// 市场清单发布流程
+// 保存
+const marketListReleaseSave = (params) => postAction('/process/es/archive/save', params)
+// 发起
+const marketListReleaseApproval = (params) => postAction('/process/es/archive/start', params)
+// 转办
+const marketListReleaseTurnTo = (params) => postAction('/process/es/archive/transfer', params)
+// 同意
+const marketListReleaseAgree = (params) => postAction('/process/es/archive/agree', params)
+// 驳回
+const marketListReleaseReject = (params) => postAction('/process/es/archive/reject', params)
+// 根据id查询流程数据--办理
+const marketListReleaseGetDataById = (taskId, params) => getAction(`/process/es/archive/handle/${taskId}`, params)
+// 草稿的办理回显数据
+const marketListReleaseGetDataDraft = (params) => getAction('/process/es/archive/draftHandle', params)
+
// 流程中心
// 已发-强制撤回
const compulsoryWithdrawal = (params) => postAction('/workCenter/forcedWithdrawal', params)
@@ -66,6 +82,14 @@ export {
newRegulationImportGetDataById,
newRegulationImportGetDataDraft,
+ marketListReleaseSave,
+ marketListReleaseApproval,
+ marketListReleaseTurnTo,
+ marketListReleaseAgree,
+ marketListReleaseReject,
+ marketListReleaseGetDataById,
+ marketListReleaseGetDataDraft,
+
compulsoryWithdrawal,
processTransfer,
diff --git a/src/common/lang/en-us.js b/src/common/lang/en-us.js
index c2fb7f3..54816d5 100644
--- a/src/common/lang/en-us.js
+++ b/src/common/lang/en-us.js
@@ -547,6 +547,10 @@ module.exports = {
textState: 'Text state',
evaluationState: 'Evaluation state'
},
+ // 市场法规清单选择器
+ marketRegulationsListSelect: {
+ marketRegulationsListSelection: '选择清单'
+ },
// 企标计划选择器
enterprisePlanSelect: {
title: '企标计划选择'
diff --git a/src/common/lang/workCenter/en.js b/src/common/lang/workCenter/en.js
index 84bd556..cc55e4e 100644
--- a/src/common/lang/workCenter/en.js
+++ b/src/common/lang/workCenter/en.js
@@ -21,6 +21,24 @@ module.exports = {
ccPerson: '抄送人员',
briefDescription: '法规要求简要描述'
},
+ // 市场清单发布流程
+ marketListReleaseProcess: {
+ englishName: '英文名称',
+ newProductionVehicleImplementationDate: '新生产车实施日期',
+ newCertifiedVehicleImplementationDate: '新认证车实施日期',
+ applicableCountryRegion: '适用国家/地区',
+ applicableVehicleType: '适用车型',
+ authenticationObject: '认证对象',
+ certifiedDeliverables: '认证交付物',
+ type: '类型',
+ dynamicType: '动力类型',
+ mainControlDepartment: '主控部门',
+ masterControlDepartmentProfessionalModule: '主控部门专业模块',
+ relatedDepartment: '关联部门',
+ associateDepartmentSpecializedModules: '关联部门专业模块',
+ requirementType: '要求类型',
+
+ },
// 流程配置
processConfig: {
processType: '流程类型',
diff --git a/src/common/lang/workCenter/zh.js b/src/common/lang/workCenter/zh.js
index 84bd556..cc55e4e 100644
--- a/src/common/lang/workCenter/zh.js
+++ b/src/common/lang/workCenter/zh.js
@@ -21,6 +21,24 @@ module.exports = {
ccPerson: '抄送人员',
briefDescription: '法规要求简要描述'
},
+ // 市场清单发布流程
+ marketListReleaseProcess: {
+ englishName: '英文名称',
+ newProductionVehicleImplementationDate: '新生产车实施日期',
+ newCertifiedVehicleImplementationDate: '新认证车实施日期',
+ applicableCountryRegion: '适用国家/地区',
+ applicableVehicleType: '适用车型',
+ authenticationObject: '认证对象',
+ certifiedDeliverables: '认证交付物',
+ type: '类型',
+ dynamicType: '动力类型',
+ mainControlDepartment: '主控部门',
+ masterControlDepartmentProfessionalModule: '主控部门专业模块',
+ relatedDepartment: '关联部门',
+ associateDepartmentSpecializedModules: '关联部门专业模块',
+ requirementType: '要求类型',
+
+ },
// 流程配置
processConfig: {
processType: '流程类型',
diff --git a/src/common/lang/zh-cn.js b/src/common/lang/zh-cn.js
index 17d29b0..313067a 100644
--- a/src/common/lang/zh-cn.js
+++ b/src/common/lang/zh-cn.js
@@ -198,6 +198,10 @@ module.exports = {
clauseName: '条款名称',
clauseContent: '条款内容',
maximumSelectFive: '最多选择五条记录!',
+ listNumber: '清单编号',
+ listName: '清单名称',
+ countryRegion: '国家/地区',
+ ccPerson: '抄送人员',
// 标准字段
standardField: {
standardEnglishName: '标准英文名称',
@@ -613,7 +617,7 @@ module.exports = {
},
// 市场法规清单选择器
marketRegulationsListSelect: {
- marketRegulationsListSelection: '市场法规清单选择'
+ marketRegulationsListSelection: '选择清单'
},
// 条款选择器
clauseSelect: {
diff --git a/src/enums/commonEnums.js b/src/enums/commonEnums.js
index c488220..805b538 100644
--- a/src/enums/commonEnums.js
+++ b/src/enums/commonEnums.js
@@ -122,7 +122,9 @@ export const EnterpriseStandardStatus = {
// 流程key,获取人员信息前需要获取流程定义id,传这里的名字到WorkCenterMixin的getFlowDefinition方法中
export const ProcessKey = {
// 新法规导入流程
- NEW_REGULATIONS_IMPORT: { text: '', value: '' }
+ NEW_REGULATIONS_IMPORT: { text: '', value: '' },
+ // 市场清单发布流程
+ MARKET_LIST_RELEASE: { text: '', value: '' }
}
// 流程类型
@@ -161,6 +163,14 @@ export const NewRegulationsImportNodes = new EsEnums({
responsibleLeaderApprovalTwo: { text: '公司标准法规责任领导批准', value: '' }
})
+// 市场清单发布流程节点
+export const MarketListReleaseNodes = new EsEnums({
+ initiated: { text: '法规工程师发起', value: '' },
+ countersign: { text: '会签', value: '' },
+ seniorManagerAudit: { text: '高级经理审核', value: '' },
+ directorSApproval: { text: '总监批准', value: '' }
+})
+
// 条款使用范围
export const ClauseUsableRange = new EsEnums({
DOMESTIC: { text: '外来标准', value: '1' },
diff --git a/src/views/workCenter/NewProcess.vue b/src/views/workCenter/NewProcess.vue
index f71f148..683a8da 100644
--- a/src/views/workCenter/NewProcess.vue
+++ b/src/views/workCenter/NewProcess.vue
@@ -53,7 +53,7 @@ export default {
},
{ // 工作组相关流程
uid: 3,
- text: this.$t('workCenter.newProcess.workgroupProcess'),
+ text: this.$t(''),
list: [
]
diff --git a/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
new file mode 100644
index 0000000..d245ee2
--- /dev/null
+++ b/src/views/workCenter/marketListReleaseProcess/MarketListReleaseProcess.vue
@@ -0,0 +1,519 @@
+
+