1

src/views/account/overview/AddModal.vue

@@ -82,15 +82,19 @@
               console.log('onChange', value);
               let { monthQy = 1, count = 1 } = getFieldsValue()
               let unitStr = value == '3' ? '个月' : '年';
+              let incrementEndTime = dayjs().add(1, value == '3' ? 'month' : 'year').format('YYYY-MM-DD')
               updateSchema([
                 { field: 'monthQy', ifShow: true, componentProps: { options: showOptions( value == '3' ? 12 : 5), } },
-                { field: 'count', suffix: ( count * monthQy ) + unitStr }
+                { field: 'count', suffix: ( count * monthQy ) + unitStr },
+                { field: 'incrementEndTime', componentProps: {
+                  disabledDate: (current) => {
+                    return current && current < dayjs().subtract(1, 'day').add(1, value == '3' ? 'month' : 'year');
+                  },
+                } }
               ]);
               setFieldsValue({
                 monthQy: 1,
-                incrementEndTime: dayjs()
-                  .add(1, value == '3' ? 'month' : 'year')
-                  .format('YYYY-MM-DD'),
+                incrementEndTime: incrementEndTime,
               });
             },
           },
@@ -130,8 +134,8 @@
           componentProps: {
             options: showOptions(5),
             onChange: (data = 1) => {
-              let { incrementTypeId, count = 1 } = getFieldsValue()
-              let unit = incrementTypeId == '3' ? 'month' : 'year'
+              let { incrementTypeId, count = 1 } = getFieldsValue();
+              let unit = incrementTypeId == '3' ? 'month' : 'year';
               let unitStr = incrementTypeId == '3' ? '个月' : '年';
               updateSchema({ field: 'count', suffix: ( count * data ) + unitStr });
               setFieldsValue({
@@ -171,7 +175,7 @@
             span: 16,
           },
           componentProps: {
-            disabled: true,
+            // disabled: true,
             valueFormat: 'YYYY-MM-DD',
             format: 'YYYY-MM-DD',
             disabledDate: (current) => {
@@ -216,6 +220,16 @@
             field: 'count',
             ifShow: !data.id,
           },
+          {
+            field: 'incrementEndTime',
+            componentProps: {
+              valueFormat: 'YYYY-MM-DD',
+              format: 'YYYY-MM-DD',
+              disabledDate: (current) => {
+                return current && current < dayjs(data.incrementEndTime).subtract(1, 'day').add(1, data.incrementTypeId == '3' ? 'month' : 'year');
+              },
+            },
+          },
         ]);
       });
       async function onDataReceive(data) {

src/views/device/putModal.vue

@@ -46,7 +46,7 @@
           colProps: {
             span: 18,
           },
-          helpMessage:'wifi名称需包含前缀，如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”。',
+          helpMessage: 'wifi名称需包含前缀，如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”、“YUNPRO_”。',
           rules: [
             {
               required: true,
@@ -56,13 +56,13 @@
                 if (!value) {
                   return Promise.reject('请输入wifi名称');
                 }
-                var list:string[] = ['4DKKPRO_','4DKKMI_','4DSS_','4DKK_','4DSG_'];
+                var list:string[] = ['4DKKPRO_','4DKKMI_','4DSS_','4DKK_','4DSG_','YUNPRO_'];
                 const some = list.some(item=>{
                   return value.indexOf(item) != -1
                 })
                 console.log('validator',some)
                 if(!some){
-                  return Promise.reject('wifi名称需包含前缀，如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”。');
+                  return Promise.reject('wifi名称需包含前缀，如“4DKKPRO_”、“4DKKMI_”、“4DSS_”、“4DKK_”、“4DSG_”、“YUNPRO_”。');
                 }
                 return Promise.resolve();
               },

src/views/empower/camera.vue

@@ -205,8 +205,8 @@
             },
           },
           {
-            field: 'machineUuid',
-            label: '设备UUID',
+            field: 'machineCode',
+            label: '机器码',
             component: 'Input',
             colProps: {
               xl: 8,

src/views/empower/install.vue

@@ -190,8 +190,8 @@
             },
           },
           {
-            field: 'machineUuid',
-            label: '设备UUID',
+            field: 'machineCode',
+            label: '机器码',
             component: 'Input',
             colProps: {
               xl: 8,