Merge remote-tracking branch 'origin/master'

src/views/ldt_bills/pointbills.vue

@@ -23,32 +23,32 @@
           余额(易宝):
           <span
             style="background-color: #494141;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-<!--            {{ censusPrice.accountsPayable }}-->
-            {{ parseFloat(censusPrice.yeePayBalance | 0).toFixed(2) }}
+            {{ censusPrice.accountsPayable }}
+<!--            {{ parseFloat(censusPrice.yeePayBalance | 0).toFixed(2) }}-->
           </span>
         </span>&nbsp;
         <span type="warning" style="font-family: '宋体',serif" v-if="this.userInfo.role_name !== 'administrator'">
           总金额:
           <span
             style="background-color: #967f1e;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-<!--            {{ censusPrice.accountsPayable }}-->
-            {{ parseFloat(censusPrice.accountsPayable | 0).toFixed(2) }}
+            {{ censusPrice.accountsPayable }}
+<!--            {{ parseFloat(censusPrice.accountsPayable | 0).toFixed(2) }}-->
           </span>
         </span>&nbsp;
         <span type="info" style="font-family: '宋体',serif">
           已核销金额:
           <span
             style="background-color: #096e38;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-<!--            {{ censusPrice.handledAmount }}-->
-            {{ parseFloat(censusPrice.handledAmount | 0).toFixed(2) }}
+            {{ censusPrice.handledAmount }}
+<!--            {{ parseFloat(censusPrice.handledAmount | 0).toFixed(2) }}-->
           </span>
         </span>
         <span type="info" style="font-family: '宋体',serif">
           未核销金额:
           <span
             style="background-color: #f60824;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-<!--            {{ censusPrice.untreatedAmount }}-->
-            {{ parseFloat(censusPrice.untreatedAmount | 0).toFixed(2) }}
+            {{ censusPrice.untreatedAmount }}
+<!--            {{ parseFloat(censusPrice.untreatedAmount | 0).toFixed(2) }}-->
           </span>
         </span>
       </template>
@@ -251,6 +251,17 @@ export default {
             label: "是否已经核销",
             prop: "isCheak",
             labelWidth: "120",
+            type: "switch",
+            dicData: [
+              {
+                label: "否",
+                value: 0
+              },
+              {
+                label: "是",
+                value: 1
+              }
+            ],
             rules: [{
               required: true,
               message: "请输入是否已经核销",