diff --git a/src/api/mes/mold.js b/src/api/mes/mold.js
index 03f54d0..d84a059 100644
--- a/src/api/mes/mold.js
+++ b/src/api/mes/mold.js
@@ -72,6 +72,13 @@ export function getMoldList(params = {}) {
})
}
+export function getInTransitMoldAllList() {
+ return request({
+ url: '/admin-api/erp/mold/getInTransitMoldAllList',
+ method: 'get'
+ })
+}
+
export function createMoldBrand(data) {
return request({
url: '/admin-api/erp/mold-brand/create',
diff --git a/src/api/mes/moldoperate.js b/src/api/mes/moldoperate.js
new file mode 100644
index 0000000..8ecd716
--- /dev/null
+++ b/src/api/mes/moldoperate.js
@@ -0,0 +1,57 @@
+import request from '@/utils/request'
+
+export function getMoldOperatePage(params = {}) {
+ return request({
+ url: '/admin-api/mes/mold-operate/page',
+ method: 'get',
+ params
+ })
+}
+
+export function getMoldOperateDetail(id) {
+ return request({
+ url: '/admin-api/mes/mold-operate/get',
+ method: 'get',
+ params: { id }
+ })
+}
+
+export function createMoldOperate(data) {
+ return request({
+ url: '/admin-api/mes/mold-operate/create',
+ method: 'post',
+ data
+ })
+}
+
+export function updateMoldOperate(data) {
+ return request({
+ url: '/admin-api/mes/mold-operate/update',
+ method: 'put',
+ data
+ })
+}
+
+export function deleteMoldOperate(id) {
+ return request({
+ url: '/admin-api/mes/mold-operate/delete',
+ method: 'delete',
+ params: { id }
+ })
+}
+
+export function getLowerMoldList(id) {
+ return request({
+ url: '/admin-api/mes/mold-operate/getLowerMoldList',
+ method: 'get',
+ params: { id }
+ })
+}
+
+export function getDeviceLedgerList(params = {}) {
+ return request({
+ url: '/admin-api/mes/device-ledger/list',
+ method: 'get',
+ params
+ })
+}
diff --git a/src/locales/index.js b/src/locales/index.js
index e8da5a2..751edf1 100644
--- a/src/locales/index.js
+++ b/src/locales/index.js
@@ -191,6 +191,42 @@ const messages = {
confirmApprove: '确认审批入库单 {no} 吗?',
approveSuccess: '审批成功'
},
+ moldOperate: {
+ moduleName: '上下模',
+ subTitle: '模具上模/下模操作记录',
+ detailTitle: '上下模详情',
+ basicInfo: '基础信息',
+ tabUp: '上模',
+ tabDown: '下模',
+ operateType: '操作类型',
+ mold: '模具',
+ lowerMold: '下模模具',
+ selectMold: '选择模具',
+ noSelectedMold: '暂无已选模具',
+ allMold: '全部模具',
+ searchRemark: '请输入备注关键字',
+ searchCode: '请输入模具编码',
+ searchName: '请输入模具名称',
+ moldCode: '模具编码',
+ moldName: '模具名称',
+ device: '设备',
+ deviceName: '设备名称',
+ creatorName: '创建人',
+ remark: '备注',
+ createTime: '创建时间',
+ createTitle: '新增上下模',
+ editTitle: '编辑上下模',
+ empty: '暂无上下模数据',
+ noMoldData: '暂无可选模具',
+ placeholderDevice: '请选择设备',
+ placeholderRemark: '请输入备注',
+ validatorOperateTypeRequired: '操作类型不能为空',
+ validatorDeviceRequired: '设备不能为空',
+ validatorMoldRequired: '请至少选择一个上模模具',
+ validatorLowerMoldRequired: '请至少选择一个下模模具',
+ loadEditFailed: '加载编辑数据失败',
+ confirmDelete: '确认删除该上下模记录吗?'
+ },
mine: {
clickLogin: '点击登录',
username: '用户名:{name}',
@@ -466,6 +502,42 @@ const messages = {
confirmApprove: 'Approve stock-in {no}?',
approveSuccess: 'Approved successfully'
},
+ moldOperate: {
+ moduleName: 'Mold Operate',
+ subTitle: 'Mold mounting and dismounting records',
+ detailTitle: 'Mold Operate Detail',
+ basicInfo: 'Basic Info',
+ tabUp: 'Mount',
+ tabDown: 'Dismount',
+ operateType: 'Operation Type',
+ mold: 'Mold',
+ lowerMold: 'Dismount Mold',
+ selectMold: 'Select Mold',
+ noSelectedMold: 'No selected molds',
+ allMold: 'All Molds',
+ searchRemark: 'Enter remark keyword',
+ searchCode: 'Enter mold code',
+ searchName: 'Enter mold name',
+ moldCode: 'Mold Code',
+ moldName: 'Mold Name',
+ device: 'Device',
+ deviceName: 'Device Name',
+ creatorName: 'Creator',
+ remark: 'Remark',
+ createTime: 'Created At',
+ createTitle: 'Create Mold Operate',
+ editTitle: 'Edit Mold Operate',
+ empty: 'No mold operate data',
+ noMoldData: 'No mold options',
+ placeholderDevice: 'Select device',
+ placeholderRemark: 'Enter remark',
+ validatorOperateTypeRequired: 'Operation type is required',
+ validatorDeviceRequired: 'Device is required',
+ validatorMoldRequired: 'Select at least one mold for mounting',
+ validatorLowerMoldRequired: 'Select at least one mold for dismounting',
+ loadEditFailed: 'Failed to load edit data',
+ confirmDelete: 'Delete this mold operate record?'
+ },
mine: {
clickLogin: 'Tap to sign in',
username: 'Username: {name}',
@@ -613,7 +685,9 @@ const literalMap = {
'模具出库': 'moldGet.moduleName',
'模具出库详情': 'moldGet.detailTitle',
'模具入库': 'moldReturn.moduleName',
- '模具入库详情': 'moldReturn.detailTitle'
+ '模具入库详情': 'moldReturn.detailTitle',
+ '上下模': 'moldOperate.moduleName',
+ '上下模详情': 'moldOperate.detailTitle'
}
function applyTabBarLanguage() {
diff --git a/src/pages.json b/src/pages.json
index 0a2963f..00e77c2 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -476,6 +476,20 @@
"navigationBarTitleText": "模具入库详情",
"navigationStyle": "custom"
}
+ },
+ {
+ "path": "moldoperate/index",
+ "style": {
+ "navigationBarTitleText": "上下模",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "moldoperate/detail",
+ "style": {
+ "navigationBarTitleText": "上下模详情",
+ "navigationStyle": "custom"
+ }
}
]
}
diff --git a/src/pages/work.vue b/src/pages/work.vue
index 2a6387b..c9248dd 100644
--- a/src/pages/work.vue
+++ b/src/pages/work.vue
@@ -245,11 +245,11 @@
{{ t('moldReturn.moduleName') }}
-
+
🔄
- 上下模
+ {{ t('moldOperate.moduleName') }}
@@ -378,7 +378,7 @@ function handleClick(name) {
'模具台账': '/pages_function/pages/moldLedger/index',
moldGet: '/pages_function/pages/moldget/index',
moldReturn: '/pages_function/pages/moldreturn/index',
- '上下模': '',
+ moldOperate: '/pages_function/pages/moldoperate/index',
'点检项库': '',
'点检模板': '',
'点检任务': '',
diff --git a/src/pages_function/pages/moldoperate/detail.vue b/src/pages_function/pages/moldoperate/detail.vue
new file mode 100644
index 0000000..bfa4ab1
--- /dev/null
+++ b/src/pages_function/pages/moldoperate/detail.vue
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+ {{ t('moldOperate.basicInfo') }}
+
+
+ {{ t('moldOperate.operateType') }}
+ {{ typeLabel(detail.operateType) }}
+
+
+ {{ t('moldOperate.deviceName') }}
+ {{ textValue(detail.deviceName) }}
+
+
+ {{ t('moldOperate.creatorName') }}
+ {{ textValue(detail.creatorName) }}
+
+
+ {{ t('moldOperate.createTime') }}
+ {{ dateTimeLabel(detail.createTime) }}
+
+
+
+
+
+
+
+
+
+ {{ t('moldOperate.noMoldData') }}
+
+ {{ textValue(m.name) }}
+
+ {{ t('moldOperate.moldCode') }}
+ {{ textValue(m.code) }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages_function/pages/moldoperate/index.vue b/src/pages_function/pages/moldoperate/index.vue
new file mode 100644
index 0000000..00f1535
--- /dev/null
+++ b/src/pages_function/pages/moldoperate/index.vue
@@ -0,0 +1,544 @@
+
+
+
+
+
+
+ {{ t('moldOperate.tabUp') }}
+ {{ t('moldOperate.tabDown') }}
+
+
+
+
+
+
+
+
+
+ {{ t('functionCommon.search') }}
+
+
+
+ {{ moldFilterLabel }}
+
+
+
+
+
+
+
+
+
+ {{ textValue(item.moldName) }}
+ {{ typeLabel(item.operateType) }}
+
+
+
+ {{ t('moldOperate.deviceName') }}
+ {{ textValue(item.deviceName) }}
+
+
+ {{ t('moldOperate.creatorName') }}
+ {{ textValue(item.creatorName) }}
+
+
+ {{ t('moldOperate.createTime') }}
+ {{ dateTimeLabel(item.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('functionCommon.loading') }}
+ {{ t('moldOperate.empty') }}
+ {{ t('functionCommon.loadingMore') }}
+ {{ t('functionCommon.noMoreData') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+