调整部分字段无数据时展示格式

src/Form/commissionDistribution/add.vue

@@ -88,7 +88,7 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥ '+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'rewardamount'">
                     {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -100,13 +100,13 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else>
                     {{ scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation' ? scope.column.data[[scope.column.columnname]] : '--' }}

src/Form/salerExpenditure/add.vue

@@ -70,7 +70,7 @@
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'orderprice'">
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -97,13 +97,13 @@
                       {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else>
                       {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/Form/salerIncome/add.vue

@@ -65,7 +65,7 @@
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                      {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                     </div>
                     <div v-else-if="scope.column.columnname === 'rewardamount'">
                       {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}

src/SDrpManagement/commissionDistribution/detail/components/income.vue

@@ -47,7 +47,7 @@
           {{scope.column.data[[scope.column.columnname]]?'¥ '+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
         <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'rewardamount'">
           {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -59,13 +59,13 @@
           {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'amount'">
           <div v-if="data.status != '发放' ">

src/SDrpManagement/commissionDistribution/detail/modules/addDetail.vue

@@ -86,7 +86,7 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥ '+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'rewardamount'">
                     {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -98,10 +98,13 @@
                     {{scope.column.data[[scope.column.columnname]]?'¥&nbsp;'+ tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
+                    {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
                   </div>
                   <div v-else>
                     {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/commissionDistribution/index.vue

@@ -56,10 +56,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
-          <span style="color: red">{{scope.data.column.data.amount?tool.formatAmount(scope.data.column.data.amount,2):scope.data.column.data.amount == 0?tool.formatAmount(0,2):'--'}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
-          {{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/SDrpManagement/myaccountclass/index.vue

@@ -62,10 +62,10 @@
                 </span>
               </div>
               <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-                {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+                {{scope.column.data[[scope.column.columnname]]?'¥ ' + tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ ' + '0.00':'¥ 0.00'}}
               </div>
               <div v-else-if="scope.column.columnname === 'amount'">
-                {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+                {{scope.column.data[[scope.column.columnname]]?'¥ ' + tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ ' + '0.00':'--'}}
               </div>
               <div v-else>
                 {{ scope.column.data[[scope.column.columnname]] ? scope.column.data[[scope.column.columnname]] : '--' }}
@@ -114,7 +114,7 @@
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'orderprice'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -138,7 +138,7 @@
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'rate'">
               {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}

src/SDrpManagement/salerAccount/index.vue

@@ -35,10 +35,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '0'?'#52c41a':'#333333'}">{{scope.data.column.data[[scope.data.column.columnname]] == '0'?'在职':'离职'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'balance'">
-          <span style="color: red">{{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ 0.00':'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'expectedReward'">
-          {{tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2)}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/SDrpManagement/salerAccount/modules/detail.vue

@@ -47,10 +47,10 @@
               {{scope.column.data[[scope.column.columnname]] == '1' ? '收入':'支出'}}
             </div>
             <div v-else-if="scope.column.columnname === 'amount'">
-              {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ '+'0.00':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-              {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ '+'0.00':'¥ 0.00'}}
             </div>
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/detail/components/income.vue

@@ -28,7 +28,7 @@
           </div>
         </div>
         <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'orderprice'">
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -55,13 +55,13 @@
           {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/detail/modules/income/add.vue

@@ -17,7 +17,7 @@
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'orderprice'">
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -44,10 +44,13 @@
               {{scope.column.data[[scope.column.columnname]]?Math.round(tool.formatAmount(scope.column.data[[scope.column.columnname]]*100)*100)/100 + '%':scope.column.data[[scope.column.columnname]] == 0?'0%':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
+            </div>
+            <div v-else-if="scope.column.columnname === 'afterrebateamount'">
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerExpenditure/index.vue

@@ -46,10 +46,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
-          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
-          {{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/detail/components/commissionDetails.vue

@@ -44,7 +44,7 @@
           </div>
         </div>
         <div v-else-if="scope.column.columnname === 'orderExpectedamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'rewardamount'">
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
@@ -56,13 +56,13 @@
           {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else-if="scope.column.columnname === 'subhrcashbilldetailamount'">
-          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+          {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/detail/modules/commissionDetails/add.vue

@@ -20,10 +20,10 @@
               {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
             </div>
             <div v-else-if="scope.column.columnname === 'afterrebateprice'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else-if="scope.column.columnname === 'afterrebateamount'">
-              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'--'}}
+              {{scope.column.data[[scope.column.columnname]]?'¥ '+tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'¥ 0.00':'¥ 0.00'}}
             </div>
             <div v-else>
               {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}

src/SDrpManagement/salerIncome/index.vue

@@ -54,10 +54,10 @@
           <span :style="{color:scope.data.column.data[[scope.data.column.columnname]] == '新建'?'#333333':'#52c41a'}">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'amount'">
-          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}</span>
+          <span style="color: red">{{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'--'}}</span>
         </div>
         <div v-else-if="scope.data.column.columnname === 'subhrcashbilldetailamount'">
-          {{scope.data.column.data[[scope.data.column.columnname]]?tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'0.00':'--'}}
+          {{scope.data.column.data[[scope.data.column.columnname]]?'¥ '+tool.formatAmount(scope.data.column.data[[scope.data.column.columnname]],2):scope.data.column.data[[scope.data.column.columnname]] == 0?'¥ '+'0.00':'¥ 0.00'}}
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]] && scope.data.column.columnname !== 'operation'?scope.data.column.data[[scope.data.column.columnname]]:'--'}}