From 80adf052e0b58abd634ca9b67f8569ccc468c430 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期一, 23 三月 2026 15:11:36 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材

---
 src/views/productionManagement/productionReporting/index.vue |   59 ++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 4bf8452..08fc2a6 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -11,11 +11,19 @@
                     @keyup.enter="handleQuery" />
         </el-form-item>
         <el-form-item label="鐝粍:">
-          <el-input v-model="searchForm.teamName"
-                    placeholder="璇疯緭鍏�"
-                    clearable
-                    style="width: 160px;"
-                    @keyup.enter="handleQuery" />
+          <el-select v-model="searchForm.teamName"
+                     placeholder="璇烽�夋嫨"
+                     clearable
+                     style="width: 160px;"
+                     @keyup.enter="handleQuery">
+            <el-option label="鐧界彮"
+                       value="鐧界彮" />
+            <el-option label="澶滅彮"
+                       value="澶滅彮" />
+          </el-select>
+          <!-- <el-input v-model="searchForm.teamName"
+                    placeholder="璇疯緭鍏�""
+                    @keyup.enter="handleQuery" /> -->
         </el-form-item>
         <el-form-item label="浜у搧鍚嶇О:">
           <el-input v-model="searchForm.productName"
@@ -57,14 +65,12 @@
         </template>
       </PIMTable>
     </div>
-    <ReportingDialog v-model:visible="dialogVisible"
-                     :data="form"
-                     @completed="handleQuery" />
   </div>
 </template>
 
 <script setup>
   import { onMounted, ref, reactive, getCurrentInstance } from "vue";
+  import { useRouter } from "vue-router";
   import { ElMessage, ElMessageBox } from "element-plus";
   import dayjs from "dayjs";
   import {
@@ -74,21 +80,23 @@
     productionReportDelete,
   } from "@/api/productionManagement/productionReporting.js";
   import PIMTable from "@/components/PIMTable/PIMTable.vue";
-  import ReportingDialog from "./components/ReportingDialog.vue";
 
+  const router = useRouter();
   const { proxy } = getCurrentInstance();
 
   const tableColumn = ref([
     {
       label: "鐢熶骇璁㈠崟鍙�",
       prop: "orderNo",
-      width: "150px",
     },
     {
       label: "鐝粍",
       prop: "teamName",
       width: "120px",
       dataType: "tag",
+      formatType: params => {
+        return params === "鐧界彮" ? "primary" : "warning";
+      },
     },
     {
       label: "浜у搧缂栫爜",
@@ -191,7 +199,7 @@
     {
       id: 1,
       orderNo: "PO202401001",
-      teamName: "鐢熶骇涓�缁�",
+      teamName: "鐧界彮",
       materialCode: "PC001",
       productName: "鏍囧噯鐮屽潡",
       specification: "600脳240脳200",
@@ -204,7 +212,7 @@
     {
       id: 2,
       orderNo: "PO202401002",
-      teamName: "鐢熶骇浜岀粍",
+      teamName: "澶滅彮",
       materialCode: "PC002",
       productName: "鏍囧噯鐮屽潡",
       specification: "600脳240脳200",
@@ -217,7 +225,7 @@
     {
       id: 3,
       orderNo: "PO202401003",
-      teamName: "鐢熶骇涓夌粍",
+      teamName: "鐧界彮",
       materialCode: "PC003",
       productName: "鍔犳皵鐮屽潡",
       specification: "600脳240脳250",
@@ -230,7 +238,7 @@
     {
       id: 4,
       orderNo: "PO202401004",
-      teamName: "鐢熶骇涓�缁�",
+      teamName: "鐧界彮",
       materialCode: "PC004",
       productName: "鏍囧噯鐮屽潡",
       specification: "600脳240脳200",
@@ -243,7 +251,7 @@
     {
       id: 5,
       orderNo: "PO202401005",
-      teamName: "鐢熶骇浜岀粍",
+      teamName: "澶滅彮",
       materialCode: "PC005",
       productName: "鍔犳皵鐮屽潡",
       specification: "600脳240脳250",
@@ -256,7 +264,7 @@
     {
       id: 6,
       orderNo: "PO202401006",
-      teamName: "鐢熶骇涓夌粍",
+      teamName: "鐧界彮",
       materialCode: "PC006",
       productName: "鏍囧噯鐮屽潡",
       specification: "600脳240脳200",
@@ -269,7 +277,7 @@
     {
       id: 7,
       orderNo: "PO202401007",
-      teamName: "鐢熶骇涓�缁�",
+      teamName: "鐧界彮",
       materialCode: "PC007",
       productName: "鍔犳皵鐮屽潡",
       specification: "600脳240脳250",
@@ -282,7 +290,7 @@
     {
       id: 8,
       orderNo: "PO202401008",
-      teamName: "鐢熶骇浜岀粍",
+      teamName: "澶滅彮",
       materialCode: "PC008",
       productName: "鏍囧噯鐮屽潡",
       specification: "600脳240脳200",
@@ -295,7 +303,7 @@
     {
       id: 9,
       orderNo: "PO202401009",
-      teamName: "鐢熶骇涓夌粍",
+      teamName: "鐧界彮",
       materialCode: "PC009",
       productName: "鍔犳皵鐮屽潡",
       specification: "600脳240脳250",
@@ -308,7 +316,7 @@
     {
       id: 10,
       orderNo: "PO202401010",
-      teamName: "鐢熶骇涓�缁�",
+      teamName: "鐧界彮",
       materialCode: "PC010",
       productName: "鏍囧噯鐮屽潡",
       specification: "600脳240脳200",
@@ -320,7 +328,6 @@
     },
   ];
 
-  const dialogVisible = ref(false);
   const form = reactive({
     id: undefined,
     orderId: "",
@@ -387,7 +394,10 @@
       processId: "",
       params: {},
     });
-    dialogVisible.value = true;
+    router.push({
+      path: "/productionManagement/ReportingDialog",
+      query: { data: JSON.stringify(form) },
+    });
   };
 
   const handleEdit = row => {
@@ -407,7 +417,10 @@
       processId: row.processId || "",
       params: row.params || {},
     });
-    dialogVisible.value = true;
+    router.push({
+      path: "/productionManagement/ReportingDialog",
+      query: { data: JSON.stringify(form) },
+    });
   };
 
   const handleDetail = row => {

--
Gitblit v1.9.3