From 5f5173e9de4509660a3d88e156f3a980da75908e Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期四, 15 五月 2025 12:47:43 +0800
Subject: [PATCH] 提交日历
---
src/views/basicData/gasMaterialUsage/index.vue | 29 ++++++++++++++++++-----------
src/views/basicData/calendar/index.vue | 17 +++++++++--------
2 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index 0e0d7af..781823a 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -1013,15 +1013,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 +1033,13 @@
});
}
);
+}
+// 璁剧疆鑺傚亣鏃�
+function handleSetHolidays(row) {
console.log(applicableTranslateArr, "applicableTranslateArr");
form.value = {
...row,
- applicableTranslate: applicableTranslateArr,
+ applicableTranslate: applicableTranslateArr(row),
};
if (!row.holidays) {
formHolidays.value = {
diff --git a/src/views/basicData/gasMaterialUsage/index.vue b/src/views/basicData/gasMaterialUsage/index.vue
index 33d2e05..0d6b106 100644
--- a/src/views/basicData/gasMaterialUsage/index.vue
+++ b/src/views/basicData/gasMaterialUsage/index.vue
@@ -2,10 +2,10 @@
<div class="app-container">
<el-row :gutter="20">
<el-col>
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+ <el-form :model="queryParams" ref="queryRef" :inline="true" label-position="left" v-show="showSearch">
<el-row :gutter="20">
- <el-col :span="6">
- <el-form-item label="鏂欏彿" prop="itemNumber">
+ <el-col :span="8">
+ <el-form-item label="鏂欏彿" prop="itemNumber" :style="{ width: '100%' }">
<el-input
v-model="queryParams.itemNumber"
placeholder="璇疯緭鍏ユ枡鍙�"
@@ -14,8 +14,8 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鍥惧彿" prop="drawingNo">
+ <el-col :span="8">
+ <el-form-item label="鍥惧彿" prop="drawingNo" :style="{ width: '100%' }">
<el-input
v-model="queryParams.drawingNo"
placeholder="璇疯緭鍏ュ浘鍙�"
@@ -24,8 +24,8 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="鐗堟湰" prop="version">
+ <el-col :span="8">
+ <el-form-item label="鐗堟湰" prop="version" :style="{ width: '100%' }">
<el-input
v-model="queryParams.version"
placeholder="璇疯緭鍏ョ増鏈�"
@@ -34,8 +34,10 @@
/>
</el-form-item>
</el-col>
- <el-col :span="6">
- <el-form-item label="宸ュ簭鍚嶇О" prop="processName">
+ </el-row>
+ <el-row :gutter="20">
+ <el-col :span="8">
+ <el-form-item label="宸ュ簭鍚嶇О" prop="processName" :style="{ width: '100%' }">
<el-input
v-model="queryParams.processName"
placeholder="璇疯緭鍏ュ伐搴忓悕绉�"
@@ -44,8 +46,8 @@
/>
</el-form-item>
</el-col>
- <el-col :span="24" style="text-align: right;">
- <el-form-item>
+ <el-col :span="16" 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>
@@ -351,3 +353,8 @@
getList();
</script>
+<style scoped>
+.column-with-margin {
+ margin-right: 0px;
+}
+</style>
\ No newline at end of file
--
Gitblit v1.9.3