fix(bugs): 修改上传组件的回参

src/api/sys/model/uploadModel.ts

@@ -1,5 +1,5 @@
 export interface UploadApiResult {
   message: string;
-  code: number;
-  url: string;
+  code?: number;
+  url?: string;
 }

src/components/Upload/src/BasicUpload.vue

@@ -84,6 +84,7 @@
 
       // 上传modal保存操作
       function handleChange(urls: string[]) {
+        console.log('handleChange', urls);
         fileList.value = [...unref(fileList), ...(urls || [])];
         emit('update:value', fileList.value);
         emit('change', fileList.value);

src/components/Upload/src/UploadModal.vue

@@ -283,9 +283,8 @@
 
         for (const item of fileListRef.value) {
           const { status, responseData } = item;
-          console.log('responseData', item);
           if (status === UploadResultStatus.SUCCESS && responseData) {
-            fileList.push(responseData.url);
+            fileList.push(responseData.message);
           }
         }
         // 存在一个上传成功的即可保存

src/views/corporation/AddCorporationModal.vue

@@ -17,7 +17,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import dayjs from 'dayjs';
+  // import dayjs from 'dayjs';
   // import { checkUserAddAble } from '/@/api/corporation/modal';
   import { data as CascaderData } from '/@/utils/cascaderData';
   import { useI18n } from '/@/hooks/web/useI18n';
@@ -127,21 +127,21 @@
         maxLength: 50,
       },
     },
-    {
-      field: 'expirationTime',
-      component: 'DatePicker',
-      label: t('routes.corporation.expirationTime'),
-      required: true,
-      colProps: {
-        span: 22,
-      },
-      componentProps: {
-        valueFormat: 'YYYY-MM-DD',
-        disabledDate: (current) => {
-          return current && current < dayjs().endOf('day');
-        },
-      },
-    },
+    // {
+    //   field: 'expirationTime',
+    //   component: 'DatePicker',
+    //   label: t('routes.corporation.expirationTime'),
+    //   required: true,
+    //   colProps: {
+    //     span: 22,
+    //   },
+    //   componentProps: {
+    //     valueFormat: 'YYYY-MM-DD',
+    //     disabledDate: (current) => {
+    //       return current && current < dayjs().endOf('day');
+    //     },
+    //   },
+    // },
     {
       field: 'logo',
       component: 'Upload',

src/views/rightsEnterprises/addModal.vue

@@ -223,14 +223,15 @@
         // let tableData = tableRef.value.getDataSource() || [];
         // let fromData = await validate();
         let tableData = getDataSource();
-        let SunNum = 0;
-        const permList = tableData?.map((ele) => {
+        let SunNum = 0,
+          permList = [];
+        tableData?.map((ele) => {
           SunNum = SunNum + ele.muber;
-          return {
+          permList.push({
             staffPermTypeId: ele.id,
             num: ele.muber || 0,
             // takeLookNum:50,
-          };
+          });
         });
         if (SunNum == 0) {
           return createMessage.warning('不支持两个权益为空');

src/views/rightsEnterprises/camera.vue

@@ -227,6 +227,7 @@
         tableSetting: { fullScreen: true },
         showIndexColumn: true,
         rowKey: 'id',
+        immediate: userinfo.value.companyId ? true : false,
         pagination: { pageSize: 20 },
         searchInfo: modelRef,
         afterFetch: (T) => {

src/views/rightsEnterprises/cameraList.vue

@@ -248,6 +248,8 @@
             companyId: record.id,
             companyName: record.name,
             companyPhone: record.phone,
+            userPermNum:
+              record.proIncrementNum + record.seeIncrementNum + record.sensorIncrementNum,
           },
           isUpdate: true,
         });

src/views/rightsEnterprises/list.vue

@@ -213,6 +213,7 @@
         tableSetting: { fullScreen: true },
         showIndexColumn: true,
         rowKey: 'id',
+        immediate: userinfo.value.companyId ? true : false,
         pagination: { pageSize: 20 },
         searchInfo: modelRef,
         afterFetch: (T) => {

src/views/rightsEnterprises/productDrawer.vue

@@ -35,6 +35,7 @@
         companyId: 0,
         companyName: '0',
         companyPhone: '0',
+        userPermNum: 0,
       });
       // const userStore = useUserStore();
       // const userinfo = computed(() => userStore.getUserInfo); computed
@@ -46,6 +47,7 @@
         modelRef.companyId = data?.record?.companyId;
         modelRef.companyName = data?.record?.companyName;
         modelRef.companyPhone = data?.record?.companyPhone;
+        modelRef.userPermNum = data?.record?.userPermNum;
         console.log('handleSubmit', t, modelRef, data);
       });
       function handleSubmit() {

src/views/staff/detailsModal.vue

@@ -175,9 +175,19 @@
             span: 22,
           },
           componentProps: {
-            api: getAllList,
+            api: async function (params) {
+              const res = await getAllList(params);
+              console.log('params', params, res);
+              // const treeData = makeTree(res);
+              return res.map((i) => {
+                return {
+                  ...i,
+                  permName: i.permName + '  ' + i.createTime,
+                };
+              });
+            },
             labelField: 'permName',
-            valueField: 'id',
+            valueField: 'permTypeId',
             immediate: true,
             mode: 'multiple',
             params: {