From 7af71944f440420db9c7d82217ce45a97f42c675 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Tue, 30 Sep 2025 17:01:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 76 +++++++++++++++++++
 src/views/periodicTesting/testTask.vue        | 15 ++--
 src/views/tankSolutionSystem/info.vue         | 19 +----
 .../tankSolutionTaskAssignment.vue            |  1 +
 .../tankSolutionTaskDispose.vue               |  1 +
 src/views/tankSolutionSystem/workTankLine.vue |  1 +
 .../tankSolutionSystem/workTankMangage.vue    |  1 +
 7 files changed, 91 insertions(+), 23 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 65adfd5..5f8ec4e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,3 +14,79 @@ body,
   height: 100%;
 }
 </style>
+<style lang="scss">
+.el-table .el-table__cell{
+    height: 36px  !important;
+    padding:  0 !important;
+    line-height: 36px !important;
+}
+
+.el-table th.el-table__cell{
+    background: #284c89 !important;
+    color: #fff !important;
+}
+.el-table .sort-caret.ascending{
+    border-bottom-color: #fff !important;
+}
+.el-table .sort-caret.descending {
+    border-top-color: #fff;
+}
+
+.avue-form__group .el-col{
+  margin-bottom: 14px !important;
+}
+
+.el-dialog{
+    min-height: 180px;
+    border-radius: 2px;
+    max-height: calc(100% - 200px);
+    max-width: calc(100% - 100px);
+    display: flex;
+    padding: 0;
+    flex-direction: column;
+    border: 1px solid #0c2556 !important;
+
+    .el-dialog__header{
+      padding:  13px 16px !important;
+      border-bottom: 1px solid #0c2556 !important;
+
+      .el-dialog__title{
+        font-size: 14px !important;
+        font-weight: bold;
+        font-stretch: normal;
+        color: #0c2556 !important;
+      }
+    }
+
+    .el-dialog__body{
+      .avue-dialog__footer{
+        border-top: 1px solid #0c2556 !important;
+      }
+    }
+
+    .el-dialog__body {
+        color: var(--el-text-color-regular);
+        font-size: var(--el-dialog-content-font-size);
+        padding: 20px 20px 60px;
+        flex: 1;
+        overflow: scroll;
+    }
+
+    .el-dialog__footer {
+      box-sizing: border-box;
+      padding-top: var(--el-dialog-padding-primary);
+      text-align: right;
+      z-index: 2;
+      display: block;
+      padding: 10px 16px;
+      box-sizing: border-box;
+      border-top: 1px solid #0c2556 !important;
+      width: 100%;
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      background-color: #fff;
+      text-align: right;
+    }
+}
+</style>
diff --git a/src/views/periodicTesting/testTask.vue b/src/views/periodicTesting/testTask.vue
index cb045b7..560c5ec 100644
--- a/src/views/periodicTesting/testTask.vue
+++ b/src/views/periodicTesting/testTask.vue
@@ -19,13 +19,12 @@
       @on-load="onLoad"  
     >
         <template #menu="scope">
-            <el-button text icon="el-icon-view" @click="handleView(scope.row,'view')">详情</el-button>
+            <el-button text  @click="handleView(scope.row,'view')">详情</el-button>
             <el-button text @click="handleView(scope.row,'add')"  v-show="scope.row.status == 1 || scope.row.status == 4">
-                <el-icon style="margin-right: 5px;"><Edit /></el-icon>
                 填报
             </el-button>
-            <el-button text  v-show="scope.row.status == 3" icon="el-icon-first-aid-kit" @click="handleView(scope.row,'drug')">领药</el-button>
-            <el-button text v-show="scope.row.status == 2" icon="el-icon-circle-check" @click="handleView(scope.row,'check')">审核</el-button>
+            <el-button text  v-show="scope.row.status == 3"  @click="handleView(scope.row,'drug')">领药</el-button>
+            <el-button text v-show="scope.row.status == 2"  @click="handleView(scope.row,'check')">审核</el-button>
         </template>
         <template #tpId="{ row }">
             {{ row.textProject.tpProject }}
@@ -76,7 +75,10 @@ export default {
             issueForm:{},
             option:{
                 tip: false,
-                simplePage: true,
+                height:'auto',
+                calcHeight: 32,
+                columnSort: true,
+                // simplePage: true,
                 searchShow: true,
                 searchMenuSpan: 6,
                 searchIcon: true,
@@ -91,6 +93,9 @@ export default {
                 editBtn:false,
                 editBtnText: '修改',
                 viewBtnText:'详情',
+                viewBtnIcon:' ',
+                delBtnIcon:' ',
+                editBtnIcon:' ',
                 labelWidth: 120,
                 // menuWidth: 330,
                 dialogWidth: 600,
diff --git a/src/views/tankSolutionSystem/info.vue b/src/views/tankSolutionSystem/info.vue
index 3166c16..e4bad1f 100644
--- a/src/views/tankSolutionSystem/info.vue
+++ b/src/views/tankSolutionSystem/info.vue
@@ -124,6 +124,7 @@ export default {
                 excelBtn: false,
                 filterBtn: true,
                 searchShowBtn: false,
+                columnSort: true,
                 excelBtn: true,
                 columnSort:true,
                 index: false,
@@ -688,21 +689,3 @@ export default {
 <style lang="scss" scoped>
 
 </style>
-<style lang="scss">
-.el-table .el-table__cell{
-    height: 36px  !important;
-    padding:  0 !important;
-    line-height: 36px !important;
-}
-
-.el-table th.el-table__cell{
-    background: #284c89 !important;
-    color: #fff !important;
-}
-.el-table .sort-caret.ascending{
-    border-bottom-color: #fff !important;
-}
-.el-table .sort-caret.descending {
-    border-top-color: #fff;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue b/src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue
index aef548b..1abfebf 100644
--- a/src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue
+++ b/src/views/tankSolutionSystem/tankSolutionTaskAssignment.vue
@@ -140,6 +140,7 @@ export default {
                 searchShowBtn: false,
                 excelBtn: true,
                 showOverflowTooltip: true,
+                columnSort: true,
                 align:'center',
                 height:'auto',
                 calcHeight: 32,
diff --git a/src/views/tankSolutionSystem/tankSolutionTaskDispose.vue b/src/views/tankSolutionSystem/tankSolutionTaskDispose.vue
index 9ae80df..9eb5b00 100644
--- a/src/views/tankSolutionSystem/tankSolutionTaskDispose.vue
+++ b/src/views/tankSolutionSystem/tankSolutionTaskDispose.vue
@@ -72,6 +72,7 @@ export default {
                 searchMenuSpan: 6,
                 searchIcon: true,
                 searchIndex: 3,
+                columnSort: true,
                 tree: false,
                 border: true,
                 index: true,
diff --git a/src/views/tankSolutionSystem/workTankLine.vue b/src/views/tankSolutionSystem/workTankLine.vue
index 8345936..66d0db0 100644
--- a/src/views/tankSolutionSystem/workTankLine.vue
+++ b/src/views/tankSolutionSystem/workTankLine.vue
@@ -115,6 +115,7 @@ export default {
                 align:'center',
                 calcHeight: 32,
                 // simplePage: true,
+                columnSort: true,
                 searchShow: true,
                 searchMenuSpan: 6,
                 searchIcon: true,
diff --git a/src/views/tankSolutionSystem/workTankMangage.vue b/src/views/tankSolutionSystem/workTankMangage.vue
index 160a6bd..114113e 100644
--- a/src/views/tankSolutionSystem/workTankMangage.vue
+++ b/src/views/tankSolutionSystem/workTankMangage.vue
@@ -69,6 +69,7 @@ export default {
                 searchMenuSpan: 6,
                 searchIcon: true,
                 searchIndex: 3,
+                columnSort: true,
                 tree: false,
                 border: true,
                 index: true,