From 80f27f1672467e91ff3d4fd7f30a817f6f11d5c0 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期五, 25 四月 2025 22:55:48 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev
---
src/views/basicData/calendar/index.vue | 717 +++++++++++++++++++++++++++++++++--------------------------
1 files changed, 401 insertions(+), 316 deletions(-)
diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index cdaef87..073b58d 100644
--- a/src/views/basicData/calendar/index.vue
+++ b/src/views/basicData/calendar/index.vue
@@ -8,78 +8,37 @@
v-show="showSearch"
label-width="68px"
>
- <el-row type="flex" justify="right">
- <el-form-item label="鏃ュ巻鎻忚堪" prop="description">
- <el-input
- style="width: 140px"
- v-model="queryParams.description"
- placeholder="璇疯緭鍏ユ弿杩板叧閿瘝"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鏃ュ巻绫诲瀷" prop="effectiveDate">
- <el-select clearable v-model="dateType" style="width: 90px">
- <el-option
- v-for="(item, index) of dateTypeList"
- :key="index"
- :label="item.name"
- :value="item.name"
- >{{ item.name }}</el-option
+ <el-row type="flex" justify="left">
+ <el-col :span="6">
+ <el-form-item label="鏃ュ巻鎻忚堪" prop="description">
+ <el-input
+ style="width: 140px"
+ v-model="queryParams.description"
+ placeholder="璇疯緭鍏ユ弿杩板叧閿瘝"
+ clearable
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="18" style="text-align: right">
+ <el-form-item class="column-with-margin">
+ <el-button type="primary" icon="Search" @click="handleQuery"
+ >鏌ヨ</el-button
>
- </el-select>
- </el-form-item>
- <el-form-item label="鐢熸晥鏃ユ湡" prop="effectiveDate">
- <el-date-picker
- clearable
- v-model="queryParams.effectiveDate"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="閫夋嫨鏃ユ湡"
- >
- </el-date-picker>
- </el-form-item>
- <el-form-item label="閫傜敤宸ュ巶" prop="expiringDate">
- <!-- <el-date-picker clearable
- v-model="queryParams.expiringDate"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="璇烽�夋嫨澶辨晥鏃ユ湡">
- </el-date-picker> -->
- <el-input
- style="width: 180px"
- v-model="queryParams.description"
- placeholder="璇疯緭鍏ュ伐鍘傚叧閿瘝"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- </el-row>
- <el-row type="flex" justify="end">
- <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-button
- type="success"
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['core:calendar:add']"
- >鏂板鏃ュ巻</el-button
- >
- </el-form-item>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-col>
</el-row>
</el-form>
- <!-- <el-row :gutter="10" class="mb8">
+ <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
- v-hasPermi="['core:calendar:add']"
+ v-hasPermi="['aps:calendar:update']"
>鏂板</el-button
>
</el-col>
@@ -90,7 +49,7 @@
icon="Edit"
:disabled="single"
@click="handleUpdate"
- v-hasPermi="['core:calendar:edit']"
+ v-hasPermi="['aps:calendar:update']"
>淇敼</el-button
>
</el-col>
@@ -101,11 +60,11 @@
icon="Delete"
:disabled="multiple"
@click="handleDelete"
- v-hasPermi="['core:calendar:remove']"
+ v-hasPermi="['aps:calendar:remove']"
>鍒犻櫎</el-button
>
</el-col>
- <el-col :span="1.5">
+ <!-- <el-col :span="1.5">
<el-button
type="warning"
plain
@@ -114,104 +73,49 @@
v-hasPermi="['core:calendar:export']"
>瀵煎嚭</el-button
>
- </el-col>
+ </el-col> -->
<right-toolbar
v-model:showSearch="showSearch"
@queryTable="getList"
></right-toolbar>
- </el-row> -->
-
- <el-table
- v-loading="loading"
+ </el-row>
+ <HxlhTable
+ style="width: 100%"
+ :columns="columns"
:data="calendarList"
- @selection-change="handleSelectionChange"
+ :loading="loading"
+ :height="height"
+ ref="tableRef"
+ :page="page"
+ @changePageNo="changePageNo"
+ @changePageSize="changePageSize"
+ @on-checkbox="handleCheckboxChange"
+ class="auto-height-grid"
>
- <!-- <el-table-column type="selection" width="55" align="center" /> -->
- <!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
- <el-table-column label="鏃ュ巻鎻忚堪" align="center" prop="description" />
- <el-table-column label="鏃ュ巻绫诲瀷" align="center" prop="type">
- <template #default="scope">
- <!-- <dict-tag :options="sys_normal_disable" :value="scope.row.status" /> -->
- <el-tag
- :type="scope.row.type === '1' ? '' : 'success'"
- disable-transitions
- >{{ scope.row.type }}</el-tag
- >
- </template>
- </el-table-column>
- <el-table-column
- label="鏃ュ巻鐢熸晥鏃堕棿"
- align="center"
- prop="effectiveDate"
- width="180"
- >
- <template #default="scope">
- <span>{{ parseTime(scope.row.effectiveDate, "{y}-{m}-{d}") }}</span>
- </template>
- </el-table-column>
- <el-table-column
- label="鏃ュ巻澶辨晥鏃堕棿"
- align="center"
- prop="expiringDate"
- width="180"
- >
- <template #default="scope">
- <span>{{ parseTime(scope.row.expiringDate, "{y}-{m}-{d}") }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鏃ュ巻鍐呭" align="center" prop="content" />
- <el-table-column
- label="閫傜敤宸ュ巶"
- align="center"
- prop="applicableFactory"
- />
- <!-- 閫傜敤杞﹂棿 -->
- <el-table-column
- label="閫傜敤杞﹂棿"
- align="center"
- prop="applicableWorkshop"
- />
- <!-- 閫傜敤宸ュ簭 -->
- <el-table-column
- label="閫傜敤宸ュ簭"
- align="center"
- prop="applicableProcess"
- />
- <el-table-column label="鍒涘缓鑰�" align="center" prop="createBy" />
- <el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" />
- <el-table-column
- label="鎿嶄綔"
- align="center"
- class-name="small-padding fixed-width"
- >
- <template #default="scope">
- <el-button
- link
- type="primary"
- icon="Edit"
- @click="handleUpdate(scope.row)"
- v-hasPermi="['core:calendar:edit']"
- >淇敼</el-button
- >
- <el-button
- link
- type="danger"
- icon="Delete"
- @click="handleDelete(scope.row)"
- v-hasPermi="['core:calendar:remove']"
- >鍒犻櫎</el-button
- >
- </template>
- </el-table-column>
- </el-table>
-
- <pagination
- v-show="total > 0"
- :total="total"
- v-model:page="queryParams.pageNum"
- v-model:limit="queryParams.pageSize"
- @pagination="getList"
- />
+ <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>
+ </template>
+ <template #mark="{ row }">
+ <div v-if="row.type === '1'">
+ <span v-for="(item, index) in JSON.parse(row.content.value).weekdays" :key="index">
+ <span v-if="item.work==='y'" status="success" class="mart5">{{item.chineseName}}: 宸ヤ綔鏃�; </span>
+ <span v-if="item.work==='n'" status="info" class="mart5">{{item.chineseName}}: 闈炲伐浣滄棩; </span>
+ </span>
+ <!-- <div v-for="(item, index) in JSON.parse(row.content.value).weekdays" :key="index">
+ <vxe-tag v-if="item.work==='y'" status="success" class="mart5">{{item.chineseName}}: 宸ヤ綔鏃�; </vxe-tag>
+ <vxe-tag v-if="item.work==='n'" status="info" class="mart5">{{item.chineseName}}: 闈炲伐浣滄棩; </vxe-tag>
+ </div> -->
+ </div>
+ <div v-if="row.type === '2'">
+ <div>{{JSON.parse(row.content.value).holidays.startdate}}鑷硔{JSON.parse(row.content.value).holidays.enddate}}</div>
+ </div>
+ </template>
+ <template #buttons="{row}">
+ <vxe-button mode="text" @click="handleUpdate(row)" v-hasPermi="['aps:calendar:update']" >淇敼</vxe-button>
+ <vxe-button mode="text" @click="handleDelete(row)" v-hasPermi="['aps:calendar:remove']" >鍒犻櫎</vxe-button>
+ </template>
+ </HxlhTable>
<!-- 娣诲姞鎴栦慨鏀规棩鍘嗙鐞嗗璇濇 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
@@ -219,15 +123,15 @@
ref="calendarRef"
:model="form"
:rules="rules"
- label-width="80px"
+ label-width="105px"
>
<el-form-item label="鏃ュ巻鎻忚堪" prop="description">
<el-input v-model="form.description" placeholder="璇疯緭鍏ユ弿杩�" />
</el-form-item>
<el-form-item label="鏃ュ巻绫诲瀷" prop="type">
- <el-radio-group v-model="typeRadioNumber" @change="handleSwitchType">
- <el-radio :label="1">鍛ㄥ伐浣�</el-radio>
- <el-radio :label="2">鑺傚亣鏃�</el-radio>
+ <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-form-item>
<el-form-item label="鐢熸晥鏃堕棿" prop="effectiveDate">
@@ -250,78 +154,59 @@
>
</el-date-picker>
</el-form-item>
- <div class="title_bar_line">
- <div class="line_short"></div>
- <div>鍛ㄥ伐浣滆缃�</div>
- <div class="line_long"></div>
- </div>
- <div
- class="week_flex"
- v-for="(item, index) in weekDaysSettingList"
- :key="index"
- >
- <div class="week_flex_item">{{item.chineseName}}</div>
- <div class="week_flex_item">
- <el-radio-group v-model="item.work" @change="handleSetWorkDays">
- <el-radio :label="'y'">宸ヤ綔鏃�</el-radio>
- <el-radio :label="'n'">闈炲伐浣滄棩</el-radio>
- </el-radio-group>
+ <div v-if="form.type === '1'">
+ <div class="title_bar_line">
+ <div class="line_short"></div>
+ <div>鍛ㄥ伐浣滆缃�</div>
+ <div class="line_long"></div>
+ </div>
+ <div
+ class="week_flex"
+ v-for="(item, index) in weekDaysSettingList"
+ :key="index"
+ >
+ <div class="week_flex_item">{{ item.chineseName }}</div>
+ <div class="week_flex_item">
+ <el-radio-group v-model="item.work" @change="handleSetWorkDays">
+ <el-radio :label="'y'">宸ヤ綔鏃�</el-radio>
+ <el-radio :label="'n'">闈炲伐浣滄棩</el-radio>
+ </el-radio-group>
+ </div>
</div>
</div>
- <!-- <div class="week_flex">
- <div class="week_flex_item">鏄熸湡浜�</div>
- <div class="week_flex_item">
- <el-radio-group v-model="tueType">
- <el-radio :label="1">宸ヤ綔鏃�</el-radio>
- <el-radio :label="2">闈炲伐浣滄棩</el-radio>
- </el-radio-group>
+ <div v-if="form.type === '2'">
+ <div class="title_bar_line">
+ <div class="line_short"></div>
+ <div>鑺傚亣鏃ヨ缃�</div>
+ <div class="line_long"></div>
+ </div>
+ <div class="week_flex mt20">
+ <div class="week_flex_item">鑺傛棩寮�濮嬫椂闂�</div>
+ <div class="week_flex_item">
+ <el-date-picker
+ clearable
+ v-model="holidays.startdate"
+ type="date"
+ value-format="YYYY-MM-DD"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
+ </el-date-picker>
+ </div>
+ </div>
+ <div class="week_flex mt20">
+ <div class="week_flex_item">鑺傛棩缁撴潫鏃堕棿</div>
+ <div class="week_flex_item">
+ <el-date-picker
+ clearable
+ v-model="holidays.enddate"
+ type="date"
+ value-format="YYYY-MM-DD"
+ placeholder="閫夋嫨鏃ユ湡"
+ >
+ </el-date-picker>
+ </div>
</div>
</div>
- <div class="week_flex">
- <div class="week_flex_item">鏄熸湡涓�</div>
- <div class="week_flex_item">
- <el-radio-group v-model="wedType">
- <el-radio :label="1">宸ヤ綔鏃�</el-radio>
- <el-radio :label="2">闈炲伐浣滄棩</el-radio>
- </el-radio-group>
- </div>
- </div>
- <div class="week_flex">
- <div class="week_flex_item">鏄熸湡鍥�</div>
- <div class="week_flex_item">
- <el-radio-group v-model="thuType">
- <el-radio :label="1">宸ヤ綔鏃�</el-radio>
- <el-radio :label="2">闈炲伐浣滄棩</el-radio>
- </el-radio-group>
- </div>
- </div>
- <div class="week_flex">
- <div class="week_flex_item">鏄熸湡浜�</div>
- <div class="week_flex_item">
- <el-radio-group v-model="friType">
- <el-radio :label="1">宸ヤ綔鏃�</el-radio>
- <el-radio :label="2">闈炲伐浣滄棩</el-radio>
- </el-radio-group>
- </div>
- </div>
- <div class="week_flex">
- <div class="week_flex_item">鏄熸湡鍏�</div>
- <div class="week_flex_item">
- <el-radio-group v-model="satType">
- <el-radio :label="1">宸ヤ綔鏃�</el-radio>
- <el-radio :label="2">闈炲伐浣滄棩</el-radio>
- </el-radio-group>
- </div>
- </div>
- <div class="week_flex">
- <div class="week_flex_item">鏄熸湡鏃�</div>
- <div class="week_flex_item">
- <el-radio-group v-model="sunType">
- <el-radio :label="1">宸ヤ綔鏃�</el-radio>
- <el-radio :label="2">闈炲伐浣滄棩</el-radio>
- </el-radio-group>
- </div>
- </div> -->
<el-form-item
label="閫傜敤宸ュ巶"
prop="applicableFactory"
@@ -329,17 +214,18 @@
>
<el-select
clearable
- v-model="dateType"
+ v-model="form.applicableFactory"
style="width: 160px"
placeholder="璇疯緭鍏ラ�傜敤宸ュ巶"
+ @change="changePlant($event)"
>
<el-option
- v-for="(item, index) of dateTypeList"
- :key="index"
- :label="item.name"
- :value="item.name"
- >{{ item.name }}</el-option
+ v-for="plant in plantList"
+ :key="plant.id"
+ :label="plant.plantName"
+ :value="plant.plantCode"
>
+ </el-option>
</el-select>
</el-form-item>
<el-form-item
@@ -349,17 +235,17 @@
>
<el-select
clearable
- v-model="dateType"
+ v-model="form.applicableWorkshop"
style="width: 160px"
placeholder="璇疯緭鍏ラ�傜敤杞﹂棿"
>
<el-option
- v-for="(item, index) of dateTypeList"
- :key="index"
- :label="item.name"
- :value="item.name"
- >{{ item.name }}</el-option
+ v-for="shop in shopList"
+ :key="shop.id"
+ :label="shop.shopName"
+ :value="shop.id"
>
+ </el-option>
</el-select>
</el-form-item>
<el-form-item
@@ -369,52 +255,18 @@
>
<el-select
clearable
- v-model="dateType"
+ v-model="form.applicableProcess"
style="width: 160px"
placeholder="璇疯緭鍏ラ�傜敤宸ュ簭"
>
<el-option
- v-for="(item, index) of dateTypeList"
- :key="index"
- :label="item.name"
- :value="item.name"
- >{{ item.name }}</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 label="鍒涘缓鑰�" prop="createBy" class="factory_use_item">
- <el-input type="text" v-model="form.createBy" placeholder="鍒涘缓鑰�" />
- </el-form-item>
- <el-form-item
- label="鍒涘缓鏃堕棿"
- prop="createTime"
- class="factory_use_item"
- >
- <el-date-picker
- clearable
- v-model="form.createTime"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="閫夋嫨鏃ユ湡"
- >
- </el-date-picker>
- </el-form-item>
- <el-form-item label="鏇存柊鑰�" prop="updateBy" class="factory_use_item">
- <el-input type="text" v-model="form.updateBy" placeholder="鍒涘缓鑰�" />
- </el-form-item>
- <el-form-item
- label="鏇存柊鏃堕棿"
- prop="updateTime"
- class="factory_use_item"
- >
- <el-date-picker
- clearable
- v-model="form.updateTime"
- type="date"
- value-format="YYYY-MM-DD"
- placeholder="閫夋嫨鏃ユ湡"
- >
- </el-date-picker>
</el-form-item>
</el-form>
<template #footer>
@@ -428,6 +280,7 @@
</template>
<script setup name="Calendar">
+import HxlhTable from "@/components/HxlhTable";
import {
listCalendar,
getCalendar,
@@ -435,9 +288,12 @@
addCalendar,
updateCalendar,
} from "@/api/basicData/calendar";
-
+import axios from "axios";
+import { listAll_plant } from "@/api/basicData/plant";
+import { listAll_shop, listAps_shop } from "@/api/basicData/shop";
+import { selectProcessNameList } from "@/api/basicData/processRoute.js";
const { proxy } = getCurrentInstance();
-
+const tableRef = ref()
const calendarList = ref([]);
const open = ref(false);
const loading = ref(true);
@@ -447,9 +303,10 @@
const multiple = ref(true);
const total = ref(0);
const title = ref("");
-
const data = reactive({
- form: {},
+ form: {
+ type: "1",
+ },
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -505,9 +362,11 @@
const dateTypeList = ref([
{
name: "鍛ㄥ伐浣�",
+ label: "1",
},
{
name: "鑺傚亣鏃�",
+ label: "2",
},
]);
const typeRadioNumber = ref(1);
@@ -515,47 +374,171 @@
{
day: "Monday",
chineseName: "鏄熸湡涓�",
- work:"y"
+ work: "y",
},
{
day: "TuesDay",
chineseName: "鏄熸湡浜�",
- work:"y"
+ work: "y",
},
{
day: "Wednesday",
chineseName: "鏄熸湡涓�",
- work:"y"
+ work: "y",
},
{
day: "Thursday",
chineseName: "鏄熸湡鍥�",
- work:"y"
+ work: "y",
},
{
- day:"Friday",
- chineseName:"鏄熸湡浜�",
- work:"y"
+ day: "Friday",
+ chineseName: "鏄熸湡浜�",
+ work: "y",
},
{
- day:"Saturday",
- chineseName:"鏄熸湡鍏�",
- work:"y"
+ day: "Saturday",
+ chineseName: "鏄熸湡鍏�",
+ work: "y",
},
{
- day:"Sunday",
- chineseName:"鏄熸湡鏃�",
- work:"y"
- }
+ day: "Sunday",
+ chineseName: "鏄熸湡鏃�",
+ work: "y",
+ },
]);
+const holidays = ref({
+ startdate: "",
+ enddate: "",
+});
+const plantList = ref([]);
+const shopList = ref([]);
+const allShopList = ref([]);
+const processList = ref([]);
+const height = ref(document.documentElement.clientHeight - 220 + "px;");
+// 琛ㄦ牸閰嶇疆-鍒楄〃
+const columns = ref([
+ { type: "checkbox", width: 60, align: "center" },
+ {
+ title: "鏃ュ巻鎻忚堪",
+ field: "description",
+ width: 150,
+ align: "center",
+ },
+ {
+ title: "鏃ュ巻绫诲瀷",
+ field: "type",
+ width: 200,
+ align: "center",
+ slots: { default: "status" },
+ },
+ {
+ title: "鏃ュ巻鐢熸晥鏃堕棿",
+ field: "effectiveDate",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: "鏃ュ巻澶辨晥鏃堕棿",
+ field: "expiringDate",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: "鏃ュ巻鍐呭",
+ field: "content",
+ width: 230,
+ align: "center",
+ slots: { default: "mark" },
+ },
+ {
+ title: "閫傜敤宸ュ巶",
+ field: "applicableFactory",
+ width: 200,
+ align: "center",
+ formatter: ({ cellValue, row, column }) => {
+ console.log(cellValue, "000hsudhwhuwhuhwu");
+ for (let i = 0; i < plantList.value.length; i++) {
+ console.log(
+ cellValue,
+ plantList.value[i].plantCode,
+ plantList.value[i].plantName,
+ "111hsudhwhuwhuhwu"
+ );
+ 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){
+ console.log(cellValue,'cellValue')
+ return shopList.value[i].shopName
+ }
+ }
+ }
+ return '';
+ })
+ },
+ {
+ title: "閫傜敤宸ュ簭",
+ field: "applicableProcess",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: "鍒涘缓鑰�",
+ field: "createBy",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: "鍒涘缓鏃堕棿",
+ field: "createTime",
+ width: 200,
+ align: "center",
+ },
+ { title: '鎿嶄綔', width: 100, fixed:"right", slots: { default: 'buttons' }, align: 'center' }
+]);
+// 鍒嗛〉灞炴��
+const page = ref({
+ total: 0,
+ current: 1,
+ size: 10,
+});
+
/** 鏌ヨ鏃ュ巻绠＄悊鍒楄〃 */
function getList() {
loading.value = true;
listCalendar(queryParams.value).then((response) => {
calendarList.value = response.rows;
- total.value = response.total;
+ page.value.total = response.total;
loading.value = false;
});
+ axios.all([
+ /** 鏌ヨ宸ュ巶鍒楄〃 */
+ listAll_plant({}),
+ /** 鏌ヨ杞﹂棿鍒楄〃 */
+ listAll_shop({}),
+ ])
+ .then(axios.spread((response1, response2) => {
+ plantList.value = response1.data;
+ shopList.value = response2.data;
+ loading.value = false;
+ }))
+ .catch(error => {
+ console.error('璇锋眰鍑洪敊:', error);
+ });
+
}
// 鍙栨秷鎸夐挳
@@ -569,7 +552,7 @@
form.value = {
id: null,
description: null,
- type: null,
+ type: "1",
effectiveDate: null,
expiringDate: null,
content: null,
@@ -604,18 +587,45 @@
}
/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
+async function handleAdd() {
reset();
open.value = true;
title.value = "娣诲姞鏃ュ巻绠＄悊";
-}
+ // const res = await listAll_plant({});
+ // plantList.value = res.data;
+ console.log(res, "sjchhscwhciwhcwi");
+}
+/** 閫夋嫨宸ュ巶鍚庝簨浠� 鍔犺浇杞﹂棿 鍜� 宸ュ簭 **/
+function changePlant(plant) {
+ listAps_shop({ plantCode: plant }).then((response) => {
+ console.log(response, "sbcsuhcuhscschsc");
+ shopList.value = response.rows;
+ });
+ selectProcessNameList({ orgCode: plant }).then((response) => {
+ processList.value = response.rows;
+ });
+}
/** 淇敼鎸夐挳鎿嶄綔 */
function handleUpdate(row) {
reset();
const _id = row.id || ids.value;
getCalendar(_id).then((response) => {
form.value = response.data;
+ console.log(
+ form.value,
+ JSON.parse(response.data.content.value),
+ "hushchsuch"
+ );
+ // form.value.content = JSON.parse(response.data.content.value);
+ if (form.value.type === "1") {
+ weekDaysSettingList.value = JSON.parse(
+ response.data.content.value
+ ).weekdays;
+ } else if (form.value.type === "2") {
+ holidays.value = JSON.parse(response.data.content.value).holidays;
+ }
+
open.value = true;
title.value = "淇敼鏃ュ巻绠＄悊";
});
@@ -626,17 +636,58 @@
proxy.$refs["calendarRef"].validate((valid) => {
if (valid) {
if (form.value.id != null) {
- updateCalendar(form.value).then((response) => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
+ console.log(form.value, "淇敼鏃ュ巻===");
+ 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();
+ });
+ }
} else {
- addCalendar(form.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: {
+ holidays: holidays.value,
+ },
+ }).then((response) => {
+ proxy.$modal.msgSuccess("鏂板鎴愬姛");
+ open.value = false;
+ getList();
+ });
+ }
}
}
});
@@ -670,6 +721,7 @@
function handleSwitchType(e) {
console.log(e, "鏃ユ湡绫诲瀷鍒囨崲");
typeRadioNumber.value = e;
+ form.value.type = e;
form.value.effectiveDate = null;
form.value.expiringDate = null;
form.value.content = null;
@@ -679,9 +731,28 @@
}
// 璁剧疆鍛ㄥ伐浣滄棩
function handleSetWorkDays(e) {
- console.log(weekDaysSettingList.value,"璁剧疆鍛ㄥ伐浣滄棩")
+ console.log(weekDaysSettingList.value, "璁剧疆鍛ㄥ伐浣滄棩");
}
-getList();
+function changePageNo(currentPage) {
+ queryParams.value.pageNum = currentPage;
+ page.value.current = currentPage;
+ getList();
+}
+function changePageSize(pageSize) {
+ page.value.current = 1;
+ queryParams.value.pageNum = 1;
+ queryParams.value.pageSize = pageSize;
+ getList();
+}
+// 澶氶�夋閫変腑鏁版嵁
+const handleCheckboxChange = (data) => {
+ ids.value = data.records.map((item) => item.id);
+ single.value = data.records.length !== 1;
+ multiple.value = !data.records.length;
+};
+onMounted(() => {
+ getList();
+});
</script>
<style lang="scss" scoped>
.column-with-margin {
@@ -710,8 +781,13 @@
display: flex;
justify-content: flex-start;
align-content: center;
- color: #333;
+ color: #606266;
+ font-weight: 700;
margin-left: 20px;
+ &.mt20 {
+ margin-top: 20px;
+ margin-left: 0 !important;
+ }
.week_flex_item {
&:nth-child(1) {
margin-top: 5px;
@@ -724,4 +800,13 @@
.factory_use_item {
margin-top: 10px;
}
+.mart5{
+ margin-top:5px;
+}
+.custom-height {
+ height: 200px; /* 鎴栬�呬娇鐢� min-height */
+}
+.auto-height-grid .xe-body .xe-body--row {
+ height: auto; /* 鎴栬�呬娇鐢� min-height */
+}
</style>
--
Gitblit v1.9.3