秀一个

.gitignore

@@ -1,5 +1,6 @@
 /package-lock.json
 /node_modules
+/.zip
 # icore-icp 是人传人的
 !node_modules/icore-icp/
 !node_modules/icore-icp/**

src/views/reportForm/components/chemicalAnalysisReport.vue

@@ -11,13 +11,15 @@
           </el-select>
         </el-form-item>
         <el-form-item label="样品名称">
-          <el-input v-model="search.matName" size="small" placeholder="请输入样品名称" style="width: 150px"></el-input>
+          <el-input v-model="search.matName" size="small" placeholder="请输入样品名称" style="width: 150px"
+            clearable></el-input>
         </el-form-item>
         <el-form-item label="中心编号">
-          <el-input v-model="search.sampleNo" size="small" placeholder="请输入中心编号" style="width: 150px"></el-input>
+          <el-input v-model="search.sampleNo" size="small" placeholder="请输入中心编号" style="width: 150px"
+            clearable></el-input>
         </el-form-item>
         <el-form-item label="委托编号">
-          <el-input v-model="search.carNo" size="small" placeholder="请输入委托编号" style="width: 150px"></el-input>
+          <el-input v-model="search.carNo" size="small" placeholder="请输入委托编号" style="width: 150px" clearable></el-input>
         </el-form-item>
         <el-form-item label="委托日期">
           <el-date-picker v-model="search.stateTime[0]" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date"
@@ -33,7 +35,7 @@
         </el-form-item>
         <el-form-item>
           <el-button icon="el-icon-search" type="goon" size="mini" :loading="dataLoading"
-            @click="searchData1">查询</el-button>
+            @click="searchData">查询</el-button>
           <el-button icon="el-icon-refresh" type="info" plain size="mini" @click="reset">重置</el-button>
         </el-form-item>
       </el-form>
@@ -86,7 +88,7 @@
               <template slot-scope="scope">
                 <span :style="redStyle(scope.row.SA_ID, col.ANLY_ITEM_NO)">{{
                   scope.row[col.ANLY_ITEM_NO]
-                }}</span>
+                  }}</span>
               </template>
             </el-table-column>
             <el-table-column sortable show-overflow-tooltip align="center" width="120" prop="UPDATE_TIME"
@@ -321,7 +323,7 @@ export default {
         validFlag: 1,
         startTime: startTime,
         endTime: endTime,
-        matNo: this.tableList.MAT_NO,
+        matName: this.search.matName
       };
       this.dataLoading = true;
       this.axios
@@ -336,6 +338,11 @@ export default {
               this.cols = [];
             }
             this.table.list1 = res.data.badyData.list;
+            if (this.table.list1 != null && this.table.list1.length > 0) {
+              this.table.list = res.data.badyData.list[0].sampleResults
+            } else {
+              this.table.list = []
+            }
             this.page.totalPage = res.data.badyData.total;
             this.redDataCk = res.data.redMap || {};
           } else {
@@ -518,7 +525,7 @@ export default {
       });
     },
     handleCurrentChange(row) {
-      this.tableList = row;
+      this.search.matName = row.MAT_NAME;
       this.searchData();
     },
     tableHeaderCellStyle() {
@@ -541,8 +548,7 @@ export default {
       this.tableList = {}
       this.table.list = []
       this.table.list1 = []
-      this.searchData1();
-
+      this.searchData();
     },
     getSummaries(param) {
       const { columns, data } = param;