diff --git a/src/api/reportforms/ConsigneeReport.js b/src/api/reportforms/ConsigneeReport.js
index b0563337..de74043f 100644
--- a/src/api/reportforms/ConsigneeReport.js
+++ b/src/api/reportforms/ConsigneeReport.js
@@ -1,10 +1,10 @@
import request from '@/axios';
/** 报表列表 */
-export const postDeptIncomingPage = params => {
+export const postDeptIncomingPage = data => {
return request({
url: '/api/logpm-report/reportIncoming/consigineeIncomingPage',
- method: 'get',
- params,
+ method: 'post',
+ data,
});
};
diff --git a/src/api/reportforms/SalesDepartmentIncomeReport.js b/src/api/reportforms/SalesDepartmentIncomeReport.js
index a63ed5c2..9ac203b6 100644
--- a/src/api/reportforms/SalesDepartmentIncomeReport.js
+++ b/src/api/reportforms/SalesDepartmentIncomeReport.js
@@ -1,10 +1,10 @@
import request from '@/axios';
/** 报表列表 */
-export const postDeptIncomingPage = params => {
+export const postDeptIncomingPage = data => {
return request({
url: '/api/logpm-report/reportIncoming/deptIncomingPage',
- method: 'get',
- params,
+ method: 'post',
+ data,
});
};
diff --git a/src/api/waybill/WaybillOrderList.js b/src/api/waybill/WaybillOrderList.js
index c270838a..a6ae6473 100644
--- a/src/api/waybill/WaybillOrderList.js
+++ b/src/api/waybill/WaybillOrderList.js
@@ -81,3 +81,14 @@ export const postExport = data => {
responseType: 'blob',
});
};
+
+/**
+ * 修改服务类型
+ */
+export const postUpdateWaybillTypeService = data => {
+ return request({
+ url: '/api/logpm-warehouse/warehouseWaybill/updateWaybillTypeService',
+ method: 'post',
+ data,
+ });
+};
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index a8a89852..a7df9afb 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -31,7 +31,7 @@
-
+
{{ dataName || '全部' }}
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index 86ec8fe7..9549aadb 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -1144,7 +1144,7 @@
filterable
remote
reserve-keyword
- placeholder="结算品类"
+ placeholder="收入品类"
@change="
val => {
const _item =
diff --git a/src/views/finance/WaybillAudit.vue b/src/views/finance/WaybillAudit.vue
index f8863338..417a6b91 100644
--- a/src/views/finance/WaybillAudit.vue
+++ b/src/views/finance/WaybillAudit.vue
@@ -139,8 +139,9 @@
>
审核
-
取消审核
-
上传回单
+
handleCloseAudit(slotProps.scope)"> 取消审核
+
handleUploadReceipt(slotProps.scope)"> 上传回单
+
handleServiceType(slotProps.scope)">切换服务类型
@@ -207,7 +208,7 @@
:show-close="false"
v-model="details.popUpShow.checkVisted"
>
-
+
批量审核
运单号:{{ details.form.waybillNo }}
@@ -227,6 +228,38 @@
+
+
+
+ 批量审核
+ 运单号:{{ details.changeServiceTypeInfo.waybillNo }}
+
+
+
+
+
+
+
+
+
+
+ 关 闭
+
+ 提 交
+
+
+
+
({
view: false,
/** 审核 */
checkVisted: false,
+ /** 切换服务类型 */
+ changeServiceTypeVisted: false,
},
/** 列表复选框选中的数据 */
selectionList: [],
@@ -395,6 +434,8 @@ const details = reactive({
}),
/** 是否为批量操作 */
isBatch: false,
+ changeServiceTypeInfo: {},
+ serviceOption: [],
});
const tableNodeRef = ref();
@@ -827,6 +868,40 @@ const handlePictureCardPreview: UploadProps['onPreview'] = uploadFile => {
details.dialogImageUrl = uploadFile.url!;
details.popUpShow.dialogVisible = true;
};
+
+/** 切换服务类型 */
+const handleServiceType = ({ row }) => {
+ details.popUpShow.changeServiceTypeVisted = true;
+ details.changeServiceTypeInfo = { ...row };
+ for (let i = 0; i < details.columnList.length; i++) {
+ const value = details.columnList[i];
+
+ if (value.label !== '服务类型') continue;
+ details.serviceOption = [...value.checkarr];
+ break;
+ }
+};
+
+const handleSubmitChangeServiceType = async () => {
+ try {
+ if (!details.changeServiceTypeInfo.serviceType) return ElMessage.warning('请选择服务类型');
+ details.popUpShow.changeServiceTypeVisted = false;
+ details.loadingObj.pageLoading = true;
+ const res = await postUpdateWaybillTypeService({
+ id: details.changeServiceTypeInfo.id,
+ serviceType: details.changeServiceTypeInfo.serviceType,
+ });
+
+ const { code, msg } = res.data;
+ if (code !== 200) return;
+ ElMessage.success(msg);
+ onLoad();
+ } catch (error) {
+ console.log('error :>> ', error);
+ } finally {
+ details.loadingObj.pageLoading = false;
+ }
+};