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 | 116 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 73 insertions(+), 43 deletions(-)
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 1f16a83..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>
@@ -134,6 +134,14 @@
<!-- 瀹℃牳琛ㄥ崟 -->
<div style=" padding: 15px; border-radius: 4px;">
<el-form ref="auditFormRef" :model="form" :rules="auditFormRules" label-width="100px">
+ <el-form-item label="鏈�缁堝鏍镐汉" prop="sureAuditUserName">
+ <el-input
+ v-model="form.sureAuditUserName"
+ :rows="4"
+ disabled
+ show-word-limit
+ />
+ </el-form-item>
<el-form-item label="瀹℃牳缁撴灉" prop="auditResult">
<el-radio-group v-model="form.auditResult" @change="handleAuditResultChange" size="large">
<el-radio label=1 >閫氳繃</el-radio>
@@ -180,6 +188,9 @@
import { productionProductMainListPage, productAudit } from "@/api/productionManagement/productionProductMain.js";
import { userListNoPageByTenantId } from "@/api/system/user.js";
import InputModal from "@/views/productionManagement/productionReporting/Input.vue";
+ import useUserStore from "@/store/modules/user";
+
+ const userStore = useUserStore();
const data = reactive({
searchForm: {
@@ -209,8 +220,13 @@
width: 120,
},
{
- label: "鎶ュ伐浜哄憳",
- prop: "nickName",
+ label: "宸ュ崟缂栧彿",
+ prop: "workOrderNo",
+ width: 120,
+ },
+ {
+ label: "璁㈠崟缂栧彿",
+ prop: "salesContractNo",
width: 120,
},
{
@@ -218,30 +234,46 @@
prop: "process",
width: 120,
},
- {
- label: "瀹℃牳鐘舵��",
- prop: "auditStatus",
+ {
+ label: "鎶ュ伐浜哄憳",
+ prop: "teamNames",
+
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] ?? "";
- },
+ if (!val) return [];
+ return val.split(",");
+ }
},
- {
- label: "宸ュ崟缂栧彿",
- prop: "workOrderNo",
+ {
+ label: "鏈哄彴",
+ prop: "deviceName",
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",
@@ -263,13 +295,13 @@
width: 120,
},
{
- label: "鍗曚綅",
- prop: "unit",
+ label: "鍔犳斁鏁�",
+ prop: "addQty",
width: 120,
},
{
- label: "瀹℃牳浜�",
- prop: "auditUserName",
+ label: "鍗曚綅",
+ prop: "unit",
width: 120,
},
{
@@ -303,14 +335,13 @@
deleteReport(row);
},
},
- {
- name:"瀹℃牳",
- color: "#E6A23C",
- clickFun: row => {
- handleAudit(row);
- },
- disabled: row => Number(row?.auditStatus) !== 0, // 宸插鏍告椂绂佺敤瀹℃牳鎸夐挳
- },
+ // {
+ // name:"瀹℃牳",
+ // clickFun: row => {
+ // handleAudit(row);
+ // },
+ // disabled: row => !(Number(row?.auditStatus) === 0 && (Number(row?.auditUserId) === -1 || Number(row?.auditUserId) === Number(userStore.id)))
+ // },
],
},
]);
@@ -503,12 +534,10 @@
// 瀹℃牳
const handleAudit = (row) => {
- if (Number(row?.auditStatus) === 1) {
- ElMessage.warning("璇ュ伐鍗曞凡瀹℃牳");
- return;
- }
// 閲嶇疆琛ㄥ崟锛岄粯璁ら�夋嫨閫氳繃
form.value = {
+ sureAuditUserId: userStore.id,
+ sureAuditUserName: userStore.nickName,
auditResult: "1",
remarks: "",
};
@@ -536,9 +565,10 @@
};
// 鎻愪氦瀹℃牳
- const submitAudit = (auditResult) => {
+ const submitAudit = () => {
auditFormRef.value?.validate().then(() => {
auditLoading.value = true;
+ console.log(form);
const auditData = {
id: auditRowData.value.id,
auditStatus: Number(form.value.auditResult),
--
Gitblit v1.9.3