From 1e3797178d05b111b901a005827189ee63d6f8f6 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期三, 07 五月 2025 16:25:33 +0800
Subject: [PATCH] 提交数据联调，i18n
---
src/api/basicData/sheetMetalConfig/sheetMetalConfig.js | 28 +
src/views/mainPlan/sheetMetalOrderManage/index.vue | 453 ++++++++++++++++++----------------
src/views/mainPlan/sheetMetalSupplyGap/index.vue | 241 ++---------------
src/utils/i18n/locales/plan/index.js | 18 +
src/views/basicData/processRouteDataPreparate/index.vue | 4
src/utils/i18n/locales/basic/index.js | 14
6 files changed, 320 insertions(+), 438 deletions(-)
diff --git a/src/api/basicData/sheetMetalConfig/sheetMetalConfig.js b/src/api/basicData/sheetMetalConfig/sheetMetalConfig.js
index 6ce75d9..442cb26 100644
--- a/src/api/basicData/sheetMetalConfig/sheetMetalConfig.js
+++ b/src/api/basicData/sheetMetalConfig/sheetMetalConfig.js
@@ -1,17 +1,25 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
// 鏌ヨ瀛楀吀
export function queryConfigParams(dictType) {
return request({
url: `/system/dict/data/type/${dictType}`,
- method: 'get'
- })
+ method: "get",
+ });
}
-export function queryConfigParamsSave(data) {
- return request({
- url: `/system/dict/data`,
- method: 'put',
- data: data
- })
- }
\ No newline at end of file
+export function queryConfigParamsSave(data) {
+ return request({
+ url: `/system/dict/data`,
+ method: "put",
+ data: data,
+ });
+}
+
+export function supplyGapList(query) {
+ return request({
+ url: `/aps/ApsPlateStandardRequire/supplyGapList`,
+ method: "get",
+ params: query
+ });
+}
diff --git a/src/utils/i18n/locales/basic/index.js b/src/utils/i18n/locales/basic/index.js
index 8c4e7d7..4629c62 100644
--- a/src/utils/i18n/locales/basic/index.js
+++ b/src/utils/i18n/locales/basic/index.js
@@ -15,7 +15,12 @@
operationSequence: "宸ュ簭搴忓彿",
applicableWorkshop:"閫傜敤杞﹂棿",
productivityModel: "浜ц兘妯″瀷",
- designCapacity:"璁捐浜ц兘"
+ designCapacity:"璁捐浜ц兘",
+ requirementID:"闇�姹侷D",
+ requirementTraceabilityID:"闇�姹傝拷婧疘D",
+ matchQuantity:"鍖归厤鏁伴噺",
+ workOrderType:"宸ュ崟绫诲瀷",
+ mainCustomer:"涓讳欢瀹㈡埛"
}
};
@@ -36,6 +41,11 @@
operationSequence: "Operation sequence ",
applicableWorkshop:"Applicable workshop",
productivityModel:"Productivity model",
- designCapacity:"Design capacity"
+ designCapacity:"Design capacity",
+ requirementID:"Requirement ID",
+ requirementTraceabilityID:"Requirement traceability ID",
+ matchQuantity:"Match Quantity",
+ workOrderType:"Work order type",
+ mainCustomer:"Main customer"
}
};
diff --git a/src/utils/i18n/locales/plan/index.js b/src/utils/i18n/locales/plan/index.js
index 06a20fe..cd246f7 100644
--- a/src/utils/i18n/locales/plan/index.js
+++ b/src/utils/i18n/locales/plan/index.js
@@ -140,6 +140,7 @@
requireID: "闇�姹侷D",
requireTraceID: "闇�姹傝拷婧疘D",
bomLowCode:"BOM浣庨樁鐮�",
+ bomUsage:"BOM鐢ㄩ噺",
matchState:"鍖归厤鐘舵��",
matchPattern:"鍖归厤妯″紡",
unmatchedDemandQuantity:"鏈尮閰嶉渶姹傛暟閲�",
@@ -149,7 +150,13 @@
// 閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃
subItemPartNumber:"瀛愪欢鏂欏彿",
mismatchedProductionQuantity:"鏈尮閰嶇敓浜ф暟閲�",
- workorderCreationTime:"宸ュ崟鍒涘缓鏃堕棿"
+ workorderCreationTime:"宸ュ崟鍒涘缓鏃堕棿",
+ delayRiskIdentification:"寤惰繜椋庨櫓鏍囪瘑",
+ startDateOfDemandPlan:"闇�姹傝鍒掑紑宸ユ棩",
+ requirementPlanCompletionDate:"闇�姹傝鍒掑畬宸ユ棩",
+ processRouteWorkingHours:"宸ヨ壓璺嚎宸ユ椂",
+ demandQuantity:"闇�姹傛暟閲�",
+ netRequirement:"鍑�闇�姹傞噺"
},
};
export const en = {
@@ -294,6 +301,7 @@
requireID: "Requirement ID",
requireTraceID: "Requirement traceability ID",
bomLowCode:"BOM low-level code",
+ bomUsage:"BOM usage",
matchState:"Match State",
matchPattern:"Match Pattern",
unmatchedDemandQuantity:"Unmatched Demand Quantity",
@@ -303,6 +311,12 @@
// 閽ｉ噾鍐椾綑宸ュ崟鎶ヨ〃
subItemPartNumber:"Sub Item Part Number",
mismatchedProductionQuantity:"Mismatched Production Quantity",
- workorderCreationTime:"Work order creation time"
+ workorderCreationTime:"Work order creation time",
+ delayRiskIdentification:"Delay risk identification",
+ startDateOfDemandPlan:"Start date of demand plan",
+ requirementPlanCompletionDate:"Requirement plan completion date",
+ processRouteWorkingHours:"Process route working hours",
+ demandQuantity:"Demand Quantity",
+ netRequirement:"Net Requirement"
},
};
diff --git a/src/views/basicData/processRouteDataPreparate/index.vue b/src/views/basicData/processRouteDataPreparate/index.vue
index cce501e..7d87169 100644
--- a/src/views/basicData/processRouteDataPreparate/index.vue
+++ b/src/views/basicData/processRouteDataPreparate/index.vue
@@ -106,10 +106,6 @@
:data="subList"
:loading="loading"
:height="heightSub"
- @on-checkbox="handleCheckboxChange"
- :page="page"
- @changePageNo="changePageNo"
- @changePageSize="changePageSize"
>
</HxlhTable>
</el-dialog>
diff --git a/src/views/mainPlan/sheetMetalOrderManage/index.vue b/src/views/mainPlan/sheetMetalOrderManage/index.vue
index e989511..232c9cd 100644
--- a/src/views/mainPlan/sheetMetalOrderManage/index.vue
+++ b/src/views/mainPlan/sheetMetalOrderManage/index.vue
@@ -66,8 +66,8 @@
type="primary"
plain
icon="Plus"
- :disabled="single"
- @click="handleUpdate"
+ :disabled="multiple"
+ @click="handleBatchUpdatePlanDate"
v-hasPermi="['apsPlatePlan:edit']"
>鎵归噺鏇存柊宸ュ崟璁″垝鏃ユ湡</el-button
>
@@ -77,7 +77,6 @@
type="success"
plain
icon="Edit"
- :disabled="single"
@click="handleUpdate"
v-hasPermi="['apsPlatePlan:edit']"
>鐢熸垚閽ｉ噾璁″垝宸ュ崟</el-button
@@ -111,17 +110,18 @@
>
</template>
</HxlhTable>
- <el-dialog :title="title" v-model="openDialog" width="900px" append-to-body>
+ <el-dialog
+ :title="'鏌ョ湅鍏宠仈闇�姹�'"
+ v-model="openDialog"
+ width="900px"
+ append-to-body
+ >
<HxlhTable
style="width: 100%"
:columns="subGridOptions"
:data="subList"
:loading="loading"
:height="heightSub"
- @on-checkbox="handleCheckboxChange"
- :page="page"
- @changePageNo="changePageNo"
- @changePageSize="changePageSize"
>
</HxlhTable>
</el-dialog>
@@ -141,10 +141,12 @@
import { listAll_plant } from "@/api/basicData/plant";
import { listAll_shop, listAps_shop } from "@/api/basicData/shop";
import { selectProcessNameList } from "@/api/basicData/processRoute.js";
+import { useI18n } from "vue-i18n"; //瑕佸湪js涓娇鐢ㄥ浗闄呭寲
+const { t, locale } = useI18n();
const { proxy } = getCurrentInstance();
const openDialog = ref(false);
const subGridOptions = ref([]);
-const tableRef = ref();
+// const tableRef = ref();
const calendarList = ref([]);
const loading = ref(true);
const showSearch = ref(true);
@@ -178,103 +180,238 @@
const processList = ref([]);
const height = ref(document.documentElement.clientHeight - 220 + "px;");
// 琛ㄦ牸閰嶇疆-鍒楄〃
-const columns = ref([
- { type: "checkbox", width: 60, align: "center" },
- {
- title: "闇�姹侷D",
- field: "description",
- width: 150,
- align: "center",
- },
- {
- title: "闇�姹傝拷婧疘D",
- field: "type",
- width: 200,
- align: "center",
- },
- {
- title: "宸ュ崟鍙�",
- field: "effectiveDate",
- width: 200,
- align: "center",
- },
- {
- title: "鍖归厤鏁伴噺",
- field: "expiringDate",
- width: 200,
- align: "center",
- },
- {
- title: "宸ュ崟绫诲瀷",
- field: "expiringDate",
- width: 200,
- align: "center",
- },
- {
- title: "鏂欏彿",
- field: "createTime",
- width: 200,
- align: "center",
- },
- {
- title: "涓讳欢鍥惧彿",
- field: "createTime",
- width: 200,
- align: "center",
- },
- {
- title: "涓讳欢瀹㈡埛",
- field: "createTime",
- width: 200,
- align: "center",
- },
- {
- title: "鐢熶骇鏁伴噺",
- field: "updateTime",
- width: 100,
- align: "center",
- },
- {
- title: "闇�姹傛棩鏈�",
- field: "updateTime",
- width: 100,
- 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: "updateTime",
- width: 100,
- align: "center",
- },
- {
- title: "鎿嶄綔",
- width: 100,
- fixed: "right",
- slots: { default: "buttons" },
- align: "center",
- },
-]);
+const columns = ref([]);
// 鍒嗛〉灞炴��
const page = ref({
total: 0,
current: 1,
size: 10,
});
+watch(
+ locale,
+ (newLocale) => {
+ columns.value = [
+ { type: "checkbox", width: 60, align: "center" },
+ {
+ title: t("basic.table.requirementID"),
+ field: "description",
+ width: 150,
+ align: "center",
+ },
+ {
+ title: t("basic.table.requirementTraceabilityID"),
+ field: "type",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("plan.table.workOrderNo"),
+ field: "effectiveDate",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("basic.table.matchQuantity"),
+ field: "expiringDate",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("basic.table.workOrderType"),
+ field: "expiringDate",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("plan.table.itemNumber"),
+ field: "createTime",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("plan.table.mainPartDrawingNumber"),
+ field: "createTime",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("basic.table.mainCustomer"),
+ field: "createTime",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("plan.table.productionQuantity"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("basic.table.applicableFactories"),
+ 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: t("plan.table.productionBase"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.planStartDay"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.planEndDayDate"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.workorderCreationTime"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.mismatchedProductionQuantity"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.delayRiskIdentification"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: "鎿嶄綔",
+ width: 100,
+ fixed: "right",
+ slots: { default: "buttons" },
+ align: "center",
+ },
+ ];
+ subGridOptions.value = [
+ {
+ title: t("basic.table.requirementID"),
+ field: "description",
+ width: 150,
+ align: "center",
+ },
+ {
+ title: t("basic.table.requirementTraceabilityID"),
+ field: "type",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("plan.table.itemNumber"),
+ field: "effectiveDate",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("plan.table.bomLowCode"),
+ field: "expiringDate",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("plan.table.bomUsage"),
+ field: "expiringDate",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("basic.table.processRouteID"),
+ field: "createTime",
+ width: 200,
+ align: "center",
+ },
+ {
+ title: t("plan.table.processRouteWorkingHours"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.demandQuantity"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.netRequirement"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.requirementPlanCompletionDate"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.planStartDay"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.planEndDayDate"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.requirementDate"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("basic.table.applicableFactories"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.productionBase"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ {
+ title: t("plan.table.matchState"),
+ field: "updateTime",
+ width: 100,
+ align: "center",
+ },
+ ];
+ },
+ {
+ immediate: true,
+ deep: true,
+ }
+);
+function handleBatchUpdatePlanDate(){
+
+}
function handleCheckView(row) {
openDialog.value = true;
// listProcessRoute({ workOrderNo: row.documentNumber }).then((data) => {
@@ -367,122 +504,6 @@
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;
- // 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 = "淇敼鏃ュ巻绠＄悊";
- });
-}
-
-/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["calendarRef"].validate((valid) => {
- if (valid) {
- 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();
- });
- }
- } 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();
- });
- }
- }
- }
- });
-}
-
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const _ids = row.id || ids.value;
- proxy.$modal
- .confirm('鏄惁纭鍒犻櫎鏃ュ巻绠＄悊缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�')
- .then(function () {
- return delCalendar(_ids);
- })
- .then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- })
- .catch(() => {});
-}
-
-/** 瀵煎嚭鎸夐挳鎿嶄綔 */
-function handleExport() {
- proxy.download(
- "core/calendar/export",
- {
- ...queryParams.value,
- },
- `calendar_${new Date().getTime()}.xlsx`
- );
-}
-function handleSwitchType(e) {
- typeRadioNumber.value = e;
- form.value.type = e;
- form.value.effectiveDate = null;
- form.value.expiringDate = null;
- form.value.content = null;
- form.value.applicableFactory = null;
- form.value.applicableWorkshop = null;
- form.value.applicableProcess = null;
}
function changePageNo(currentPage) {
queryParams.value.pageNum = currentPage;
diff --git a/src/views/mainPlan/sheetMetalSupplyGap/index.vue b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
index 3ec494f..0a2c021 100644
--- a/src/views/mainPlan/sheetMetalSupplyGap/index.vue
+++ b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
@@ -12,11 +12,11 @@
<el-col :span="locale === 'zh' ? 5 : 10">
<el-form-item
:label="$t('plan.query.requireTraceID')"
- prop="description"
+ prop="requireId"
>
<el-input
:style="{ width: locale === 'zh' ? '140px' : '300px' }"
- v-model="queryParams.description"
+ v-model="queryParams.requireId"
:placeholder="`${$t('plan.placeholder.requireTraceID')}`"
clearable
@keyup.enter="handleQuery"
@@ -24,10 +24,10 @@
</el-form-item>
</el-col>
<el-col :span="locale === 'zh' ? 8 : 9">
- <el-form-item :label="$t('plan.query.itemNumber')" prop="description">
+ <el-form-item :label="$t('plan.query.itemNumber')" prop="bomLineCode">
<el-input
:style="{ width: locale === 'zh' ? '140px' : '210px' }"
- v-model="queryParams.description"
+ v-model="queryParams.bomLineCode"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.query.itemNumber'
)}`"
@@ -68,7 +68,7 @@
<HxlhTable
style="width: 100%"
:columns="columns"
- :data="calendarList"
+ :data="gapList"
:loading="loading"
:height="height"
ref="tableRef"
@@ -85,21 +85,15 @@
<script setup name="Calendar">
import HxlhTable from "@/components/HxlhTable";
import {
- listCalendar,
- getCalendar,
- delCalendar,
- addCalendar,
- updateCalendar,
-} from "@/api/basicData/calendar";
+ supplyGapList
+} from "@/api/basicData/sheetMetalConfig/sheetMetalConfig";
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";
import { useI18n } from "vue-i18n"; //瑕佸湪js涓娇鐢ㄥ浗闄呭寲
const { t, locale } = useI18n();
const { proxy } = getCurrentInstance();
const tableRef = ref();
-const calendarList = ref([]);
+const gapList = ref([]);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
@@ -114,14 +108,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- description: null,
- type: null,
- effectiveDate: null,
- expiringDate: null,
- content: null,
- applicableFactory: null,
- applicableWorkshop: null,
- applicableProcess: null,
+ bomLineCode: null,
+ requireId: null
},
});
const { queryParams, form, rules } = toRefs(data);
@@ -145,67 +133,67 @@
columns.value = [
{
title: t("plan.table.requireID"),
- field: "description",
+ field: "id",
width: 150,
align: "center",
},
{
title: t("plan.table.requireTraceID"),
- field: "type",
+ field: "requireId",
width: 200,
align: "center",
},
{
title: t("plan.table.itemNumber"),
- field: "effectiveDate",
+ field: "bomLineCode",
width: 200,
align: "center",
},
{
title: t("plan.table.bomLowCode"),
- field: "expiringDate",
+ field: "bomLineLevel",
width: 200,
align: "center",
},
{
title: t("plan.table.matchState"),
- field: "expiringDate",
+ field: "matchState",
width: 200,
align: "center",
},
{
title: t("plan.table.matchPattern"),
- field: "createTime",
+ field: "matchMode",
width: 200,
align: "center",
},
{
title: t("plan.table.unmatchedDemandQuantity"),
- field: "createTime",
+ field: "unmatchedDemandAmount",
width: 200,
align: "center",
},
{
title: t("plan.table.planStartDay"),
- field: "createTime",
+ field: "startDate",
width: 200,
align: "center",
},
{
title: t("plan.table.planEndDayDate"),
- field: "updateTime",
+ field: "completeDate",
width: 100,
align: "center",
},
{
title: t("plan.table.requirementDate"),
- field: "updateTime",
+ field: "demandDate",
width: 100,
align: "center",
},
{
title: t("plan.table.applicableFactories"),
- field: "applicableFactory",
+ field: "orgCode",
width: 200,
align: "center",
formatter: ({ cellValue, row, column }) => {
@@ -220,7 +208,7 @@
},
{
title: t("plan.table.productionBase"),
- field: "updateTime",
+ field: "productionBase",
width: 100,
align: "center",
},
@@ -231,52 +219,24 @@
/** 鏌ヨ鏃ュ巻绠＄悊鍒楄〃 */
function getList() {
loading.value = true;
- listCalendar(queryParams.value).then((response) => {
- calendarList.value = response.rows;
+ supplyGapList(queryParams.value).then((response) => {
+ gapList.value = response.rows;
page.value.total = response.total;
loading.value = false;
+ }).catch(()=>{
+ 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);
- });
+ listAll_plant({}).then(response=>{
+ plantList.value = response.data;
+ })
}
-
-// 鍙栨秷鎸夐挳
-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,
+ queryParams.value = {
+ pageNum: 1,
+ pageSize: 10,
+ bomLineCode: null,
+ requireId: null
};
proxy.resetForm("calendarRef");
}
@@ -284,6 +244,7 @@
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
queryParams.value.pageNum = 1;
+ page.value.current = 1
getList();
}
@@ -299,137 +260,15 @@
single.value = selection.length != 1;
multiple.value = !selection.length;
}
-
-/** 鏂板鎸夐挳鎿嶄綔 */
-async function handleAdd() {
- reset();
- open.value = true;
- title.value = "娣诲姞鏃ュ巻绠＄悊";
-}
-/** 閫夋嫨宸ュ巶鍚庝簨浠� 鍔犺浇杞﹂棿 鍜� 宸ュ簭 **/
-function changePlant(plant) {
- listAps_shop({ plantCode: plant }).then((response) => {
- 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;
- // 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 = "淇敼鏃ュ巻绠＄悊";
- });
-}
-
-/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["calendarRef"].validate((valid) => {
- if (valid) {
- 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();
- });
- }
- } 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();
- });
- }
- }
- }
- });
-}
-
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const _ids = row.id || ids.value;
- proxy.$modal
- .confirm('鏄惁纭鍒犻櫎鏃ュ巻绠＄悊缂栧彿涓�"' + _ids + '"鐨勬暟鎹」锛�')
- .then(function () {
- return delCalendar(_ids);
- })
- .then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- })
- .catch(() => {});
-}
-
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
function handleExport() {
proxy.download(
- "core/calendar/export",
+ "aps/ApsPlateStandardRequire/supplyGapListExport",
{
...queryParams.value,
},
- `calendar_${new Date().getTime()}.xlsx`
+ `supplyGapListExport_${new Date().getTime()}.xlsx`
);
-}
-function handleSwitchType(e) {
- typeRadioNumber.value = e;
- form.value.type = e;
- form.value.effectiveDate = null;
- form.value.expiringDate = null;
- form.value.content = null;
- form.value.applicableFactory = null;
- form.value.applicableWorkshop = null;
- form.value.applicableProcess = null;
}
function changePageNo(currentPage) {
queryParams.value.pageNum = currentPage;
@@ -442,12 +281,6 @@
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();
});
--
Gitblit v1.9.3