From 0a5df5ab2cc2f564ccebb54ec28e0a0b159797bf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期五, 09 一月 2026 17:35:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_tide' into dev_tide
---
src/views/productionManagement/productionReporting/index.vue | 35 ++++-------------------------------
1 files changed, 4 insertions(+), 31 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index b823b6a..1e45199 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -2,14 +2,6 @@
<div class="app-container">
<div class="search_form">
<el-form :model="searchForm" :inline="true">
- <el-form-item label="瀹㈡埛鍚嶇О:">
- <el-input v-model="searchForm.customerName" 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"
- @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" />
@@ -48,6 +40,7 @@
:data="expandData"
border
show-summary
+ stripe
:summary-method="summarizeMainTable"
v-loading="childrenLoading"
>
@@ -57,7 +50,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 +63,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 +80,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"
@@ -195,26 +188,6 @@
{
label: "鎺掍骇浜�",
prop: "schedulingUserName",
- },
- {
- label: "鍚堝悓鍙�",
- prop: "salesContractNo",
- width: 200,
- },
- {
- label: "瀹㈡埛鍚堝悓鍙�",
- prop: "customerContractNo",
- width: 200,
- },
- {
- label: "瀹㈡埛鍚嶇О",
- prop: "customerName",
- width: 200,
- },
- {
- label: "椤圭洰鍚嶇О",
- prop: "projectName",
- width:300
},
{
label: "浜у搧澶х被",
--
Gitblit v1.9.3