BUG

operationSupport/src/components/common/newsearch.vue

@@ -17,7 +17,7 @@
         class="col"
         v-for='(item, index) in normal'
         :key='index'
-        style="margin-top: 4px;"
+        :style="index==0 ? 'margin-top: 0px;' :  'margin-top: 4px;'"
       >
         <span class="search-box">
           <span

operationSupport/src/router/dynamicMuen.js

@@ -80,10 +80,10 @@ const staticMuen = [
         path: '/patrolStandard',
         component: () => import(/* webpackChunkName: "404" */ '@views/patrolManagement/patrolStandard.vue')
     },
-    // {
-    //     path: '/employeeServices',
-    //     component: () => import(/* webpackChunkName: "404" */ '@views/workOrders/employeeServices/index.vue')
-    // },
+    {
+        path: '/employeeServices',
+        component: () => import(/* webpackChunkName: "404" */ '@views/workOrders/employeeServices/index.vue')
+    },
     {
         path: '*',
         redirect: '/404'

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

@@ -144,7 +144,7 @@
                   <xk-upload
                     class="upload_class"
                     @callback="mixins_search"
-                    :params="{ importType: 'BILL' }"
+                    :params="{ importType: 'LANDLORD_BILL' }"
                   >
                     <span slot="content">批量导入</span>
                   </xk-upload>
@@ -644,7 +644,7 @@ export default {
     },
     addCommand (command) {
       if (command === 'template') {
-        this.__exportExcel('/czc-community/excel/download/template', { importType: '' });
+        this.__exportExcel('/czc-community/excel/download/template', { importType: 'LANDLORD_BILL' });
         return;
       }
     },

operationSupport/src/views/payService/landlordBill/stePage/details.vue

@@ -16,7 +16,7 @@
                 {{ !!thisItem['parkingDetail'] ? thisItem['parkingDetail'] : '--' }}
               </template>
               <template v-else-if="item.slot == 'chargeMode'">
-                {{ !!chargeModeValue[thisItem[item.prop]] ? chargeModeValue[thisItem[item.prop]] : '--' }}
+                {{chargeModeValue[thisItem[item.prop]]}}
               </template>
               <template v-else-if="item.slot === 'chargeStatus'">
                 <span
@@ -29,7 +29,7 @@
                 >已缴费</span>
               </template>
               <template v-else-if="item.slot === 'payEndTime'">
-                <div style="white-space: nowrap">{{ thisItem['payBeginTime'] }} - {{ thisItem['payEndTime'] }}</div>
+                <div style="white-space: nowrap">{{ (thisItem['payBeginTime']).substr(0,10) }} - {{ (thisItem['payEndTime']).substr(0,10) }}</div>
               </template>
 
               <template v-else>
@@ -53,7 +53,8 @@ export default {
       chargeModeValue: {
         1: '固定收费',
         2: '价格*面积收费',
-        4: '单价*用量'
+        3: '阶梯',
+        4: '单价*用量收费'
       },
       formLook: [
         {
@@ -62,7 +63,8 @@ export default {
         },
         {
           label: '计费方式:',
-          prop: 'chargeModeDict'
+          prop: 'chargeMode',
+          slot: 'chargeMode',
         },
         {
           label: '面积(㎡):',
@@ -70,7 +72,7 @@ export default {
           slot: 'assetsArea'
         },
         {
-          label: '单价(元/㎡):',
+          label: '单价(元):',
           prop: 'chargePrice'
         },
         {
@@ -135,10 +137,10 @@ export default {
   methods: {
     getDatali (id) {
       this.$http
-        .get('/czc-charge/charge/bill/findUserBillDetail', { id: id })
+        // /czc-charge/charge/bill/find/{id}
+        .post(`/czc-charge/charge/bill/find/${id}`)
         .then(({ data, msg, status }) => {
           if (status == 0) {
-
             this.thisItem = data;
           }
         })
@@ -157,9 +159,9 @@ export default {
         }
       } else if (val == 'chargePrice') {
         if (type == 2) {
-          lab = '价格(元/吨):';
+          lab = '价格(元):';
         } else if (type == 3) {
-          lab = '价格(元/度):';
+          lab = '价格(元):';
         }
       }
       return lab;

operationSupport/src/views/payService/landlordBill/stePage/editAmount.vue

@@ -62,7 +62,6 @@ export default {
     }
   },
   created () {
-    debugger
     Object.assign(this.formData, this.params.data);
   }
 };

operationSupport/src/views/payService/landlordBill/stePage/single.vue

@@ -255,7 +255,6 @@ export default {
   },
   created () {
     this.getDatali(this.params.data.id);
-    debugger
     this.chiData = this.params.data;
   }
 };

operationSupport/src/views/payService/landlordBill/stePage/temporary.vue

@@ -189,12 +189,11 @@ export default {
     },
     buildingList () {
       this.$http.get('/czc-community/landlord/buildingList', { id: this.formData.residentId }).then(({ data, status, msg }) => {
-
         if (status == 0) {
           this.dateBuilding = [];
           for (let i = 0; i < data.length; i++) {
             this.dateBuilding.push({
-              name: data[i].buildingName,
+              name: data[i].communityName + '-' + data[i].buildingName,
               id: data[i].id
             })
           }

operationSupport/src/views/payService/propertyFee/stepPage/details.vue

@@ -70,7 +70,7 @@ export default {
           slot: 'assetsArea'
         },
         {
-          label: '单价(元/㎡):',
+          label: '单价(元):',
           prop: 'chargePrice'
         },
         {
@@ -155,9 +155,9 @@ export default {
         }
       } else if (val == 'chargePrice') {
         if (type == 2) {
-          lab = '价格(元/吨):';
+          lab = '价格(元):';
         } else if (type == 3) {
-          lab = '价格(元/度):';
+          lab = '价格(元):';
         }
       }
       return lab;

operationSupport/src/views/workOrders/employeeServices/details.vue

@@ -1,7 +1,23 @@
 <template>
   <div class="main">
-    <div class="search">
-      <span>{{this.params.row.username}} - {{this.params.row.phone}}</span>
+    <div
+      class="search"
+      style="margin-bottom: 15px; height: 50px;"
+    >
+      <div class="formContent-item_title">{{this.params.row.username}} - {{this.params.row.phone}}</div>
+
+    </div>
+    <div style="padding: 0 17px;margin-bottom: 15px; height: 20px;">
+      <div style="float: left;">
+        <span>{{this.params.row.companyOrgName}}{{this.params.row.deptOrgName}}</span>
+      </div>
+      <div style="float: right;">
+        <span>业主报修工单数：</span>
+        <span style="color:#0be5f0;font-size: 20px;">{{this.params.row.workOrderNum}}</span>
+        <el-divider direction="vertical"></el-divider>
+        <span>服务费提成：</span>
+        <span style="color:#0be5f0;font-size: 20px;">{{this.params.row.royalty}}</span>
+      </div>
     </div>
     <zz-table
       :cols="cols"
@@ -62,4 +78,10 @@ export default {
     this.getUserList();
   },
 }
-</script>
+</script>
+
+<style lang="scss" scoped>
+/deep/.el-divider--vertical {
+    margin: 0 20px !important;
+}
+</style>

operationSupport/src/views/workOrders/employeeServices/index.vue

@@ -322,6 +322,9 @@ export default {
             row,
             callback: resolve,
           },
+          showConfirmButton: true,
+          showCancelButton: true,
+          hideStar: true,
           title: '任务详情'
         });
       }).then(() => {

operationSupport/src/views/workOrders/popups/details.vue

@@ -139,6 +139,27 @@
                 <span>报修人：</span>
                 <span>{{ thisItem['repairName'] }}</span>
               </div>
+              <div
+                class="steps-right-content"
+                v-if="item.type == 4"
+              >
+                <span>服务费金额（元）:</span>
+                <span> {{thisItem.cost}}</span>
+              </div>
+              <div
+                class="steps-right-content"
+                v-if="item.type == 4"
+              >
+                <span>收费状态：</span>
+                <span> {{thisItem.payStatus == '1' ? '已支付' : '未支付'}}</span>
+              </div>
+              <div
+                class="steps-right-content"
+                v-if="item.type == 4"
+              >
+                <span>收费方式：</span>
+                <span> 微信</span>
+              </div>
               <template v-else>
                 <div class="steps-right-content">
                   <span>处理人：</span>
@@ -155,12 +176,12 @@
             </div>
           </div>
         </template>
-        <!-- <div v-if="thisItem.orderStatus == 5">待评价111111</div> -->
+
         <div
           v-if="thisItem.orderStatus == 6"
           class="grate"
         >
-          {{this.thisItem.orderStatus}}
+          <!-- {{this.thisItem.orderStatus}} -->
           <div class="grate-rate">
             <div style="margin-top: 3px">评价星级：</div>
             <div>
@@ -253,7 +274,8 @@ export default {
         }
       ],
       thisItem: {},
-      thisActive: 0
+      thisActive: 0,
+
     };
   },
 
@@ -263,7 +285,9 @@ export default {
         .get('/czc-community/workOrder/find/' + id)
         .then(({ data, msg, status }) => {
           if (status == 0) {
+
             this.thisItem = data;
+
             this.thisActive = !!data.progressList.length ? Number(data.progressList.length) - 1 : 0;
           }
         })

operationSupport/src/views/workOrders/popups/dispatchTsk.vue

@@ -80,7 +80,8 @@ export default {
       },
       formRules: {
         urgencyDegree: [this.$valid.selectRequired('紧急程度')],
-        userId: [this.$valid.selectRequired('维修人员')]
+        userId: [this.$valid.selectRequired('维修人员')],
+        cost: [this.$valid.inputRequired('服务费用金额')],
       },
       formCols: [
         [