新增流转步骤

src/assets/js/blockSort.js

@@ -277,6 +277,14 @@ export const process = () => {
       value: '17',
     },
     {
+      label: '司机回收超期瓶',
+      value: 'sjextended',
+    },
+    {
+      label: '司机回收报废瓶',
+      value: 'sjscrap',
+    },
+    {
       label: '司机交付门店',
       value: '19',
     },
@@ -293,6 +301,10 @@ export const process = () => {
       value: '25',
     },
     {
+      label: '司机确认重瓶从门店出库',
+      value: '033',
+    },
+    {
       label: '送气员送达重瓶',
       value: '26',
     },
@@ -305,6 +317,26 @@ export const process = () => {
       value: '31',
     },
     {
+      label: '气站确认重瓶到达气站',
+      value: '016',
+    },
+    {
+      label: '门店回收超期瓶',
+      value: 'mdextended',
+    },
+    {
+      label: '气站回收超期瓶',
+      value: 'qzextended',
+    },
+    {
+      label: '门店回收报废瓶',
+      value: 'mdscrap',
+    },
+    {
+      label: '气站回收报废瓶',
+      value: 'qzscrap',
+    },
+    {
       label: '门店将重瓶退回司机',
       value: '33',
     },

src/views/manufacture/cylinderCondition.vue

@@ -2,7 +2,8 @@
   <!-- 钢瓶状态 -->
   <div class="card_cylinder_condition">
     <!-- 重瓶区域 -->
-    <div class="card_bottle">
+    <div class="card_bottle" v-loading="bottleLoading" element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.3)">
       <div class="card_district">
         <div class="herderArea center_in title_green">重瓶区</div>
         <div class="same_row_in card_add_cylinder">
@@ -29,7 +30,8 @@
       </div>
     </div>
     <!-- 空瓶区 -->
-    <div class="card_bottle">
+    <div class="card_bottle" v-loading="emptyLoading" element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.3)">
       <div class="card_district">
         <div class="herderArea center_in title_yellow">空瓶区</div>
         <div class="same_row_in card_add_cylinder">
@@ -60,7 +62,8 @@
       </div>
     </div>
     <!-- 不合格瓶区 -->
-    <div class="card_bottle">
+    <div class="card_bottle" v-loading="defectiveLoading" element-loading-text="拼命加载中"
+      element-loading-spinner="el-icon-loading" element-loading-background="rgba(0, 0, 0, 0.3)">
       <div class="card_district">
         <div class="herderArea center_in title_red">不合格瓶区</div>
         <div class="card_tabs_abnormal">
@@ -205,6 +208,9 @@
         codeType: 1,
         // 报废(scrap）超期(extended)
         tabsStatus: 'extended',
+        bottleLoading: false,
+        emptyLoading: false,
+        defectiveLoading: false,
       }
     },
     mounted() {
@@ -214,6 +220,7 @@
     },
     methods: {
       getList(state) {
+        this.bottleLoading = true
         getCylinderStatus({
           page: this.Pagination.PageIndex,
           pageSize: this.Pagination.PageSize,
@@ -224,9 +231,11 @@
             this.bottleData = res.data.list
             this.Pagination.Total = res.data.count
           }
+          this.bottleLoading = false
         })
       },
       getList1(state) {
+        this.emptyLoading = true
         getCylinderStatus({
           page: this.Pagination1.PageIndex,
           pageSize: this.Pagination1.PageSize,
@@ -237,9 +246,11 @@
             this.bottleData1 = res.data.list
             this.Pagination1.Total = res.data.count
           }
+          this.emptyLoading = false
         })
       },
       getList2(state) {
+        this.defectiveLoading = true
         getCylinderStatus({
           page: this.Pagination2.PageIndex,
           pageSize: this.Pagination2.PageSize,
@@ -250,6 +261,7 @@
             this.bottleData2 = res.data.list
             this.Pagination2.Total = res.data.count
           }
+          this.defectiveLoading = false
         })
       },
       // 切换显示不合格瓶/超期。报废
@@ -500,7 +512,7 @@
   }
 
   .card_bottle {
-    padding: 10px 10px 15px 10px;
+    margin: 10px 10px 15px 10px;
     flex: 1;
   }