From 84ee03eb7701d8aeb8aa9514989f2c8b4ce53e79 Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期五, 09 五月 2025 16:16:12 +0800
Subject: [PATCH] 批量更新日期联调等
---
src/utils/request.js | 1
src/views/basicData/sheetMetalParamConfig/index.vue | 4
src/views/mainPlan/abnormalPartNumberReport/index.vue | 23 +--
src/views/mainPlan/sheetMetalOrderManage/index.vue | 262 +++++++++++++++++++++++++++----------
src/views/mainPlan/sheetMetalSupplyGap/index.vue | 24 +--
src/views/basicData/processRouteDataPreparate/index.vue | 13 +
src/api/mainPlan/metalOrderManage.js | 8 +
src/api/basicData/bom/bom.js | 8 +
src/utils/i18n/locales/common/index.js | 8
src/views/mainPlan/sheetMetalRedundantReport/index.vue | 14 +-
src/views/basicData/bom/index.vue | 27 +++
11 files changed, 268 insertions(+), 124 deletions(-)
diff --git a/src/api/basicData/bom/bom.js b/src/api/basicData/bom/bom.js
index 644724e..cad7dbb 100644
--- a/src/api/basicData/bom/bom.js
+++ b/src/api/basicData/bom/bom.js
@@ -15,6 +15,14 @@
params: query
})
}
+// /ApsBomHeader/refreshBomData
+export function listApsBomRefreshBomDataList() {
+ return request({
+ url: '/aps/ApsBomHeader/refreshBomData',
+ method: 'post',
+ })
+}
+
// 鏌ヨBOM鏁版嵁绠＄悊鍒楄〃
export function listApsBom(query) {
return request({
diff --git a/src/api/mainPlan/metalOrderManage.js b/src/api/mainPlan/metalOrderManage.js
index 9875539..2d63384 100644
--- a/src/api/mainPlan/metalOrderManage.js
+++ b/src/api/mainPlan/metalOrderManage.js
@@ -20,4 +20,12 @@
url: `/aps/ApsPlateStandardRequire/generatorPlan`,
method: "post"
});
+}
+// /ApsPlatOrderPlanManager/planDate
+export function planDateList(query) {
+ return request({
+ url: `/aps/ApsPlatOrderPlanManager/planDate`,
+ method: "put",
+ data: query
+ });
}
\ No newline at end of file
diff --git a/src/utils/i18n/locales/common/index.js b/src/utils/i18n/locales/common/index.js
index b11f7c8..c9b0d65 100644
--- a/src/utils/i18n/locales/common/index.js
+++ b/src/utils/i18n/locales/common/index.js
@@ -21,7 +21,9 @@
placeholder:"璇疯緭鍏�",
view:"鏌ョ湅",
viewDetails:"鏌ョ湅璇︽儏",
- operate:"鎿嶄綔"
+ operate:"鎿嶄綔",
+ batchUpdate:"鎵归噺鏇存柊",
+ close:"鍏抽棴"
},
};
export const en = {
@@ -47,6 +49,8 @@
placeholder:"Please enter the ",
view:"View",
viewDetails:"View details",
- operate:"Operate"
+ operate:"Operate",
+ batchUpdate:"Batch update",
+ close:"Close"
},
};
diff --git a/src/utils/request.js b/src/utils/request.js
index 26411b0..c2424e0 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -133,6 +133,7 @@
responseType: 'blob',
...config
}).then(async (data) => {
+ console.log(data,"new Blob")
const isBlob = blobValidate(data);
if (isBlob) {
const blob = new Blob([data])
diff --git a/src/views/basicData/bom/index.vue b/src/views/basicData/bom/index.vue
index 0d93fef..790f207 100644
--- a/src/views/basicData/bom/index.vue
+++ b/src/views/basicData/bom/index.vue
@@ -65,8 +65,9 @@
type="success"
plain
icon="Refresh"
+ :disabled="loadingRefresh"
@click="handleRefresh"
- v-hasPermi="['apsPartRouteStat:edit']"
+ v-hasPermi="['Aps:ApsBomHeader:refreshBomData']"
>{{ $t("common.common.update") }}</el-button
>
</el-col>
@@ -94,7 +95,7 @@
type="primary"
link
@click="handleCheckView(row)"
- v-hasPermi="['aps:calendar:update']"
+ v-hasPermi="['Aps:apsBom:list']"
>鏌ョ湅</el-button
>
</template>
@@ -104,19 +105,20 @@
v-model="openDialog"
width="900px"
append-to-body
+ style="height:400px;overflow:hidden;"
>
<HxlhTable
style="width: 100%"
:columns="subGridOptions"
:data="subList"
:loading="loadingSub"
- :height="heightSub"
+ :height="'280px;'"
>
</HxlhTable>
<template #footer>
<span class="dialog-footer">
<el-button @click="openDialog = false">{{
- $t("common.common.cancel")
+ $t("common.common.close")
}}</el-button>
</span>
</template>
@@ -128,6 +130,7 @@
import {
listApsBomHeaderList,
listApsBomLineList,
+ listApsBomRefreshBomDataList
} from "@/api/basicData/bom/bom.js";
import { listAll_plant } from "@/api/basicData/plant";
import HxlhTable from "@/components/HxlhTable/index.vue";
@@ -146,6 +149,7 @@
const subList = ref([]);
const loading = ref(false);
const loadingSub = ref(false);
+const loadingRefresh = ref(false);
const showSearch = ref(true);
const total = ref(0);
const height = ref(document.documentElement.clientHeight - 210 + "px;");
@@ -301,7 +305,20 @@
},
{ immediate: true, deep: true }
);
-
+async function handleRefresh() {
+ loadingRefresh.value = true;
+ const res = await listApsBomRefreshBomDataList()
+ if(res.code == 200){
+ ElMessage({
+ message: t("plan.message.update"),
+ type: "success",
+ });
+ loadingRefresh.value = false;
+ getList();
+ }else{
+ loadingRefresh.value = false;
+ }
+}
function changePageNo(currentPage) {
queryParams.value.pageNum = currentPage;
page.value.current = currentPage;
diff --git a/src/views/basicData/processRouteDataPreparate/index.vue b/src/views/basicData/processRouteDataPreparate/index.vue
index c25fe34..3bf41f5 100644
--- a/src/views/basicData/processRouteDataPreparate/index.vue
+++ b/src/views/basicData/processRouteDataPreparate/index.vue
@@ -96,7 +96,7 @@
type="primary"
link
@click="handleCheckView(row)"
- v-hasPermi="['aps:calendar:update']"
+ v-hasPermi="['Aps:ApsStandardProcessRouteLine:list']"
>{{ $t("common.common.view") }}</el-button
>
</template>
@@ -105,6 +105,7 @@
:title="$t('common.common.viewDetails')"
v-model="openDialog"
width="900px"
+ style="height:400px;overflow:hidden;"
append-to-body
>
<HxlhTable
@@ -112,13 +113,13 @@
:columns="subGridOptions"
:data="subList"
:loading="loading"
- :height="heightSub"
+ :height="'280px;'"
>
</HxlhTable>
<template #footer>
<span class="dialog-footer">
<el-button @click="openDialog = false">{{
- $t("common.common.cancel")
+ $t("common.common.close")
}}</el-button>
</span>
</template>
@@ -269,19 +270,19 @@
{
title: t("basic.table.effectiveDate"),
field: "startDate",
- width: 200,
+ width: 230,
align: "center",
},
{
title: t("basic.table.expiringDate"),
field: "endDate",
- width: 200,
+ width: 230,
align: "center",
},
{
title: t("basic.table.integrationDate"),
field: "createTime",
- width: 200,
+ width: 230,
align: "center",
},
{
diff --git a/src/views/basicData/sheetMetalParamConfig/index.vue b/src/views/basicData/sheetMetalParamConfig/index.vue
index 62135fa..55b2511 100644
--- a/src/views/basicData/sheetMetalParamConfig/index.vue
+++ b/src/views/basicData/sheetMetalParamConfig/index.vue
@@ -15,7 +15,7 @@
</div>
</el-form-item>
<el-form-item class="form_class">
- <el-button type="primary" @click="submitForm">淇濆瓨</el-button>
+ <el-button type="primary" @click="submitForm" v-hasPermi="['system:dict:edit']">淇濆瓨</el-button>
</el-form-item>
</el-form>
</div>
@@ -70,7 +70,7 @@
});
if (res.code == 200) {
ElMessage({
- message: "鏇存柊鎴愬姛",
+ message:t("plan.message.update"),
type: "success",
});
}
diff --git a/src/views/mainPlan/abnormalPartNumberReport/index.vue b/src/views/mainPlan/abnormalPartNumberReport/index.vue
index b8ea020..c34fb2e 100644
--- a/src/views/mainPlan/abnormalPartNumberReport/index.vue
+++ b/src/views/mainPlan/abnormalPartNumberReport/index.vue
@@ -10,11 +10,11 @@
>
<el-row type="flex" justify="left">
<el-col :span="locale === 'zh' ? 5 : 10">
- <el-form-item :label="$t('plan.query.itemNumber')" prop="itemNumber">
+ <el-form-item :label="$t('plan.query.itemNumber')" prop="itemNum">
<el-input
:style="{ width: locale === 'zh' ? '140px' : '300px' }"
- v-model="queryParams.itemNumber"
- :placeholder="`${$t('plan.placeholder.requireTraceID')}`"
+ v-model="queryParams.itemNum"
+ :placeholder="`${$t('common.common.placeholder')}${$t('plan.query.itemNumber')}`"
clearable
@keyup.enter="handleQuery"
/>
@@ -23,13 +23,13 @@
<el-col :span="locale === 'zh' ? 8 : 9">
<el-form-item
:label="$t('plan.query.workOrderNo')"
- prop="documentNumber"
+ prop="docNum"
>
<el-input
:style="{ width: locale === 'zh' ? '140px' : '210px' }"
- v-model="queryParams.documentNumber"
+ v-model="queryParams.docNum"
:placeholder="`${$t('common.common.placeholder')}${$t(
- 'plan.query.itemNumber'
+ 'plan.query.workOrderNo'
)}`"
clearable
@keyup.enter="handleQuery"
@@ -56,7 +56,7 @@
plain
icon="Download"
@click="handleExport"
- v-hasPermi="['Aps:apsPlatePlan:redundantOrderListExport']"
+ v-hasPermi="['Aps:ApsPlateStandardRequireError:export']"
>{{ $t("common.common.export") }}</el-button
>
</el-col>
@@ -98,8 +98,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- documentNumber: null,
- itemNumber: null,
+ docNum: null,
+ itemNum: null,
},
});
const { queryParams, form, rules } = toRefs(data);
@@ -120,19 +120,16 @@
{
title: t("plan.table.workOrderNo"),
field: "docNum",
- width: 150,
align: "center",
},
{
title: t("plan.table.itemNumber"),
field: "itemNum",
- width: 200,
align: "center",
},
{
title: t("plan.table.applicableFactories"),
field: "orgCode",
- width: 200,
align: "center",
formatter: ({ cellValue, row, column }) => {
if (cellValue) {
@@ -147,13 +144,11 @@
{
title: t("plan.table.abnormalCause"),
field: "message",
- width: 200,
align: "center",
},
{
title: t("plan.table.creationTime"),
field: "createTime",
- width: 200,
align: "center",
}
];
diff --git a/src/views/mainPlan/sheetMetalOrderManage/index.vue b/src/views/mainPlan/sheetMetalOrderManage/index.vue
index 2b9872d..d08d125 100644
--- a/src/views/mainPlan/sheetMetalOrderManage/index.vue
+++ b/src/views/mainPlan/sheetMetalOrderManage/index.vue
@@ -23,11 +23,11 @@
<el-col :span="5"> -->
<el-form-item
:label="$t('plan.query.requireTraceID')"
- prop="requireTraceId"
+ prop="requireTrackId"
>
<el-input
:style="{ width: locale == 'zh' ? '200px' : '280px' }"
- v-model="queryParams.requireTraceId"
+ v-model="queryParams.requireTrackId"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.query.requireTraceID'
)}`"
@@ -52,7 +52,7 @@
:label="$t('plan.table.delayRiskIdentification')"
prop="hasDelayRisk"
>
- <el-input
+ <!-- <el-input
:style="{ width: locale == 'zh' ? '200px' : '280px' }"
v-model="queryParams.hasDelayRisk"
:placeholder="`${$t('common.common.placeholder')}${$t(
@@ -60,7 +60,19 @@
)}`"
clearable
@keyup.enter="handleQuery"
- />
+ /> -->
+ <el-select
+ clearable
+ v-model="queryParams.hasDelayRisk"
+ style="width: 140px"
+ >
+ <el-option
+ v-for="item in delayRiskOptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
</el-form-item>
<!-- </el-col>
<el-col :span="14" style="text-align: right"> -->
@@ -84,7 +96,7 @@
icon="Plus"
:disabled="multiple"
@click="handleBatchUpdatePlanDate"
- v-hasPermi="['apsPlatePlan:edit']"
+ v-hasPermi="['ApsPlatOrderPlanManager:requirement:list']"
>{{ $t("plan.btns.batchUpdateOrderDate") }}</el-button
>
</el-col>
@@ -93,6 +105,7 @@
type="success"
plain
icon="Edit"
+ :disabled="loadingGenerateList"
@click="handleGenerateList"
v-hasPermi="['apsPlatePlan:edit']"
>{{ $t("plan.btns.generatePlanOrder") }}</el-button
@@ -120,7 +133,7 @@
type="primary"
link
@click="handleCheckView(row)"
- v-hasPermi="['aps:calendar:update']"
+ v-hasPermi="['ApsPlatOrderPlanManager:requirement:list']"
>{{ $t("plan.btns.viewRequirement") }}</el-button
>
</template>
@@ -129,6 +142,7 @@
:title="$t('plan.title.viewAssociatedRequirements')"
v-model="openDialog"
width="900px"
+ style="height: 400px; overflow: hidden"
append-to-body
>
<HxlhTable
@@ -136,13 +150,13 @@
:columns="subGridOptions"
:data="subList"
:loading="loadingSub"
- :height="heightSub"
+ :height="'280px'"
>
</HxlhTable>
<template #footer>
<span class="dialog-footer">
<el-button @click="openDialog = false">{{
- $t("common.common.cancel")
+ $t("common.common.close")
}}</el-button>
</span>
</template>
@@ -151,11 +165,12 @@
:title="$t('plan.btns.batchUpdateOrderDate')"
v-model="openBatchDialog"
width="900px"
+ style="height: 400px; overflow: hidden"
append-to-body
>
<div class="mode_box">
<span>{{ $t("plan.title.setMode") }}</span>
- <el-radio-group v-model="radio">
+ <el-radio-group v-model="radio" @change="changeRadioCustom">
<el-radio :label="1">{{
$t("plan.btns.batchUpdateOrderDate")
}}</el-radio>
@@ -167,10 +182,17 @@
<div class="red_color">{{ $t("plan.title.tipsBugSheetMetal") }}</div>
<div class="mode_box" v-if="radio === 2">
<span>{{ $t("plan.title.CustomizePlannedCompletionDate") }}</span>
- <el-date-picker
- v-model="value4"
+ <!-- <el-date-picker
+ v-model="customicDate"
type="dates"
:placeholder="$t('plan.title.CustomizePlannedCompletionDate')"
+ @change="handleChangeCustomDate($event)"
+ /> -->
+ <el-date-picker
+ v-model="customicDate"
+ type="datetime"
+ :placeholder="$t('plan.title.CustomizePlannedCompletionDate')"
+ @change="handleChangeCustomDate($event)"
/>
</div>
<HxlhTable
@@ -179,7 +201,7 @@
:columns="subUpdateGridOptions"
:data="subUpdateList"
:loading="loading"
- :height="heightSub"
+ :height="'200px'"
>
</HxlhTable>
<HxlhTable
@@ -188,7 +210,7 @@
:columns="subUpdateCustomGridOptions"
:data="subUpdateList"
:loading="loading"
- :height="heightSub"
+ :height="'200px'"
>
</HxlhTable>
<template #footer>
@@ -196,6 +218,13 @@
<el-button @click="openBatchDialog = false">{{
$t("common.common.cancel")
}}</el-button>
+ <el-button
+ type="primary"
+ @click="hanleBatchUpdateDate"
+ :disabled="loadingUpdateDate"
+ v-hasPermi="['ApsPlatOrderPlanManager:requirement:list']"
+ >{{ $t("common.common.batchUpdate") }}</el-button
+ >
</span>
</template>
</el-dialog>
@@ -204,14 +233,32 @@
<script setup name="Calendar">
import HxlhTable from "@/components/HxlhTable";
+import { parseTime } from "@/utils/ruoyi.js";
import useBasicStore from "@/store/modules/request/basic/page";
import { listAll_plant } from "@/api/basicData/plant";
-import { metalOrderManageList,metalOrderManageSubList,generatorPlanList } from "@/api/mainPlan/metalOrderManage.js";
+import {
+ metalOrderManageList,
+ metalOrderManageSubList,
+ generatorPlanList,
+ planDateList,
+} from "@/api/mainPlan/metalOrderManage.js";
import { useI18n } from "vue-i18n"; //瑕佸湪js涓娇鐢ㄥ浗闄呭寲
+import { ElMessage } from "element-plus";
const { t, locale } = useI18n();
const basicStore = useBasicStore();
const { proxy } = getCurrentInstance();
+const delayRiskOptions = ref([
+ {
+ label: "鏈夐闄�",
+ value: "1",
+ },
+ {
+ label: "鏃犻闄�",
+ value: "0",
+ },
+]);
const radio = ref(1);
+const customicDate = ref("");
const openDialog = ref(false);
const openBatchDialog = ref(false);
const subGridOptions = ref([]);
@@ -222,7 +269,9 @@
// const tableRef = ref();
const orderList = ref([]);
const loading = ref(false);
-const loadingSub = ref(false)
+const loadingUpdateDate = ref(false);
+const loadingGenerateList = ref(false);
+const loadingSub = ref(false);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
@@ -237,7 +286,7 @@
pageNum: 1,
pageSize: 10,
workOrderNo: null,
- requireTraceId: null,
+ requireTrackId: null,
mainPartNumber: null,
hasDelayRisk: null,
},
@@ -260,7 +309,7 @@
locale,
(newLocale) => {
columns.value = [
- { type: "checkbox", width: 60, align: "center" },
+ { type: "checkbox", width: 60, align: "center", fixed: "left" },
{
title: t("basic.table.requirementID"),
field: "requireId",
@@ -269,7 +318,7 @@
},
{
title: t("basic.table.requirementTraceabilityID"),
- field: "requireTraceId",
+ field: "requireTrackId",
width: 200,
align: "center",
},
@@ -339,19 +388,19 @@
{
title: t("plan.table.planStartDay"),
field: "planStartDay",
- width: 100,
+ width: 200,
align: "center",
},
{
title: t("plan.table.planEndDayDate"),
field: "planEndDay",
- width: 100,
+ width: 200,
align: "center",
},
{
title: t("plan.table.workorderCreationTime"),
field: "orderCreateTime",
- width: 100,
+ width: 200,
align: "center",
},
{
@@ -365,6 +414,15 @@
field: "hasDelayRisk",
width: 100,
align: "center",
+ formatter: ({ cellValue, row, column }) => {
+ if (cellValue) {
+ for (let i = 0; i < delayRiskOptions.value.length; i++) {
+ if (cellValue === delayRiskOptions.value[i].value) {
+ return delayRiskOptions.value[i].label;
+ }
+ }
+ }
+ },
},
{
title: t("common.common.operate"),
@@ -488,6 +546,15 @@
field: "hasDelayRisk",
width: 100,
align: "center",
+ formatter: ({ cellValue, row, column }) => {
+ if (cellValue) {
+ for (let i = 0; i < delayRiskOptions.value.length; i++) {
+ if (cellValue === delayRiskOptions.value[i].value) {
+ return delayRiskOptions.value[i].label;
+ }
+ }
+ }
+ },
},
];
subUpdateGridOptions.value = [
@@ -499,7 +566,7 @@
},
{
title: t("basic.table.requirementTraceabilityID"),
- field: "requireTraceId",
+ field: "requireTrackId",
width: 200,
align: "center",
},
@@ -530,25 +597,25 @@
{
title: t("plan.table.planStartDay"),
field: "planStartDay",
- width: 100,
+ width: 200,
align: "center",
},
{
title: t("plan.table.planEndDayDate"),
field: "planEndDay",
- width: 100,
+ width: 200,
align: "center",
},
{
title: t("plan.table.startDateOfDemandPlan"),
- field: "startDay",
- width: 100,
+ field: "startDate",
+ width: 200,
align: "center",
},
{
title: t("plan.table.requirementPlanCompletionDate"),
- field: "completeDay",
- width: 100,
+ field: "completeDate",
+ width: 200,
align: "center",
},
];
@@ -561,7 +628,7 @@
},
{
title: t("basic.table.requirementTraceabilityID"),
- field: "requireTraceId",
+ field: "requireTrackId",
width: 200,
align: "center",
},
@@ -592,19 +659,19 @@
{
title: t("plan.table.planStartDay"),
field: "planStartDay",
- width: 100,
+ width: 200,
align: "center",
},
{
title: t("plan.table.planEndDayDate"),
field: "planEndDay",
- width: 100,
+ width: 200,
align: "center",
},
{
title: t("plan.table.customizePlannedCompletionDate"),
- field: "updateTime",
- width: 100,
+ field: "customTime",
+ width: 200,
align: "center",
},
];
@@ -614,63 +681,116 @@
deep: true,
}
);
+function changeRadioCustom() {}
function handleBatchUpdatePlanDate() {
openBatchDialog.value = true;
+}
+function handleChangeCustomDate(e) {
+ customicDate.value = parseTime(e); //new Date(e).getFullYear()+ '-' + parseInt(new Date(e).getMonth()*1+1) + '-' + new Date(e).getDate()
+ console.log(customicDate.value, "chang date");
+ if (radio.value == 2) {
+ subUpdateList.value = subUpdateList.value.map((item) => {
+ return {
+ ...item,
+ customTime: customicDate.value,
+ };
+ });
+ console.log(subUpdateList.value, "changeRadioCustom");
+ }
}
function handleCheckView(row) {
openDialog.value = true;
loadingSub.value = true;
- metalOrderManageSubList(row.workOrderNo).then((res)=>{
- subList.value = res;
- loadingSub.value = false;
- console.log(res,"metalOrderManageSubListmetalOrderManageSubList")
- }).catch(()=>{
- loadingSub.value = false;
- })
+ metalOrderManageSubList(row.workOrderNo)
+ .then((res) => {
+ subList.value = res;
+ loadingSub.value = false;
+ })
+ .catch(() => {
+ loadingSub.value = false;
+ });
}
-async function handleGenerateList(){
- await generatorPlanList()
+async function hanleBatchUpdateDate() {
+ loadingUpdateDate.value = true;
+ let planIds = subUpdateList.value.map((item) => {
+ return item.id;
+ });
+ let res = null;
+ console.log(planIds, "planIds");
+ if (radio.value == 1) {
+ res = await planDateList({
+ isCustom: false,
+ planIds,
+ });
+ } else {
+ res = await planDateList({
+ isCustom: true,
+ planIds,
+ customDate: customicDate.value,
+ });
+ console.log(res, "res planDateList");
+ }
+ if (res.code === 200) {
+ ElMessage({
+ message: t("plan.message.update"),
+ type: "success",
+ });
+ openBatchDialog.value = false;
+ loadingUpdateDate.value = false;
+ getList();
+ } else {
+ openBatchDialog.value = true;
+ loadingUpdateDate.value = false;
+ }
+}
+async function handleGenerateList() {
+ loadingGenerateList.value = true;
+ const res = await generatorPlanList();
+ if (res.code == 200) {
+ ElMessage({
+ message: t("plan.message.update"),
+ type: "success",
+ });
+ loadingGenerateList.value = false;
+ getList();
+ }else {
+ loadingGenerateList.value = false;
+ }
}
/** 鏌ヨ閽ｉ噾宸ュ崟璁″垝绠＄悊鍒楄〃 */
function getList() {
loading.value = true;
- if (basicStore.sheetMetalOrderManageList&&basicStore.sheetMetalOrderManageList.rows) {
- orderList.value = basicStore.sheetMetalOrderManageList.rows;
- loading.value = false;
- } else {
- basicStore.getMetalOrderManagerList(queryParams.value).then((response) => {
+ metalOrderManageList(queryParams.value)
+ .then((response) => {
orderList.value = response.rows;
page.value.total = response.total;
loading.value = false;
- }).catch(()=>{
+ })
+ .catch((res) => {
loading.value = false;
});
- }
- // metalOrderManageList(queryParams.value).then((response) => {
- // orderList.value = response.rows;
- // 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);
- // });
}
+
+// 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);
+// });
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
+ console.log("111111");
queryParams.value.pageNum = 1;
getList();
}
diff --git a/src/views/mainPlan/sheetMetalRedundantReport/index.vue b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
index a6062c5..40d60ee 100644
--- a/src/views/mainPlan/sheetMetalRedundantReport/index.vue
+++ b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
@@ -9,10 +9,10 @@
:label-width="locale === 'zh' ? '90px' : '200px'"
>
<el-row type="flex" justify="left">
- <el-col :span="locale === 'zh' ? 5 : 10">
- <el-form-item :label="$t('plan.query.itemNumber')" prop="itemNumber">
+ <el-col :span="locale === 'zh' ? 5 : 8" style="text-align:left;">
+ <el-form-item :label="$t('plan.query.itemNumber')" style="display:flex; justify-content:flex-start; align-item:center" prop="itemNumber">
<el-input
- :style="{ width: locale === 'zh' ? '140px' : '300px' }"
+ :style="{ width: locale === 'zh' ? '140px' : '240px' }"
v-model="queryParams.itemNumber"
:placeholder="`${$t('plan.placeholder.requireTraceID')}`"
clearable
@@ -20,7 +20,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="locale === 'zh' ? 8 : 9">
+ <el-col :span="locale === 'zh' ? 8 : 8">
<el-form-item
:label="$t('plan.query.workOrderNo')"
prop="documentNumber"
@@ -36,7 +36,7 @@
/>
</el-form-item>
</el-col>
- <el-col :span="locale === 'zh' ? 11 : 5" style="text-align: right">
+ <el-col :span="locale === 'zh' ? 11 : 8" style="text-align: right">
<el-form-item class="column-with-margin">
<el-button type="primary" icon="Search" @click="handleQuery">{{
$t("common.common.query")
@@ -170,13 +170,13 @@
{
title: t("plan.table.planEndDayDate"),
field: "planEndDay",
- width: 100,
+ width: 200,
align: "center",
},
{
title: t("plan.table.workorderCreationTime"),
field: "orderCreateTime",
- width: 100,
+ width: 200,
align: "center",
},
];
diff --git a/src/views/mainPlan/sheetMetalSupplyGap/index.vue b/src/views/mainPlan/sheetMetalSupplyGap/index.vue
index 58092c8..8ee91b7 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="requireId"
+ prop="requireTrackId"
>
<el-input
:style="{ width: locale === 'zh' ? '140px' : '300px' }"
- v-model="queryParams.requireId"
+ v-model="queryParams.requireTrackId"
:placeholder="`${$t('plan.placeholder.requireTraceID')}`"
clearable
@keyup.enter="handleQuery"
@@ -105,7 +105,7 @@
pageNum: 1,
pageSize: 10,
bomLineCode: null,
- requireId: null
+ requireTrackId: null
},
});
const { queryParams } = toRefs(data);
@@ -131,7 +131,7 @@
},
{
title: t("plan.table.requireTraceID"),
- field: "requireId",
+ field: "requireTrackId",
width: 200,
align: "center",
},
@@ -174,13 +174,13 @@
{
title: t("plan.table.planEndDayDate"),
field: "completeDate",
- width: 100,
+ width: 200,
align: "center",
},
{
title: t("plan.table.requirementDate"),
field: "demandDate",
- width: 100,
+ width: 200,
align: "center",
},
{
@@ -201,7 +201,7 @@
{
title: t("plan.table.productionBase"),
field: "productionBase",
- width: 100,
+ width: 200,
align: "center",
},
];
@@ -221,16 +221,6 @@
listAll_plant({}).then(response=>{
plantList.value = response.data;
})
-}
-// 琛ㄥ崟閲嶇疆
-function reset() {
- queryParams.value = {
- pageNum: 1,
- pageSize: 10,
- bomLineCode: null,
- requireId: null
- };
- proxy.resetForm("queryRef");
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
--
Gitblit v1.9.3