From 76d921a3fe7488dae2c522a77259f2c2c1ce2859 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 12 三月 2025 16:01:32 +0800
Subject: [PATCH] 表格组件调整2

---
 src/views/business/inspectionOrder/index.vue |  692 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 342 insertions(+), 350 deletions(-)

diff --git a/src/views/business/inspectionOrder/index.vue b/src/views/business/inspectionOrder/index.vue
index 59d5def..435168b 100644
--- a/src/views/business/inspectionOrder/index.vue
+++ b/src/views/business/inspectionOrder/index.vue
@@ -183,7 +183,7 @@
             :height="tableHeight + ''"
             @pagination="pagination"
             :handleSelectionChange="selectionChange"
-            :table="table"
+            :column="column"
             :page="page"
             :tableLoading="tableLoading"
           ></lims-table>
@@ -378,7 +378,7 @@
             highlightCurrentRow
             :height="'80vh'"
             :tableData="dataLooktableData"
-            :table="dataLookTable"
+            :column="dataLookColumn"
             :tableLoading="dataLookTableLoading"
           ></lims-table>
         </el-dialog>
@@ -868,357 +868,349 @@
         current: 1,
       },
       tableLoading: false,
-      table: {
-        // 鏍囬
-        column: [
-          {
-            label: "濮旀墭缂栧彿",
-            prop: "entrustCode",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "澶栭儴濮旀墭缂栧彿",
-            prop: "outEntrustCode",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "濮旀墭鍗曚綅",
-            prop: "company",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "鏍峰搧鍚嶇О",
-            prop: "sampleName",
-            minWidth: "160px",
-            width: "160px",
-            dataType: "link",
-            linkEvent: {
-              method: "showDetails",
-              vueComponent: this,
-            },
-          },
-          {
-            label: "鏍峰搧缂栧彿",
-            prop: "sampleCode",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "鏍峰搧鍨嬪彿",
-            prop: "sampleModel",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "鏍峰搧鏁伴噺",
-            prop: "sampleNum",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "妫�楠岃繘搴�%",
-            prop: "insProgress",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "绱ф�ョ▼搴�",
-            prop: "type",
-            minWidth: "100px",
-            width: "100px",
-            dataType: "tag",
-            formatData: (params) => {
-              let index = this.urgencyDictList.findIndex(
-                (item) => item.dictValue == params
-              );
-              if (index > -1) {
-                return this.urgencyDictList[index].dictLabel;
-              } else {
-                return null;
-              }
-            },
-            formatType: (params) => {
-              let index = this.urgencyDictList.findIndex(
-                (item) => item.dictValue == params
-              );
-              if (index > -1) {
-                return this.urgencyDictList[index].listClass;
-              } else {
-                return null;
-              }
-            },
-          },
-          {
-            label: "澶囨敞",
-            prop: "remark",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "鍒跺崟浜�",
-            prop: "custom",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "绾﹀畾鏃堕棿",
-            prop: "appointed",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "涓嬪崟鏃堕棿",
-            prop: "createTime",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "涓嬪彂鏃堕棿",
-            prop: "sendTime",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "閫�鍥炵悊鐢�",
-            prop: "tell",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "濮旀墭浜�",
-            prop: "prepareUser",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "鎾ら攢鏃ユ湡",
-            prop: "revocationTime",
-            minWidth: "120px",
-            width: "120px",
-          },
-        ],
-        operatorConfig: {
-          fixed: "right",
-          label: "鎿嶄綔",
-          minWidth: 100,
+      column: [
+        {
+          label: "濮旀墭缂栧彿",
+          prop: "entrustCode",
+          minWidth: "160px",
+          width: "160px",
         },
-        operator: [
-          {
-            name: "鏁版嵁鏌ョ湅",
-            type: "text",
-            disabled: (row) => {
-              return row.state != 1 && row.state != 4;
-            },
-            clickFun: (row) => {
-              this.handleDataLook(row);
-            },
-            showFun: () => {
-              return true;
-            },
-          },
-          {
-            name: "鎶ュ憡涓嬭浇",
-            type: "text",
-            clickFun: (row) => {},
-            disabled: (row, index) => {
-              return row.state != 4 || row.isRatify != 1;
-            },
-          },
-          {
-            name: "瀹℃牳",
-            type: "text",
-            clickFun: (row) => {},
-            disabled: (row, index) => {
-              return row.state != 0;
-            },
-          },
-          {
-            name: "鎾ら攢",
-            type: "text",
-            clickFun: (row) => {},
-            disabled: (row, index) => {
-              return row.state != 1 && row.state != 0;
-            },
-          },
-          {
-            name: "鎾ら攢瀹℃牳",
-            type: "text",
-            clickFun: (row) => {},
-            disabled: (row, index) => {
-              return (
-                (row.state != 1 && row.state != 0) ||
-                this.tabIndex != 1 ||
-                row.isRevocation != 1
-              );
-            },
-          },
-          {
-            name: "鍒嗛厤",
-            type: "text",
-            clickFun: (row) => {},
-            disabled: (row, index) => {
-              return (
-                row.state != 1 ||
-                (row.entrustCode != null &&
-                  Number(row.assign) > 0 &&
-                  row.inspectId != null)
-              );
-            },
-          },
-        ],
-      },
-      dataLookTable: {
-        column: [
-          {
-            label: "濮旀墭缂栧彿",
-            prop: "entrustCode",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "鏍峰搧缂栧彿",
-            prop: "sampleCode",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "绠″鑹叉爣",
-            prop: "bushColor",
-            minWidth: "100px",
-            width: "100px",
-          },
-          {
-            label: "鍏夌氦甯︾紪鍙�",
-            prop: "code",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "鍏夌氦鑹叉爣",
-            prop: "color",
-            minWidth: "100px",
-            width: "100px",
-          },
-          {
-            label: "妫�楠岄」",
-            prop: "inspectionItem",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "妫�楠屽瓙椤�",
-            prop: "inspectionItemSubclass",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "妫�楠岀粨鏋�",
-            prop: "lastValue",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "缁撴灉鍒ゅ畾",
-            prop: "insResult",
-            minWidth: "100px",
-            width: "100px",
-            dataType: "tag",
-            formatData: (params) => {
-              let index = this.insResultList.findIndex(
-                (item) => item.value == params
-              );
-              if (index > -1) {
-                return this.insResultList[index].label;
-              } else {
-                return null;
-              }
-            },
-            formatType: (params) => {
-              let index = this.insResultList.findIndex(
-                (item) => item.value == params
-              );
-              if (index > -1) {
-                return this.insResultList[index].type;
-              } else {
-                return null;
-              }
-            },
-          },
-          {
-            label: "鍗曚綅",
-            prop: "unit",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "璇曢獙瑕佹眰",
-            prop: "tell",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "妫�楠屼汉",
-            prop: "checkName",
-            minWidth: "120px",
-            width: "120px",
-          },
-          {
-            label: "妫�楠屾棩鏈�",
-            prop: "checkTime",
-            minWidth: "140px",
-            width: "140px",
-          },
-          {
-            label: "鏍峰搧鍚嶇О",
-            prop: "sample",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "鏍峰搧鍨嬪彿",
-            prop: "model",
-            minWidth: "160px",
-            width: "160px",
-          },
-          {
-            label: "璇曢獙瀹�",
-            prop: "sonLaboratory",
-            minWidth: "120px",
-            width: "120px",
-          },
-        ],
-        operatorConfig: {
-          fixed: "right",
-          label: "鎿嶄綔",
-          width: 80,
-          minWidth: 100,
+        {
+          label: "澶栭儴濮旀墭缂栧彿",
+          prop: "outEntrustCode",
+          minWidth: "160px",
+          width: "160px",
         },
-        operator: [
-          {
-            name: "鏌ョ湅",
-            type: "text",
-            clickFun: (row) => {},
-            showFun: (row) => {
-              console.log(row);
-              console.log(row.inspectionItem);
-              return (
-                row.inspectionItem == "鍗曟牴鍨傜洿鐕冪儳" ||
-                row.inspectionItem.includes("鏉惧绠�") ||
-                row.inspectionItemSubclass.includes("鏉惧绠�") ||
-                (row.inspectionItem == "鎶楁媺寮哄害" &&
-                  (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
-                    row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�")) ||
-                (row.inspectionItem == "鏂浼搁暱鐜�" &&
-                  (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
-                    row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�"))
-              );
-            },
+        {
+          label: "濮旀墭鍗曚綅",
+          prop: "company",
+          minWidth: "160px",
+          width: "160px",
+        },
+        {
+          label: "鏍峰搧鍚嶇О",
+          prop: "sampleName",
+          minWidth: "160px",
+          width: "160px",
+          dataType: "link",
+          linkEvent: {
+            method: "showDetails",
+            vueComponent: this,
           },
-        ],
-      },
+        },
+        {
+          label: "鏍峰搧缂栧彿",
+          prop: "sampleCode",
+          minWidth: "160px",
+          width: "160px",
+        },
+        {
+          label: "鏍峰搧鍨嬪彿",
+          prop: "sampleModel",
+          minWidth: "160px",
+          width: "160px",
+        },
+        {
+          label: "鏍峰搧鏁伴噺",
+          prop: "sampleNum",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "妫�楠岃繘搴�%",
+          prop: "insProgress",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "绱ф�ョ▼搴�",
+          prop: "type",
+          minWidth: "100px",
+          width: "100px",
+          dataType: "tag",
+          formatData: (params) => {
+            let index = this.urgencyDictList.findIndex(
+              (item) => item.dictValue == params
+            );
+            if (index > -1) {
+              return this.urgencyDictList[index].dictLabel;
+            } else {
+              return null;
+            }
+          },
+          formatType: (params) => {
+            let index = this.urgencyDictList.findIndex(
+              (item) => item.dictValue == params
+            );
+            if (index > -1) {
+              return this.urgencyDictList[index].listClass;
+            } else {
+              return null;
+            }
+          },
+        },
+        {
+          label: "澶囨敞",
+          prop: "remark",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "鍒跺崟浜�",
+          prop: "custom",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "绾﹀畾鏃堕棿",
+          prop: "appointed",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "涓嬪崟鏃堕棿",
+          prop: "createTime",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "涓嬪彂鏃堕棿",
+          prop: "sendTime",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "閫�鍥炵悊鐢�",
+          prop: "tell",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "濮旀墭浜�",
+          prop: "prepareUser",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "鎾ら攢鏃ユ湡",
+          prop: "revocationTime",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "鎿嶄綔",
+          dataType: "action",
+          fixed: "right",
+          operation: [
+            {
+              name: "鏁版嵁鏌ョ湅",
+              type: "text",
+              disabled: (row) => {
+                return row.state != 1 && row.state != 4;
+              },
+              clickFun: (row) => {
+                this.handleDataLook(row);
+              },
+              showHide: () => {
+                return true;
+              },
+            },
+            {
+              name: "鎶ュ憡涓嬭浇",
+              type: "text",
+              clickFun: (row) => {},
+              disabled: (row, index) => {
+                return row.state != 4 || row.isRatify != 1;
+              },
+            },
+            {
+              name: "瀹℃牳",
+              type: "text",
+              clickFun: (row) => {},
+              disabled: (row, index) => {
+                return row.state != 0;
+              },
+            },
+            {
+              name: "鎾ら攢",
+              type: "text",
+              clickFun: (row) => {},
+              disabled: (row, index) => {
+                return row.state != 1 && row.state != 0;
+              },
+            },
+            {
+              name: "鎾ら攢瀹℃牳",
+              type: "text",
+              clickFun: (row) => {},
+              disabled: (row, index) => {
+                return (
+                  (row.state != 1 && row.state != 0) ||
+                  this.tabIndex != 1 ||
+                  row.isRevocation != 1
+                );
+              },
+            },
+            {
+              name: "鍒嗛厤",
+              type: "text",
+              clickFun: (row) => {},
+              disabled: (row, index) => {
+                return (
+                  row.state != 1 ||
+                  (row.entrustCode != null &&
+                    Number(row.assign) > 0 &&
+                    row.inspectId != null)
+                );
+              },
+            },
+          ],
+        },
+      ],
+      dataLookColumn: [
+        {
+          label: "濮旀墭缂栧彿",
+          prop: "entrustCode",
+          minWidth: "160px",
+          width: "160px",
+        },
+        {
+          label: "鏍峰搧缂栧彿",
+          prop: "sampleCode",
+          minWidth: "160px",
+          width: "160px",
+        },
+        {
+          label: "绠″鑹叉爣",
+          prop: "bushColor",
+          minWidth: "100px",
+          width: "100px",
+        },
+        {
+          label: "鍏夌氦甯︾紪鍙�",
+          prop: "code",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "鍏夌氦鑹叉爣",
+          prop: "color",
+          minWidth: "100px",
+          width: "100px",
+        },
+        {
+          label: "妫�楠岄」",
+          prop: "inspectionItem",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "妫�楠屽瓙椤�",
+          prop: "inspectionItemSubclass",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "妫�楠岀粨鏋�",
+          prop: "lastValue",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "缁撴灉鍒ゅ畾",
+          prop: "insResult",
+          minWidth: "100px",
+          width: "100px",
+          dataType: "tag",
+          formatData: (params) => {
+            let index = this.insResultList.findIndex(
+              (item) => item.value == params
+            );
+            if (index > -1) {
+              return this.insResultList[index].label;
+            } else {
+              return null;
+            }
+          },
+          formatType: (params) => {
+            let index = this.insResultList.findIndex(
+              (item) => item.value == params
+            );
+            if (index > -1) {
+              return this.insResultList[index].type;
+            } else {
+              return null;
+            }
+          },
+        },
+        {
+          label: "鍗曚綅",
+          prop: "unit",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "璇曢獙瑕佹眰",
+          prop: "tell",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "妫�楠屼汉",
+          prop: "checkName",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          label: "妫�楠屾棩鏈�",
+          prop: "checkTime",
+          minWidth: "140px",
+          width: "140px",
+        },
+        {
+          label: "鏍峰搧鍚嶇О",
+          prop: "sample",
+          minWidth: "160px",
+          width: "160px",
+        },
+        {
+          label: "鏍峰搧鍨嬪彿",
+          prop: "model",
+          minWidth: "160px",
+          width: "160px",
+        },
+        {
+          label: "璇曢獙瀹�",
+          prop: "sonLaboratory",
+          minWidth: "120px",
+          width: "120px",
+        },
+        {
+          dataType: "action",
+          label: "鎿嶄綔",
+          fixed: "right",
+          operation: [
+            {
+              name: "鏌ョ湅",
+              type: "text",
+              clickFun: (row) => {},
+              showHide: (row) => {
+                return (
+                  row.inspectionItem == "鍗曟牴鍨傜洿鐕冪儳" ||
+                  row.inspectionItem.includes("鏉惧绠�") ||
+                  row.inspectionItemSubclass.includes("鏉惧绠�") ||
+                  (row.inspectionItem == "鎶楁媺寮哄害" &&
+                    (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
+                      row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�")) ||
+                  (row.inspectionItem == "鏂浼搁暱鐜�" &&
+                    (row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍓�" ||
+                      row.inspectionItemSubclass == "鐑�佸寲澶勭悊鍚�"))
+                );
+              },
+            },
+          ],
+        },
+      ],
       dataLookTableLoading: false,
       dataLooktableData: [],
       qrData: [],

--
Gitblit v1.9.3