From 9587438965a876c23b9e9efcff014f1cc565cb4d Mon Sep 17 00:00:00 2001
From: chengxiangling <291105840@qq.com>
Date: 星期三, 14 五月 2025 09:34:17 +0800
Subject: [PATCH] 提交日历等
---
src/views/basicData/materialManagement/index.vue | 2
src/views/mainPlan/sheetMetalOrderManage/index.vue | 9 +
src/views/basicData/processRouteDataPreparate/index.vue | 13
package.json | 1
src/views/basicData/resourceGroup/index.vue | 6
src/views/basicData/calendar/index.vue | 398 ++++++++++++++++++++++++++++++++++++++++++-------
src/views/basicData/processCapacityManagement/index.vue | 2
src/views/basicData/materialStorageManagement/index.vue | 2
src/views/basicData/professionalFixedCycleManagement/index.vue | 2
src/views/basicData/bom/index.vue | 11
10 files changed, 368 insertions(+), 78 deletions(-)
diff --git a/package.json b/package.json
index 08774bc..5b44267 100644
--- a/package.json
+++ b/package.json
@@ -44,6 +44,7 @@
},
"devDependencies": {
"@vitejs/plugin-vue": "5.0.5",
+ "moment": "^2.30.1",
"sass": "1.77.5",
"terser": "^5.39.0",
"unplugin-auto-import": "^0.17.6",
diff --git a/src/views/basicData/bom/index.vue b/src/views/basicData/bom/index.vue
index d0ad5b8..19efb8d 100644
--- a/src/views/basicData/bom/index.vue
+++ b/src/views/basicData/bom/index.vue
@@ -6,11 +6,11 @@
:rules="rules"
:inline="true"
v-show="showSearch"
- :label-width="locale === 'zh' ? '90px' : '160px'"
+ label-position="left"
>
<el-row :gutter="20">
- <el-col :span="locale === 'zh' ? 5 : 9">
- <el-form-item :label="$t('plan.query.itemNumber')" prop="itemCode">
+ <el-col :span="locale === 'zh' ? 5 : 8">
+ <el-form-item :label="$t('plan.query.itemNumber')" :label-width="locale === 'zh' ? '50px' : '110px'" prop="itemCode">
<el-input
:style="{ width: locale === 'zh' ? '140px' : '220px' }"
v-model="queryParams.itemCode"
@@ -22,15 +22,16 @@
/>
</el-form-item>
</el-col>
- <el-col :span="locale === 'zh' ? 7 : 9">
+ <el-col :span="locale === 'zh' ? 7 : 10">
<el-form-item
:label="$t('plan.table.applicableFactories')"
+ :label-width="locale === 'zh' ? '70px' : '150px'"
prop="orgCode"
>
<el-select
clearable
v-model="queryParams.orgCode"
- :style="{ width: locale === 'zh' ? '180px' : '240px' }"
+ :style="{ width: locale === 'zh' ? '180px' : '280px' }"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.table.applicableFactories'
)}`"
diff --git a/src/views/basicData/calendar/index.vue b/src/views/basicData/calendar/index.vue
index 8868a93..ea785cc 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"
@@ -37,7 +38,7 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="12" 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
@@ -140,17 +141,26 @@
</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>
@@ -193,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>
@@ -251,10 +261,10 @@
prop="applicableFactory"
class="factory_use_item"
> -->
- <div class="select_factory">閫傜敤宸ュ巶/杞﹂棿/宸ュ簭</div>
+ <div class="select_factory select_factory_dis">閫傜敤宸ュ巶/杞﹂棿/宸ュ簭</div>
<!-- <el-row :gutter="20" class="select_factory"> -->
<div
- class="select_factory"
+ class="select_factory_dis"
v-for="(item, index) in applicableSettingList"
:key="index"
>
@@ -271,7 +281,7 @@
v-for="plant in aps_factory"
:key="plant.value"
:label="plant.label"
- :value="plant.value"
+ :value="`${plant.value};${plant.label}`"
>
</el-option>
</el-select>
@@ -289,7 +299,7 @@
v-for="shop in shopList"
:key="shop.id"
:label="shop.shopName"
- :value="shop.id"
+ :value="`${shop.id};${shop.shopName}`"
>
</el-option>
</el-select>
@@ -304,9 +314,9 @@
>
<el-option
v-for="process in processList"
- :key="process.id"
+ :key="process.processNumber"
:label="process.processName"
- :value="process.processName"
+ :value="`${process.processNumber};${process.processName}`"
>
</el-option>
</el-select>
@@ -315,8 +325,17 @@
<el-button
class="select_content"
type="primary"
- :icon="Plus"
+ 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"
/>
@@ -344,11 +363,115 @@
</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">
+ <el-form
+ class="mart10"
+ ref="holidaysRef"
+ :model="formHolidays"
+ :rules="holidayRules"
+ :inline="true"
+ label-width="105px"
+ >
+ <template v-for="(item, index) in formHolidays" :key="index">
+ <el-form-item label="鑺傚亣鏃ユ弿杩�" prop="description">
+ <el-input
+ style="width: 130px"
+ v-model="item.describe"
+ placeholder="璇疯緭鍏ユ弿杩�"
+ />
+ </el-form-item>
+ <el-form-item label="寮�濮嬫椂闂�" prop="startdate">
+ <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="enddate">
+ <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>
+ </template>
+ </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 { Plus } from "@element-plus/icons-vue";
+import moment from "moment";
import HxlhTable from "@/components/HxlhTable";
import {
listCalendar,
@@ -361,11 +484,14 @@
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 { 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([]);
@@ -384,6 +510,13 @@
},
],
},
+ formHolidays: [
+ {
+ enddate: "",
+ startdate: "",
+ describe: "",
+ },
+ ],
queryParams: {
pageNum: 1,
pageSize: 10,
@@ -426,16 +559,18 @@
trigger: "blur",
},
],
- applicableFactory: [
+ },
+ holidayRules: {
+ describe: [
{
required: true,
- message: "璇烽�夋嫨閫傜敤宸ュ巶",
+ message: "璇疯緭鍏ヨ妭鍋囨棩鎻忚堪",
trigger: "blur",
},
],
},
});
-const { queryParams, form, rules } = toRefs(data);
+const { queryParams, form, rules, formHolidays, holidayRules } = toRefs(data);
const dateType = ref("鍛ㄥ伐浣�");
const dateTypeList = ref([
{
@@ -449,7 +584,7 @@
]);
const typeRadioNumber = ref(1);
const applicableSettingList = ref([
- { factory: "", workshop: "", process: "" },
+ { factory: "", workshop: "", process: "", id: 0 },
]);
const weekDaysSettingList = ref([
{
@@ -583,7 +718,7 @@
},
{
title: "鎿嶄綔",
- width: 100,
+ width: 270,
fixed: "right",
slots: { default: "buttons" },
align: "center",
@@ -626,34 +761,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,
- applicable: [
- {
- factory: "",
- workshop: "",
- process: "",
- },
- ],
- };
- proxy.resetForm("calendarRef");
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
@@ -677,7 +784,6 @@
/** 鏂板鎸夐挳鎿嶄綔 */
async function handleAdd() {
- reset();
open.value = true;
form.value = {
applicable: [
@@ -693,7 +799,7 @@
/** 閫夋嫨宸ュ巶鍚庝簨浠� 鍔犺浇杞﹂棿 鍜� 宸ュ簭 **/
function changePlant(plant) {
console.log(plant);
- listAps_shop({ plantCode: plant }).then((response) => {
+ listAps_shop({ plantCode: plant.split(";")[0] }).then((response) => {
shopList.value = response.rows;
});
// selectProcessNameList({ orgCode: plant }).then((response) => {
@@ -701,17 +807,23 @@
// });
}
function changeWorkshop(workShop) {
+ console.log(workShop.split(";")[0]);
listByWorkShop({ workShop: "姘旀煖" }).then((res) => {
console.log(res, "workShop");
processList.value = res.rows;
});
}
function handleAddFactory(row) {
- applicableSettingList.value.push(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;
@@ -728,11 +840,102 @@
title.value = "淇敼鏃ュ巻绠＄悊";
});
}
-
+// 璁剧疆鑺傚亣鏃�
+function handleSetHolidays(row) {
+ form.value = {
+ ...row,
+ applicableTranslate: JSON.parse(row.applicableTranslate),
+ };
+ if (!row.holidays) {
+ formHolidays.value = [
+ {
+ enddate: "",
+ startdate: "",
+ describe: "",
+ },
+ ];
+ } else {
+ formHolidays.value = JSON.parse(row.holidays.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();
+ console.log(targetDate, startDate, endDate, "handleDisabledDate");
+ return targetDate < startDate || targetDate > endDate;
+}
+// 鍒犻櫎鑺傚亣鏃ヨ缃�
+function handleDelSettingHolidays(row) {
+ formHolidays.value = formHolidays.value.filter(item=>{
+ return item != row
+ })
+}
+// 娣诲姞鑺傚亣鏃�
+function hanldeAddHolidays() {
+ formHolidays.value.push({
+ enddate: "",
+ startdate: "",
+ describe: "",
+ });
+}
+function handleToggleExpand() {
+ expand.value = !expand.value;
+}
+// 鎻愪氦鑺傚亣鏃�
+function handleSaveHolidaysForm() {
+ proxy.$refs["holidaysRef"].validate((valid) => {
+ if (valid) {
+ updateCalendar({
+ id: form.value.id,
+ // content: {
+ // weekdays: weekDaysSettingList.value,
+ // },
+ holidays: formHolidays.value.map((item) => {
+ return {
+ startdate: moment(item.startdate).format("YY-MM-DD"),
+ enddate: moment(item.enddate).format("YY-MM-DD"),
+ };
+ }),
+ // 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],
+ // };
+ // })
+ //),
+ // applicableCn:
+ //},
+ }).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({
@@ -753,7 +956,13 @@
content: {
holidays: holidays.value,
},
- applicableWorkshop: form.value.applicableWorkshop,
+ 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,
}).then((response) => {
proxy.$modal.msgSuccess("淇敼鎴愬姛");
@@ -779,8 +988,24 @@
content: {
weekdays: weekDaysSettingList.value,
},
- holidays: holidays.value,
- applicable: applicableSettingList.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],
+ };
+ })
+ ),
+ // applicableCn:
//},
}).then((response) => {
proxy.$modal.msgSuccess("鏂板鎴愬姛");
@@ -896,10 +1121,12 @@
margin-top: 10px;
}
.select_factory {
- margin-left: 34px;
font-weight: 800;
font-size: 14px;
color: #606266;
+}
+.select_factory_dis {
+ margin-left: 34px;
}
.select_content {
margin-right: 10px;
@@ -917,4 +1144,55 @@
.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;
+ }
+}
+.grey_bg {
+ background: #f1f1f1;
+ width: 100%;
+ padding: 10px;
+ box-sizing: border-box;
+ .flex_item {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-top: 10px;
+ .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>
diff --git a/src/views/basicData/materialManagement/index.vue b/src/views/basicData/materialManagement/index.vue
index e1dd58f..ccb05fe 100644
--- a/src/views/basicData/materialManagement/index.vue
+++ b/src/views/basicData/materialManagement/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="left" label-width="50px">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="鏂欏彿" prop="itemNumber">
diff --git a/src/views/basicData/materialStorageManagement/index.vue b/src/views/basicData/materialStorageManagement/index.vue
index 2f5fefb..4467600 100644
--- a/src/views/basicData/materialStorageManagement/index.vue
+++ b/src/views/basicData/materialStorageManagement/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="left" label-width="50px">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="鏂欏彿" prop="itemNumber">
diff --git a/src/views/basicData/processCapacityManagement/index.vue b/src/views/basicData/processCapacityManagement/index.vue
index f0a7355..d9a05bd 100644
--- a/src/views/basicData/processCapacityManagement/index.vue
+++ b/src/views/basicData/processCapacityManagement/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :rules="rules" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryRef" :rules="rules" :inline="true" v-show="showSearch" label-position="left" label-width="50px">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="鏂欏彿" prop="itemNumber">
diff --git a/src/views/basicData/processRouteDataPreparate/index.vue b/src/views/basicData/processRouteDataPreparate/index.vue
index 0caac75..242ff6d 100644
--- a/src/views/basicData/processRouteDataPreparate/index.vue
+++ b/src/views/basicData/processRouteDataPreparate/index.vue
@@ -6,13 +6,13 @@
:rules="rules"
:inline="true"
v-show="showSearch"
- :label-width="locale === 'zh' ? '90px' : '160px'"
+ label-position="left"
>
<el-row type="flex" justify="left" :gutter="20">
- <el-col :span="locale === 'zh' ? 5 : 9">
- <el-form-item :label="$t('plan.query.itemNumber')" prop="itemCode">
+ <el-col :span="locale === 'zh' ? 5 : 8">
+ <el-form-item :label="$t('plan.query.itemNumber')" :label-width="locale === 'zh' ? '50px' : '110px'" prop="itemCode">
<el-input
- :style="{ width: locale === 'zh' ? '140px' : '240px' }"
+ :style="{ width: locale === 'zh' ? '140px' : '220px' }"
v-model="queryParams.itemCode"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.query.itemNumber'
@@ -22,15 +22,16 @@
/>
</el-form-item>
</el-col>
- <el-col :span="locale === 'zh' ? 7 : 9">
+ <el-col :span="locale === 'zh' ? 7 : 10">
<el-form-item
:label="$t('plan.table.applicableFactories')"
+ :label-width="locale === 'zh' ? '70px' : '150px'"
prop="orgCode"
>
<el-select
clearable
v-model="queryParams.orgCode"
- :style="{ width: locale === 'zh' ? '180px' : '260px' }"
+ :style="{ width: locale === 'zh' ? '180px' : '280px' }"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.table.applicableFactories'
)}`"
diff --git a/src/views/basicData/professionalFixedCycleManagement/index.vue b/src/views/basicData/professionalFixedCycleManagement/index.vue
index 88459db..c190cb8 100644
--- a/src/views/basicData/professionalFixedCycleManagement/index.vue
+++ b/src/views/basicData/professionalFixedCycleManagement/index.vue
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="left" label-width="50px">
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="鏂欏彿" prop="itemNumber">
diff --git a/src/views/basicData/resourceGroup/index.vue b/src/views/basicData/resourceGroup/index.vue
index 1ba8e96..138b1a1 100644
--- a/src/views/basicData/resourceGroup/index.vue
+++ b/src/views/basicData/resourceGroup/index.vue
@@ -1,10 +1,10 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="90px">
+ <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="left" >
<el-row :gutter="20">
<el-col
:span="6">
- <el-form-item label="璧勬簮缁�" prop="resourceGroupName">
+ <el-form-item label="璧勬簮缁�" label-width="60px" prop="resourceGroupName">
<el-input
v-model="queryParams.resourceGroupName"
placeholder="璇疯緭鍏ヨ祫婧愮粍鍚嶇О"
@@ -15,7 +15,7 @@
</el-col>
<el-col
:span="6">
- <el-form-item label="鎴鏈哄姞闇�姹傛棩鏈�" style="width: 400px" label-width="150px">
+ <el-form-item label="鎴鏈哄姞闇�姹傛棩鏈�" style="width: 400px" label-width="140px">
<el-date-picker
v-model="daterangeRequestDate"
value-format="YYYY-MM-DD"
diff --git a/src/views/mainPlan/sheetMetalOrderManage/index.vue b/src/views/mainPlan/sheetMetalOrderManage/index.vue
index 2ae876b..b70e6a4 100644
--- a/src/views/mainPlan/sheetMetalOrderManage/index.vue
+++ b/src/views/mainPlan/sheetMetalOrderManage/index.vue
@@ -552,6 +552,15 @@
field: "orgCode",
width: 100,
align: "center",
+ formatter: ({ cellValue, row, column }) => {
+ if (cellValue) {
+ for (let i = 0; i < aps_factory.value.length; i++) {
+ if (cellValue === aps_factory.value[i].value) {
+ return aps_factory.value[i].label;
+ }
+ }
+ }
+ },
},
{
title: t("plan.table.productionBase"),
--
Gitblit v1.9.3