From a90e40daf67e6728e2b542c61e4923034ddf7294 Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 7 Mar 2025 13:09:07 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E9=80=81=E8=B4=A7=E6=97=A5=E5=8E=86?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../supplierAddressModelDeli/index.vue | 26 ++++++++++++++-----
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
index 70c6abc41..01348db24 100644
--- a/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/supplierAddressModelDeli/index.vue
@@ -33,8 +33,8 @@
- 白班
- 夜班
+ 白班
+ 夜班
@@ -177,12 +177,26 @@ const openForm = (type: string, row?: any) => {
if (type == 'update') {
row.shift = []
row.modelShow = row.model?.split(',')
- if (row.isDay == 1) {
+ if (row.isDay == 'TRUE') {
row.shift.push('day')
}
- if (row.isNight == 1) {
+ if (row.isNight == 'TRUE') {
row.shift.push('night')
}
+ SupplierAddressModelDeli.allSchemas.formSchema.forEach((item) => {
+ if(item.field == 'supplierCode'){
+ item.componentProps.disabled = true
+ }
+ if(item.field == 'supplierName'){
+ item.componentProps.disabled = true
+ }
+ if(item.field == 'supplierAddress'){
+ item.componentProps.disabled = true
+ }
+ if(item.field == 'modelShow'){
+ item.componentProps.disabled = true
+ }
+ })
}
console.log(row)
basicFormRef.value.open(type, row)
@@ -191,8 +205,8 @@ const openForm = (type: string, row?: any) => {
// form表单提交
const formsSuccess = async (formType, dataParams) => {
const data = {...dataParams}
- data.isDay = data.shift.some(item=>item === 'day') ? 1 :0
- data.isNight = data.shift.some(item => item === 'night') ? 1 :0
+ data.isDay = data.shift.some(item=>item === 'day') ? 'TRUE' :'FALSE'
+ data.isNight = data.shift.some(item => item === 'night') ? 'TRUE' :'FALSE'
data.model = data.modelShow.join(',')
delete data.shift
if (formType === 'create') {
From 78a9530c93dfbb25cfbe3aeb78d6ce1f25fa53ab Mon Sep 17 00:00:00 2001
From: yufei_wang <2267742828@qq.com>
Date: Fri, 7 Mar 2025 13:14:03 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0head=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/config/axios/index.ts | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/src/config/axios/index.ts b/src/config/axios/index.ts
index 1c49f58e7..a3c02ecf9 100644
--- a/src/config/axios/index.ts
+++ b/src/config/axios/index.ts
@@ -24,6 +24,24 @@ const request = (option: any) => {
}
})
}
+const requestHeaders = (option: any) => {
+ const { url, method, params, data, headersType, responseType,headers, ...config } = option
+ return service({
+ url: url,
+ method,
+ params,
+ data,
+ ...config,
+ responseType: responseType,
+ headers: {
+ 'Content-Type': headersType || default_headers,
+ 'language': language,
+ 'Referer1': router.currentRoute.value.fullPath.split('?')[0],
+ ...headers
+ }
+ })
+}
+
export default {
get: async (option: any) => {
const res = await request({ method: 'GET', ...option })
@@ -61,6 +79,14 @@ export default {
const res = await request({ method: 'POST', responseType: 'blob', ...option })
return res as unknown as Promise
},
+ downloadHeaders: async (option: any) => {
+ const res = await requestHeaders({ method: 'GET', responseType: 'blob', ...option })
+ return res as unknown as Promise
+ },
+ downloadPostHeaders: async (option: any) => {
+ const res = await requestHeaders({ method: 'POST', responseType: 'blob', ...option })
+ return res as unknown as Promise
+ },
upload: async (option: any) => {
option.headersType = 'multipart/form-data'
const res = await request({ method: 'POST', ...option })
From 510541af9d284678a50b4e79ffaf77010a11d91f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 7 Mar 2025 13:47:27 +0800
Subject: [PATCH 3/6] =?UTF-8?q?YT-2032=E4=BE=BF=E6=AC=A1=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=98=8E=E7=BB=86=E4=B8=AD=E7=BC=96=E5=8F=B7?=
=?UTF-8?q?=E5=92=8C=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basicDataManage/supplierManage/deliTime/deliTime.data.ts | 3 +++
.../wms/basicDataManage/supplierManage/deliTime/index.vue | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts b/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts
index 1ca39a2d8..1076ac8c3 100644
--- a/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/deliTime/deliTime.data.ts
@@ -53,6 +53,9 @@ export const DeliTime = useCrudSchemas(reactive([
valueFormat: 'x'
}
},
+ detail: {
+ dateFormat:'YYYY-MM-DD HH:mm:ss'
+ }
},
{
label: '创建者',
diff --git a/src/views/wms/basicDataManage/supplierManage/deliTime/index.vue b/src/views/wms/basicDataManage/supplierManage/deliTime/index.vue
index 42ee0083a..2ffb21828 100644
--- a/src/views/wms/basicDataManage/supplierManage/deliTime/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/deliTime/index.vue
@@ -28,7 +28,7 @@
v-model:sort="tableObject.sort"
>
-
+
{{ row.code }}
From 34622996ce6b166123a32276326ca0c2c36df2a3 Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 7 Mar 2025 13:49:45 +0800
Subject: [PATCH 4/6] =?UTF-8?q?YT-2033=E4=BE=BF=E6=AC=A1=E6=97=B6=E9=97=B4?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=BC=96=E8=BE=91=E4=B9=8B=E5=90=8E?=
=?UTF-8?q?=E5=86=8D=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96=E5=8F=B7=E6=97=A0?=
=?UTF-8?q?=E6=B3=95=E5=A1=AB=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../wms/basicDataManage/supplierManage/deliTime/index.vue | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/views/wms/basicDataManage/supplierManage/deliTime/index.vue b/src/views/wms/basicDataManage/supplierManage/deliTime/index.vue
index 2ffb21828..f9688f2f2 100644
--- a/src/views/wms/basicDataManage/supplierManage/deliTime/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/deliTime/index.vue
@@ -155,7 +155,14 @@ const openForm = (type: string, row?: any) => {
item.componentProps.disabled = true
}
})
+ } else {
+ DeliTime.allSchemas.formSchema.forEach((item) => {
+ if(item.field == 'code'){
+ item.componentProps.disabled = false
+ }
+ })
}
+
basicFormRef.value.open(type, row)
}
From f6ff8bbd3811d45aec90c7d174a0a7d92abac28e Mon Sep 17 00:00:00 2001
From: "YEJIAXING-PC\\lenovo" <591141169@qq.com>
Date: Fri, 7 Mar 2025 13:51:31 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E5=B9=B4=E6=9C=88=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../deliveryCalendar/deliveryCalendar.data.ts | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts
index 48078b0cc..21c7575cd 100644
--- a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts
+++ b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/deliveryCalendar.data.ts
@@ -77,6 +77,18 @@ export const DeliveryCalendar = useCrudSchemas(
sort: 'custom',
isSearch: true
},
+
+ {
+ label: '年月',
+ field: 'yearAndMonth',
+ sort: 'custom',
+ isSearch: true,
+ form: {
+ componentProps: {
+ disabled: true
+ }
+ },
+ },
{
label: '日期',
field: 'yearAndMonth',
From 4b2e6466b7d64fb9f82df355da0e9630e189555f Mon Sep 17 00:00:00 2001
From: zhang_li <2235006734@qqq.com>
Date: Fri, 7 Mar 2025 14:17:27 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=80=81=E8=B4=A7=E6=97=A5=E5=8E=86?=
=?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/wms/deliveryCalendar/index.ts | 4 +-
.../supplierManage/deliveryCalendar/index.vue | 45 ++++++++++++++++---
2 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/src/api/wms/deliveryCalendar/index.ts b/src/api/wms/deliveryCalendar/index.ts
index 46dce36b5..65b1e664d 100644
--- a/src/api/wms/deliveryCalendar/index.ts
+++ b/src/api/wms/deliveryCalendar/index.ts
@@ -40,8 +40,8 @@ export const updateDeliveryCalendar = async (data: DeliveryCalendarVO) => {
}
// 删除送货日历
-export const deleteDeliveryCalendar = async (id: number) => {
- return await request.delete({ url: `/wms/delivery-calendar/delete?id=` + id })
+export const deleteDeliveryCalendar = async (data) => {
+ return await request.post({ url: `/wms/delivery-calendar/delete`, data })
}
// 导出送货日历 Excel
diff --git a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue
index 3085fa857..19eaed0d8 100644
--- a/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue
+++ b/src/views/wms/basicDataManage/supplierManage/deliveryCalendar/index.vue
@@ -26,6 +26,9 @@
v-model:pageSize="tableObject.pageSize"
v-model:currentPage="tableObject.currentPage"
v-model:sort="tableObject.sort"
+ row-key="id"
+ :selection="true"
+ @getSelectionRows="getSelectionRows"
>
@@ -106,11 +109,13 @@ const { tableObject, tableMethods } = useTable({
// 获得表格的各种操作
const { getList, setSearchParams } = tableMethods
+const selectionRowsData = ref([])//多选数据
// 列表头部按钮
const HeadButttondata = [
// defaultButtons.defaultAddBtn({hasPermi:'wms:delivery-calendar:create'}), // 新增
defaultButtons.defaultImportBtn({hasPermi:'wms:delivery-calendar:import'}), // 导入
defaultButtons.defaultExportBtn(null), // 导出
+ defaultButtons.mainLisSelectiontDeleteBtn(null), // 批量删除
defaultButtons.defaultFreshBtn(null), // 刷新
defaultButtons.defaultFilterBtn(null), // 筛选
defaultButtons.defaultSetBtn(null), // 设置
@@ -132,6 +137,8 @@ const buttonBaseClick = (val, item) => {
handleImport()
} else if (val == 'export') { // 导出
handleExport()
+ } else if (val == 'selection_delete') { // 批量删除
+ handleDelete()
} else if (val == 'refresh') { // 刷新
getList()
} else if (val == 'filtrate') { // 筛选
@@ -151,7 +158,7 @@ const buttonTableClick = async (val, row) => {
if (val == 'edit') { // 编辑
openForm('update', row)
} else if (val == 'delete') { // 删除
- handleDelete(row.id)
+ handleDelete(row)
}
}
@@ -192,12 +199,37 @@ const openDetail = (row: any, titleName: any, titleValue: any) => {
}
/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
+const handleDelete = async (row?:any) => {
try {
+ // 发起删除
+ let list = []
+ if (row) {
// 删除的二次确认
await message.delConfirm()
- // 发起删除
- await DeliveryCalendarApi.deleteDeliveryCalendar(id)
+ list.push({
+ supplierCode:row.supplierCode,
+ supplierAddress:row.supplierAddress,
+ model:row.model,
+ yearAndMonth:row.yearAndMonth,
+ })
+ } else {
+ console.log(selectionRowsData.value)
+ if (selectionRowsData.value.length == 0) {
+ message.warning('请选择数据')
+ return
+ }
+ // 删除的二次确认
+ await message.delConfirm()
+ selectionRowsData.value.forEach(item => {
+ list.push({
+ supplierCode:item.supplierCode,
+ supplierAddress:item.supplierAddress,
+ model:item.model,
+ yearAndMonth:item.yearAndMonth,
+ })
+ })
+ }
+ await DeliveryCalendarApi.deleteDeliveryCalendar(list)
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
@@ -276,7 +308,10 @@ const updateDateTableColumns = ()=>{
tableColumns.value = [...orginTableColumns.value,...dateColumns.value]
console.log('tableColumns',tableColumns.value)
}
-
+const getSelectionRows = (currentPage,currentPageSelectionRows) => {
+ selectionRowsData.value = currentPageSelectionRows
+ console.log(selectionRowsData.value)
+}
/** 初始化 **/
onMounted(async () => {
getListHead()