From 1c4ff7adf79cd9abc1ea644a3161780a623b9f5c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 26 十一月 2025 16:43:31 +0800
Subject: [PATCH] 1.湟水峡-生产订单不和销售关联逻辑修改联调
---
src/views/productionManagement/productionReporting/index.vue | 55 +++++++++++++++++++++++++------------------------------
1 files changed, 25 insertions(+), 30 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index b823b6a..e26a1dc 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -4,10 +4,12 @@
<el-form :model="searchForm" :inline="true">
<el-form-item label="瀹㈡埛鍚嶇О:">
<el-input v-model="searchForm.customerName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+ style="width: 200px;"
@change="handleQuery" />
</el-form-item>
<el-form-item label="椤圭洰鍚嶇О:">
<el-input v-model="searchForm.projectName" placeholder="璇疯緭鍏�" clearable prefix-icon="Search"
+ style="width: 200px;"
@change="handleQuery" />
</el-form-item>
<el-form-item label="鎺掍骇鏃ユ湡:">
@@ -29,6 +31,7 @@
<div class="table_list">
<div style="text-align: right" class="mb10">
<el-button type="primary" @click="openForm('add')">鐢熶骇鎶ュ伐</el-button>
+ <el-button @click="handleOut">瀵煎嚭</el-button>
</div>
<PIMTable
rowKey="id"
@@ -57,7 +60,7 @@
type="index"
width="60"
/>
- <el-table-column label="鏈鐢熶骇鏁伴噺" prop="finishedNum" align="center">
+ <el-table-column label="鏈鐢熶骇鏁伴噺" prop="finishedNum" align="center" width="400">
<template #default="scope">
<el-input-number :step="0.01" :min="0" style="width: 100%"
v-model="scope.row.finishedNum"
@@ -70,7 +73,7 @@
</template>
</el-table-column>
<!-- <el-table-column label="寰呯敓浜ф暟閲�" prop="pendingNum" width="240" align="center"></el-table-column>-->
- <el-table-column label="鐢熶骇浜�" prop="schedulingUserId" width="240">
+ <el-table-column label="鐢熶骇浜�" prop="schedulingUserId" width="400">
<template #default="scope">
<el-select
v-model="scope.row.schedulingUserId"
@@ -87,7 +90,7 @@
</el-select>
</template>
</el-table-column>
- <el-table-column label="鐢熶骇鏃ユ湡" prop="schedulingDate" width="240">
+ <el-table-column label="鐢熶骇鏃ユ湡" prop="schedulingDate" width="400">
<template #default="scope">
<el-date-picker
v-model="scope.row.schedulingDate"
@@ -146,12 +149,9 @@
const data = reactive({
searchForm: {
staffName: "",
- entryDate: [
- dayjs().format("YYYY-MM-DD"),
- dayjs().add(1, "day").format("YYYY-MM-DD"),
- ], // 褰曞叆鏃ユ湡
- entryDateStart: dayjs().format("YYYY-MM-DD"),
- entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"),
+ entryDate: null, // 褰曞叆鏃ユ湡
+ entryDateStart: undefined,
+ entryDateEnd: undefined,
},
});
const { searchForm } = toRefs(data);
@@ -197,26 +197,6 @@
prop: "schedulingUserName",
},
{
- label: "鍚堝悓鍙�",
- prop: "salesContractNo",
- width: 200,
- },
- {
- label: "瀹㈡埛鍚堝悓鍙�",
- prop: "customerContractNo",
- width: 200,
- },
- {
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
- width: 200,
- },
- {
- label: "椤圭洰鍚嶇О",
- prop: "projectName",
- width:300
- },
- {
label: "浜у搧澶х被",
prop: "productCategory",
width: 150,
@@ -235,6 +215,16 @@
prop: "process",
},
{
+ label: "鍙ｅ懗鍒嗙被",
+ prop: "type",
+ width: 150,
+ },
+ {
+ label: "鎹熻��",
+ prop: "loss",
+ width: 150,
+ },
+ {
label: "鎺掍骇鏁伴噺",
prop: "schedulingNum",
width: 100,
@@ -248,6 +238,11 @@
label: "寰呯敓浜ф暟閲�",
prop: "pendingFinishNum",
width: 100,
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark",
+ width: 200,
},
]);
const tableData = ref([]);
@@ -414,7 +409,7 @@
type: "warning",
})
.then(() => {
- proxy.download("/staff/staffJoinLeaveRecord/export", {staffState: 1}, "浜哄憳鍏ヨ亴.xlsx");
+ proxy.download("/salesLedger/work/export", {}, "鐢熶骇鎶ュ伐.xlsx");
})
.catch(() => {
proxy.$modal.msg("宸插彇娑�");
--
Gitblit v1.9.3