Merge branch 'master' of http://47.101.159.18:3000/Muchinfo/MTP2.0_WEB

src/views/business/purchase/components/funds/index.vue

@@ -61,12 +61,12 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="已定价额">
-              <span class="white">{{ selectedRow.pricedamount }}</span>
+              <span class="white">{{ selectedRow.pricedamount +  " 元"  }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="调整金额">
-              <span class="white">{{ selectedRow.reckonadjustamount }}</span>
+              <span class="white">{{ selectedRow.reckonadjustamount + " 元" }}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -75,12 +75,12 @@
           <a-col :span="12">
             <a-form-item label="货款总额">
               <span
-                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}</span>
+                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="保证金">
-              <span class="white">{{ selectedRow.margin }}</span>
+              <span class="white">{{ selectedRow.margin + " 元"}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -88,12 +88,12 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="其他费用">
-              <span class="white">{{ selectedRow.reckonotheramount }}</span>
+              <span class="white">{{ selectedRow.reckonotheramount  + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="合计总额">
-              <span class="white">{{ formatValue(selectedRow.totalamount) }}</span>
+              <span class="white">{{ formatValue(selectedRow.totalamount) + " 元"}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -101,12 +101,12 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="已支付额">
-              <span class="white">{{ selectedRow.payamount }}</span>
+              <span class="white">{{ selectedRow.payamount + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="预计款额">
-              <span class="white">{{ selectedRow.prepayamount }}</span>
+              <span class="white">{{ selectedRow.prepayamount + " 元"}}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/purchase/components/invoice/index.vue

@@ -53,40 +53,40 @@
           <a-col :span="12">
             <a-form-item label="贷款总额">
               <span
-                    class="white">{{ formatValue(selectedRow.loanamount) + selectedRow.currencyname }}</span>
+                    class="white">{{ formatValue(selectedRow.loanamount) + " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="保证金">
               <span
-                    class="white">{{ formatValue(selectedRow.margin) + selectedRow.currencyname }}</span>
+                    class="white">{{ formatValue(selectedRow.margin)+ " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="其他费用">
               <span
-                    class="white">{{ selectedRow.reckonotheramount + selectedRow.currencyname }}</span>
+                    class="white">{{ selectedRow.reckonotheramount + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="合计总额">
-              <span class="white">{{ selectedRow.totalamount + selectedRow.currencyname }}</span>
+              <span class="white">{{ selectedRow.totalamount+ " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="已支付额 ">
-              <span class="white">{{ selectedRow.payamount + selectedRow.currencyname }}</span>
+              <span class="white">{{ selectedRow.payamount + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="已收票额">
-              <span class="white">{{ selectedRow.invoiceamount + selectedRow.currencyname }}</span>
+              <span class="white">{{ selectedRow.invoiceamount + " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="24">
             <a-form-item label="预收票额">
               <span
-                    class="white">{{ selectedRow.preinvoiceamount + selectedRow.currencyname }}</span>
+                    class="white">{{ selectedRow.preinvoiceamount + " 元" }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/purchase/components/settlement/index.vue

@@ -65,29 +65,29 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="已定价量">
-              <span class="white">{{ selectedRow.pricedqty + selectedRow.enumdicname }}</span>
+              <span class="white">{{ selectedRow.pricedqty + " " + selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="已交收量">
-              <span class="white">{{ selectedRow.reckonrealqty + selectedRow.enumdicname }}</span>
+              <span class="white">{{ selectedRow.reckonrealqty + " " + selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="调整金额">
               <span
-                    class="white">{{ selectedRow.reckonadjustamount + selectedRow.currencyname }}</span>
+                    class="white">{{ selectedRow.reckonadjustamount + " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="保证金">
-              <span class="white">{{ selectedRow.margin + selectedRow.currencyname }}</span>
+              <span class="white">{{ selectedRow.margin + " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="24">
             <a-form-item label="其他费用">
               <span
-                    class="white">{{ selectedRow.reckonotheramount + selectedRow.currencyname }}</span>
+                    class="white">{{ selectedRow.reckonotheramount + " 元" }}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/sell/components/funds/index.vue

@@ -61,12 +61,12 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="已定价额">
-              <span class="white">{{ selectedRow.pricedamount }}</span>
+              <span class="white">{{ selectedRow.pricedamount + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="调整金额">
-              <span class="white">{{ selectedRow.reckonadjustamount }}</span>
+              <span class="white">{{ selectedRow.reckonadjustamount + " 元"}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -75,13 +75,13 @@
           <a-col :span="12">
             <a-form-item label="货款总额">
               <span
-                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
+                    class="white">{{ selectedRow.pricedamount + selectedRow.reckonadjustamount }}{{handleCurrencyname(selectedRow.currencyname) + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="保证金">
               <span
-                    class="white">{{ selectedRow.margin }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
+                    class="white">{{ selectedRow.margin }}{{handleCurrencyname(selectedRow.currencyname) + " 元"}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -90,13 +90,13 @@
           <a-col :span="12">
             <a-form-item label="其他费用">
               <span
-                    class="white">{{ selectedRow.reckonotheramount }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
+                    class="white">{{ selectedRow.reckonotheramount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="合计总额">
               <span
-                    class="white">{{ formatValue(selectedRow.totalamount) }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
+                    class="white">{{ formatValue(selectedRow.totalamount) }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
             </a-form-item>
           </a-col>
         </a-row>
@@ -105,13 +105,13 @@
           <a-col :span="12">
             <a-form-item label="已收付额">
               <span
-                    class="white">{{ selectedRow.payamount }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
+                    class="white">{{ selectedRow.payamount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="预收款额">
               <span
-                    class="white">{{ selectedRow.prepayamount }}{{handleCurrencyname(selectedRow.currencyname)}}</span>
+                    class="white">{{ selectedRow.prepayamount }}{{handleCurrencyname(selectedRow.currencyname)  + " 元"}}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/sell/components/invoice/index.vue

@@ -53,43 +53,43 @@
           <a-col :span="12">
             <a-form-item label="贷款总额">
               <span
-                    class="white">{{ formatValue(selectedRow.loanamount) + handleCurrencyname(selectedRow.currencyname) }}</span>
+                    class="white">{{ formatValue(selectedRow.loanamount) + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="保证金">
               <span
-                    class="white">{{ formatValue(selectedRow.margin) + handleCurrencyname(selectedRow.currencyname) }}</span>
+                    class="white">{{ formatValue(selectedRow.margin) + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="其他费用">
               <span
-                    class="white">{{ selectedRow.reckonotheramount + handleCurrencyname(selectedRow.currencyname) }}</span>
+                    class="white">{{ selectedRow.reckonotheramount + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="合计总额">
               <span
-                    class="white">{{ selectedRow.totalamount + handleCurrencyname(selectedRow.currencyname) }}</span>
+                    class="white">{{ selectedRow.totalamount + " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="已收额 ">
               <span
-                    class="white">{{ selectedRow.payamount + handleCurrencyname(selectedRow.currencyname) }}</span>
+                    class="white">{{ selectedRow.payamount + " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="已开票额">
               <span
-                    class="white">{{ selectedRow.invoiceamount + handleCurrencyname(selectedRow.currencyname) }}</span>
+                    class="white">{{ selectedRow.invoiceamount + " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="24">
             <a-form-item label="预开票额">
               <span
-                    class="white">{{ selectedRow.preinvoiceamount + handleCurrencyname(selectedRow.currencyname) }}</span>
+                    class="white">{{ selectedRow.preinvoiceamount+ " 元"}}</span>
             </a-form-item>
           </a-col>
         </a-row>

src/views/business/sell/components/settlement/index.vue

@@ -65,29 +65,29 @@
         <a-row :gutter="24">
           <a-col :span="12">
             <a-form-item label="已定价量">
-              <span class="white">{{ selectedRow.pricedqty + selectedRow.enumdicname }}</span>
+              <span class="white">{{ selectedRow.pricedqty + " " +  selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="已交收量">
-              <span class="white">{{ selectedRow.reckonrealqty + selectedRow.enumdicname }}</span>
+              <span class="white">{{ selectedRow.reckonrealqty + " " +  selectedRow.enumdicname }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="调整金额">
               <span
-                    class="white">{{ selectedRow.reckonadjustamount + selectedRow.currencyname }}</span>
+                    class="white">{{ selectedRow.reckonadjustamount + " 元"}}</span>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="保证金">
-              <span class="white">{{ selectedRow.margin + selectedRow.currencyname }}</span>
+              <span class="white">{{ selectedRow.margin + " 元" }}</span>
             </a-form-item>
           </a-col>
           <a-col :span="24">
             <a-form-item label="其他费用">
               <span
-                    class="white">{{ selectedRow.reckonotheramount + selectedRow.currencyname }}</span>
+                    class="white">{{ selectedRow.reckonotheramount + " 元" }}</span>
             </a-form-item>
           </a-col>
         </a-row>