Merge remote-tracking branch 'origin/v1.7' into dev

# Conflicts:
#	src/api/system/DictionaryController.ts

src/api/system/DictionaryController.ts

@@ -431,4 +431,15 @@ export default class DictionaryController extends BaseController {
         });
     });
   }
+  static dictDirectoryInfoByType(params: ANY_OBJECT, httpOptions?: RequestOption) {
+    return new Promise<DictionaryBase>((resolve, reject) => {
+      super.get<DictData[]>('/admin/app/directoryInfo/listDictByType', params, httpOptions)
+        .then(res => {
+          let dictData = new DictionaryBase('门户菜单字典', res.data);
+          resolve(dictData);
+        }).catch(err => {
+          reject(err);
+        });
+    });
+  }
 }

src/pages/tourOrder/formTourOrder.vue

@@ -173,7 +173,7 @@
             type="primary"
             :size="layoutStore.defaultFormItemSize"
             @click.stop="onClearRebateClick(scope.row)"
-            :disabled="scope.row.orderStatus != 1 && !checkPermCodeExist('formTourOrder:formTourOrder:clearRebate')"
+            :disabled="scope.row.orderStatus != 1 || !checkPermCodeExist('formTourOrder:formTourOrder:clearRebate')"
           >
             核销返利
           </el-button>

src/pages/tourismProject/formTourismProject.vue

@@ -623,7 +623,7 @@ const loadBelongTabFilterDropdownList = (): Promise<ListData<DictData>> => {
     const params = {
       directoryType: 1,
     };
-    DictionaryController.dictDirectoryInfoBytype(params)
+    DictionaryController.dictDirectoryInfoByType(params)
       .then(res => {
         resolve({
           dataList: res.getList(),

src/pages/tourismProject/verifyTourismProjectDatePrice.vue

@@ -93,7 +93,7 @@ const gridOptions = reactive<VxeGridProps>({
       field: 'adultPrice',
       width: 150,
       editRender: {},
-      title: '成人价格（元/人）',
+      title: '成人价格',
       slots: {
         edit({ row }) {
           return (
@@ -110,7 +110,7 @@ const gridOptions = reactive<VxeGridProps>({
       field: 'childrenPrice',
       width: 150,
       editRender: {},
-      title: '儿童价格（元/人）',
+      title: '儿童价格',
       slots: {
         edit({ row }) {
           return (