From 0f0b27ccb7fb8cbdf1080a915f5a579c1fbb4497 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 10 十二月 2025 09:19:44 +0800
Subject: [PATCH] 1.海川开心-项目利润里面不要项目名称
---
src/views/productionManagement/productionReporting/index.vue | 74 +++++++++++++++++++++++++------------
1 files changed, 50 insertions(+), 24 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index b823b6a..39bfff4 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -4,12 +4,14 @@
<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"
- @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="鎺掍骇鏃ユ湡:">
<el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
@@ -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"
@@ -145,13 +148,12 @@
const data = reactive({
searchForm: {
- staffName: "",
- entryDate: [
- dayjs().format("YYYY-MM-DD"),
- dayjs().add(1, "day").format("YYYY-MM-DD"),
- ], // 褰曞叆鏃ユ湡
+ customerName: "",
+ projectName: "",
+ status: "",
+ entryDate: [dayjs().format("YYYY-MM-DD"), dayjs().format("YYYY-MM-DD")], // 褰曞叆鏃ユ湡锛岄粯璁ゅ綋澶�
entryDateStart: dayjs().format("YYYY-MM-DD"),
- entryDateEnd: dayjs().add(1, "day").format("YYYY-MM-DD"),
+ entryDateEnd: dayjs().format("YYYY-MM-DD"),
},
});
const { searchForm } = toRefs(data);
@@ -197,25 +199,29 @@
prop: "schedulingUserName",
},
{
+ label: "浜х嚎",
+ prop: "productionLine",
+ },
+ {
label: "鍚堝悓鍙�",
prop: "salesContractNo",
width: 200,
},
- {
- label: "瀹㈡埛鍚堝悓鍙�",
- prop: "customerContractNo",
- width: 200,
- },
+ // {
+ // label: "瀹㈡埛鍚堝悓鍙�",
+ // prop: "customerContractNo",
+ // width: 200,
+ // },
{
label: "瀹㈡埛鍚嶇О",
prop: "customerName",
width: 200,
},
- {
- label: "椤圭洰鍚嶇О",
- prop: "projectName",
- width:300
- },
+ // {
+ // label: "椤圭洰鍚嶇О",
+ // prop: "projectName",
+ // width:300
+ // },
{
label: "浜у搧澶х被",
prop: "productCategory",
@@ -227,12 +233,27 @@
width: 150,
},
{
+ label: "缁戝畾鏈哄櫒",
+ prop: "speculativeTradingName",
+ width: 220,
+ },
+ {
label: "鍗曚綅",
prop: "unit",
},
{
label: "宸ュ簭",
prop: "process",
+ },
+ // {
+ // label: "鍙ｅ懗鍒嗙被",
+ // prop: "type",
+ // width: 150,
+ // },
+ {
+ label: "鎹熻��",
+ prop: "loss",
+ width: 150,
},
{
label: "鎺掍骇鏁伴噺",
@@ -248,6 +269,11 @@
label: "寰呯敓浜ф暟閲�",
prop: "pendingFinishNum",
width: 100,
+ },
+ {
+ label: "澶囨敞",
+ prop: "remark",
+ width: 200,
},
]);
const tableData = ref([]);
@@ -414,7 +440,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