diff --git a/src/application/mk/libs/function/funs.js b/src/application/mk/libs/function/funs.js index b7e9073..c774a31 100644 --- a/src/application/mk/libs/function/funs.js +++ b/src/application/mk/libs/function/funs.js @@ -2,11 +2,87 @@ import JSONbig from 'json-bigint' export default { - toBigInt(id) { - return JSONbig.parse(`{"v":${id}}`).v; - }, + toBigInt(id) { + return JSONbig.parse(`{"v":${id}}`).v; + }, - trim(str) { - return str.replace(/^\s+|\s+$/gm, ''); + trim(str) { + return str.replace(/^\s+|\s+$/gm, ''); + }, + + + formatDetailData({ data }) { + + if (data.create_time) { + data.create_time = new Date(data.create_time * 1000); } + if (data.update_time) { + data.update_time = new Date(data.update_time * 1000); + } + + + return data; + + }, + + getPostFieldValue({ dataId, list, type, deletedList, fieldName, rowFilter, dataRule }) { + + let d = {}; + console.log(list) + if (rowFilter) { + list = list.filter(rowFilter); + } + if (dataRule) { + list.forEach(item => { + + dataRule.forEach(rule => { + let value = item[rule.field]; + if (rule.type == "integer") { + item[rule.field] = parseInt(value); + } + else if (rule.type == "number") { + item[rule.field] = parseFloat(value); + } + else if (rule.type == "timestamp") { + item[rule.field] = parseInt(new Date(value).getTime() / 1000); + } + }) + + }) + + } + if (fieldName) { + list.forEach(item => { + item[fieldName] = dataId; + }) + } + if (dataId && type !== 'array') { + + + + d = { + insertList: [], + updateList: [], + deleteList: [] + }; + + list.forEach(item => { + if (item.id) { + d.updateList.push(item); + } + else { + d.insertList.push(item); + } + }); + + deletedList.forEach(item => { + d.deleteList.push(item); + }) + + + } else { + d = list; + } + return d; + } } \ No newline at end of file diff --git a/src/pages/Middle/Mes/MesMaterials/MesMaterials/treeEdit.vue b/src/pages/Middle/Mes/MesMaterials/MesMaterials/treeEdit.vue index f972d43..9f74bdb 100644 --- a/src/pages/Middle/Mes/MesMaterials/MesMaterials/treeEdit.vue +++ b/src/pages/Middle/Mes/MesMaterials/MesMaterials/treeEdit.vue @@ -105,6 +105,7 @@ export default { formOptions: { data: { + ename:"", "name": "", "code": "", parent_id: "0" @@ -120,7 +121,7 @@ export default { }, items: [ - { field: 'name', title: '名称', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } }, + { field: 'name', title: '名称', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入名称' } } }, { field: 'code', title: '编号', span: 24, itemRender: { name: '$input', props: { placeholder: '请输入编号' } } }, { title: '上级分类', span: 24, slots: { default: 'parent_id' } }, @@ -209,6 +210,18 @@ export default { postdata.parent_id = parseInt(postdata.parent_id) } + if(!postdata.ename){ + postdata.ename = ""; + } + if(!postdata.create_uid){ + postdata.create_uid = 0; + } + if(!postdata.update_uid){ + postdata.update_uid = 0; + } + postdata.create_time = 0; + postdata.update_time = 0; + this.$mk.post({ url: action, loading: "保存中...", diff --git a/src/pages/Middle/Mold/MoldComponent/Edit.vue b/src/pages/Middle/Mold/MoldComponent/Edit.vue new file mode 100644 index 0000000..a30ed68 --- /dev/null +++ b/src/pages/Middle/Mold/MoldComponent/Edit.vue @@ -0,0 +1,438 @@ + + + + + + diff --git a/src/pages/Middle/Mold/MoldComponent/List.vue b/src/pages/Middle/Mold/MoldComponent/List.vue new file mode 100644 index 0000000..003d1aa --- /dev/null +++ b/src/pages/Middle/Mold/MoldComponent/List.vue @@ -0,0 +1,126 @@ + + + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldComponent/i18n.js b/src/pages/Middle/Mold/MoldComponent/i18n.js new file mode 100644 index 0000000..3232945 --- /dev/null +++ b/src/pages/Middle/Mold/MoldComponent/i18n.js @@ -0,0 +1,14 @@ +module.exports = { + messages: { + CN: { + pageDesc:'单位管理' + }, + HK: { + pageDesc:'单位管理' + }, + US: { + pageDesc:'单位管理' + } + } + } + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldComponent/index.js b/src/pages/Middle/Mold/MoldComponent/index.js new file mode 100644 index 0000000..dabe980 --- /dev/null +++ b/src/pages/Middle/Mold/MoldComponent/index.js @@ -0,0 +1,2 @@ +import list from './List' +export default list diff --git a/src/pages/Middle/Mold/MoldComponentCategory/Edit.vue b/src/pages/Middle/Mold/MoldComponentCategory/Edit.vue new file mode 100644 index 0000000..9b335b5 --- /dev/null +++ b/src/pages/Middle/Mold/MoldComponentCategory/Edit.vue @@ -0,0 +1,180 @@ + + + + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldComponentCategory/List.vue b/src/pages/Middle/Mold/MoldComponentCategory/List.vue new file mode 100644 index 0000000..7d815a9 --- /dev/null +++ b/src/pages/Middle/Mold/MoldComponentCategory/List.vue @@ -0,0 +1,111 @@ + + + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldOrder/Edit.vue b/src/pages/Middle/Mold/MoldOrder/Edit.vue new file mode 100644 index 0000000..f5c99fb --- /dev/null +++ b/src/pages/Middle/Mold/MoldOrder/Edit.vue @@ -0,0 +1,467 @@ + + + + + + diff --git a/src/pages/Middle/Mold/MoldOrder/List.vue b/src/pages/Middle/Mold/MoldOrder/List.vue new file mode 100644 index 0000000..616cba5 --- /dev/null +++ b/src/pages/Middle/Mold/MoldOrder/List.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldOrder/i18n.js b/src/pages/Middle/Mold/MoldOrder/i18n.js new file mode 100644 index 0000000..3232945 --- /dev/null +++ b/src/pages/Middle/Mold/MoldOrder/i18n.js @@ -0,0 +1,14 @@ +module.exports = { + messages: { + CN: { + pageDesc:'单位管理' + }, + HK: { + pageDesc:'单位管理' + }, + US: { + pageDesc:'单位管理' + } + } + } + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldOrder/index.js b/src/pages/Middle/Mold/MoldOrder/index.js new file mode 100644 index 0000000..dabe980 --- /dev/null +++ b/src/pages/Middle/Mold/MoldOrder/index.js @@ -0,0 +1,2 @@ +import list from './List' +export default list diff --git a/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue new file mode 100644 index 0000000..8187b29 --- /dev/null +++ b/src/pages/Middle/Mold/MoldProductionOrder/Edit.vue @@ -0,0 +1,602 @@ + + + + + + diff --git a/src/pages/Middle/Mold/MoldProductionOrder/List.vue b/src/pages/Middle/Mold/MoldProductionOrder/List.vue new file mode 100644 index 0000000..a80f905 --- /dev/null +++ b/src/pages/Middle/Mold/MoldProductionOrder/List.vue @@ -0,0 +1,124 @@ + + + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldProductionOrder/i18n.js b/src/pages/Middle/Mold/MoldProductionOrder/i18n.js new file mode 100644 index 0000000..3232945 --- /dev/null +++ b/src/pages/Middle/Mold/MoldProductionOrder/i18n.js @@ -0,0 +1,14 @@ +module.exports = { + messages: { + CN: { + pageDesc:'单位管理' + }, + HK: { + pageDesc:'单位管理' + }, + US: { + pageDesc:'单位管理' + } + } + } + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldProductionOrder/index.js b/src/pages/Middle/Mold/MoldProductionOrder/index.js new file mode 100644 index 0000000..dabe980 --- /dev/null +++ b/src/pages/Middle/Mold/MoldProductionOrder/index.js @@ -0,0 +1,2 @@ +import list from './List' +export default list diff --git a/src/pages/Middle/Mold/MoldScheme/Edit.vue b/src/pages/Middle/Mold/MoldScheme/Edit.vue new file mode 100644 index 0000000..f5310b6 --- /dev/null +++ b/src/pages/Middle/Mold/MoldScheme/Edit.vue @@ -0,0 +1,523 @@ + + + + + + diff --git a/src/pages/Middle/Mold/MoldScheme/List.vue b/src/pages/Middle/Mold/MoldScheme/List.vue new file mode 100644 index 0000000..218509a --- /dev/null +++ b/src/pages/Middle/Mold/MoldScheme/List.vue @@ -0,0 +1,126 @@ + + + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldScheme/i18n.js b/src/pages/Middle/Mold/MoldScheme/i18n.js new file mode 100644 index 0000000..3232945 --- /dev/null +++ b/src/pages/Middle/Mold/MoldScheme/i18n.js @@ -0,0 +1,14 @@ +module.exports = { + messages: { + CN: { + pageDesc:'单位管理' + }, + HK: { + pageDesc:'单位管理' + }, + US: { + pageDesc:'单位管理' + } + } + } + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldScheme/index.js b/src/pages/Middle/Mold/MoldScheme/index.js new file mode 100644 index 0000000..dabe980 --- /dev/null +++ b/src/pages/Middle/Mold/MoldScheme/index.js @@ -0,0 +1,2 @@ +import list from './List' +export default list diff --git a/src/pages/Middle/Mold/MoldSchemeCategory/Edit.vue b/src/pages/Middle/Mold/MoldSchemeCategory/Edit.vue new file mode 100644 index 0000000..ee831b2 --- /dev/null +++ b/src/pages/Middle/Mold/MoldSchemeCategory/Edit.vue @@ -0,0 +1,177 @@ + + + + \ No newline at end of file diff --git a/src/pages/Middle/Mold/MoldSchemeCategory/List.vue b/src/pages/Middle/Mold/MoldSchemeCategory/List.vue new file mode 100644 index 0000000..8ca139f --- /dev/null +++ b/src/pages/Middle/Mold/MoldSchemeCategory/List.vue @@ -0,0 +1,111 @@ + + + \ No newline at end of file diff --git a/src/router/Middle/Mold/router.map.js b/src/router/Middle/Mold/router.map.js new file mode 100644 index 0000000..bd20f14 --- /dev/null +++ b/src/router/Middle/Mold/router.map.js @@ -0,0 +1,282 @@ + // 视图组件 + const view = { + tabs: () => import('@/layouts/tabs'), + blank: () => import('@/layouts/BlankView'), + page: () => import('@/layouts/PageView') +} + +// 路由组件注册 +const routerMap = { +}; + +routerMap['Mold']= { + name: '模具管理', + icon: 'idcard', + component: view.blank, + meta: { + }, + authority: { + permission: [], + } +}; + + +routerMap['MoldOrder']= { + name: '模具订单', + icon: 'idcard', + path: `/Mold/MoldOrder`, + meta:{ + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldOrder`), + authority: { + permission: [], + } +}; +routerMap['MoldOrderCreate']= { + name: '模具订单', + icon: 'idcard', + path: `/Mold/MoldOrderAdd`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldOrder/Edit`), + authority: { + permission: [], + } +}; + +routerMap['MoldOrderUpdate']= { + name: '模具订单', + icon: 'idcard', + path: `/Mold/MoldOrderUpdate/:id`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldOrder/Edit`), + authority: { + permission: [], + } +}; + + + +routerMap['MoldProductionOrder']= { + name: '工艺布产', + icon: 'idcard', + path: `/Mold/MoldProductionOrder`, + meta:{ + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldProductionOrder`), + authority: { + permission: [], + } +}; + +routerMap['MoldProductionOrderCreate']= { + name: '工艺布产', + icon: 'idcard', + path: `/Mold/MoldProductionOrderAdd`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldProductionOrder/Edit`), + authority: { + permission: [], + } +}; + +routerMap['MoldProductionOrderUpdate']= { + name: '工艺布产', + icon: 'idcard', + path: `/Mold/MoldProductionOrderUpdate/:id`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldProductionOrder/Edit`), + authority: { + permission: [], + } +}; + + + +routerMap['MoldScheme']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldScheme`, + meta:{ + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldScheme`), + authority: { + permission: [], + } +}; + +routerMap['MoldSchemeCreate']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldSchemeAdd`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldScheme/Edit`), + authority: { + permission: [], + } +}; + +routerMap['MoldSchemeUpdate']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldSchemeUpdate/:id`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldScheme/Edit`), + authority: { + permission: [], + } +}; + + + + +routerMap['MoldComponent']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldComponent`, + meta:{ + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldComponent`), + authority: { + permission: [], + } +}; + +routerMap['MoldComponentCreate']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldComponentAdd`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldComponent/Edit`), + authority: { + permission: [], + } +}; + +routerMap['MoldComponentUpdate']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldComponentUpdate/:id`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldComponent/Edit`), + authority: { + permission: [], + } +}; + + + + +routerMap['MoldComponentCategory']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldComponentCategory`, + meta:{ + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldComponentCategory/List`), + authority: { + permission: [], + } +}; + +routerMap['MoldComponentCategoryCreate']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldComponentCategoryAdd`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldComponentCategory/Edit`), + authority: { + permission: [], + } +}; + +routerMap['MoldComponentCategoryUpdate']= { + name: '模具设计', + icon: 'idcard', + path: `/Mold/MoldComponentCategoryUpdate/:id`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldComponentCategory/Edit`), + authority: { + permission: [], + } +}; + + + +routerMap['MoldSchemeCategory']= { + name: '模具分类', + icon: 'idcard', + path: `/Mold/MoldSchemeCategory`, + meta:{ + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldSchemeCategory/List`), + authority: { + permission: [], + } +}; + +routerMap['MoldSchemeCategoryCreate']= { + name: '模具分类', + icon: 'idcard', + path: `/Mold/MoldSchemeCategoryAdd`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldSchemeCategory/Edit`), + authority: { + permission: [], + } +}; + +routerMap['MoldSchemeCategoryUpdate']= { + name: '模具分类', + icon: 'idcard', + path: `/Mold/MoldSchemeCategoryUpdate/:id`, + meta:{ + invisible: true, + page:{ cacheAble:false} + }, + component: () => import(`@/pages/Middle/Mold/MoldSchemeCategory/Edit`), + authority: { + permission: [], + } +}; + + +export default routerMap diff --git a/src/router/router.map.js b/src/router/router.map.js index fe6b2c5..505e5a1 100644 --- a/src/router/router.map.js +++ b/src/router/router.map.js @@ -15,7 +15,7 @@ import Bathroom from '@/router/Middle/bathroom/router.map.js' import Mes from '@/router/Middle/Mes/router.map.js' import Chatgpt from '@/router/Middle/Chatgpt/router.map.js' import ProvideLoanApply from '@/router/Middle/ProvideLoanApply/router.map.js' - +import Mold from '@/router/Middle/Mold/router.map.js' import Test from '@/router/Test/router.map.js' @@ -42,6 +42,8 @@ const routerMap = Object.assign({ //车贷 ProvideLoanApply, + //模具 + Mold, //测试 Test