粮情异常颜色调整

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

@@ -121,8 +121,15 @@
           width="100px"
         >
           <template slot-scope="scope">
-            <div class="yellow" v-if="scope.row.anomalousStatus === 1"></div>
-            <div class="green" v-if="scope.row.anomalousStatus !== 1"></div>
+
+            <div disable-transitions v-if="scope.row.anomalousStatus != '1'">
+              <!-- 无 -->
+              <span class="colorspano"></span>
+            </div>
+            <div disable-transitions v-if="scope.row.anomalousStatus == '1'">
+              <!-- 有 -->
+              <span class="colorspant"></span>
+            </div>
           </template>
         </el-table-column>
         <el-table-column prop="recordStatus" label="状态" align="center">
@@ -516,23 +523,31 @@ export default {
   font-size: 15px;
   font-family: "Gill Sans", "Gill Sans MT", Calibri, "Trebuchet MS", sans-serif;
 }
-.yellow {
-  // width: 100px;
-  display: block;
-  height: 25px;
-  background-color: #e3a512;
-  color: azure;
+.colorspano {
+  width: 100px;
+  height: 30px;
+  background-color: #199856;
+  display: inline-block;
   border-radius: 5px;
-  // text-align: center;
-  font-size: 13px;
+  color: #fff;
+  line-height: 30px;
 }
-.green {
-  display: block;
-  // width: 80%;
-  height: 25px;
-  background-color: #037d41;
+.colorspant {
+  width: 100px;
+  height: 30px;
+  background-color: #ffff00;
+  display: inline-block;
+  border-radius: 5px;
   color: #fff;
+  line-height: 30px;
+}
+.colorspanr {
+  width: 100px;
+  height: 30px;
+  background-color: #ff9933;
+  display: inline-block;
   border-radius: 5px;
-  font-size: 13px;
 }
+
+
 </style>

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

@@ -291,7 +291,7 @@ export default {
     // console.log(this.$route.query,'this.$route.query........')
     this.userInfo = JSON.parse(localStorage.getItem("userInfo"))
 
-    console.log(this.userInfo.roleName, "this.userInfo.roleName00000000")
+    // console.log(this.userInfo.roleName, "this.userInfo.roleName00000000")
     this.data5.grainConditionRecord.checkPerson = this.userInfo.uid
     this.uid = this.userInfo.uid
     // 此处是从待办跳转到本页面时传递过来的参数，用data2收集保存
@@ -337,7 +337,7 @@ export default {
       const parentId = 18 //粮情检查类型parentId
       getGrainItems(parentId)
         .then(res => {
-          console.log(res, "res字典粮情检查类型")
+          // console.log(res, "res字典粮情检查类型")
           this.grainKind = res.data
         })
         .catch(err => {
@@ -347,9 +347,9 @@ export default {
        getGrainItems(19)
           .then(res => {
             if (res.code == 200) {
-              console.log(res, "保管员检查项字典")
+              // console.log(res, "保管员检查项字典")
               this.checkItems = res.data
-              console.log(this.checkItems, "checkItems.......")
+              // console.log(this.checkItems, "checkItems.......")
             }
           })
           .catch(err => {
@@ -381,10 +381,10 @@ export default {
             ? this.houseId
             : 94
       }
-      console.log(data, "data")
+      // console.log(data, "data")
       getNewGrainInfo(data)
         .then(res => {
-          console.log(res.data, "res000")
+          // console.log(res.data, "res000")
           this.data = res.data
           this.sort()
         })
@@ -398,28 +398,28 @@ export default {
       // 如果sortData是空的，使用splice进行排序，不准确
       // this.sortData = [0, 0, 0, 0]
 
-      console.log(this.sortData,'sortData.......')
+      // console.log(this.sortData,'sortData.......')
       if (sortdata.length !== 0) {
         for (let i = 0; i < sortdata.length; i++) {
           if (sortdata[i].enumId == 22) {
-            console.log(sortdata[i], "总经理 ")
+            // console.log(sortdata[i], "总经理 ")
             this.sortData.splice(0, 1, sortdata[i])
           }
           if (sortdata[i].enumId == 21) {
-            console.log(this.data[i], "分管副总")
+            // console.log(this.data[i], "分管副总")
             this.sortData.splice(1, 1, sortdata[i])
           }
           if (sortdata[i].enumId === 20) {
-            console.log(this.data[i], "主管科长")
+            // console.log(this.data[i], "主管科长")
             this.sortData.splice(2, 1, sortdata[i])
           }
           if (sortdata[i].enumId == 19) {
-            console.log(this.data[i], "保管员")
+            // console.log(this.data[i], "保管员")
             this.sortData.splice(3, 1, sortdata[i])
           }
         }
       }
-      console.log(this.sortData, "this.sortData.....")
+      // console.log(this.sortData, "this.sortData.....")
     },
     // 状态改成图标
     formatterColumn(row, column) {
@@ -435,16 +435,16 @@ export default {
     // 除保管员外弹窗
     open(val,index) {
       // console.log(this.$route.query, "保管员外的角色")
-      console.log(val, "val...")
-      console.log(index,'index')
+      // console.log(val, "val...")
+      // console.log(index,'index')
       this.data5.grainConditionRecord.depotId = this.depotId
       this.data5.grainConditionRecord.houseId = this.houseId
       this.data5.grainConditionRecord.enumId = val.enumId
-      console.log(val.enumId, "当前角色信息id")
-      console.log(this.grainKind, "角色类别字典")
+      // console.log(val.enumId, "当前角色信息id")
+      // console.log(this.grainKind, "角色类别字典")
       var item = this.grainKind.find(item => item.enumId == val.enumId)
-      console.log(item.enumName, "item")
-      console.log(item,'item数据')
+      // console.log(item.enumName, "item")
+      // console.log(item,'item数据')
 
       // console.log(this.data2,'this.data2..........')
       const h = this.$createElement
@@ -490,14 +490,14 @@ export default {
         console.log(this.data5, "this.data5...")
         addInfo(this.data5)
           .then(res => {
-            console.log(res, "res增")
+            // console.log(res, "res增")
             if (res.code == 200) {
               // this.sortData.operationTime = this.data5.grainConditionRecord.operationTime
 
-              console.log(this.houseId, "this.houseId")
-              console.log(this.data2.houseId, "this.data2.houseId")
+              // console.log(this.houseId, "this.houseId")
+              // console.log(this.data2.houseId, "this.data2.houseId")
               let auditState = 4 //4 是已完成
-              console.log(this.data2.houseId, "this.data2.houseId")
+              // console.log(this.data2.houseId, "this.data2.houseId")
               //判断是否切换仓房，或者仓房发生改变
               if (this.data2.houseId == this.houseId) {
                 haveDone(this.data2.id, auditState)
@@ -557,7 +557,7 @@ export default {
             query: { type: type, pid: row.id, data: row }
           })
         } else {
-          console.log(row, "科长，副总，总经理")
+          // console.log(row, "科长，副总，总经理")
           this.open(row,index)
         }
       } else if (Object.keys(this.data2).length !== 0) {