Merge branch 'feature/mockApi' of http://192.168.0.115:3000/zhangyupeng/zfb_mp into feature/mockApi

src/views/dashboard/advertisement/pads.vue

@@ -124,7 +124,7 @@
         ],
       };
 
-      const [registerTable] = useTable({
+      const [registerTable, { getForm }] = useTable({
         title: '推荐位',
         api: RecommendListApi,
         columns: columns,
@@ -138,11 +138,13 @@
       function handleCreate() {
         openDrawer(true, {
           isUpdate: false,
+          ...getForm().getFieldsValue(),
         });
       }
       function handleEdit(record: Recordable) {
         openDrawer(true, {
           record,
+          ...getForm().getFieldsValue(),
           isUpdate: true,
         });
       }

src/views/dashboard/advertisement/padsDrawer.vue

@@ -17,7 +17,7 @@
       const { createMessage } = useMessage();
       const modelRef = ref({});
       const isUpdate = ref(true);
-      const [registerForm, { validate, getForm, setProps, resetFields, setFieldsValue }] = useForm({
+      const [registerForm, { validate, setProps, resetFields, setFieldsValue }] = useForm({
         labelCol: {
           span: 4,
         },
@@ -38,8 +38,6 @@
       async function summitAddDrawer() {
         try {
           let data = await validate();
-          let SearchForm = getForm().getFieldsValue();
-          console.log('SearchForm', SearchForm);
           let httpApi = unref(isUpdate) ? padsUpdateApi : padsSaveApi;
           setProps({
             submitButtonOptions: {
@@ -52,9 +50,7 @@
             image:
               'http://zfb-4dkankan.oss-cn-shenzhen.aliyuncs.com/scene/1546422941329_测试.png' ??
               data.image.toString(),
-            type: SearchForm,
-          }).then((res) => {
-            console.log('itemUpdateApi', SearchForm, res);
+          }).then((_) => {
             setProps({
               submitButtonOptions: {
                 loading: false,
@@ -64,14 +60,19 @@
             emit('reload');
             closeDrawer();
           });
-        } catch (error) {}
+        } catch (error) {
+          console.log('error', error);
+        }
       }
       const getTitle = computed(() => (!unref(isUpdate) ? '新增轮播资讯' : '编辑轮播资讯'));
       const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
         resetFields();
         setDrawerProps({ confirmLoading: false });
         isUpdate.value = !!data?.isUpdate;
-        modelRef.value = data.record;
+        modelRef.value = {
+          ...data.record,
+          type: data.type,
+        };
 
         if (unref(isUpdate)) {
           console.log('data.record', data.record);

src/views/dashboard/corporation/deviceModal.vue

@@ -179,6 +179,7 @@
               field: `ID${index}`,
               component: 'Input',
               label: '设备ID' + index,
+              helpMessage: ['验证提示', '设备号码异常'],
               itemProps: {
                 validateTrigger: 'blur',
               },
@@ -187,8 +188,10 @@
               },
               rules: [
                 {
-                  required: false,
-                  trigger: 'blur',
+                  required: true,
+                  message: '请输入设备ID',
+                },
+                {
                   validator: handlevalidator,
                 },
               ],