Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/suzhouyingjiPC

src/views/components/dialog/index.vue

@@ -124,7 +124,7 @@
               <div class="btns">
                 <div class="select-btn" @click="filtrate">搜索</div>
                 <div class="select-btn reset" @click="reset">重置</div>
-                <div class="select-btn select-btn1">导入</div>
+                <!-- <div class="select-btn select-btn1">导入</div> -->
               </div>
             <!-- </div> -->
           </div>
@@ -142,6 +142,7 @@
               <el-table-column
                 type="selection"
                 reserve-selection
+                :selectable="checkSelectable"
                 width="55"
                 header-align="center"
               >
@@ -323,6 +324,7 @@ export default {
     };
   },
   methods: {
+    // 搜索
     filtrate(){
       if(this.form.subdistrict) {
         this.form.subdistrict = this.form.subdistrict[1]
@@ -330,9 +332,19 @@ export default {
       let obj = {...this.pages,...this.form}
       this.getTable(obj);
     },
+    // 重置
     reset(){
-      Object.keys(this.form).forEach(key=>this.form[key]='')
+      Object.keys(this.form).forEach(key=>this.form[key]='');
+      this.pages.pageNum = 1;
+      this.pages.pageSize = 10;
+      this.getTable(this.pages);
+    },
+    // 当前行的checkBox是否可以勾选
+    checkSelectable(row){
+      console.log(row)
+      return row
     },
+    // 打开
     async open(item) {
       this.dialogVisible = true;
       if(item == 'newlyIncreased') {
@@ -344,6 +356,7 @@ export default {
         this.getTable(this.pages);
       }
     },
+    // 关闭
     Close(item) {
       this.dialogVisible = false;
       this.isamend = false;
@@ -678,6 +691,7 @@ export default {
       }
       .btns {
         display: flex;
+        align-items: center;
       }
       .select-btn {
         margin: 20px 0 0 0;
@@ -698,10 +712,10 @@ export default {
         background: #FDAB5B;
         margin-left: 20px;
       }
-      .select-btn1 {
-        background: #28b384;
-        margin-left: 20px;
-      }
+      // .select-btn1 {
+      //   background: #28b384;
+      //   margin-left: 20px;
+      // }
     }
     .tables {
       background-color: #eaf2fd;