diff --git a/src/layout/components/NewMenu/index.vue b/src/layout/components/NewMenu/index.vue index c305a63..602795c 100644 --- a/src/layout/components/NewMenu/index.vue +++ b/src/layout/components/NewMenu/index.vue @@ -115,6 +115,26 @@ export default { show: true, }, ], + permissionsMenu: [ + { + title: "主数据中心", + path: "/MasterDataCenter", + icon: "el-icon-coin", + show: false, + }, + { + title: "应用管理", + path: "/ApplicationCenter", + icon: "el-icon-menu", + show: false, + }, + { + title: "集成任务", + path: "/IntegrationTaskCenter", + icon: "el-icon-data-line", + show: false, + }, + ], }; }, created() { @@ -157,10 +177,18 @@ export default { } return type; }, - // 判断当前有没有菜单权限 知识库 在线文档 报表中心 系统管理 系统维护 代码生成器 + // 判断当前有没有菜单权限 主数据中心 应用管理 DetermineMenuPermission() { this.menuData = []; - this.menuData = [...this.fixedMenu]; + let routeList = localStorage.getItem("routeList") + ? localStorage.getItem("routeList") + : null; + this.permissionsMenu.forEach((aItem) => { + if (routeList != null && routeList.includes(aItem.title)) { + aItem.show = true; + } + }); + this.menuData = [...this.fixedMenu, ...this.permissionsMenu]; }, // 路由跳转 jumpRoute(item) { @@ -406,7 +434,6 @@ export default { background: #1478f6; color: #ffffff; text-align: center; - } } } diff --git a/src/router/index.js b/src/router/index.js index 6654c70..433bb90 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -109,7 +109,8 @@ export const constantRoutes = [{ icon: 'dashboard' // affix: true, } - },{ + }, + { path: "Workbench", component: () => import("@/views/newVersionView/Workbench/index"), name: "Workbench", @@ -118,6 +119,33 @@ export const constantRoutes = [{ icon: "dashboard", }, }, + { + path: "MasterDataCenter", + component: () => import("@/views/newVersionView/MasterDataCenter/index"), + name: "MasterDataCenter", + meta: { + title: "主数据中心", + icon: "dashboard", + }, + }, + { + path: "ApplicationCenter", + component: () => import("@/views/newVersionView/ApplicationCenter/index"), + name: "ApplicationCenter", + meta: { + title: "应用管理", + icon: "dashboard", + }, + }, + { + path: "IntegrationTaskCenter", + component: () => import("@/views/newVersionView/IntegrationTaskCenter/index"), + name: "IntegrationTaskCenter", + meta: { + title: "集成任务", + icon: "dashboard", + }, + }, ] }, { diff --git a/src/views/DataCenterOptions/authority/images/删除.png b/src/views/DataCenterOptions/authority/images/删除.png new file mode 100644 index 0000000..c74a004 Binary files /dev/null and b/src/views/DataCenterOptions/authority/images/删除.png differ diff --git a/src/views/DataCenterOptions/authority/images/设置.png b/src/views/DataCenterOptions/authority/images/设置.png new file mode 100644 index 0000000..fa32cf3 Binary files /dev/null and b/src/views/DataCenterOptions/authority/images/设置.png differ diff --git a/src/views/DataCenterOptions/authority/index.vue b/src/views/DataCenterOptions/authority/index.vue new file mode 100644 index 0000000..1d862ed --- /dev/null +++ b/src/views/DataCenterOptions/authority/index.vue @@ -0,0 +1,384 @@ + + + + + diff --git a/src/views/DataCenterOptions/authority/settingForm.vue b/src/views/DataCenterOptions/authority/settingForm.vue new file mode 100644 index 0000000..482e162 --- /dev/null +++ b/src/views/DataCenterOptions/authority/settingForm.vue @@ -0,0 +1,365 @@ + + + + + diff --git a/src/views/DataCenterOptions/com/baseNewSelect.vue b/src/views/DataCenterOptions/com/baseNewSelect.vue new file mode 100644 index 0000000..03193c5 --- /dev/null +++ b/src/views/DataCenterOptions/com/baseNewSelect.vue @@ -0,0 +1,290 @@ + + + + + + + diff --git a/src/views/DataCenterOptions/compoments/baseCascader/index.vue b/src/views/DataCenterOptions/compoments/baseCascader/index.vue new file mode 100644 index 0000000..ebd7630 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseCascader/index.vue @@ -0,0 +1,212 @@ + + + + + diff --git a/src/views/DataCenterOptions/compoments/baseDatePicker.vue b/src/views/DataCenterOptions/compoments/baseDatePicker.vue new file mode 100644 index 0000000..75a72f4 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseDatePicker.vue @@ -0,0 +1,149 @@ + + + \ No newline at end of file diff --git a/src/views/DataCenterOptions/compoments/baseDateTimePicker.vue b/src/views/DataCenterOptions/compoments/baseDateTimePicker.vue new file mode 100644 index 0000000..c38eea6 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseDateTimePicker.vue @@ -0,0 +1,48 @@ + + + \ No newline at end of file diff --git a/src/views/DataCenterOptions/compoments/baseDialog.vue b/src/views/DataCenterOptions/compoments/baseDialog.vue new file mode 100644 index 0000000..b491bc9 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseDialog.vue @@ -0,0 +1,99 @@ + + + diff --git a/src/views/DataCenterOptions/compoments/baseForm.vue b/src/views/DataCenterOptions/compoments/baseForm.vue new file mode 100644 index 0000000..2344934 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseForm.vue @@ -0,0 +1,100 @@ +// 表格 + + + + + \ No newline at end of file diff --git a/src/views/DataCenterOptions/compoments/baseFormItem.vue b/src/views/DataCenterOptions/compoments/baseFormItem.vue new file mode 100644 index 0000000..e9d9746 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseFormItem.vue @@ -0,0 +1,21 @@ + + + + + \ No newline at end of file diff --git a/src/views/DataCenterOptions/compoments/baseLink/index.vue b/src/views/DataCenterOptions/compoments/baseLink/index.vue new file mode 100644 index 0000000..e98ddc4 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseLink/index.vue @@ -0,0 +1,554 @@ + + + + + + + diff --git a/src/views/DataCenterOptions/compoments/baseMenuTree.vue b/src/views/DataCenterOptions/compoments/baseMenuTree.vue new file mode 100644 index 0000000..88af583 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseMenuTree.vue @@ -0,0 +1,463 @@ + + + + + diff --git a/src/views/DataCenterOptions/compoments/baseNewForm.vue b/src/views/DataCenterOptions/compoments/baseNewForm.vue new file mode 100644 index 0000000..87ea049 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseNewForm.vue @@ -0,0 +1,928 @@ + + + + + + diff --git a/src/views/DataCenterOptions/compoments/baseNewSelect.vue b/src/views/DataCenterOptions/compoments/baseNewSelect.vue new file mode 100644 index 0000000..d222cac --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseNewSelect.vue @@ -0,0 +1,321 @@ + + + + + + + + diff --git a/src/views/DataCenterOptions/compoments/basePage.vue b/src/views/DataCenterOptions/compoments/basePage.vue new file mode 100644 index 0000000..3a34e28 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/basePage.vue @@ -0,0 +1,79 @@ + + + + diff --git a/src/views/DataCenterOptions/compoments/baseRadio.vue b/src/views/DataCenterOptions/compoments/baseRadio.vue new file mode 100644 index 0000000..8b8e93f --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseRadio.vue @@ -0,0 +1,24 @@ +// 单选框 + + + \ No newline at end of file diff --git a/src/views/DataCenterOptions/compoments/baseSelect.vue b/src/views/DataCenterOptions/compoments/baseSelect.vue new file mode 100644 index 0000000..9fdb3fa --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseSelect.vue @@ -0,0 +1,29 @@ +// 下拉框 + + + \ No newline at end of file diff --git a/src/views/DataCenterOptions/compoments/baseTable.vue b/src/views/DataCenterOptions/compoments/baseTable.vue new file mode 100644 index 0000000..3a30cdc --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseTable.vue @@ -0,0 +1,634 @@ + + + + + + diff --git a/src/views/DataCenterOptions/compoments/baseTableForm_v2.vue b/src/views/DataCenterOptions/compoments/baseTableForm_v2.vue new file mode 100644 index 0000000..d067843 --- /dev/null +++ b/src/views/DataCenterOptions/compoments/baseTableForm_v2.vue @@ -0,0 +1,741 @@ + + + + + + diff --git a/src/views/DataCenterOptions/compoments/baseUpload.vue b/src/views/DataCenterOptions/compoments/baseUpload.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/views/DataCenterOptions/configData.js b/src/views/DataCenterOptions/configData.js new file mode 100644 index 0000000..bfad5c9 --- /dev/null +++ b/src/views/DataCenterOptions/configData.js @@ -0,0 +1,102 @@ +const addForm = [ + { + elCol: [ + { + type: 'input', + title: '主数据名称', + id: 'mdmName', + row: 24, + disabled: false, + required: true, + fontSize: 16 + } + ] + }, + { + elCol: [ + { + type: 'textrea', + title: '备注', + id: 'remark', + row: 24, + disabled: false, + fontSize: 16 + + } + ] + } +] + +const tableColumn = [ + { + id: 'mdmName', + title: '主数据名称', + align: 'left', + width: 130 + }, + { + id: 'mdmTypeName', + title: '主数据类型' + }, + { + id: 'remark', + title: '备注', + tooltip: true + }, + { + id: 'createUserId', + title: '创建人', + tooltip: true + }, + { + id: 'createTime', + title: '创建日期', + tooltip: true + }, + { + id: 'modifyUserId', + title: '修改人' + }, + { + id: 'modifyTime', + title: '修改时间' + } +] +const settingMenu = [ + { + title: '基本信息', + icon: 'masterDataMenu01', + path: 'masterDataEdit' + }, + { + title: '数据源', + icon: 'masterDataMenu02', + path: 'dataOrigin' + }, + { + title: '显示信息', + icon: 'masterDataMenu03', + path: 'displayInfo' + }, + { + title: '数据来源', + icon: 'masterDataMenu04', + path: 'authorily' + }, + { + title: '分发设置', + icon: 'masterDataMenu05', + path: 'distribute' + }, + { + title: '日志', + icon: 'masterDataMenu06', + path: 'logsDeatil' + }, +] +const configData = { + addForm, + tableColumn, + settingMenu +} +export default configData diff --git a/src/views/DataCenterOptions/dataOrigin/configData.js b/src/views/DataCenterOptions/dataOrigin/configData.js new file mode 100644 index 0000000..abace11 --- /dev/null +++ b/src/views/DataCenterOptions/dataOrigin/configData.js @@ -0,0 +1,281 @@ +const dataOriginFormRow = [ + { + elCol: [ + { + type: "input", + title: "表名", + id: "clientPath", + + row: 12, + disabled: false, + required: true, + fontSize: 16 + }, + { + type: "input", + title: "备注", + id: "webPath", + row: 12, + disabled: false, + required: false, + fontSize: 16 + }, + ], + }, +] +const optionFormRow = [ + { + elCol: [ + { + type: "input", + title: "中文名称", + id: "chName", + row: 24, + disabled: false, + required: true, + fontSize: 16 + }, + ], + }, + { + elCol: [ + { + type: "input", + title: "英文名称", + id: "enName", + row: 24, + disabled: false, + required: true, + fontSize: 16, + pattern: /^[a-z][a-z0-9_]{0,50}$/, + message: "须以小写字母开头,只能包含小写字母,数字和下划线,不能包含中文字符其他符号。", + disabledOfId: true, + }, + ], + }, + { + elCol: [ + { + type: "select", + title: "字段类型", + id: "filedType", + row: 24, + disabled: false, + required: true, + fontSize: 16, + options: [], + }, + ], + }, + { + elCol: [ + { + type: "num", + title: "长度", + id: "filedLength", + max:255, + row: 24, + disabled: false, + required: true, + fontSize: 16 + }, + ], + }, + { + elCol: [ + { + type: "input", + title: "显示名", + id: "title", + row: 24, + disabled: false, + required: true, + fontSize: 16 + }, + ], + } + , { + elCol: [ + { + type: "select", + title: "宽度", + id: "row", + row: 24, + disabled: false, + required: true, + fontSize: 16, + options: [ + { + label: "3", + id: "3", + }, { + label: "6", + id: "6", + }, { + label: "9", + id: "9", + }, { + label: "12", + id: "12", + }, { + label: "15", + id: "15", + }, { + label: "18", + id: "18", + }, { + label: "21", + id: "21", + }, { + label: "24", + id: "24", + }, + ] + }, + ], + }, + { + elCol: [ + { + type: "num", + title: "单元格宽度", + id: "width", + row: 24, + disabled: false, + required: false, + fontSize: 16, + message:"px" + }, + ], + }, + { + elCol: [ + { + type: "select", + title: "数据类型", + id: "type", + row: 24, + disabled: false, + required: true, + fontSize: 16, + options: [ + { + label: "input", + id: "input", + }, { + label: "datepick", + id: "datepick", + }, { + label: "daterange", + id: "daterange", + }, { + label: "radio", + id: "radio", + }, { + label: "textrea", + id: "textrea", + }, { + label: "select", + id: "select", + }, { + label: "treeselect", + id: "treeselect", + }, { + label: "number", + id: "num", + }, + ] + }, + ], + }, + { + elCol: [ + { + type: "onecheck", + title: "必填", + id: "required", + row: 24, + disabled: false, + required: false, + fontSize: 16, + options: [ + { + label: "是", + id: "true", + }, { + label: "否", + id: "false", + } + ] + }, + ], + }, + { + elCol: [ + { + type: "onecheck", + title: "禁止修改", + id: "disabled", + row: 24, + disabled: false, + required: false, + fontSize: 16, + options: [ + { + label: "是", + id: "true", + }, + ] + }, + ], + }, +] +const mainOptionRow = [ + { + elCol: [ + { + type: "input", + title: "英文名", + id: "dbName", + disabledOfId: true, + row: 24, + disabled: false, + required: true, + fontSize: 16, + pattern: /^[a-zA-Z][a-zA-Z0-9_]{0,50}$/, + message: "须以字母开头且不能出现_外的字符与中文", + }, + ], + }, + { + elCol: [ + { + type: "input", + title: "表说明", + id: "remark", + row: 24, + disabled: false, + required: true, + fontSize: 16 + }, + ], + }, + +] +const mainRule = + { + dbName: [ + { + pattern: /^[a-zA-Z][a-zA-Z0-9_]{0,29}$/, + message: "必须以字母开头,后续字符可包含字母、数字和下划线,总长度不超过30个字符。", + trigger: "change", + }, + ], + } +const config = { + dataOriginFormRow, + optionFormRow, + mainOptionRow, + mainRule +} +export default config diff --git a/src/views/DataCenterOptions/dataOrigin/images/删除.png b/src/views/DataCenterOptions/dataOrigin/images/删除.png new file mode 100644 index 0000000..c74a004 Binary files /dev/null and b/src/views/DataCenterOptions/dataOrigin/images/删除.png differ diff --git a/src/views/DataCenterOptions/dataOrigin/images/设置.png b/src/views/DataCenterOptions/dataOrigin/images/设置.png new file mode 100644 index 0000000..fa32cf3 Binary files /dev/null and b/src/views/DataCenterOptions/dataOrigin/images/设置.png differ diff --git a/src/views/DataCenterOptions/dataOrigin/index.vue b/src/views/DataCenterOptions/dataOrigin/index.vue new file mode 100644 index 0000000..65f9592 --- /dev/null +++ b/src/views/DataCenterOptions/dataOrigin/index.vue @@ -0,0 +1,664 @@ + + + + + diff --git a/src/views/DataCenterOptions/dataOrigin/indexOld.vue b/src/views/DataCenterOptions/dataOrigin/indexOld.vue new file mode 100644 index 0000000..d700277 --- /dev/null +++ b/src/views/DataCenterOptions/dataOrigin/indexOld.vue @@ -0,0 +1,1211 @@ + + + + + + + diff --git a/src/views/DataCenterOptions/dataOrigin/mainTable.vue b/src/views/DataCenterOptions/dataOrigin/mainTable.vue new file mode 100644 index 0000000..81f8176 --- /dev/null +++ b/src/views/DataCenterOptions/dataOrigin/mainTable.vue @@ -0,0 +1,83 @@ + + + + + diff --git a/src/views/DataCenterOptions/dataOrigin/ruleAddTable.vue b/src/views/DataCenterOptions/dataOrigin/ruleAddTable.vue new file mode 100644 index 0000000..4d13e51 --- /dev/null +++ b/src/views/DataCenterOptions/dataOrigin/ruleAddTable.vue @@ -0,0 +1,172 @@ + + + + + + diff --git a/src/views/DataCenterOptions/dataOrigin/sonTable.vue b/src/views/DataCenterOptions/dataOrigin/sonTable.vue new file mode 100644 index 0000000..dbbe80c --- /dev/null +++ b/src/views/DataCenterOptions/dataOrigin/sonTable.vue @@ -0,0 +1,866 @@ + + + + + diff --git a/src/views/DataCenterOptions/displayInfo/images/删除.png b/src/views/DataCenterOptions/displayInfo/images/删除.png new file mode 100644 index 0000000..c74a004 Binary files /dev/null and b/src/views/DataCenterOptions/displayInfo/images/删除.png differ diff --git a/src/views/DataCenterOptions/displayInfo/images/设置.png b/src/views/DataCenterOptions/displayInfo/images/设置.png new file mode 100644 index 0000000..b6fd71a Binary files /dev/null and b/src/views/DataCenterOptions/displayInfo/images/设置.png differ diff --git a/src/views/DataCenterOptions/displayInfo/index.vue b/src/views/DataCenterOptions/displayInfo/index.vue new file mode 100644 index 0000000..69b771a --- /dev/null +++ b/src/views/DataCenterOptions/displayInfo/index.vue @@ -0,0 +1,608 @@ + + + + diff --git a/src/views/DataCenterOptions/displayInfo/indexOldCopy.vue b/src/views/DataCenterOptions/displayInfo/indexOldCopy.vue new file mode 100644 index 0000000..2afae3c --- /dev/null +++ b/src/views/DataCenterOptions/displayInfo/indexOldCopy.vue @@ -0,0 +1,442 @@ + + + + diff --git a/src/views/DataCenterOptions/displayInfo/settingChunk.vue b/src/views/DataCenterOptions/displayInfo/settingChunk.vue new file mode 100644 index 0000000..bc41bb3 --- /dev/null +++ b/src/views/DataCenterOptions/displayInfo/settingChunk.vue @@ -0,0 +1,289 @@ + + + + + + diff --git a/src/views/DataCenterOptions/distribute/baseLink/index.vue b/src/views/DataCenterOptions/distribute/baseLink/index.vue new file mode 100644 index 0000000..0498095 --- /dev/null +++ b/src/views/DataCenterOptions/distribute/baseLink/index.vue @@ -0,0 +1,614 @@ + + + + + diff --git a/src/views/DataCenterOptions/distribute/baseNewSelect.vue b/src/views/DataCenterOptions/distribute/baseNewSelect.vue new file mode 100644 index 0000000..cef9fb9 --- /dev/null +++ b/src/views/DataCenterOptions/distribute/baseNewSelect.vue @@ -0,0 +1,315 @@ + + + + + + + + + +
+ + +
+
+ + + diff --git a/src/views/DataCenterOptions/distribute/images/删除.png b/src/views/DataCenterOptions/distribute/images/删除.png new file mode 100644 index 0000000..c74a004 Binary files /dev/null and b/src/views/DataCenterOptions/distribute/images/删除.png differ diff --git a/src/views/DataCenterOptions/distribute/images/设置.png b/src/views/DataCenterOptions/distribute/images/设置.png new file mode 100644 index 0000000..fa32cf3 Binary files /dev/null and b/src/views/DataCenterOptions/distribute/images/设置.png differ diff --git a/src/views/DataCenterOptions/distribute/index.vue b/src/views/DataCenterOptions/distribute/index.vue new file mode 100644 index 0000000..1a176dc --- /dev/null +++ b/src/views/DataCenterOptions/distribute/index.vue @@ -0,0 +1,379 @@ + + + + + diff --git a/src/views/DataCenterOptions/distribute/settingForm.vue b/src/views/DataCenterOptions/distribute/settingForm.vue new file mode 100644 index 0000000..b0296b6 --- /dev/null +++ b/src/views/DataCenterOptions/distribute/settingForm.vue @@ -0,0 +1,649 @@ + + + + + diff --git a/src/views/DataCenterOptions/images/1.png b/src/views/DataCenterOptions/images/1.png new file mode 100644 index 0000000..dea5cfa Binary files /dev/null and b/src/views/DataCenterOptions/images/1.png differ diff --git a/src/views/DataCenterOptions/images/2.png b/src/views/DataCenterOptions/images/2.png new file mode 100644 index 0000000..18b3437 Binary files /dev/null and b/src/views/DataCenterOptions/images/2.png differ diff --git a/src/views/DataCenterOptions/images/3.png b/src/views/DataCenterOptions/images/3.png new file mode 100644 index 0000000..0e818e6 Binary files /dev/null and b/src/views/DataCenterOptions/images/3.png differ diff --git a/src/views/DataCenterOptions/images/4.png b/src/views/DataCenterOptions/images/4.png new file mode 100644 index 0000000..b17c19a Binary files /dev/null and b/src/views/DataCenterOptions/images/4.png differ diff --git a/src/views/DataCenterOptions/images/5.png b/src/views/DataCenterOptions/images/5.png new file mode 100644 index 0000000..afc7666 Binary files /dev/null and b/src/views/DataCenterOptions/images/5.png differ diff --git a/src/views/DataCenterOptions/images/icon.png b/src/views/DataCenterOptions/images/icon.png new file mode 100644 index 0000000..dfa057c Binary files /dev/null and b/src/views/DataCenterOptions/images/icon.png differ diff --git a/src/views/DataCenterOptions/images/删除.png b/src/views/DataCenterOptions/images/删除.png new file mode 100644 index 0000000..c74a004 Binary files /dev/null and b/src/views/DataCenterOptions/images/删除.png differ diff --git a/src/views/DataCenterOptions/images/设置.png b/src/views/DataCenterOptions/images/设置.png new file mode 100644 index 0000000..b6fd71a Binary files /dev/null and b/src/views/DataCenterOptions/images/设置.png differ diff --git a/src/views/DataCenterOptions/index.vue b/src/views/DataCenterOptions/index.vue new file mode 100644 index 0000000..96594cd --- /dev/null +++ b/src/views/DataCenterOptions/index.vue @@ -0,0 +1,587 @@ + + + + diff --git a/src/views/DataCenterOptions/logsDeatil/index.vue b/src/views/DataCenterOptions/logsDeatil/index.vue new file mode 100644 index 0000000..8a46b01 --- /dev/null +++ b/src/views/DataCenterOptions/logsDeatil/index.vue @@ -0,0 +1,371 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/DataCenterOptions/masterDataAdd.vue b/src/views/DataCenterOptions/masterDataAdd.vue new file mode 100644 index 0000000..1be220c --- /dev/null +++ b/src/views/DataCenterOptions/masterDataAdd.vue @@ -0,0 +1,482 @@ + + + + + + diff --git a/src/views/DataCenterOptions/settingMenu.vue b/src/views/DataCenterOptions/settingMenu.vue new file mode 100644 index 0000000..c1c064b --- /dev/null +++ b/src/views/DataCenterOptions/settingMenu.vue @@ -0,0 +1,245 @@ + + + + + diff --git a/src/views/masterDataOptions/index.vue b/src/views/masterDataOptions/index.vue index 53eb2ee..00d1583 100644 --- a/src/views/masterDataOptions/index.vue +++ b/src/views/masterDataOptions/index.vue @@ -10,12 +10,12 @@ -
- - - - -
+ + + + + +
@@ -43,7 +43,7 @@
{{ row.mdmName }}
-
档案
+
{{ row.mdmType == 1 ? '档案' : '数据' }}
{{ row.remark }}
@@ -192,14 +192,15 @@ export default { async initMainTableData(obj = {}) { this.refreshLoading = true const res = await getApiModuleApi( - { - tl: 'mdmModuleService', - as: '', - dj: 'queryMdm' - }, - { - ...obj - } + { + tl: 'mdmModuleService', + as: '', + dj: 'queryMdm' + }, + { + ...obj, + mdmType: 1 + } ) this.refreshLoading = false if (res.status == 200) { @@ -215,7 +216,7 @@ export default { el.imgLoading = false if (!res.byteLength) return let tempImgUrl = - 'data:image/png/jpg;base64,' + btoa(new Uint8Array(res).reduce((data, byte) => data + String.fromCharCode(byte), '')) + 'data:image/png/jpg;base64,' + btoa(new Uint8Array(res).reduce((data, byte) => data + String.fromCharCode(byte), '')) this.$set(el, 'imgUrl', tempImgUrl) }) }) diff --git a/src/views/masterDataOptions/masterDataAdd.vue b/src/views/masterDataOptions/masterDataAdd.vue index d7148b0..2fddda6 100644 --- a/src/views/masterDataOptions/masterDataAdd.vue +++ b/src/views/masterDataOptions/masterDataAdd.vue @@ -4,7 +4,7 @@
-
主数据信息
+
{{ bigTitle }}
@@ -116,7 +116,9 @@ export default { saveLoading: false, showForm: false, billid: '', - receiptsTableData: [] + receiptsTableData: [], + bigTitle: '主数据信息', + mdmType: 1 } }, methods: { @@ -183,7 +185,7 @@ export default { if (!this.billid) { this.openLoading('submit') const res = await authApi('mdmModuleService', '', 'saveMdm', '', { - updateType: 1, ...this.ruleForm, mdmLogo: this.appLogo, mdmType: 1 + updateType: 1, ...this.ruleForm, mdmLogo: this.appLogo, mdmType: this.mdmType }) this.$vmNews('保存成功', 'success') this.saveLoading = false @@ -194,7 +196,7 @@ export default { const res = await authApi('mdmModuleService', '', 'updateMdm', '', { ...this.ruleForm, mdmLogo: this.appLogo, - mdmType: 1 + mdmType: this.mdmType }) this.$vmNews('保存成功', 'success') this.saveLoading = false @@ -286,6 +288,15 @@ export default { this.initEditFormData() this.getRuleHandle() } + if (this.$route.query.type) { + this.bigTitle = '数据中心信息' + this.mdmType = 2 + this.formRow[0].elCol[0].title = '单据名称' + } else { + this.bigTitle = '主数据信息' + this.formRow[0].elCol[0].title = '主数据名称' + this.mdmType = 1 + } } } diff --git a/src/views/newVersionView/ApplicationCenter/index.vue b/src/views/newVersionView/ApplicationCenter/index.vue new file mode 100644 index 0000000..1ed7f8e --- /dev/null +++ b/src/views/newVersionView/ApplicationCenter/index.vue @@ -0,0 +1,172 @@ +/** + desc 应用管理 + */ + + + + + diff --git a/src/views/newVersionView/IntegrationTaskCenter/index.vue b/src/views/newVersionView/IntegrationTaskCenter/index.vue new file mode 100644 index 0000000..fefbbd9 --- /dev/null +++ b/src/views/newVersionView/IntegrationTaskCenter/index.vue @@ -0,0 +1,172 @@ +/** + desc 集成任务 + */ + + + + + \ No newline at end of file diff --git a/src/views/newVersionView/MasterDataCenter/index.vue b/src/views/newVersionView/MasterDataCenter/index.vue new file mode 100644 index 0000000..405c61d --- /dev/null +++ b/src/views/newVersionView/MasterDataCenter/index.vue @@ -0,0 +1,172 @@ +/** + desc 主数据中心 + */ + + + + + diff --git a/src/views/recordContrast/index.vue b/src/views/recordContrast/index.vue index d0ecba8..46d98f6 100644 --- a/src/views/recordContrast/index.vue +++ b/src/views/recordContrast/index.vue @@ -101,11 +101,11 @@ export default { type: '7' }, { - name: '银行账户', + name: '采购订单',//原来叫银行账户 type: '8' }, { - name: '资产类别', + name: '销售订单',//原来叫资产类别 type: '9' } ], diff --git a/vue.config.js b/vue.config.js index 07475e0..2e42864 100644 --- a/vue.config.js +++ b/vue.config.js @@ -40,13 +40,13 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://hzya.ufyct.com:9067/`, - // target: `http://ufidahz.com.cn:9067/`, + target: `http://ufidahz.com.cn:9067/`, // target: `http://127.0.0.1:9081/`, // target: `http://192.168.2.78:9999`, // target: `http://192.168.2.85:9999`, // target: `http://192.168.2.78:8080`, - //target: `http://192.168.2.78:9999`, - target: `http://192.168.2.185:9999`, + // target: `http://192.168.2.78:9999`, + // target: `http://192.168.2.185:9999`, // target: `http://192.168.2.83:9999`, changeOrigin: true, pathRewrite: {