bug

shanXiPlatform/src/views/reservesManagement/grainCheck/allGrain/index.vue

@@ -10,16 +10,7 @@
                 >起始日期时刻为 12:00:00，结束日期时刻为 08:00:00</span
               > -->
               <span class="demonstration">检测时间：</span>
-              <!-- <el-date-picker
-                v-model="value2"
-                type="datetimerange"
-                align="right"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                :default-time="['00:00:00', '12:00:00']"
-                value-format="yyyy-MM-dd HH:mm:ss"
-              >
-              </el-date-picker> -->
+
               <el-date-picker
                 v-model="value2"
                 type="daterange"
@@ -38,13 +29,7 @@
             <div class="top_select">
               <span class="demonstration"> 检查类型: </span>
               <el-select v-model="kind" placeholder="请选择">
-                <!-- <el-option
-                  v-for="item in options"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.label"
-                >
-                </el-option> -->
+
                 <el-option
               v-for="item in grainKind"
               :key="item.enumId"
@@ -95,7 +80,7 @@
           :index="indexMethod"
         >
         </el-table-column>
-        <el-table-column prop="operationTime" label="记录时间" align="center" >
+        <el-table-column prop="operationTime" label="记录时间" align="center" width='250'>
            <template slot-scope="scope">
             <span>{{
               scope.row.operationTime == null
@@ -105,7 +90,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="enumId" label="检查类型" align="center">
+        <el-table-column prop="enumId" label="检查类型" align="center" width='300'>
           <template slot-scope="scope">
             <p v-for="item in grainKind" :key="item.enumId">
               <span v-if="scope.row.enumId == item.enumId">{{
@@ -118,7 +103,7 @@
           prop="anomalousStatus"
           label="有无异常"
           align="center"
-          width="100px"
+          
         >
           <template slot-scope="scope">
 
@@ -132,7 +117,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="recordStatus" label="状态" align="center">
+        <el-table-column prop="recordStatus" label="状态" align="center" width='150'>
           <template slot-scope="scope">
             <div
               disable-transitions
@@ -154,12 +139,20 @@
             </p>
           </template>
         </el-table-column>
-        <!--         <el-table-column prop="checkList" label="异常项" align="center">
+         <!-- <el-table-column prop="checkList" label="异常项" align="center"  width="250">
           <template slot-scope="scope">
-            <div>
-              {{ scope.row.waterAbnormal == "1" ? "水分检测异常" : "" }}
-              {{ scope.row.grainAbnormal == "1" ? "粮情异常" : "" }}
-              {{ scope.row.pestAbnormal == "1" ? "虫害异常" : "" }}
+            <div disable-transitions>
+              <p class="anomalousItem" v-for="item in checkItems" :key="item.enumId">
+              <span v-show="scope.row.insectPestError == item.enumId">
+                {{item.enumName}}
+              </span>
+              <span v-show="scope.row.grainError == item.enumId">
+                {{item.enumName}}
+              </span>
+              <span v-show="scope.row.wetCheckError == item.enumId">
+                 {{item.enumName}}
+              </span>
+            </p>
             </div>
           </template>
         </el-table-column> -->
@@ -252,7 +245,7 @@ export default {
       depotId: this.$store.state.depotId,
       houseId: this.$store.state.houseId,
       grainKind: [], //粮情检查类别
-
+      checkItems:[],
       // select 选项数据
       options: [
         {
@@ -327,6 +320,19 @@ export default {
         .catch(err => {
           console.log(err)
         })
+
+    // 保管员检查类型下的检查项字典表
+       getGrainItems(19)
+          .then(res => {
+            if (res.code == 200) {
+              // console.log(res, "保管员检查项字典")
+              this.checkItems = res.data
+              // console.log(this.checkItems, "checkItems.......")
+            }
+          })
+          .catch(err => {
+            console.log(err)
+          })
     },
     // 获取数据
     getList() {

shanXiPlatform/src/views/reservesManagement/grainCheck/newGrain/index.vue

@@ -678,7 +678,7 @@ export default {
   display: inline-block;
   word-break: keep-all;
   white-space: nowrap;
-  font-size: 12px;
+  font-size: 14px;
   font-weight: 800;
   span {
     padding-right: 5px;