From 4f38240e2fd66324ebf9d7dc69b00a363d4c8c4a Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期三, 14 五月 2025 16:20:03 +0800
Subject: [PATCH] 提交调整列宽，日历对接等
---
src/views/basicData/calendar/index.vue | 893 +++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 719 insertions(+), 174 deletions(-)
diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index 6b2d26d..a0f174e 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -7,9 +7,10 @@
:inline="true"
v-show="showSearch"
label-width="68px"
+ label-position="left"
>
- <el-row type="flex" justify="left">
- <el-col :span="6">
+ <el-row type="flex" justify="left" :gutter="20">
+ <el-col :span="5">
<el-form-item label="鏃ュ巻鎻忚堪" prop="description">
<el-input
style="width: 140px"
@@ -20,7 +21,24 @@
/>
</el-form-item>
</el-col>
- <el-col :span="18" style="text-align: right">
+ <el-col :span="6">
+ <el-form-item label="閫傜敤宸ュ巶" prop="plant">
+ <el-select
+ style="width: 140px"
+ clearable
+ v-model="queryParams.plant"
+ placeholder="閫傜敤宸ュ巶"
+ >
+ <el-option
+ v-for="item in aps_factory"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <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
@@ -93,7 +111,7 @@
class="auto-height-grid"
>
<template #status="{ row }">
- <vxe-tag v-if="row.type === '1'" status="primary">鍛ㄥ伐浣滄棩</vxe-tag>
+ <vxe-tag v-if="row.type === '1'" status="primary">鍛ㄥ伐浣�</vxe-tag>
<vxe-tag v-if="row.type === '2'" status="success">鑺傚亣鏃�</vxe-tag>
</template>
<template #mark="{ row }">
@@ -123,23 +141,32 @@
</div>
</template>
<template #buttons="{ row }">
- <vxe-button
- mode="text"
+ <el-button
+ type="primary"
+ size="small"
@click="handleUpdate(row)"
v-hasPermi="['aps:calendar:update']"
- >淇敼</vxe-button
+ >淇敼</el-button
>
- <vxe-button
- mode="text"
+ <el-button
+ type="warning"
+ size="small"
+ @click="handleSetHolidays(row)"
+ v-hasPermi="['aps:calendar:remove']"
+ >璁剧疆鑺傚亣鏃�</el-button
+ >
+ <el-button
+ type="danger"
+ size="small"
@click="handleDelete(row)"
v-hasPermi="['aps:calendar:remove']"
- >鍒犻櫎</vxe-button
+ >鍒犻櫎</el-button
>
</template>
</HxlhTable>
<!-- 娣诲姞鎴栦慨鏀规棩鍘嗙鐞嗗璇濇 -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+ <el-dialog :title="title" v-model="open" width="80%" append-to-body>
<el-form
ref="calendarRef"
:model="form"
@@ -150,10 +177,11 @@
<el-input v-model="form.description" placeholder="璇疯緭鍏ユ弿杩�" />
</el-form-item>
<el-form-item label="鏃ュ巻绫诲瀷" prop="type">
- <el-radio-group v-model="form.type" @change="handleSwitchType">
+ <!-- <el-radio-group v-model="form.type" @change="handleSwitchType">
<el-radio :label="'1'">鍛ㄥ伐浣�</el-radio>
<el-radio :label="'2'">鑺傚亣鏃�</el-radio>
- </el-radio-group>
+ </el-radio-group> -->
+ <el-tag type="primary">鍛ㄥ伐浣�</el-tag>
</el-form-item>
<el-form-item label="鐢熸晥鏃堕棿" prop="effectiveDate">
<el-date-picker
@@ -175,7 +203,7 @@
>
</el-date-picker>
</el-form-item>
- <div v-if="form.type === '1'">
+ <div>
<div class="title_bar_line">
<div class="line_short"></div>
<div>鍛ㄥ伐浣滆缃�</div>
@@ -228,67 +256,105 @@
</div>
</div>
</div>
- <el-form-item
+ <!-- <el-form-item
label="閫傜敤宸ュ巶"
prop="applicableFactory"
class="factory_use_item"
+ > -->
+ <div class="select_factory select_factory_dis">閫傜敤宸ュ巶/杞﹂棿/宸ュ簭</div>
+ <!-- <el-row :gutter="20" class="select_factory"> -->
+ <div
+ class="select_factory_dis"
+ v-for="(item, index) in applicableSettingList"
+ :key="index"
>
+ <!-- <el-col :span="7"> -->
<el-select
+ class="select_content"
clearable
- v-model="form.applicableFactory"
+ v-model="item.factory"
style="width: 160px"
placeholder="璇疯緭鍏ラ�傜敤宸ュ巶"
@change="changePlant($event)"
>
<el-option
- v-for="plant in plantList"
- :key="plant.id"
- :label="plant.plantName"
- :value="plant.plantCode"
+ v-for="plant in aps_factory"
+ :key="plant.value"
+ :label="plant.label"
+ :value="`${plant.value};${plant.label}`"
>
</el-option>
</el-select>
- </el-form-item>
- <el-form-item
- label="閫傜敤杞﹂棿"
- prop="applicableWorkshop"
- class="factory_use_item"
- >
+ <!-- </el-col>
+ <el-col :span="7"> -->
<el-select
+ class="select_content"
clearable
- v-model="form.applicableWorkshop"
+ v-model="item.workshop"
style="width: 160px"
placeholder="璇疯緭鍏ラ�傜敤杞﹂棿"
+ @change="changeWorkshop($event)"
>
<el-option
v-for="shop in shopList"
:key="shop.id"
:label="shop.shopName"
- :value="shop.id"
+ :value="`${shop.id};${shop.shopName}`"
>
</el-option>
</el-select>
+ <!-- </el-col>
+ <el-col :span="7"> -->
+ <el-select
+ class="select_content"
+ clearable
+ v-model="item.process"
+ style="width: 160px"
+ placeholder="璇疯緭鍏ラ�傜敤宸ュ簭"
+ >
+ <el-option
+ v-for="process in processList"
+ :key="process.processNumber"
+ :label="process.processName"
+ :value="`${process.processNumber};${process.processName}`"
+ >
+ </el-option>
+ </el-select>
+ <!-- </el-col>
+ <el-col :span="3"> -->
+ <el-button
+ class="select_content"
+ type="primary"
+ icon="Plus"
+ @click="handleAddFactory(item)"
+ circle
+ size="small"
+ />
+ <el-button
+ v-if="applicableSettingList.length > 1"
+ class="select_content"
+ type="primary"
+ icon="Minus"
+ @click="handleMinusFactory(item)"
+ circle
+ size="small"
+ />
+ <!-- </el-col> -->
+ </div>
+ <!-- </el-row> -->
+ <!-- </el-form-item> -->
+ <!-- <el-form-item
+ label="閫傜敤杞﹂棿"
+ prop="applicableWorkshop"
+ class="factory_use_item"
+ >
</el-form-item>
<el-form-item
label="閫傜敤宸ュ簭"
prop="applicableProcess"
class="factory_use_item"
>
- <el-select
- clearable
- v-model="form.applicableProcess"
- style="width: 160px"
- placeholder="璇疯緭鍏ラ�傜敤宸ュ簭"
- >
- <el-option
- v-for="process in processList"
- :key="process.id"
- :label="process.processName"
- :value="process.processName"
- >
- </el-option>
- </el-select>
- </el-form-item>
+ </el-form-item> -->
</el-form>
<template #footer>
<div class="dialog-footer">
@@ -297,10 +363,206 @@
</div>
</template>
</el-dialog>
+ <el-dialog
+ title="璁剧疆鑺傚亣鏃�"
+ v-model="openSetHolidays"
+ width="80%"
+ style="height: 570px"
+ append-to-body
+ >
+ <div class="height_dialog">
+ <div class="height_dialog_scroll">
+ <div class="grey_bg">
+ <div v-if="expand">
+ <div class="flex_item">
+ <div>宸ヤ綔鏃ュ巻锛� </div>
+ <div>{{ form.description }}</div>
+ </div>
+ <div class="flex_item">
+ <div>鐢熸晥鏃堕棿锛� </div>
+ <div>{{ form.effectiveDate }}</div>
+ </div>
+ <div class="flex_item">
+ <div>澶辨晥鏃堕棿锛� </div>
+ <div>{{ form.expiringDate }}</div>
+ </div>
+ <div class="flex_item">
+ <div>閫傜敤宸ュ巶锛� </div>
+ <div class="flex_item_dis">
+ <div
+ v-for="(item, index) in form.applicableTranslate"
+ :key="index"
+ >
+ {{ item.factory }} - {{ item.workshop }} -
+ {{ item.process }}
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="flex_item_expand_end" @click="handleToggleExpand">
+ <el-icon :size="18" v-if="expand"><ArrowUpBold /></el-icon>
+ <el-icon v-else><ArrowDownBold /></el-icon>
+ </div>
+ </div>
+ <div class="title_flex">
+ <div class="holiday_title">鑺傚亣鏃ュ垪琛�</div>
+ <el-button type="primary" size="small" @click="hanldeAddHolidays"
+ >娣诲姞鑺傚亣鏃�</el-button
+ >
+ </div>
+ <div class="grey_bg">
+ <div
+ class="flex_holidays_set"
+ v-for="(item, index) in formHolidays"
+ :key="index"
+ >
+ <div class="dis_error_wrap">
+ <div class="flex_item">
+ <div class="flex_item_title">
+ <span class="error_require">*</span><span>鑺傚亣鏃ユ弿杩�</span>
+ </div>
+ <div>
+ <el-input
+ style="width: 130px"
+ v-model="item.describe"
+ placeholder="璇疯緭鍏ユ弿杩�"
+ />
+ </div>
+ </div>
+ <div class="error_text">璇疯緭鍏ヨ妭鍋囨棩鎻忚堪</div>
+ </div>
+ <div class="dis_error_wrap">
+ <div class="flex_item">
+ <div class="flex_item_title">
+ <span class="error_require">*</span><span>寮�濮嬫椂闂�</span>
+ </div>
+ <div>
+ <el-date-picker
+ style="width: 130px"
+ clearable
+ v-model="item.startdate"
+ type="date"
+ :disabled-date="handleDisabledDate"
+ :default-value="form.effectiveDate"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
+ </el-date-picker>
+ </div>
+ </div>
+ <div class="error_text">璇疯緭鍏ュ紑濮嬫椂闂�</div>
+ </div>
+ <div class="dis_error_wrap">
+ <div class="flex_item">
+ <div class="flex_item_title">
+ <span class="error_require">*</span><span>缁撴潫鏃堕棿</span>
+ </div>
+ <div>
+ <el-date-picker
+ style="width: 130px"
+ clearable
+ v-model="item.enddate"
+ type="date"
+ :disabled-date="handleDisabledDate"
+ :default-value="form.expiringDate"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
+ </el-date-picker>
+ </div>
+ </div>
+ <div class="error_text">璇疯緭鍏ョ粨鏉熸椂闂�</div>
+ </div>
+ <div class="dis_error_wrap">
+ <div class="flex_item">
+ <el-button
+ v-if="formHolidays.length > 1"
+ type="danger"
+ size="small"
+ @click="handleDelSettingHolidays(item)"
+ >鍒犻櫎</el-button
+ >
+ </div>
+ </div>
+ </div>
+ <!-- <el-form
+ class="mart10"
+ ref="holidaysRef"
+ :model="item"
+ :rules="holidayRules"
+ :inline="true"
+ label-width="105px"
+ >
+ <div v-for="(item, index) in formHolidays.holidays" :key="index">
+ <el-form-item
+ label="鑺傚亣鏃ユ弿杩�"
+ :prop="'holidays.' + index + '.describe'"
+ :rules="{ required: true, message: '璇疯緭鍏ヨ妭鍋囨棩鎻忚堪', trigger: 'blur' }"
+ >
+ <el-input
+ style="width: 130px"
+ v-model="item.describe"
+ placeholder="璇疯緭鍏ユ弿杩�"
+ />
+ </el-form-item>
+ <el-form-item
+ label="寮�濮嬫椂闂�"
+ :prop="'holidays.' + index + '.startdate'"
+ :rules="{ required: true, message: '璇疯緭鍏ュ紑濮嬫椂闂�', trigger: 'blur' }"
+ >
+ <el-date-picker
+ style="width: 130px"
+ clearable
+ v-model="item.startdate"
+ type="date"
+ :disabled-date="handleDisabledDate"
+ :default-value="form.effectiveDate"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item
+ label="缁撴潫鏃堕棿"
+ :prop="'holidays.' + index + '.enddate'"
+ :rules="{ required: true, message: '璇疯緭鍏ョ粨鏉熸椂闂�', trigger: 'blur' }"
+ >
+ <el-date-picker
+ style="width: 130px"
+ clearable
+ v-model="item.enddate"
+ type="date"
+ placeholder="閫夋嫨鏃ユ湡"
+ :disabled-date="handleDisabledDate"
+ :default-value="form.expiringDate"
+ >
+ </el-date-picker>
+ </el-form-item>
+ <el-form-item label="" prop="">
+ <el-button
+ v-if="formHolidays.length > 1"
+ type="danger"
+ size="small"
+ @click="handleDelSettingHolidays(item)"
+ >鍒犻櫎</el-button
+ >
+ </el-form-item>
+ </div>
+ </el-form> -->
+ </div>
+ </div>
+ </div>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button @click="openSetHolidays = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="handleSaveHolidaysForm"
+ >淇濆瓨</el-button
+ >
+ </div>
+ </template>
+ </el-dialog>
</div>
</template>
<script setup name="Calendar">
+import moment from "moment";
import HxlhTable from "@/components/HxlhTable";
import {
listCalendar,
@@ -310,13 +572,18 @@
updateCalendar,
} from "@/api/basicData/calendar";
import axios from "axios";
-import { listAll_plant } from "@/api/basicData/plant";
+import { listAll_plant, listByWorkShop } from "@/api/basicData/plant";
import { listAll_shop, listAps_shop } from "@/api/basicData/shop";
import { selectProcessNameList } from "@/api/basicData/processRoute.js";
+import { ElMessage } from "element-plus";
const { proxy } = getCurrentInstance();
+const holidaysRef = ref(null);
+const { aps_factory } = proxy.useDict("aps_factory");
const tableRef = ref();
const calendarList = ref([]);
const open = ref(false);
+const openSetHolidays = ref(false);
+const expand = ref(true);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
@@ -327,11 +594,28 @@
const data = reactive({
form: {
type: "1",
+ applicable: [
+ {
+ factory: "",
+ workshop: "",
+ process: "",
+ },
+ ],
+ },
+ formHolidays: {
+ holidays: [
+ {
+ enddate: "",
+ startdate: "",
+ describe: "",
+ },
+ ],
},
queryParams: {
pageNum: 1,
pageSize: 10,
description: null,
+ plant: null,
type: null,
effectiveDate: null,
expiringDate: null,
@@ -348,13 +632,13 @@
trigger: "blur",
},
],
- type: [
- {
- required: true,
- message: "璇烽�夋嫨鏃ュ巻绫诲瀷",
- trigger: "blur",
- },
- ],
+ // type: [
+ // {
+ // required: true,
+ // message: "璇烽�夋嫨鏃ュ巻绫诲瀷",
+ // trigger: "blur",
+ // },
+ // ],
effectiveDate: [
{
required: true,
@@ -369,16 +653,35 @@
trigger: "blur",
},
],
- applicableFactory: [
- {
- required: true,
- message: "璇烽�夋嫨閫傜敤宸ュ巶",
- trigger: "blur",
- },
- ],
},
+ // holidayRules: {
+ // describe: [
+ // {
+ // required: true,
+ // message: "璇疯緭鍏ヨ妭鍋囨棩鎻忚堪",
+ // trigger: "blur",
+ // },
+ // ],
+ // startdate: [
+ // {
+ // required: true,
+ // message: "璇疯緭鍏ュ紑濮嬫椂闂�",
+ // trigger: "blur",
+ // },
+ // ],
+ // enddate: [
+ // {
+ // required: true,
+ // message: "璇疯緭鍏ョ粨鏉熸椂闂�",
+ // trigger: "blur",
+ // },
+ // ],
+ // },
});
-const { queryParams, form, rules } = toRefs(data);
+const holidayRules = {
+ holidays: [{ required: true, message: "鑺傚亣鏃ユ槸蹇呭～椤�", trigger: "blur" }],
+};
+const { queryParams, form, rules, formHolidays } = toRefs(data);
const dateType = ref("鍛ㄥ伐浣�");
const dateTypeList = ref([
{
@@ -391,6 +694,9 @@
},
]);
const typeRadioNumber = ref(1);
+const applicableSettingList = ref([
+ { factory: "", workshop: "", process: "", id: 0 },
+]);
const weekDaysSettingList = ref([
{
day: "Monday",
@@ -472,43 +778,43 @@
align: "center",
slots: { default: "mark" },
},
- {
- title: "閫傜敤宸ュ巶",
- field: "applicableFactory",
- width: 200,
- align: "center",
- formatter: ({ cellValue, row, column }) => {
- if (cellValue) {
- for (let i = 0; i < plantList.value.length; i++) {
- if (cellValue === plantList.value[i].plantCode) {
- return plantList.value[i].plantName;
- }
- }
- }
- },
- },
- {
- title: "閫傜敤杞﹂棿",
- field: "applicableWorkshop",
- width: 200,
- align: "center",
- formatter: ({ cellValue, row, column }) => {
- if (cellValue) {
- for (let i = 0; i < shopList.value.length; i++) {
- if (cellValue === shopList.value[i].id) {
- return shopList.value[i].shopName;
- }
- }
- }
- return "";
- },
- },
- {
- title: "閫傜敤宸ュ簭",
- field: "applicableProcess",
- width: 200,
- align: "center",
- },
+ // {
+ // title: "閫傜敤宸ュ巶",
+ // field: "applicableFactory",
+ // width: 200,
+ // align: "center",
+ // formatter: ({ cellValue, row, column }) => {
+ // if (cellValue) {
+ // for (let i = 0; i < plantList.value.length; i++) {
+ // if (cellValue === plantList.value[i].plantCode) {
+ // return plantList.value[i].plantName;
+ // }
+ // }
+ // }
+ // },
+ // },
+ // {
+ // title: "閫傜敤杞﹂棿",
+ // field: "applicableWorkshop",
+ // width: 200,
+ // align: "center",
+ // formatter: ({ cellValue, row, column }) => {
+ // if (cellValue) {
+ // for (let i = 0; i < shopList.value.length; i++) {
+ // if (cellValue === shopList.value[i].id) {
+ // return shopList.value[i].shopName;
+ // }
+ // }
+ // }
+ // return "";
+ // },
+ // },
+ // {
+ // title: "閫傜敤宸ュ簭",
+ // field: "applicableProcess",
+ // width: 200,
+ // align: "center",
+ // },
{
title: "鍒涘缓鑰�",
field: "createBy",
@@ -523,7 +829,7 @@
},
{
title: "鎿嶄綔",
- width: 100,
+ width: 270,
fixed: "right",
slots: { default: "buttons" },
align: "center",
@@ -566,27 +872,6 @@
// 鍙栨秷鎸夐挳
function cancel() {
open.value = false;
- reset();
-}
-
-// 琛ㄥ崟閲嶇疆
-function reset() {
- form.value = {
- id: null,
- description: null,
- type: "1",
- effectiveDate: null,
- expiringDate: null,
- content: null,
- applicableFactory: null,
- applicableWorkshop: null,
- applicableProcess: null,
- createBy: null,
- createTime: null,
- updateBy: null,
- updateTime: null,
- };
- proxy.resetForm("calendarRef");
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -610,22 +895,46 @@
/** 鏂板鎸夐挳鎿嶄綔 */
async function handleAdd() {
- reset();
open.value = true;
+ form.value = {
+ applicable: [
+ {
+ factory: "",
+ workshop: "",
+ process: "",
+ },
+ ],
+ };
title.value = "娣诲姞鏃ュ巻绠＄悊";
}
/** 閫夋嫨宸ュ巶鍚庝簨浠� 鍔犺浇杞﹂棿 鍜� 宸ュ簭 **/
function changePlant(plant) {
- listAps_shop({ plantCode: plant }).then((response) => {
+ console.log(plant);
+ listAps_shop({ plantCode: plant.split(";")[0] }).then((response) => {
shopList.value = response.rows;
});
- selectProcessNameList({ orgCode: plant }).then((response) => {
- processList.value = response.rows;
+ // selectProcessNameList({ orgCode: plant }).then((response) => {
+ // processList.value = response.rows;
+ // });
+}
+function changeWorkshop(workShop) {
+ console.log(workShop.split(";")[0]);
+ listByWorkShop({ workShop: "姘旀煖" }).then((res) => {
+ console.log(res, "workShop");
+ processList.value = res.rows;
});
+}
+function handleAddFactory(row) {
+ console.log(row);
+ applicableSettingList.value.push({ ...row, id: ++row.id });
+}
+function handleMinusFactory(row) {
+ applicableSettingList.value = applicableSettingList.value.filter(
+ (item, index) => item !== row
+ );
}
/** 淇敼鎸夐挳鎿嶄綔 */
function handleUpdate(row) {
- reset();
const _id = row.id || ids.value;
getCalendar(_id).then((response) => {
form.value = response.data;
@@ -642,63 +951,208 @@
title.value = "淇敼鏃ュ巻绠＄悊";
});
}
-
+// 璁剧疆鑺傚亣鏃�
+function handleSetHolidays(row) {
+ form.value = {
+ ...row,
+ applicableTranslate: JSON.parse(row.applicableTranslate),
+ };
+ if (!row.holidays) {
+ formHolidays.value = {
+ holidays: [
+ {
+ enddate: "",
+ startdate: "",
+ describe: "",
+ },
+ ],
+ };
+ } else {
+ formHolidays.value.holidays = JSON.parse(row.holidays.value);
+ }
+ console.log(formHolidays.value.holidays, "formHolidays.value");
+ openSetHolidays.value = true;
+}
+// 绂佺敤鏃ユ湡
+function handleDisabledDate(date) {
+ const targetDate = moment(date).valueOf();
+ const startDate = moment(form.value.effectiveDate).valueOf();
+ const endDate = moment(form.value.expiringDate).valueOf();
+ return targetDate < startDate || targetDate > endDate;
+}
+// 鍒犻櫎鑺傚亣鏃ヨ缃�
+function handleDelSettingHolidays(row) {
+ formHolidays.value.holidays = formHolidays.value.holidays.filter((item) => {
+ return item != row;
+ });
+}
+// 娣诲姞鑺傚亣鏃�
+function hanldeAddHolidays() {
+ formHolidays.value.holidays.push({
+ enddate: "",
+ startdate: "",
+ describe: "",
+ });
+}
+function handleToggleExpand() {
+ expand.value = !expand.value;
+}
+// const confirmClick = () => {
+// let formList = [predictionFormRef]
+// let resultArr = [];
+// let validate = (form) => {
+// let result = new Promise((resolve, reject) => {
+// form.value.validate(valid => {
+// if (valid) {
+// resolve()
+// } else {
+// reject()
+// }
+// })
+// })
+// resultArr.push(result)
+// }
+// formList.forEach(item => {
+// validate(item)
+// })
+// Promise.all(resultArr).then(() => {
+// saveRule() // 鏍￠獙鎴愬姛涔嬪悗 淇濆瓨鏁版嵁鐨勬柟娉�
+// })
+// }
+// const submitForm = () => {
+// formRef.value.validate((valid) => {
+// if (valid) {
+// alert('submit!');
+// } else {
+// alert('Form is not valid.');
+// return false;
+// }
+// });
+// };
+// 鎻愪氦鑺傚亣鏃�
+function handleSaveHolidaysForm() {
+ console.log(holidaysRef.value, "琛ㄥ崟dom");
+ // holidaysRef.value.validate((valid) => {
+ // console.log(valid,"valid")
+ // if (valid) {
+ // proxy.$modal.msgSuccess('submit!');
+ // } else {
+ // proxy.$modal.msgSuccess('Form is not valid.');
+ // return false;
+ // }
+ // })
+ holidaysRef.value.validate((valid) => {
+ if (!valid) {
+ proxy.$modal.msgSuccess("蹇呭～椤逛笉鑳戒负绌�");
+ }
+ if (valid) {
+ updateCalendar({
+ id: form.value.id,
+ holidays: formHolidays.value.holidays.map((item) => {
+ return {
+ startdate: moment(item.startdate).format("YYYY-MM-DD"),
+ enddate: moment(item.enddate).format("YYYY-MM-DD"),
+ describe: item.describe,
+ };
+ }),
+ }).then((response) => {
+ proxy.$modal.msgSuccess("鏂板鎴愬姛");
+ open.value = false;
+ getList();
+ });
+ }
+ });
+}
/** 鎻愪氦鎸夐挳 */
function submitForm() {
proxy.$refs["calendarRef"].validate((valid) => {
if (valid) {
+ if (applicableSettingList.value[0].factory === "") {
+ ElMessage({
+ type: "error",
+ message: "鑷冲皯閫夋嫨涓�涓�傜敤宸ュ巶",
+ });
+ return;
+ }
if (form.value.id != null) {
- if (form.value.type === "1") {
- updateCalendar({
- ...form.value,
- content: {
- weekdays: weekDaysSettingList.value,
- },
- applicableWorkshop: form.value.applicableWorkshop,
- applicableProcess: form.value.applicableProcess,
- }).then((response) => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
- } else if (form.value.type === "2") {
- updateCalendar({
- ...form.value,
- content: {
- holidays: holidays.value,
- },
- applicableWorkshop: form.value.applicableWorkshop,
- applicableProcess: form.value.applicableProcess,
- }).then((response) => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
- }
+ // if (form.value.type === "1") {
+ // updateCalendar({
+ // ...form.value,
+ // content: {
+ // weekdays: weekDaysSettingList.value,
+ // },
+ // applicableWorkshop: form.value.applicableWorkshop,
+ // applicableProcess: form.value.applicableProcess,
+ // }).then((response) => {
+ // proxy.$modal.msgSuccess("淇敼鎴愬姛");
+ // open.value = false;
+ // getList();
+ // });
+ // } else if (form.value.type === "2") {
+ updateCalendar({
+ ...form.value,
+ content: {
+ holidays: holidays.value,
+ },
+ applicableWorkshop: form.value.applicableWorkshop.map((item) => {
+ return {
+ factory: item.factory.split(";")[0],
+ process: item.process.split(";")[0],
+ workshop: item.workshop.split(";")[0],
+ };
+ }),
+ applicableProcess: form.value.applicableProcess,
+ type: "1",
+ }).then((response) => {
+ proxy.$modal.msgSuccess("淇敼鎴愬姛");
+ open.value = false;
+ getList();
+ });
+ // }
} else {
- if (form.value.type === "1") {
- addCalendar({
- ...form.value,
- content: {
- weekdays: weekDaysSettingList.value,
- },
- }).then((response) => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- });
- } else if (form.value.type === "2") {
- addCalendar({
- ...form.value,
- content: {
- holidays: holidays.value,
- },
- }).then((response) => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- });
- }
+ // if (form.value.type === "1") {
+ // addCalendar({
+ // ...form.value,
+ // content: {
+ // weekdays: weekDaysSettingList.value,
+ // },
+ // }).then((response) => {
+ // proxy.$modal.msgSuccess("鏂板鎴愬姛");
+ // open.value = false;
+ // getList();
+ // });
+ // } else if (form.value.type === "2") {
+ addCalendar({
+ ...form.value,
+ content: {
+ weekdays: weekDaysSettingList.value,
+ },
+ // holidays: holidays.value,
+ applicable: applicableSettingList.value.map((item) => {
+ return {
+ factory: item.factory.split(";")[0],
+ process: item.process.split(";")[0],
+ workshop: item.workshop.split(";")[0],
+ };
+ }),
+ applicableTranslate: JSON.stringify(
+ applicableSettingList.value.map((item) => {
+ return {
+ factory: item.factory.split(";")[1],
+ process: item.process.split(";")[1],
+ workshop: item.workshop.split(";")[1],
+ };
+ })
+ ),
+ type: "1",
+ // applicableCn:
+ //},
+ }).then((response) => {
+ proxy.$modal.msgSuccess("鏂板鎴愬姛");
+ open.value = false;
+ getList();
+ });
+ // }
}
}
});
@@ -806,6 +1260,21 @@
.factory_use_item {
margin-top: 10px;
}
+.select_factory {
+ font-weight: 800;
+ font-size: 14px;
+ color: #606266;
+}
+.select_factory_dis {
+ margin-left: 34px;
+}
+.select_content {
+ margin-right: 10px;
+ margin-top: 20px;
+ // &:nth-child(1) {
+ // margin-left:34px;
+ // }
+}
.mart5 {
margin-top: 5px;
}
@@ -815,4 +1284,80 @@
.auto-height-grid .xe-body .xe-body--row {
height: auto; /* 鎴栬�呬娇鐢� min-height */
}
+.mart10 {
+ margin-top: 20px;
+}
+.h300 {
+}
+.height_dialog {
+ height: 400px;
+ overflow: hidden;
+ .height_dialog_scroll {
+ height: 100%;
+ overflow: auto;
+ }
+}
+.dis_error_wrap {
+ .error_text {
+ margin-left: 20px;
+ font-size: 12px;
+ color: #f56c6c;
+ margin-left: 120px;
+ }
+}
+.grey_bg {
+ background: #f1f1f1;
+ width: 100%;
+ padding: 10px;
+ box-sizing: border-box;
+ .flex_holidays_set {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ }
+ .flex_item {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-top: 10px;
+ .flex_item_title {
+ width: 85px;
+ color: #606266;
+ font-size: 14px;
+ font-weight: 600;
+ margin-left: 20px;
+ margin-right: 10px;
+ .error_require {
+ color: #f56c6c;
+ margin-right: 5px;
+ }
+ }
+ .flex_item_dis {
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: flex-start;
+ & div {
+ margin-bottom: 5px;
+ }
+ }
+ }
+ .flex_item_expand_end {
+ display: flex;
+ justify-content: flex-end;
+ align-items: center;
+ cursor: pointer;
+ }
+}
+.title_flex {
+ margin-top: 20px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ margin-bottom: 20px;
+ .holiday_title {
+ font-size: 15px;
+ font-weight: 500;
+ }
+}
</style>
--
Gitblit v1.9.3