From ae633932334e456278babd24c47d746b3807bab7 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 05 八月 2025 17:06:44 +0800
Subject: [PATCH] 计量器具台账开发联调、检定校准记录开发联调
---
src/views/productionManagement/productionReporting/index.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index f65697d..3ceae74 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="鎺掍骇鏃ユ湡:">
@@ -17,7 +19,7 @@
<el-form-item label="鐘舵��:">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨鐘舵��" style="width: 140px" clearable>
<el-option label="寰呯敓浜�" :value="1"></el-option>
- <el-option label="宸叉姤宸�" :value="0"></el-option>
+ <el-option label="宸叉姤宸�" :value="3"></el-option>
<el-option label="鐢熶骇涓�" :value="2"></el-option>
</el-select>
</el-form-item>
@@ -57,7 +59,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 +72,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 +89,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"
@@ -109,6 +111,7 @@
size="small"
@click="changeEditType(scope.row)"
v-if="!scope.row.editType"
+ :disabled="scope.row.parentStatus === 3"
>缂栬緫</el-button
>
<el-button
@@ -168,7 +171,7 @@
prop: "status",
dataType: "tag",
formatData: (params) => {
- if (params == 0) {
+ if (params == 3) {
return "宸叉姤宸�";
} else if (params == 1) {
return "寰呯敓浜�";
@@ -177,7 +180,7 @@
}
},
formatType: (params) => {
- if (params == 0) {
+ if (params == 3) {
return "success";
} else if (params == 1) {
return "primary";
@@ -314,7 +317,8 @@
if (index > -1) {
expandData.value = res.data.map(item => ({
...item,
- pendingNum: (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0)
+ pendingNum: (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
+ parentStatus: row.status // 鏂板鐖惰〃鐘舵��
}));
}
expandedRowKeys.value.push(row.id);
--
Gitblit v1.9.3