From af1c9e588f1de0240390648f9bb56aa486870aff Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期五, 16 五月 2025 17:40:18 +0800
Subject: [PATCH] 提交高度修改;
---
src/views/basicData/calendar/index.vue | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index 0e0d7af..dba5bf1 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -26,7 +26,7 @@
<el-select
style="width: 140px"
clearable
- v-model="queryParams.plant"
+ v-model="queryParams.applicableFactory"
placeholder="閫傜敤宸ュ巶"
>
<el-option
@@ -38,14 +38,14 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="13" style="text-align: right">
+ <!-- <el-col :span="13" style="text-align: right">
<el-form-item class="column-with-margin">
<el-button type="primary" icon="Search" @click="handleQuery"
>鏌ヨ</el-button
>
<el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
</el-form-item>
- </el-col>
+ </el-col> -->
</el-row>
</el-form>
@@ -94,7 +94,8 @@
</el-col> -->
<right-toolbar
v-model:showSearch="showSearch"
- @queryTable="getList"
+ @queryTable="handleQuery"
+ @resetTable="resetQuery"
></right-toolbar>
</el-row>
<HxlhTable
@@ -112,7 +113,7 @@
>
<template #status="{ row }">
<vxe-tag v-if="row.type === '1'" status="primary">鍛ㄥ伐浣�</vxe-tag>
- <vxe-tag v-if="row.type === '2'" status="success">鑺傚亣鏃�</vxe-tag>
+ <!-- <vxe-tag v-if="row.type === '2'" status="success">鑺傚亣鏃�</vxe-tag> -->
</template>
<template #mark="{ row }">
<div v-if="row.type === '1'">
@@ -642,7 +643,7 @@
pageNum: 1,
pageSize: 10,
description: null,
- plant: null,
+ applicableFactory: null,
type: null,
effectiveDate: null,
expiringDate: null,
@@ -1013,15 +1014,13 @@
console.log(response.data, "response.data");
form.value.content = JSON.parse(response.data.content.value);
weekDaysSettingList.value = response.data.content.weekdays;
-
- // else if (form.value.type === "2") {
- // holidays.value = JSON.parse(response.data.content.value).holidays;
- // }
+ form.value.applicableTranslate= applicableTranslateArr(response.data);
+ console.log(form.value.applicableTranslate,"form.value.applicableTranslate")
});
+
}
-// 璁剧疆鑺傚亣鏃�
-function handleSetHolidays(row) {
- let applicableTranslateArr = JSON.parse(row.applicableTranslate).map(
+let applicableTranslateArr = (row)=>{
+ return JSON.parse(row.applicableTranslate).map(
(item) => {
return Object.keys(item).map((n) => {
console.log(item);
@@ -1035,10 +1034,13 @@
});
}
);
+}
+// 璁剧疆鑺傚亣鏃�
+function handleSetHolidays(row) {
console.log(applicableTranslateArr, "applicableTranslateArr");
form.value = {
...row,
- applicableTranslate: applicableTranslateArr,
+ applicableTranslate: applicableTranslateArr(row),
};
if (!row.holidays) {
formHolidays.value = {
--
Gitblit v1.9.3