From 9b26870265cbbc75bcd32529e46b229a49ec30a0 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 05 九月 2023 11:29:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/laboratory/measure/index.vue |   34 ++++++++++++++++++++++------------
 1 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/views/laboratory/measure/index.vue b/src/views/laboratory/measure/index.vue
index 3ddf695..427e4d7 100644
--- a/src/views/laboratory/measure/index.vue
+++ b/src/views/laboratory/measure/index.vue
@@ -7,6 +7,9 @@
             <el-input v-model="searchData.code" @blur="blurSearch()" class="input-form" placeholder="璇疯緭鍏�">
             </el-input>
           </el-form-item>
+          <el-form-item v-if="this.radioValue === 1">
+            <el-button type="primary" @click="searchPlan">鏌ヨ</el-button>
+          </el-form-item>
           <el-form-item v-if="this.radioValue === 0" :label="this.radioValue === 0 ? '浠櫒璁惧鍚嶇О:' : '璁惧鍚嶇О'"
             class="sermargin">
             <el-input v-model="searchData.name" class="input-form" placeholder="璇疯緭鍏�">
@@ -39,8 +42,8 @@
           </div>
         </div>
         <div class="table-box">
-          <el-table v-if="this.radioValue == 0" :max-height="800" :cell-style="{ textAlign: 'center' }"
-            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
+          <el-table v-if="this.radioValue == 0" :max-height="500" :cell-style="{ textAlign: 'left' }"
+            :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'left' }"
             :data="measureLedgerTable" style="width: 100%">
             <el-table-column type="index" min-width="10%" />
             <el-table-column prop="equipmentCode" label="浠櫒璁惧缂栧彿" min-width="10%" />
@@ -70,15 +73,15 @@
             <el-table-column prop="name" label="璐熻矗浜�" min-width="10%" />
             <el-table-column prop="createTime" label="鍒涘缓鏃ユ湡" min-width="10%" />
             <el-table-column prop="name" label="鍒涘缓浜�" min-width="8%" />
-            <el-table-column prop="code" label="璁￠噺缂栧彿" min-width="8%" />
+            <el-table-column prop="code" label="璁￠噺缂栧彿" min-width="12%" />
             <el-table-column label="鎿嶄綔" min-width="15%">
               <template slot-scope="scope">
-                <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">鏌ョ湅璁￠噺灞ュ巻</el-button>
+                <!-- <el-button type="text" @click="lookMeasurement(scope.row.equipmentCode)" size="small">鏌ョ湅璁￠噺灞ュ巻</el-button> -->
                 <el-button type="text" size="small">鏌ョ湅闄勪欢</el-button>
               </template>
             </el-table-column>
           </el-table>
-          <el-table v-show="this.radioValue == 1" :max-height="800" :cell-style="{ textAlign: 'center' }"
+          <el-table v-show="this.radioValue == 1" :max-height="500" :cell-style="{ textAlign: 'center' }"
             :header-cell-style="{ border: '0px', background: '#f5f7fa', color: '#606266', boxShadow: 'inset 0 1px 0 #ebeef5', textAlign: 'center' }"
             :data="measurePlanTable" style="width: 100%">
             <el-table-column type="index" min-width="10%" />
@@ -109,9 +112,9 @@
             </el-table-column>
           </el-table>
           <!-- 鍒嗛〉鍣� -->
-          <div style="display: flex;justify-content: end;">
+          <div style="display: flex;justify-content: end;padding: 10px 0;">
             <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
-              :current-page="currentPage" :page-sizes="[5, 10, 20]" :page-size="pageSize"
+              :current-page="currentPage" :page-sizes="[10, 20, 30]" :page-size="pageSize"
               layout="total, sizes, prev, pager, next, jumper" :total="total">
             </el-pagination>
           </div>
@@ -325,10 +328,10 @@
       measureLedgerTable: [],
       measurePlanTable: [],
       currentPage: 1,
-      pageSize: 5,
+      pageSize: 10,
       total: 0,
       currentPagePlan: 1,
-      pageSizePlan: 5,
+      pageSizePlan: 10,
       totalPlan: 0,
       direction: 'rtl',
       lookVisible: false,
@@ -504,6 +507,9 @@
     search() {
       this.getStandingPageList()
     },
+    searchPlan(){
+      this.getPlanPageList()
+    },
     reset(formName) {
       this.searchData.name = ''
       this.searchData.code = ''
@@ -514,9 +520,11 @@
       this.reset()
     },
     async getPlanPageList() {
+      console.log(111);
       let param = {
-        currentPage: this.currentPage, pageSize: this.pageSize,
-        code: this.searchData.code, name: this.searchData.name, unit: this.searchData.measureunit
+        currentPage: this.currentPage,
+        pageSize: this.pageSize,
+        plannedOrderNumber: this.searchData.code
       }
       const res = await getPlanPageList(param)
       res.data.list.forEach(item => {
@@ -524,6 +532,7 @@
       })
       this.measurePlanTable = res.data.list
       this.total = res.data.total
+      console.log(333);
     },
     async lookMeasurement(code) {
     },
@@ -585,4 +594,5 @@
       margin: 10px 0;
     }
   }
-}</style>
+}
+</style>

--
Gitblit v1.9.3