fix(bugs): 修改问题点

src/api/advertisement/list.ts

@@ -11,6 +11,7 @@ enum Api {
   uploadFile = '/zfb-api/zfb/house/upload',
   padssave = '/zfb-api/zfb/recommend/save',
   padsupdate = '/zfb-api/zfb/recommend/update',
+  padsdelete = '/zfb-api/zfb/recommend/delete',
 }
 
 /**
@@ -27,7 +28,17 @@ export const ListApi = (params: PageParams) =>
       ignoreCancelToken: true,
     },
   });
-export const RecommendListApi = (params: PageParams) =>
+export const RecommendDeleteApi = (params: DeleteItem) =>
+  defHttp.post<Result>({
+    url: Api.padsdelete,
+    params,
+    headers: {
+      // @ts-ignore
+      ignoreCancelToken: true,
+    },
+  });
+
+export const RecommendListApi = (params: DeleteItem) =>
   defHttp.post<ListGetResultModel>({
     url: Api.recommend,
     params,

src/api/corporation/model.ts

@@ -8,6 +8,7 @@ export interface UpdateCompanyParam {
   sceneLogo?: string;
   floorLogo?: string;
   bgMusic?: string;
+  expirationTime?: string;
 }
 export interface SaveCompanyParam {
   address?: string;

src/views/advertisement/pads.vue

@@ -21,9 +21,7 @@
               label: '删除',
               popConfirm: {
                 title: '是否确认删除',
-                confirm: () => {
-                  createMessage.info(`暂未接入`);
-                },
+                confirm: handleDelete.bind(null, record),
               },
             },
           ]"
@@ -39,14 +37,16 @@
   import { useMessage } from '/@/hooks/web/useMessage';
   // import { Tag } from 'ant-design-vue';
   import PadsDrawer from './padsDrawer.vue';
-  import { RecommendListApi } from '/@/api/advertisement/list';
+  import { RecommendListApi, RecommendDeleteApi } from '/@/api/advertisement/list';
   import { useDrawer } from '/@/components/Drawer';
   import { Time } from '/@/components/Time';
   import { useRoute } from 'vue-router';
+  import { useI18n } from '/@/hooks/web/useI18n';
   // param type 2
   export default defineComponent({
     components: { BasicTable, TableAction, TableImg, PadsDrawer },
     setup() {
+      const { t } = useI18n();
       const { createMessage } = useMessage();
       const [registerDrawer, { openDrawer }] = useDrawer();
       const route = useRoute();
@@ -151,6 +151,12 @@
           ...getForm().getFieldsValue(),
         });
       }
+      async function handleDelete(record: Recordable) {
+        let res = await RecommendDeleteApi({ id: record.id });
+        console.log(res);
+        createMessage.success(t('common.optSuccess'));
+        reload();
+      }
       function handleEdit(record: Recordable) {
         openDrawer(true, {
           record,
@@ -166,6 +172,7 @@
         handleEdit,
         reload,
         type,
+        handleDelete,
       };
     },
   });

src/views/corporation/AddCorporationModal.vue

@@ -51,7 +51,7 @@
     {
       field: 'phone',
       component: 'Input',
-      label: t('common.mobile'),
+      label: t('routes.corporation.phone'),
       rules: [
         {
           required: true,
@@ -82,6 +82,7 @@
       field: 'area',
       label: '地区',
       component: 'ApiCascader',
+      required: true,
       componentProps: {
         api: () => {
           return CascaderData;

src/views/corporation/SubaccountModal.vue

@@ -131,7 +131,7 @@
           labelWidth: 200,
         },
         {
-          field: 'totalSubNum',
+          field: 'subNum',
           component: 'InputNumber',
           label: `${t('routes.devices.subNum')} ：`,
           labelWidth: 200,

src/views/corporation/cameraModal.vue

@@ -21,7 +21,7 @@
       </BasicForm>
       <BasicTable @register="registerDeviceTable" :searchInfo="searchInfo">
         <template #activatedTime="{ record }">
-          <Time v-if="record.activatedTime" :value="record.activatedTime" mode="datetime" />
+          <Time v-if="record.activeTime" :value="record.activeTime" mode="datetime" />
         </template>
         <template #action="{ record }">
           <TableAction
@@ -66,6 +66,7 @@
 
       const searchInfo = reactive<Recordable>({
         id: '',
+        userName: '',
       });
 
       const [register, { closeModal }] = useModalInner((data) => {
@@ -74,13 +75,13 @@
 
       const schemas: FormSchema[] = [
         {
-          field: 'companyName',
+          field: 'name',
           label: t('routes.corporation.enterpriseName'),
           slot: 'userName',
           component: 'Input',
         },
         {
-          field: 'managerPhone',
+          field: 'userName',
           label: t('routes.corporation.enterpriseId'),
           slot: 'name',
           component: 'Input',
@@ -125,7 +126,7 @@
         },
         {
           title: t('routes.corporation.activeTime'),
-          dataIndex: 'activatedTime',
+          dataIndex: 'activeTime',
           slots: { customRender: 'activatedTime' },
           width: 100,
         },
@@ -163,6 +164,7 @@
         });
 
         searchInfo.id = data.id;
+        searchInfo.userName = data.userName;
         nextTick(reload);
       }
 

src/views/corporation/detailsModal.vue

@@ -54,8 +54,8 @@
     props: {
       userData: { type: Object },
     },
-    emits: ['register'],
-    setup(props) {
+    emits: ['register', 'reload'],
+    setup(props, { emit }) {
       const modelRef = ref({
         id: '',
       });
@@ -89,7 +89,7 @@
       const schemas: FormSchema[] = [
         {
           field: 'name',
-          label: t('routes.corporation.name'),
+          label: t('routes.corporation.enterpriseName'),
           slot: 'text',
           component: 'Input',
         },
@@ -110,7 +110,7 @@
         // },
         {
           field: 'phone',
-          label: t('common.mobile'),
+          label: t('routes.corporation.phone'),
           slot: 'text',
           component: 'Input',
         },
@@ -175,6 +175,7 @@
           });
           success(t('common.optSuccess'));
           closeModal();
+          emit('reload');
         } catch (error) {
           console.log('error', error);
         }

src/views/corporation/index.vue

@@ -46,7 +46,12 @@
         />
       </template>
       <template #expirationTime="{ record }">
-        <Time v-if="record.expirationTime" :value="record.expirationTime" mode="date" />
+        <Time
+          v-if="record.expirationTime"
+          @click="openTimeModal(true, record)"
+          :value="record.expirationTime"
+          mode="date"
+        />
       </template>
 
       <template #cameraNum="{ record }">
@@ -89,6 +94,7 @@
     <deviceModal @register="registerDeviceModal" @reload="reload" />
     <SubaccountModal @register="registerSubaccountModal" @update="reload" />
     <cameraModal @register="registerCameraModal" @ok="reload" />
+    <TimeModal @register="registerTimeModal" @submit="reload" />
   </div>
 </template>
 <script lang="ts">
@@ -105,6 +111,7 @@
   import { useModal } from '/@/components/Modal';
   import chargeModal from './chargeModal.vue';
   import deviceModal from './deviceModal.vue';
+  import TimeModal from './setTime.vue';
   import SubaccountModal from './SubaccountModal.vue';
   import cameraModal from './cameraModal.vue';
   import { Time } from '/@/components/Time';
@@ -123,12 +130,14 @@
       Time,
       BasicUpload,
       Tag,
+      TimeModal,
     },
     setup() {
       const [registerDeviceModal, { openModal: openDeviceModal }] = useModal();
       const [registerChargeModal, { openModal: openChargeModal }] = useModal();
       const [registerSubaccountModal, { openModal: openSubaccountModal }] = useModal();
       const [registerCameraModal, { openModal: openCameraModal }] = useModal();
+      const [registerTimeModal, { openModal: openTimeModal }] = useModal();
       const { t } = useI18n();
       const columns: BasicColumn[] = [
         // {
@@ -174,7 +183,7 @@
         },
         {
           title: t('routes.corporation.subNum'),
-          dataIndex: 'subNum',
+          dataIndex: 'totalSubNum',
           ellipsis: false,
           width: 80,
         },
@@ -303,6 +312,7 @@
         registerTable,
         registerChargeModal,
         registerDeviceModal,
+        registerTimeModal,
         registerSubaccountModal,
         handleOpenModal,
         uploadLogoApi: uploadLogoApi as any,
@@ -312,6 +322,7 @@
         handleMusicUploadFetch,
         registerCameraModal,
         openCameraModal,
+        openTimeModal,
       };
     },
   });

src/views/corporation/setTime.vue

@@ -0,0 +1,122 @@
+<template>
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    :title="t('routes.corporation.expirationTime')"
+    :height="600"
+    @visible-change="handleVisibleChange"
+    @ok="handleSubmit"
+    @cancel="resetFields"
+  >
+    <div class="pt-2px pr-3px">
+      <BasicForm @register="registerForm" :model="model" />
+    </div>
+  </BasicModal>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, nextTick } from 'vue';
+  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 { checkUserAddAble } from '/@/api/corporation/modal';
+  import { useI18n } from '/@/hooks/web/useI18n';
+  import { updateCompnayApi } from '/@/api/corporation/list';
+  const { t } = useI18n();
+  const schemas: FormSchema[] = [
+    {
+      field: 'id',
+      component: 'Input',
+      label: 'id',
+      show: false,
+    },
+    {
+      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');
+        },
+      },
+    },
+  ];
+  export default defineComponent({
+    components: { BasicModal, BasicForm },
+    props: {
+      userData: { type: Object },
+    },
+    emits: ['register', 'submit'],
+    setup(props, { emit }) {
+      const modelRef = ref({});
+      const { createMessage } = useMessage();
+      const [
+        registerForm,
+        {
+          // getFieldsValue,
+          setFieldsValue,
+          // setProps
+          resetFields,
+          validate,
+        },
+      ] = useForm({
+        labelWidth: 120,
+        schemas,
+        showActionButtonGroup: false,
+        actionColOptions: {
+          span: 24,
+        },
+      });
+      let addListFunc = () => {};
+      const [register, { closeModal }] = useModalInner((data) => {
+        data && onDataReceive(data);
+      });
+
+      function onDataReceive(data) {
+        if (dayjs(data.expirationTime) > dayjs()) {
+          setFieldsValue({ ...data });
+        } else {
+          setFieldsValue({ id: data.id });
+        }
+      }
+      const handleSubmit = async () => {
+        const values = await validate();
+        console.log('insertData', values);
+        //TODO hack parameter
+        const res = await updateCompnayApi({
+          id: values.id,
+          expirationTime: values.expirationTime,
+        });
+        // let res = await checkUserAddAble({ phoneNum: values.managerPhone });
+        console.log('res', res);
+        emit('submit');
+        closeModal();
+        resetFields();
+        createMessage.success(t('common.optSuccess'));
+        // createMessage.success(t('routes.corporation.optSuccess'));
+      };
+      function handleVisibleChange(v) {
+        v && props.userData && nextTick(() => onDataReceive(props.userData));
+      }
+
+      return {
+        t,
+        register,
+        schemas,
+        registerForm,
+        model: modelRef,
+        handleVisibleChange,
+        handleSubmit,
+        addListFunc,
+        closeModal,
+        resetFields,
+        // nextTick,
+      };
+    },
+  });
+</script>

src/views/corporation/verify.vue

@@ -29,7 +29,7 @@
         />
       </template>
     </BasicTable>
-    <detailsModal @register="registerDeviceModal" />
+    <detailsModal @register="registerDeviceModal" @reload="reload" />
     <AddCorporationModal @register="registerAddCorporationModal" @submit="reload" />
   </div>
 </template>

src/views/product/addModal.vue

@@ -1,5 +1,11 @@
 <template>
-  <BasicModal v-bind="$attrs" @register="register" title="新 增" @ok="handleOk">
+  <BasicModal
+    v-bind="$attrs"
+    @register="register"
+    @cancel="resetFields"
+    title="新 增"
+    @ok="handleOk"
+  >
     <div class="pt-3px pr-3px">
       <BasicForm @register="registerForm" :model="model" />
     </div>
@@ -63,6 +69,7 @@
         {
           // setFieldsValue,
           validate,
+          resetFields,
           // getFieldsValue,
         },
       ] = useForm({
@@ -100,9 +107,10 @@
         context && context.emit('saveadd', res);
         createMessage.success(t('common.optSuccess'));
         closeModal();
+        resetFields();
       }
 
-      return { register, schemas, registerForm, model: modelRef, handleOk, t };
+      return { register, resetFields, schemas, registerForm, model: modelRef, handleOk, t };
     },
   });
 </script>