暂停状态的显示

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/basislist.vue

@@ -95,7 +95,7 @@
         <el-table-column width="160px"
                          align="center"
                          prop="Status"
-                         label="审核状态"
+                         label="状态"
                          show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''"
@@ -124,8 +124,12 @@
                   style="color:#E6A23C">待缴费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
-            <span v-if="scope.row.Status=='8'"
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
                   style="color:#67C23A">已入库</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag=='2'"
+                  style="color:#E6A23C">已暂停</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag=='3'"
+                  style="color:#dd6161">已取消</span>
           </template>
         </el-table-column>
 

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/goodslist.vue

@@ -94,7 +94,7 @@
         <el-table-column width="160px"
                          align="center"
                          prop="Status"
-                         label="审核状态"
+                         label="状态"
                          show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''"
@@ -123,8 +123,12 @@
                   style="color:#E6A23C">待缴费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
-            <span v-if="scope.row.Status=='8'"
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
                   style="color:#67C23A">已入库</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag=='2'"
+                  style="color:#E6A23C">已暂停</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag=='3'"
+                  style="color:#dd6161">已取消</span>
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns"
@@ -925,7 +929,6 @@ export default {
     getDictOptions () {
       api.getDictList(this.$axios).then(res => {
         this.dictData = res.data.items
-        console.log(this.dictData)
         this.OperTypeOptions = this.dictData['OperType']
         this.UnitRelationOptions = this.dictData['UnitRelation']
         this.InOptions = this.dictData['InOptions']

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/index.vue

@@ -62,7 +62,7 @@
 
         </el-table-column>
 
-        <el-table-column width="160px" align="center" prop="Status" label="审核状态" show-overflow-tooltip>
+        <el-table-column width="160px" align="center" prop="Status" label="状态" show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''" style="color:#E6A23C">待提交</span>
             <span v-if="scope.row.Status=='10'" style="color:#E6A23C">待二级单位分办</span>
@@ -77,7 +77,12 @@
             <span v-if="scope.row.Status=='-5'" style="color:#F56C6C">集中评审未通过</span>
             <span v-if="scope.row.Status=='6'" style="color:#E6A23C">待缴费</span>
             <span v-if="scope.row.Status=='7'" style="color:#E6A23C">待入库</span>
-            <span v-if="scope.row.Status=='8'" style="color:#67C23A">已入库</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
+                  style="color:#67C23A">已入库</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag=='2'"
+                  style="color:#E6A23C">已暂停</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag=='3'"
+                  style="color:#dd6161">已取消</span>
           </template>
         </el-table-column>
         <el-table-column v-for="column in tableColumns" :key="column.Id"

src/dashoo.cn/frontend_web/src/pages/oilsupplier/supplier/techlist.vue

@@ -95,7 +95,7 @@
         <el-table-column width="160px"
                          align="center"
                          prop="Status"
-                         label="审核状态"
+                         label="状态"
                          show-overflow-tooltip>
           <template slot-scope="scope">
             <span v-if="scope.row.Status=='0' || scope.row.Status==''"
@@ -124,8 +124,12 @@
                   style="color:#E6A23C">待缴费</span>
             <span v-if="scope.row.Status=='7'"
                   style="color:#E6A23C">待入库</span>
-            <span v-if="scope.row.Status=='8'"
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag<='1'"
                   style="color:#67C23A">已入库</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag=='2'"
+                  style="color:#E6A23C">已暂停</span>
+            <span v-if="scope.row.Status=='8' && scope.row.InFlag=='3'"
+                  style="color:#dd6161">已取消</span>
           </template>
         </el-table-column>