浏览代码

feat: 修改bug

tangning 2 年之前
父节点
当前提交
ec38a32567

+ 2 - 1
src/locales/lang/en/routes/equity.ts

@@ -68,6 +68,7 @@ export default {
   operation:{
     0:'Authorize',
     1:'Unbind',
-  }
+  },
+  jjxs:'total',
 }
 

+ 2 - 1
src/locales/lang/zh-CN/routes/equity.ts

@@ -68,6 +68,7 @@ export default {
   operation:{
     0:'授权',
     1:'解除',
-  }
+  },
+  jjxs:'即将销售',
 }
 

+ 23 - 13
src/views/equity/InvoiceModal.vue

@@ -80,7 +80,7 @@
               },
             ],
             colProps: {
-              span: 16,
+              span: 19,
             },
         },{
             field: 'incrementTypeId',
@@ -89,6 +89,7 @@
             required: true,
             componentProps: {
               maxLength: 50,
+              style:'width:200px',
               api: async function () {
                 const list = await dincrementList();
                 return list.map(ele => {
@@ -104,6 +105,9 @@
               },
               onChange:(value)=>{
                 updateSchema([{
+                  field: 'incrementTypeId',
+                  suffix:`${t('routes.equity.syks')} ${value == 3?agent.value.highSubNum:agent.value.majorSubNum} ${value == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`, 
+                },{
                   field: 'count',
                   componentProps: {
                     max:value == 3?agent.value.highSubNum:agent.value.majorSubNum,
@@ -111,7 +115,6 @@
                   },
                 },{
                   field: 'totalTime',
-                  suffix:`${t('routes.equity.syks')} ${value == 3?agent.value.highSubNum:agent.value.majorSubNum} ${value == 3?t('routes.equity.unit.-2'):t('routes.equity.unit.-1')}`, 
                   componentProps: {
                     options: timeOption(value)
                   },
@@ -123,7 +126,7 @@
               }
               },
             colProps: {
-              span: 16,
+              span: 21,
             },
           },{
             field: 'count',
@@ -138,36 +141,43 @@
             componentProps: {
               max:agent.value.majorSubNum,
               min:1,
-              // onChange:(value)=>{
-              //   setFieldsValue({
-              //     incrementEndTime:dayjs(fileFlow.incrementEndTime || new Date()).add(value,fileFlow.validTimeType == 0?'year':'month').format('YYYY-MM-DD')
-              //   });
-              // }
+              onChange:(value)=>{
+                let { incrementTypeId, totalTime } = getFieldsValue()
+                console.log('totalTime',totalTime)
+                updateSchema([{
+                  field: 'totalTime',
+                  suffix:totalTime?`${t('routes.equity.jjxs')} ${value * totalTime} ${t('routes.equity.unit.1')}`:'',
+                }]);
+              }
             },
             colProps: {
-              span: 19,
+              span: 24,
             },
           },{
             field: 'totalTime',
             component: 'Select',
             label: t('routes.equity.totalTime'),
             required: true,
-            // suffix:`${t('routes.equity.syks')} ${agent.value.majorSubNum} ${t('routes.equity.unit.1')}`,
             itemProps: {
               validateTrigger: 'onBlur',
             },
             componentProps: {
               options:[],
               listHeight:150,
+              style:'width:200px',
               onChange:(value)=>{
-                let { incrementTypeId } = getFieldsValue()
+                let { incrementTypeId ,count = 1 } = getFieldsValue()
+                updateSchema([{
+                  field: 'totalTime',
+                  suffix:`${t('routes.equity.jjxs')} ${value * count} ${t('routes.equity.unit.1')}`,
+                }]);
                 setFieldsValue({
                   incrementEndTime:dayjs(fileFlow.incrementEndTime || new Date()).add(value,incrementTypeId != 3?'year':'month').format('YYYY-MM-DD')
                 });
               }
             },
             colProps: {
-              span: 19,
+              span: 21,
             },
           },{
             field: 'incrementEndTime',
@@ -213,7 +223,7 @@
           {field: 'shipNum',ifShow:fileFlow.type == 3,},
           {field: 'email',ifShow:fileFlow.type == 2,},
           {field: 'file',ifShow:fileFlow.type == 2,},
-          {field: 'totalTime',suffix:`${t('routes.equity.syks')} ${agent.value.majorSubNum} ${t('routes.equity.unit.1')}`,},
+          {field: 'totalTime' },
           {field: 'count',componentProps:{
               max:agent.value.majorSubNum,
               min:1,

+ 3 - 0
src/views/finance/data.tsx

@@ -62,6 +62,9 @@ export const columns: BasicColumn[] = [
     dataIndex: 'totalTime',
     // slots: { customRender: 'orderStatus' },
     width: 120,
+    customRender: ({ record }) => {
+      return record.type == 2?'-':record.totalTime;
+    },
   },
   {
     title: t('routes.equity.giveType'),