Merge branch 'main' of http://123.60.103.97:3000/xuziqiang/SaaS-lib

hx-ai-intelligent/src/config/app.config.ts

@@ -1,6 +1,8 @@
 /** @format */
 import { dateUtil } from '/nerv-lib/util/date-util';
 import mockResource from './resource.json';
+import { ref } from 'vue';
+const value = ref('1');
 
 export const appConfig = {
   projectType: 'web',
@@ -16,6 +18,21 @@ export const appConfig = {
   // },
 
   // customUpdatePwd: () => import('/@/view/updatePassword/updatePassword.vue'),
+  headerSlotConfig: {
+    component: 'NsSelect',
+    componentProps: {
+      style: { width: '200px' },
+      placeholder: '请选择',
+      value,
+      onChange: (cur) => {
+        value.value = cur;
+      },
+      options: [
+        { label: '济阳', value: '1' },
+        { label: '临沂', value: '2' },
+      ],
+    },
+  },
   timeout: 60 * 1000,
   userLoginApi: () => {
     return {

hx-ai-intelligent/src/view/organizationManage/usermanage/index.vue

@@ -301,6 +301,7 @@
                   title: '是否冻结该账户',
                   icon: createVNode(ExclamationCircleOutlined),
                   content: createVNode('div', { style: 'color:red;' }, ''),
+
                   onOk() {
                     // http
                     //   .post('/api/parking_merchant/objs/gateInfo/delete', {
@@ -309,10 +310,9 @@
                     //   .then((res) => {
                     //     mainRef.value.nsTableRef.reload();
                     //   });
-                    NsMessage.success('冻结成功');
-                  },
-                  onCancel() {
-                    console.log('Cancel');
+                    return new Promise((resolve, reject) => {
+                      NsMessage.success('冻结成功');
+                    }).catch(() => console.log('Oops errors!'));
                   },
                   class: 'test',
                 });
@@ -465,9 +465,6 @@
             {
               label: '删除',
               name: 'RoleTypeEdit',
-              dynamicParams: {
-                uuid: 'uuid',
-              },
               confirm: true,
               handle: (record: any, name, reload) => {
                 console.log(record, name, reload, 'record');