2/24 界面优化1.0

src/views/collect/ConfirmDrugDealOrder.vue

@@ -46,7 +46,7 @@
         <!--              &lt;!&ndash;                :disabled="!formData.billNo"&ndash;&gt;-->
         <!--              &lt;!&ndash;                @click.native="cancelOrder()"&ndash;&gt;-->
         <!--              &lt;!&ndash;              >放弃&ndash;&gt;-->
-        <!--              &lt;!&ndash;              </el-button>&ndash;&gt;-->
+                      <!--              </el-button>-->
         <!--              <el-button-->
         <!--                type="primary"-->
         <!--                :disabled="!formData.billNo"-->
@@ -209,6 +209,12 @@
                   @click.native="nextCollectOrder()"
                 >下一单
                 </el-button>
+                <el-button
+                  type="primary"
+                  :disabled="!formData.billNo"
+                  @click.native="cancelOrder()"
+                >放弃
+                </el-button>
                 <el-button
                   type="primary"
                   :disabled="formData.billNo ||(this.formDataVisible != null &&  this.formDataVisible.scanType == 1)"
@@ -270,9 +276,10 @@
 
           <el-descriptions-item
             label="灯组信息"
-
           >
-            <el-tag  :style="colorStyle(formData.ledNum)">灯组信息</el-tag>
+            <!--colorStyle(formData.ledNum)-->
+            <!--<el-tag  style="color:red ">灯组信息</el-tag>-->
+            <el-tag  :type="colorStyle(formData.ledNum)">{{ledName}}</el-tag>
           </el-descriptions-item>
         </el-descriptions>
 
@@ -1642,18 +1649,40 @@ export default {
       this.placeholder = '请点击输入框进行选扫码'
     },
 
+    // colorStyle(ledNum) {
+    //   switch (ledNum) {
+    //     case 1:
+    //       return { type: 'danger' };
+    //     case 2:
+    //       return { type: 'warning' };
+    //     case 3:
+    //       return { type: '' };
+    //     case 4:
+    //       return { type: 'success' };
+    //     default:
+    //
+    //       return { type: 'info' };
+    //       // return { type: '#918e8e' };
+    //   }
+    // },
     colorStyle(ledNum) {
       switch (ledNum) {
         case 1:
-          return { backgroundColor: 'red' };
+          this.ledName = '红灯'
+          return  'danger' ;
         case 2:
-          return { backgroundColor: '#ec951f' };
+          this.ledName = '黄灯'
+          return  'warning' ;
         case 3:
-          return { backgroundColor: 'blue' };
+          this.ledName = '蓝灯'
+          return  '';
         case 4:
-          return { backgroundColor: 'green' };
+          this.ledName = '绿灯'
+          return 'success' ;
         default:
-          return { backgroundColor: '#918e8e' };
+          this.ledName = '未绑定灯组'
+          return  'info' ;
+        // return { type: '#918e8e' };
       }
     }
   },