From a1917eca0b4f0fabf9f13648a840c2be8e2bf7f9 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 20 九月 2023 15:41:26 +0800
Subject: [PATCH] 	modified:   src/components/view/standard-table/target.vue 	modified:   src/components/view/standard.vue

---
 src/components/view/technical.vue |   23 ++++++++++++++---------
 1 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/view/technical.vue b/src/components/view/technical.vue
index 4bcdbda..501871f 100644
--- a/src/components/view/technical.vue
+++ b/src/components/view/technical.vue
@@ -18,14 +18,15 @@
             v-model="searchData.date"
             value-format="yyyy-MM-dd"
             type="date"
+            style="width: 10vw;"
             placeholder="閫夋嫨鏃ユ湡">
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="浜у搧鍚嶇О:">
+        <el-form-item label="浜у搧鍚嶇О:" style="margin-right: 24px;">
           <el-input v-model="searchData.name" ></el-input>
         </el-form-item>
         <el-form-item label="缂栧埗鐘舵��:" >
-          <el-select v-model="searchData.type" size="small" placeholder="鍏ㄩ儴" style="width: 250px;">
+          <el-select v-model="searchData.type" size="small" placeholder="鍏ㄩ儴" style="width: 10vw;">
               <el-option label="寰呯紪鍒�" :value="0"></el-option>
 							<el-option label="宸茬紪鍒�" :value="1"></el-option>
           </el-select>
@@ -39,8 +40,8 @@
     <div class="technical-table">
       <div class="table-box">
         <el-table
-        height="500"
-          border style="width: 100%"
+          border 
+          height="calc(90vh - 250px)"
           :data="technicalTable"
           >
           <el-table-column
@@ -84,6 +85,10 @@
             label="浜よ揣鏃ユ湡">
           </el-table-column>
           <el-table-column
+            prop="note"
+            label="澶囨敞">
+          </el-table-column>
+          <el-table-column
             label="鐘舵��"
             width="85"
             >
@@ -99,7 +104,7 @@
               <template slot-scope="scope">
                 <!-- <el-button type="text" size="small" @click="showDetails(scope.row)">鏌ョ湅璇︽儏</el-button>
                 <el-button type="text" size="small">缂栬緫闄勪欢</el-button> -->
-                <el-button type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
+                <el-button v-if="scope.row.type===0" type="text" size="small" @click="authorizedstrength(scope.row)">缂栧埗</el-button>
               </template>
             </el-table-column>
       </el-table>
@@ -262,8 +267,8 @@
               id:this.compiledata.id
         }).then( res =>{
         this.$message.success('缂栧埗瀹屾垚')
-      })
         this.getTechnicalTableData()
+      })
       },
 
       async showDetails(row){
@@ -345,7 +350,7 @@
   font-size: 20px;
 }
 .search-header .el-form-item:nth-child(1){
-  margin-right: 48px;
+  margin-right: 24px;
 } 
 .search-header .el-form-item:nth-child(2){
   margin-right: 24px;
@@ -368,7 +373,7 @@
 }
 /* 杈撳叆妗嗙殑鏍峰紡 */
 .search-header .el-form-item .el-input >>>.el-input__inner{
-width: 224px;
+width: 10vw;
 height: 32px ;
 box-sizing: border-box;
 background: rgb(255, 255, 255);
@@ -393,7 +398,7 @@
 } */
 .technical-table .table-box {
   flex: 1;
-  /* overflow-y: scroll; */
+  overflow-y: scroll;
 }
 .technical-table .el-pagination{
   margin-top: 23px;

--
Gitblit v1.9.3