diff --git a/package.json b/package.json
index d3fce1d..cdeae8a 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
"@types/nprogress": "^0.2.0",
"@vueuse/core": "^9.12.0",
"ali-oss": "^6.17.1",
- "ant-design-vue": "~4.2.6",
+ "ant-design-vue": "^4.2.6",
"ant-design-x-vue": "^1.3.2",
"axios": "^1.3.0",
"dayjs": "^1.11.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 195baf5..028a76b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,7 +27,7 @@ importers:
specifier: ^6.17.1
version: 6.20.0
ant-design-vue:
- specifier: ~4.2.6
+ specifier: ^4.2.6
version: 4.2.6(vue@3.5.18(typescript@4.9.5))
ant-design-x-vue:
specifier: ^1.3.2
diff --git a/src/api/all/assignment-management.ts b/src/api/all/assignment-management.ts
index f9aa270..26cd548 100644
--- a/src/api/all/assignment-management.ts
+++ b/src/api/all/assignment-management.ts
@@ -37,3 +37,9 @@ export const editTaskSchedulesTime = (id: string, params = {}) => {
console.log('id', id);
return Http.patch(`/v1/task-schedules/${id}/execution-time`, params);
};
+
+
+export const getWorkDetail = (id: string) => {
+ console.log('id', id);
+ return Http.get(`/v1/works/${id}`);
+};
\ No newline at end of file
diff --git a/src/components/common-select/index.vue b/src/components/common-select/index.vue
index 2ca73d2..40477b3 100644
--- a/src/components/common-select/index.vue
+++ b/src/components/common-select/index.vue
@@ -22,9 +22,9 @@
{{ item.label }}
-
+
-
![]()
+
{{ label }}
@@ -39,6 +39,11 @@
diff --git a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
index df5253f..919e3b0 100644
--- a/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
+++ b/src/views/property-marketing/assignment-management/components/raw-material-drawer.vue
@@ -6,6 +6,7 @@
placement="right"
:visible="visible"
@after-visible-change="onAfterVisibleChange"
+ @close="handleClose"
@cancel="handleCancel"
width="904px"
class="task-drawer"
@@ -246,25 +247,18 @@ const getStatus = (status: number) => {
}
};
-// 抽屉显示状态变化处理
-const onAfterVisibleChange = (visible: boolean) => {
- emit('after-visible-change', visible);
- if (visible) {
- // 当抽屉显示时,使用最新参数请求数据
- fetchProductData();
- } else {
- // 关闭时清空数据
- materialData.value = [];
- selectedRowKeys.value = [];
- choseText.value = '';
- choseImgArray.value = [];
- }
+// 抽屉关闭事件处理(右上角关闭按钮)
+const handleClose = () => {
+ console.log('关闭');
+ emit('cancel');
+ emit('update:visible', false);
};
// 取消按钮处理
const handleCancel = () => {
console.log('取消');
emit('cancel');
+ emit('update:visible', false);
};
// 确定按钮处理
@@ -282,6 +276,22 @@ const handleOk = () => {
});
emit('update:visible', false);
};
+
+// 抽屉显示状态变化处理
+const onAfterVisibleChange = (visible: boolean) => {
+ emit('after-visible-change', visible);
+ if (visible) {
+ // 当抽屉显示时,使用最新参数请求数据
+ fetchProductData();
+ } else {
+ // 关闭时清空数据
+ materialData.value = [];
+ selectedRowKeys.value = [];
+ choseText.value = '';
+ choseImgArray.value = [];
+ }
+};
+