From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides

---
 src/views/business/unpass/index-manage.vue |   66 +++++++++++++++++---------------
 1 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/src/views/business/unpass/index-manage.vue b/src/views/business/unpass/index-manage.vue
index e478a36..fc767bf 100644
--- a/src/views/business/unpass/index-manage.vue
+++ b/src/views/business/unpass/index-manage.vue
@@ -3,6 +3,10 @@
     <div class="search">
       <div>
         <el-form :model="entity" ref="entity" size="small" :inline="true">
+          <el-form-item label="璁㈠崟缂栧彿" prop="no">
+            <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.no"
+                      @keyup.enter.native="refreshTable()"></el-input>
+          </el-form-item>
           <el-form-item label="瑙勬牸鍨嬪彿" prop="model">
             <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="entity.model"
                       @keyup.enter.native="refreshTable()"></el-input>
@@ -12,8 +16,8 @@
                       @keyup.enter.native="refreshTable()"></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="refreshTable">鏌� 璇�</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="refresh">閲� 缃�</el-button>
+            <el-button type="primary" size="mini" @click="refreshTable">鏌ヨ</el-button>
+            <el-button size="mini" @click="refresh">閲嶇疆</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -82,35 +86,35 @@
       tableData: [],
       tableLoading: false,
       column: [
-        { label: '缂栧彿', prop: 'no' },
-        {
-          label: "OA瀹℃牳鐘舵��",
-          prop: "oaState",
-          width: "100px",
-          dataType: "tag",
-          formatData: (params) => {
-            if (params == 1) {
-              return "寰呭鏍�";
-            } else if(params == 2) {
-              return "瀹℃牳涓�";
-            }  else if(params == 3) {
-              return "閫氳繃";
-            } else {
-              return "椹冲洖";
-            }
-          },
-          formatType: (params) => {
-            if (params == 1) {
-              return "warning";
-            } else if(params == 2) {
-              return "info";
-            }  else if(params == 3) {
-              return "success";
-            } else {
-              return "danger";
-            }
-          },
-        },
+        { label: '缂栧彿', prop: 'no', width: "160px", },
+        // {
+        //   label: "OA瀹℃牳鐘舵��",
+        //   prop: "oaState",
+        //   width: "100px",
+        //   dataType: "tag",
+        //   formatData: (params) => {
+        //     if (params == 1) {
+        //       return "寰呭鏍�";
+        //     } else if(params == 2) {
+        //       return "瀹℃牳涓�";
+        //     }  else if(params == 3) {
+        //       return "閫氳繃";
+        //     } else {
+        //       return "椹冲洖";
+        //     }
+        //   },
+        //   formatType: (params) => {
+        //     if (params == 1) {
+        //       return "warning";
+        //     } else if(params == 2) {
+        //       return "info";
+        //     }  else if(params == 3) {
+        //       return "success";
+        //     } else {
+        //       return "danger";
+        //     }
+        //   },
+        // },
         { label: '璁㈠崟鍙�', prop: 'orderNo' },
         {
           label: "闆朵欢鍙�",

--
Gitblit v1.9.3