Merge branch 'dev' into 'master'

feat:设置菜单放到系统设置下，运费试算添加订单号查询条件

See merge request !92

src/router/menu.ts

@@ -205,14 +205,13 @@ const menu: MenuItem[] = [
         id: 6,
         id: 6,
         label: '客户管理',
         label: '客户管理',
       },
       },
-    ],
-  },
       {
       {
         index: '/setting/settingIndex',
         index: '/setting/settingIndex',
-    id: 7,
-    label: '设置',
+        id: 8,
+        label: '工厂设置',
+      },
+    ],
   }, 
   }, 
-
   // {
   // {
   //   index: '',
   //   index: '',
   //   id: 3,
   //   id: 3,

src/views/logistics/logisticsCalculate.vue

@@ -57,7 +57,6 @@ const searchConfig = ref<ISeachFormConfig[]>([
     prop: 'code',
     prop: 'code',
     type: 'input',
     type: 'input',
     label: '邮编', 
     label: '邮编', 
-
     attrs: {
     attrs: {
       clearable: true,
       clearable: true,
       placeholder: '请输入邮编',
       placeholder: '请输入邮编',
@@ -73,6 +72,14 @@ const searchConfig = ref<ISeachFormConfig[]>([
       hasUnit: true,
       hasUnit: true,
       suffix: 'g',
       suffix: 'g',
     },
     },
+  },{
+    prop: 'orderNumber',
+    type: 'input',
+    label: '订单号',
+    attrs: {
+      clearable: true,
+      placeholder: '请输入订单号', 
+    },
   },
   },
 ])
 ])