From 1b56e5ca59f20aebc5add65a6a76d9a5f2b1b03b Mon Sep 17 00:00:00 2001
From: CD配唱片 <CD配唱片>
Date: 星期三, 07 五月 2025 17:53:01 +0800
Subject: [PATCH] 钣金冗余工单联调
---
src/views/mainPlan/sheetMetalRedundantReport/index.vue | 242 +++++++----------------------------------------
1 files changed, 38 insertions(+), 204 deletions(-)
diff --git a/src/views/mainPlan/sheetMetalRedundantReport/index.vue b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
index 0681d75..0585e63 100644
--- a/src/views/mainPlan/sheetMetalRedundantReport/index.vue
+++ b/src/views/mainPlan/sheetMetalRedundantReport/index.vue
@@ -10,13 +10,10 @@
>
<el-row type="flex" justify="left">
<el-col :span="locale === 'zh' ? 5 : 10">
- <el-form-item
- :label="$t('plan.query.requireTraceID')"
- prop="description"
- >
+ <el-form-item :label="$t('plan.query.itemNumber')" prop="itemNumber">
<el-input
:style="{ width: locale === 'zh' ? '140px' : '300px' }"
- v-model="queryParams.description"
+ v-model="queryParams.itemNumber"
:placeholder="`${$t('plan.placeholder.requireTraceID')}`"
clearable
@keyup.enter="handleQuery"
@@ -24,10 +21,13 @@
</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.workOrderNo')"
+ prop="documentNumber"
+ >
<el-input
:style="{ width: locale === 'zh' ? '140px' : '210px' }"
- v-model="queryParams.description"
+ v-model="queryParams.documentNumber"
:placeholder="`${$t('common.common.placeholder')}${$t(
'plan.query.itemNumber'
)}`"
@@ -56,7 +56,7 @@
plain
icon="Download"
@click="handleExport"
- v-hasPermi="['core:calendar:export']"
+ v-hasPermi="['Aps:apsPlatePlan:redundantOrderListExport']"
>{{ $t("common.common.export") }}</el-button
>
</el-col>
@@ -68,7 +68,7 @@
<HxlhTable
style="width: 100%"
:columns="columns"
- :data="calendarList"
+ :data="orderList"
:loading="loading"
:height="height"
ref="tableRef"
@@ -91,6 +91,7 @@
addCalendar,
updateCalendar,
} from "@/api/basicData/calendar";
+import { redundantOrderList } 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";
@@ -99,7 +100,7 @@
const { t, locale } = useI18n();
const { proxy } = getCurrentInstance();
const tableRef = ref();
-const calendarList = ref([]);
+const orderList = ref([]);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
@@ -114,14 +115,8 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- description: null,
- type: null,
- effectiveDate: null,
- expiringDate: null,
- content: null,
- applicableFactory: null,
- applicableWorkshop: null,
- applicableProcess: null,
+ documentNumber: null,
+ itemNumber: null,
},
});
const { queryParams, form, rules } = toRefs(data);
@@ -145,31 +140,31 @@
columns.value = [
{
title: t("plan.table.workOrderNo"),
- field: "description",
+ field: "documentNumber",
width: 150,
align: "center",
},
{
title: t("plan.table.subItemPartNumber"),
- field: "type",
+ field: "itemNumber",
width: 200,
align: "center",
},
{
title: t("plan.table.productionQuantity"),
- field: "effectiveDate",
+ field: "productionQuantity",
width: 200,
align: "center",
},
{
title: t("plan.table.mismatchedProductionQuantity"),
- field: "expiringDate",
+ field: "unmatchedQuantity",
width: 200,
align: "center",
},
{
title: t("plan.table.applicableFactories"),
- field: "applicableFactory",
+ field: "plant",
width: 200,
align: "center",
formatter: ({ cellValue, row, column }) => {
@@ -184,25 +179,25 @@
},
{
title: t("plan.table.productionBase"),
- field: "expiringDate",
+ field: "productionBase",
width: 200,
align: "center",
},
{
title: t("plan.table.planStartDay"),
- field: "createTime",
+ field: "planStartDay",
width: 200,
align: "center",
},
{
title: t("plan.table.planEndDayDate"),
- field: "updateTime",
+ field: "planEndDay",
width: 100,
align: "center",
},
{
title: t("plan.table.workorderCreationTime"),
- field: "updateTime",
+ field: "orderCreateTime",
width: 100,
align: "center",
},
@@ -213,59 +208,24 @@
/** 鏌ヨ鏃ュ巻绠＄悊鍒楄〃 */
function getList() {
loading.value = true;
- listCalendar(queryParams.value).then((response) => {
- calendarList.value = response.rows;
+ redundantOrderList(queryParams.value).then((response) => {
+ orderList.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);
- });
-}
-
-// 鍙栨秷鎸夐挳
-function cancel() {
- open.value = false;
- reset();
}
// 琛ㄥ崟閲嶇疆
function reset() {
- form.value = {
- id: null,
- description: null,
- type: "1",
- effectiveDate: null,
- expiringDate: null,
- content: null,
- applicableFactory: null,
- applicableWorkshop: null,
- applicableProcess: null,
- createBy: null,
- createTime: null,
- updateBy: null,
- updateTime: null,
- };
- proxy.resetForm("calendarRef");
+ proxy.resetForm("queryRef");
}
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
queryParams.value.pageNum = 1;
+ page.value.current = 1;
getList();
}
@@ -275,143 +235,15 @@
handleQuery();
}
-// 澶氶�夋閫変腑鏁版嵁
-function handleSelectionChange(selection) {
- ids.value = selection.map((item) => item.id);
- 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/apsPlatePlan/redundantOrderListExport",
{
...queryParams.value,
},
- `calendar_${new Date().getTime()}.xlsx`
+ `redundantOrderList_${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;
@@ -424,14 +256,16 @@
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();
+ /** 鏌ヨ宸ュ巶鍒楄〃 */
+ listAll_plant({})
+ .then((response) => {
+ plantList.value = response.data;
+ })
+ .catch((error) => {
+ console.error("璇锋眰鍑洪敊:", error);
+ });
});
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3