超期转空瓶

src/views/manufacture/cylinderCondition.vue

@@ -80,7 +80,10 @@
               <span class="item_index">{{index + 1}}</span>
               <div class="card_item_code">{{item.inner_code}}</div>
             </div>
-            <div class="card_red" @click="delSteelCylinder(item,3)">删除</div>
+            <div style="display: flex;align-items: center;">
+              <div class="card_yellow" v-if="tabsStatus == 'extended'" @click="overdueScrapping(item,'2')">空瓶</div>
+              <div class="card_red" @click="delSteelCylinder(item,3)">删除</div>
+            </div>
           </div>
         </div>
         <div v-else><el-empty :image="require('../../assets/image/empty.png')" description="暂无燃气瓶"></el-empty></div>
@@ -251,6 +254,7 @@
       },
       // 切换显示不合格瓶/超期。报废
       getTabsStatus(value) {
+        this.bottleData2 = []
         this.tabsStatus = value
         this.getList2(this.tabsStatus)
       },
@@ -394,7 +398,7 @@
         }).then(res => {
           if (res.code == 200) {
             this.getList1(2)
-            if (type == this.tabsStatus) {
+            if (type == this.tabsStatus || type == '2') {
               this.getList2(this.tabsStatus)
             }
           }
@@ -677,11 +681,13 @@
   }
 
   .card_tabs_abnormal {
-    width: 100%;
+    width: calc(100% - 30px);
     display: flex;
     align-items: center;
     height: 40px;
     margin-top: 15px;
+    margin-left: 15px;
+    margin-right: 15px;
     background-color: rgba(13, 162, 203, 0.2);
   }