From 8ef070c84a703c4a8b838bf9320d68d00a7d6dca Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 28 五月 2026 11:15:32 +0800
Subject: [PATCH] 设备巡检去掉高度限制
---
src/views/productionManagement/productionReporting/index.vue | 107 +++++++++++++++++++++++++++++------------------------
1 files changed, 59 insertions(+), 48 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 43f9df6..6585237 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -19,12 +19,12 @@
style="width: 200px;"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="瀹℃牳鐘舵��:">
- <el-select v-model="searchForm.auditStatus" placeholder="璇烽�夋嫨" style="width: 200px;" @change="handleQuery">
- <el-option v-for="item in auditStatusOptions" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="瀹℃牳鐘舵��:">-->
+<!-- <el-select v-model="searchForm.auditStatus" placeholder="璇烽�夋嫨" style="width: 200px;" @change="handleQuery">-->
+<!-- <el-option v-for="item in auditStatusOptions" :key="item.value" :label="item.label" :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary"
@click="handleQuery">鎼滅储</el-button>
@@ -220,54 +220,60 @@
width: 120,
},
{
+ label: "宸ュ崟缂栧彿",
+ prop: "workOrderNo",
+ width: 120,
+ },
+ {
+ label: "璁㈠崟缂栧彿",
+ prop: "salesContractNo",
+ width: 120,
+ },
+ {
label: "宸ュ簭",
prop: "process",
width: 120,
},
{
label: "鎶ュ伐浜哄憳",
- prop: "nickName",
+ prop: "teamNames",
+
width: 120,
+ dataType: "tag",
+ formatData: val => {
+ if (!val) return [];
+ return val.split(",");
+ }
},
{
label: "鏈哄彴",
prop: "deviceName",
width: 120,
},
- {
- label: "瀹℃牳浜�",
- prop: "auditUserName",
- width: 120,
- },
- {
- label: "瀹℃牳鐘舵��",
- prop: "auditStatus",
- width: 120,
- dataType: "tag",
- formatData: val => {
- const statusMap = { 0: "鏈鏍�", 1: "閫氳繃", 2: "涓嶉�氳繃" };
- return statusMap[val] ?? "鏈煡";
- },
- formatType: val => {
- const typeMap = { 0: "info", 1: "success", 2: "danger" };
- return typeMap[val] ?? "";
- },
- },
- {
- label: "鏈�缁堝鏍镐汉",
- prop: "sureAuditUserName",
- width: 120,
- },
- {
- label: "宸ュ崟缂栧彿",
- prop: "workOrderNo",
- width: 120,
- },
- {
- label: "閿�鍞悎鍚屽彿",
- prop: "salesContractNo",
- width: 120,
- },
+ // {
+ // label: "瀹℃牳浜�",
+ // prop: "auditUserName",
+ // width: 120,
+ // },
+ // {
+ // label: "瀹℃牳鐘舵��",
+ // prop: "auditStatus",
+ // width: 120,
+ // dataType: "tag",
+ // formatData: val => {
+ // const statusMap = { 0: "鏈鏍�", 1: "閫氳繃", 2: "涓嶉�氳繃" };
+ // return statusMap[val] ?? "鏈煡";
+ // },
+ // formatType: val => {
+ // const typeMap = { 0: "info", 1: "success", 2: "danger" };
+ // return typeMap[val] ?? "";
+ // },
+ // },
+ // {
+ // label: "鏈�缁堝鏍镐汉",
+ // prop: "sureAuditUserName",
+ // width: 120,
+ // },
{
label: "浜у搧鍚嶇О",
prop: "productName",
@@ -286,6 +292,11 @@
{
label: "鎶ュ簾鏁伴噺",
prop: "scrapQty",
+ width: 120,
+ },
+ {
+ label: "鍔犳斁鏁�",
+ prop: "addQty",
width: 120,
},
{
@@ -324,13 +335,13 @@
deleteReport(row);
},
},
- {
- name:"瀹℃牳",
- clickFun: row => {
- handleAudit(row);
- },
- disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
- },
+ // {
+ // name:"瀹℃牳",
+ // clickFun: row => {
+ // handleAudit(row);
+ // },
+ // disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
+ // },
],
},
]);
--
Gitblit v1.9.3