Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/layout/components/Sidebar/Logo.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import logoImg from "@/assets/logo/logo.png";
+import logoImg from "@/assets/logo/logo2.png";
 import variables from "@/assets/styles/variables.scss";
 
 export default {
@@ -83,7 +83,7 @@ export default {
       margin-right: 12px;
     }
     & .sidebar-logo-mini {
-      height: 50px;
+      width: 50px;
       vertical-align: middle;
       margin: auto;
     }

src/views/index.vue

@@ -412,6 +412,7 @@
             <span v-else-if="scope.row.refno2 === 'HQZY'">货转</span>
             <span v-else-if="scope.row.refno2 === 'CKDB'">调拨</span>
             <span v-else-if="scope.row.refno2 === 'CCF'">仓储费</span>
+            <span v-else-if="scope.row.refno2 === 'HWTG'">货物通关</span>
             <span v-else-if="scope.row.refno2 === 'ZYF'">作业费</span>
             <span v-else-if="scope.row.refno2 === 'SF'">收费</span>
             <span v-else-if="scope.row.refno2 === 'DZ'">对账</span>
@@ -593,6 +594,13 @@ export default {
           });
           break;
         }
+        case "HWTG": {
+          this.$router.push({
+            path: "/business/cargoClearance",
+            query: { data: JSON.stringify(row) },
+          });
+          break;
+        }
         case "JSCCF": {
           this.$router.push({
             path: "/business/agreement",