Browse Source

新增了容积状态显示

duanxiaoduan 1 year ago
parent
commit
b00d41f808
2 changed files with 27 additions and 1 deletions
  1. 20 0
      cls
  2. 7 1
      src/views/formulationPlan/materialIssuancePlan/index.vue

+ 20 - 0
cls

@@ -0,0 +1,20 @@
+  develop
+  fearture/ci-test5
+  feature/addproblem
+* feature/addproblem2
+  feature/ci-cd
+  feature/ci-cd2
+  feature/ci-cd3
+  feature/ci-test1
+  feature/ci-test2
+  feature/ci-test3
+  feature/ci-test4
+  feature/ci-test5
+  feature/ci-test6
+  feature/ci-test7
+  feature/fence_shed
+  feature/pasture-export
+  feature/test
+  hotfix/bug1
+  hotfix/test1
+  master

+ 7 - 1
src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -95,7 +95,9 @@
         </el-table-column>
         <el-table-column label="容量状态" width="90px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.volumeStatus }}</span>
+            <span v-if="scope.row.volumeStatus == 1" style="color:red;">{{ scope.row.volumeStatusStr }}</span>
+            <span v-if="scope.row.volumeStatus == 2" style="color:red;">{{ scope.row.volumeStatusStr }}</span>
+            <span v-if="scope.row.volumeStatus == 0" style="color:green;">{{ scope.row.volumeStatusStr }}</span>
           </template>
         </el-table-column>
         <el-table-column label="撒料" min-width="250px" align="left" header-align="center">
@@ -1218,6 +1220,10 @@ export default {
       this.create.temp.mytmrid = row.tmrid
       this.create.checkBarList = []
       this.create.temp.mytmrid = row.tmrid
+      if(this.create.temp.volume == undefined || this.create.temp.volume == ''){
+        console.log(111)
+        this.$set(this.create.temp,'volume',0)
+      }
       console.log(this.create.temp,'this.create.temp')
       this.getCreateList1()