From 9a5855cc0a16c3be7e27bcd337665a3a0b66e6d1 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期三, 16 四月 2025 15:22:34 +0800
Subject: [PATCH] 费用统计字段调整
---
src/views/business/costStatistics/index.vue | 32 +++++++++++++++++++++++++++++---
src/views/business/costStatistics/components/viewInfoDia.vue | 1 +
src/views/business/unpass/index-manage.vue | 6 +++++-
3 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/src/views/business/costStatistics/components/viewInfoDia.vue b/src/views/business/costStatistics/components/viewInfoDia.vue
index 63269f3..19d5876 100644
--- a/src/views/business/costStatistics/components/viewInfoDia.vue
+++ b/src/views/business/costStatistics/components/viewInfoDia.vue
@@ -25,6 +25,7 @@
{label: '妫�楠岄」', prop: 'inspectionItem', width: 160},
{label: '妫�楠屽瓙椤�', prop: 'inspectionItemSubclass', width: 160},
{ label: '鏀惰垂鏍囧噯(鍏�/娆�)', prop: 'rates' },
+ { label: '鍒嗙粍绯绘暟', prop: 'manHourGroup' },
],
viewInfoDia: false,
tableLoading: false,
diff --git a/src/views/business/costStatistics/index.vue b/src/views/business/costStatistics/index.vue
index 221cfd4..4b34fe2 100644
--- a/src/views/business/costStatistics/index.vue
+++ b/src/views/business/costStatistics/index.vue
@@ -4,6 +4,10 @@
<div class="search">
<div>
<el-form :model="entity" ref="entity" size="small" :inline="true">
+ <el-form-item label="濮旀墭缂栧彿" prop="entrustCode">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.entrustCode"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
<el-form-item label="鏍峰搧鍚嶇О" prop="sample">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.sample"
@keyup.enter.native="refreshTable()"></el-input>
@@ -52,12 +56,34 @@
{ label: '涓嬪崟鏃堕棿', prop: 'createTime', width: 150 },
{ label: '濮旀墭缂栧彿', prop: 'entrustCode', width: 160 },
{ label: '鏍峰搧鍚嶇О', prop: 'sample', width: 160 },
- { label: '鏍峰搧鏁伴噺', prop: 'sampleNum' },
{ label: '濮旀墭鍗曚綅', prop: 'company' },
+ {
+ label: "涓嬪崟绫诲瀷",
+ prop: "typeSource",
+ width: "100px",
+ dataType: "tag",
+ formatData: (params) => {
+ if (params == 0) {
+ return "鎴愬搧涓嬪崟";
+ } else if(params == 1) {
+ return "鍘熸潗鏂欎笅鍗�";
+ } else {
+ return null
+ }
+ },
+ formatType: (params) => {
+ if (params == 0) {
+ return "warning";
+ } else if(params == 1) {
+ return "info";
+ } else {
+ return "null";
+ }
+ },
+ },
{ label: '濮旀墭浜�', prop: 'prepareUser' },
{ label: '鐢熶骇鍗曚綅', prop: 'production' },
- { label: '宸ョ▼鍚嶇О', prop: 'engineering' },
- { label: '宸ユ椂', prop: 'cost' },
+ { label: '鎬讳环', prop: 'totalPrice' },
{
dataType: "action",
fixed: "right",
diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index 5bf3f36..fc767bf 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -3,6 +3,10 @@
<div class="search">
<div>
<el-form :model="entity" ref="entity" size="small" :inline="true">
+ <el-form-item label="璁㈠崟缂栧彿" prop="no">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.no"
+ @keyup.enter.native="refreshTable()"></el-input>
+ </el-form-item>
<el-form-item label="瑙勬牸鍨嬪彿" prop="model">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.model"
@keyup.enter.native="refreshTable()"></el-input>
@@ -82,7 +86,7 @@
tableData: [],
tableLoading: false,
column: [
- { label: '缂栧彿', prop: 'no' },
+ { label: '缂栧彿', prop: 'no', width: "160px", },
// {
// label: "OA瀹℃牳鐘舵��",
// prop: "oaState",
--
Gitblit v1.9.3