Merge branch 'master' of https://hel.hand-china.com/komatsu/komatsu-lease-app

src/modules/intention/views/index.vue

@@ -24,6 +24,7 @@ import Plus from '@/components/Plus.vue'
 import api from "../api";
 import { useRouter } from "vue-router";
 import { useIntention } from '../store/index'
+import {currency} from '@/utils/textFormat'
 
 const formStore = useIntention()
 
@@ -35,8 +36,8 @@ const getList = async () => {
     listValue = res.rows.map(item => {
       return {
         title: item.intentionNumber,
-        other_title: item.creationDate,
-        values: [["合同金额", "状态"], ["￥ " + (item.contractAmount || '0.00'), item.intentionStatusN]],
+        other_title: item.creationDate.split(' ')[0],
+        values: [["合同金额", "状态"], ["￥ " + (currency(item.contractAmount) || '0.00'), item.intentionStatusN]],
         intentionId: item.intentionId
       }
     })

src/modules/intention/views/intentionForm.vue

@@ -35,7 +35,7 @@ let location = useLocation()
 const formRaw = [
   {
     title: '合同总额',
-    propName: 'contractAmount',
+    propName: 'financeAmount',
     type: 'currency',
     value: '',
     isRequired: true
@@ -123,7 +123,7 @@ const save = async () => {
     }
     console.log(formValueObj);
     if (formConfig.validate()) {
-      let res = await api.saveInfo({ remark: message, ...formValueObj })
+      let res = await api.saveInfo({ remark: message, ...formValueObj, financeAmount: +formValueObj.financeAmount})
       if (res.success) {
         Toast.success('保存成功');
       } else {

src/modules/repayPlan/views/index.vue

@@ -24,6 +24,7 @@ import Notice from '@/components/Notice.vue'
 import ListItem from '@/components/ListItem.vue'
 import api from "../api";
 import { useRouter } from "vue-router";
+import {currency} from '@/utils/textFormat'
 
 const searchVal = $ref('');
 
@@ -52,11 +53,12 @@ const getList = async () => {
       ...item,
       title: item.contractNumber,
       other_title: item.applyDate?.split(' ')[0],
-      values: [["剩余应还金额", "状态", "融资金额"], [item.residueAmount, item.contractStatusN, item.financeAmount]]
+      values: [["剩余应还金额", "状态", "融资金额"], [currency(item.residueAmount),item.contractStatusN, currency(item.financeAmount)]]
     }))
   }else {
     list = [];
   }
+
   listValue = list;
   refreshing = false;
 };

src/modules/repayPlan/views/plan.vue

@@ -15,11 +15,11 @@
             </div>
             <div class="center-item">
               <p>
-                <span>应付金额</span>
+                <span>应付</span>
                 <span>￥9,000.00</span>
               </p>
               <p>
-                <span>待付金额</span>
+                <span>待付</span>
                 <span>￥0.00</span>
               </p>
             </div>