From 2990f5217f7b687c7666f964770fab86f268dff7 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 22 May 2024 17:30:14 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=BF=98=E8=AE=B0=E5=AF=86=E7=A0=81?=
=?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/locales/en-US.ts | 18 +++++++++++-------
src/locales/zh-CN.ts | 15 +++++++++++----
src/views/login/forgetPassword.vue | 12 ++++++------
3 files changed, 28 insertions(+), 17 deletions(-)
diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts
index f3ab4f8b1..5a6b94b3f 100644
--- a/src/locales/en-US.ts
+++ b/src/locales/en-US.ts
@@ -1097,17 +1097,21 @@ export default {
请输入供应商批次:'Please input the supplier batch',
选择日期:'Option Date',
请输入备注:'Please input comment',
- // 格式为…的文件:The format is... File of
请输入包装规格1:'Please input package specification1',
请输入包装数量1:'Please input package quantity1',
请输入包装规格2:'Please input package specification2',
请输入包装数量2:'Please input package quantity2',
- 提交审批:'submit for approval'
-
-
-
-
-
+ 提交审批:'submit for approval',
+ // 系统管理:'system management',
+ // 基础设施:'infrastructure',
+ // 报表管理:'report manager',
+ // 报表:'statement',
+ // 富维海拉供应商管理系统:'vendor management system',
+ 请输入用户名:'Please enter your username',
+ 请输入邮箱:'Please enter email',
+ 忘记密码:'Forget Password',
+ 用户名:'User Name',
+ 邮箱:'Mail',
},
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 4dbc07161..0a7311fa7 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1097,14 +1097,21 @@ export default {
请输入供应商批次:'请输入供应商批次',
选择日期:'选择日期',
请输入备注:'请输入备注',
- // 格式为…的文件:The format is... File of
请输入包装规格1:'请输入包装规格1',
请输入包装数量1:'请输入包装数量1',
请输入包装规格2:'请输入包装规格2',
请输入包装数量2:'请输入包装数量2',
- 提交审批:'提交审批'
-
-
+ 提交审批:'提交审批',
+ 系统管理:'系统管理',
+ 基础设施:'基础设施',
+ 报表管理:'报表管理',
+ 报表:'报表',
+ 富维海拉供应商管理系统:'富维海拉供应商管理系统',
+ 请输入用户名:'请输入用户名',
+ 请输入邮箱:'请输入邮箱',
+ 忘记密码:'忘记密码',
+ 用户名:'用户名',
+ 邮箱:'邮箱',
diff --git a/src/views/login/forgetPassword.vue b/src/views/login/forgetPassword.vue
index 3511c919b..2b73fa777 100644
--- a/src/views/login/forgetPassword.vue
+++ b/src/views/login/forgetPassword.vue
@@ -1,22 +1,22 @@
- 忘记密码
+ {{ t('ts.忘记密码') }}
-
-
+
+
-
-
+
+
From 8a31b638fc83125af0781f6ecf0a05f6f90e0e9d Mon Sep 17 00:00:00 2001
From: chenfang
Date: Wed, 22 May 2024 17:31:51 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E8=87=AA=E5=88=B6=E5=A4=87=E4=BB=B6?=
=?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/customeritem/index.ts | 11 ++
src/api/wms/deliverPlanMain/index.ts | 13 ++
src/api/wms/deliverRequestMain/index.ts | 13 ++
.../deliver/deliverJobMain/index.vue | 29 ++++-
.../deliver/deliverRecordMain/index.vue | 28 ++++-
.../deliverRequestMain.data.ts | 22 +---
.../deliver/deliverRequestMain/index.vue | 113 +++++++++---------
.../deliverPlanMain/deliverPlanMain.data.ts | 22 +---
.../deliverplan/deliverPlanMain/index.vue | 60 ++++++++--
9 files changed, 199 insertions(+), 112 deletions(-)
diff --git a/src/api/wms/customeritem/index.ts b/src/api/wms/customeritem/index.ts
index d4b636c5b..c4c27e8a7 100644
--- a/src/api/wms/customeritem/index.ts
+++ b/src/api/wms/customeritem/index.ts
@@ -61,4 +61,15 @@ export const exportCustomeritem = async (params) => {
// 下载用户导入模板
export const importTemplate = () => {
return request.download({ url: '/wms/customeritem/get-import-template' })
+}
+
+// 获得业务类型筛选出的物料分页
+export const getPageBusinessTypeToItemCode = async (params) => {
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return request.post({ url: '/wms/customeritem/pageBusinessTypeToLocationSenior', data })
+ } else {
+ return await request.get({ url: `/wms/customeritem/pageBusinessTypeToItemCode`, params })
+ }
}
\ No newline at end of file
diff --git a/src/api/wms/deliverPlanMain/index.ts b/src/api/wms/deliverPlanMain/index.ts
index 46277041e..83363172a 100644
--- a/src/api/wms/deliverPlanMain/index.ts
+++ b/src/api/wms/deliverPlanMain/index.ts
@@ -49,6 +49,19 @@ export const deleteDeliverPlanMain = async (id: number) => {
// 导出发货计划主 Excel
export const exportDeliverPlanMain = async (params) => {
+ params.businessType = 'Deliver'
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/deliver-plan-main/export-excel-senior', data })
+ } else {
+ return await request.download({ url: `/wms/deliver-plan-main/export-excel`, params })
+ }
+}
+
+// 导出发货计划主 Excela
+export const exportZZBJDeliverPlanMain = async (params) => {
+ params.businessType = 'ZZBJDeliver'
if (params.isSearch) {
delete params.isSearch
const data = {...params}
diff --git a/src/api/wms/deliverRequestMain/index.ts b/src/api/wms/deliverRequestMain/index.ts
index 03f544ed9..714df74e3 100644
--- a/src/api/wms/deliverRequestMain/index.ts
+++ b/src/api/wms/deliverRequestMain/index.ts
@@ -65,6 +65,19 @@ export const deleteDeliverRequestMain = async (id: number) => {
// 导出发货申请主 Excel
export const exportDeliverRequestMain = async (params) => {
+ params.businessType = 'Deliver'
+ if (params.isSearch) {
+ delete params.isSearch
+ const data = {...params}
+ return await request.post({ url: '/wms/deliver-request-main/export-excel-senior', data })
+ } else {
+ return await request.download({ url: `/wms/deliver-request-main/export-excel`, params })
+ }
+}
+
+// 导出发货申请主 Excel
+export const exportZZBJDeliverRequestMain = async (params) => {
+ params.businessType = 'ZZBJDeliver'
if (params.isSearch) {
delete params.isSearch
const data = {...params}
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
index 304c98e19..40fa6a1ba 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverJobMain/index.vue
@@ -82,8 +82,33 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
+console.log(99 , routeName.value)
const tableColumns = ref([...DeliverJobMain.allSchemas.tableColumns,...DeliverJobDetail.allSchemas.tableMainColumns])
+const { tableObject, tableMethods } = useTable({
+ getListApi: DeliverJobDetailApi.getDeliverJobDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdRequestMain 合格转隔离
+ */
+ if ( routeName.value == 'DeliverJobMain') {
+ tableObject.params = {
+ businessType: 'Deliver'
+ }
+ businessType.value = 'Deliver'
+ importFileName.value = '成品发货任务'
+} else if ( routeName.value == 'ZZBJDeliverJobMain') {
+ tableObject.params = {
+ businessType: 'ZZBJDeliver'
+ }
+ businessType.value = 'ZZBJDeliver'
+ importFileName.value = '自制备件发货任务'
+}
+
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
tableColumns.value = val
@@ -128,10 +153,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
// const Echo = ['ppNumber','poLine', 'batch', 'altBatch', 'itemCode', 'itemName', 'itemDesc1', 'itemDesc2', 'projectCode', 'qty', 'uom']
const Echo = []
-const { tableObject, tableMethods } = useTable({
- getListApi: DeliverJobDetailApi.getDeliverJobDetailPage // 分页接口
-})
-
// 获得表格的各种操作
const { getList, setSearchParams } = tableMethods
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
index ef6bf3ea3..5af1128a4 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRecordMain/index.vue
@@ -78,16 +78,38 @@ const { t } = useI18n() // 国际化
const route = useRoute() // 路由信息
const routeName = ref()
routeName.value = route.name
+const businessType = ref()
+const importFileName = ref()
+console.log(99 , routeName.value)
const tableColumns = ref([...DeliverRecordMain.allSchemas.tableColumns,...DeliverRecordDetail.allSchemas.tableMainColumns])
+const { tableObject, tableMethods } = useTable({
+ getListApi: DeliverRecordDetailApi.getDeliverRecordDetailPage // 分页接口
+})
+
+// 判断 路由名称 进行条件过滤
+/**
+ * OktoholdRequestMain 合格转隔离
+ */
+ if ( routeName.value == 'DeliverRecordMain') {
+ tableObject.params = {
+ businessType: 'Deliver'
+ }
+ businessType.value = 'Deliver'
+ importFileName.value = '成品发货记录'
+} else if ( routeName.value == 'ZZBJDeliverRecordMain') {
+ tableObject.params = {
+ businessType: 'ZZBJDeliver'
+ }
+ businessType.value = 'ZZBJDeliver'
+ importFileName.value = '自制备件发货记录'
+}
+
// 字段设置 更新主列表字段
const updataTableColumns = (val) => {
tableColumns.value = val
}
-const { tableObject, tableMethods } = useTable({
- getListApi: DeliverRecordDetailApi.getDeliverRecordDetailPage // 分页接口
-})
// 获得表格的各种操作
const { getList, setSearchParams } = tableMethods
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
index 54715ea57..7e4d7b243 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts
@@ -698,16 +698,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([
searchField: 'itemCode',
searchTitle: '客户物料基础信息',
searchAllSchemas: Customeritem.allSchemas,
- searchPage: CustomerItemApi.getCustomeritemPage,
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'customerCode',
- value: 'customerCode',
- isMainValue: true
- }]
+ searchPage: CustomerItemApi.getPageBusinessTypeToItemCode,
},
form: {
componentProps: {
@@ -716,16 +707,7 @@ export const DeliverRequestDetail = useCrudSchemas(reactive([
searchField: 'itemCode',
searchTitle: '客户物料基础信息',
searchAllSchemas: Customeritem.allSchemas,
- searchPage: CustomerItemApi.getCustomeritemPage,
- searchCondition: [{
- key: 'available',
- value: 'TRUE',
- isMainValue: false
- },{
- key: 'customerCode',
- value: 'customerCode',
- isMainValue: true
- }]
+ searchPage: CustomerItemApi.getPageBusinessTypeToItemCode,
}
}
},
diff --git a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
index ddf3d1998..7562032b5 100644
--- a/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/deliver/deliverRequestMain/index.vue
@@ -84,7 +84,7 @@
+ @success="importSuccess" :updateIsDisable="true" :coverIsDisable="true" :mode="2" :extend= "businessType"/>
diff --git a/src/views/eam/maintenance/maintenance.data.ts b/src/views/eam/maintenance/maintenance.data.ts
new file mode 100644
index 000000000..d8eacab32
--- /dev/null
+++ b/src/views/eam/maintenance/maintenance.data.ts
@@ -0,0 +1,214 @@
+import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
+import { dateFormatter } from '@/utils/formatTime'
+
+// 表单校验
+export const MaintenanceRules = reactive({
+ number: [required],
+ equipmentCode: [required],
+ optionCode: [required],
+ factoryAreaCode: [required],
+ concurrencyStamp: [required],
+})
+
+export const Maintenance = useCrudSchemas(reactive([
+ {
+ label: 'id',
+ field: 'id',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '计划编号',
+ field: 'number',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '描述',
+ field: 'describing',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '设备编号',
+ field: 'equipmentCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '设备类别枚举',
+ field: 'type',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '方案编号',
+ field: 'optionCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '周期',
+ field: 'cycle',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '班次',
+ field: 'classes',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '人数',
+ field: 'peoples',
+ sort: 'custom',
+ isSearch: true,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '预计所需时间',
+ field: 'estimatedMinutes',
+ sort: 'custom',
+ isSearch: true,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '所属厂区编号',
+ field: 'factoryAreaCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '车间编号',
+ field: 'workshopCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '工段编号',
+ field: 'workshopSectionCode',
+ sort: 'custom',
+ isSearch: true,
+ },
+ {
+ label: '创建时间',
+ field: 'createTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ isForm: false,
+ },
+ {
+ label: '部门id',
+ field: 'departmentCode',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '备注',
+ field: 'remark',
+ sort: 'custom',
+ isSearch: false,
+ },
+ {
+ label: '地点ID',
+ field: 'siteId',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '是否可用',
+ field: 'available',
+ sort: 'custom',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string', // 默认都是字符串类型其他暂不考虑
+ isTable: true,
+ isDetail: false,
+ isSearch: true,
+ isTableForm: false,
+ isForm: false,
+ },
+ {
+ label: '删除时间',
+ field: 'deletionTime',
+ sort: 'custom',
+ formatter: dateFormatter,
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ search: {
+ component: 'DatePicker',
+ componentProps: {
+ valueFormat: 'YYYY-MM-DD HH:mm:ss',
+ type: 'daterange',
+ defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')]
+ }
+ },
+ form: {
+ component: 'DatePicker',
+ componentProps: {
+ type: 'datetime',
+ valueFormat: 'x'
+ }
+ },
+ },
+ {
+ label: '删除人id',
+ field: 'deleterId',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ },
+ {
+ label: '并发乐观锁',
+ field: 'concurrencyStamp',
+ sort: 'custom',
+ isSearch: false,
+ isTable: false,
+ isForm: false,
+ isDetail:false,
+ form: {
+ component: 'InputNumber',
+ value: 0
+ },
+ },
+ {
+ label: '操作',
+ field: 'action',
+ isForm: false,
+ table: {
+ width: 150,
+ fixed: 'right'
+ }
+ }
+]))
From 4312fddf559d292dafa6989b3180fbfa0f8fa34b Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 23 May 2024 08:23:43 +0800
Subject: [PATCH 4/6] =?UTF-8?q?dev=E5=8F=91=E5=B8=832024-05-23-001?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index c9ab210f8..1bb4abe15 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## dev发布2024-05-21-002
+## dev发布2024-05-23-001
**xxxx.data.ts 文件配置说明**
**form表单查询弹窗配置**
form: {
From 599de89e465b34b9762fb1cc6bc797f3e007a56f Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 23 May 2024 09:21:09 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
=?UTF-8?q?=E8=84=B1=E7=A6=BBERP=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../itemManage/itembasic/itembasic.data.ts | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
index c5e1778db..c9c072358 100644
--- a/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/itembasic/itembasic.data.ts
@@ -207,6 +207,25 @@ export const Itembasic = useCrudSchemas(reactive([
}
},
},
+ {
+ label: '是否脱离ERP管理',
+ field: 'isOutErp',
+ sort: 'custom',
+ dictType: DICT_TYPE.TRUE_FALSE,
+ dictClass: 'string',
+ isTable: true,
+ table: {
+ width: 100
+ },
+ form: {
+ component: 'Switch',
+ value: 'FALSE',
+ componentProps: {
+ inactiveValue: 'FALSE',
+ activeValue: 'TRUE'
+ }
+ },
+ },
{
label: 'ABC类',
field: 'abcClass',
From 47000ea4fd7a16c6995e8f5f3896897e97f0f74a Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 23 May 2024 10:10:25 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E5=AF=BC?=
=?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/TableForm/src/TableForm.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue
index 2de165246..df2adca3f 100644
--- a/src/components/TableForm/src/TableForm.vue
+++ b/src/components/TableForm/src/TableForm.vue
@@ -64,7 +64,7 @@
v-model="row[headerItem.field]"
clearable
:type="headerItem?.tableForm?.inputType"
- :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`)"
+ :placeholder="t(`ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`).replace('ts.','')"
:disabled="headerItem?.tableForm?.disabled ? true: headerItem?.tableForm?.isInpuFocusShow ? true : false"
style="flex:1"
@blur="inputStringBlur(headerItem.field, row[headerItem.field], row)"