tangning 2 anni fa
parent
commit
345357cf7b
2 ha cambiato i file con 5 aggiunte e 4 eliminazioni
  1. 1 1
      src/views/equity/DownModal.vue
  2. 4 3
      src/views/equity/InvoiceModal.vue

+ 1 - 1
src/views/equity/DownModal.vue

@@ -74,7 +74,7 @@
                     /* eslint-disable-next-line */
                     return Promise.reject(t('routes.equity.rules.userName1'));
                   }
-                  let res = await checkUserName({userName:value})
+                  const res = await checkUserName({userName:value})
                   if(!res){
                     return Promise.reject(t('routes.equity.rules.userName2'));
                   }

+ 4 - 3
src/views/equity/InvoiceModal.vue

@@ -124,7 +124,7 @@
                 }])
                 setFieldsValue({
                   count:1,
-                  incrementEndTime: dayjs().add(1,value!='3'?'year':'month').format('YYYY-MM-DD'),
+                  incrementEndTime: dayjs().add(totalTime?totalTime:1,value!='3'?'year':'month').format('YYYY-MM-DD'),
                 });
               }
               },
@@ -149,7 +149,7 @@
                 console.log('totalTime',totalTime)
                 updateSchema([{
                   field: 'totalTime',
-                  suffix:totalTime?`${t('routes.equity.jjxs')} ${value * totalTime} ${incrementTypeId == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`:'',
+                  suffix:(totalTime && value)?`${t('routes.equity.jjxs')} ${value * totalTime} ${incrementTypeId == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`:'',
                 }]);
               }
             },
@@ -170,9 +170,10 @@
               style:'width:200px',
               onChange:(value)=>{
                 let { incrementTypeId ,count = 1, } = getFieldsValue()
+
                 updateSchema([{
                   field: 'totalTime',
-                  suffix:`${t('routes.equity.jjxs')} ${value * count} ${incrementTypeId == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`,
+                  suffix:(value && count)?`${t('routes.equity.jjxs')} ${value * count} ${incrementTypeId == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`:'',
                 }]);
                 setFieldsValue({
                   incrementEndTime:dayjs(fileFlow.incrementEndTime || new Date()).add(value,incrementTypeId != 3?'year':'month').format('YYYY-MM-DD')