BUG

operationSupport/src/views/patrolManagement/popups/patrolDetails.vue

@@ -19,6 +19,7 @@
       </div>
     </div>
     <div class="contentText">
+
       <div class="leftMap">
         <map-value
           :point="thisItem"
@@ -28,6 +29,35 @@
           :height="400"
         ></map-value>
         <div class="formLabel">
+          <div class="formContent-item_title">巡更任务汇报情况
+            <div style="float: right;">
+              <el-tooltip
+                class="item"
+                effect="light"
+                placement="bottom"
+                content="导出"
+              >
+                <i
+                  class="zoniot_font zoniot-icon-daochu2"
+                  @click="exportExcel"
+                ></i>
+              </el-tooltip>
+            </div>
+
+          </div>
+          <!-- <div>
+            <el-tooltip
+              class="item"
+              effect="light"
+              placement="bottom"
+              content="导出"
+            >
+              <i
+                class="zoniot_font zoniot-icon-daochu2"
+                @click="exportExcel"
+              ></i>
+            </el-tooltip>
+          </div> -->
           <el-table
             :data="tableData"
             style="width: 100%"
@@ -244,6 +274,10 @@ export default {
     }
   },
   methods: {
+    exportExcel () {
+      // this.__exportExcel('/czc-charge/charge/bill/export/excel', this.mixins_query);
+    },
+
     standard () {
       this.$http.get('/czc-community/patrol/record/standard/detail', { recordId: this.thisObj.id }).then(({ data, status, msg }) => {
         debugger;
@@ -442,4 +476,7 @@ export default {
         cursor: pointer;
     }
 }
+.zoniot_font {
+    font-size: 30px !important;
+}
 </style>

operationSupport/src/views/payService/landlordBill/index.vue

@@ -649,7 +649,6 @@ export default {
       }
     },
     exportExcel () {
-      debugger
       this.__exportExcel('/czc-charge/charge/bill/export/excel', this.mixins_query);
     },
     typeTimeTransition (start, end) {

operationSupport/src/views/payService/systemSetup/stepPage/billingSettings.vue

@@ -404,7 +404,7 @@ export default {
           userType: Number(item.commission),
           feeType: Number(item.expenseType),
           commissionMethod: Number(item.commissionPlatform),
-          divideIntoValues: Number(item.platformAmount),
+          divideIntoValues: Number(item.commissionPlatform) == '2' ? Number(item.platformAmount) * 100 : Number(item.platformAmount),
         })
       })
 

operationSupport/src/views/workOrders/index.vue

@@ -246,6 +246,7 @@ export default {
       });
     },
     closeTask (row, data = {}) {
+      debugger
       new Promise((resolve) => {
         let title = '关闭工单';
         this.$store.dispatch('addPopup', {
@@ -260,7 +261,10 @@ export default {
           },
           notip: true,
           title: title,
-          confirmButtonText: row.auditStatus == null ? '提交审核' : '确认'
+          confirmButtonText: row.auditStatus == null ? '提交审核' : '确认',
+          showConfirmButton: row.auditStatus == 2 ? true : false,
+          showCancelButton: row.auditStatus == 2 ? true : false,
+          hideStar: row.auditStatus == 2 ? true : false,
         });
       }).then(() => {
         this.mixins_search();