登录

login/src/config/env.production.js

@@ -12,6 +12,9 @@ module.exports = {
   baseApi: "http://14.29.248.135:8888", // 本地api请求地址
   baseImgApi: "http://14.29.248.135:8888", // 图片api请求地址
   loginUrl: "http://14.29.248.135:8888/sc-login/login", // 项目地址
+  baseExcelApi: "http://14.29.248.135:8888", // excel请求地址
+  baseMapApi:"http://14.29.248.135:8888",
+  websoketUrl:'114.135.61.186:21020',
 
   upload: {
     imageSize: 5, // MB

login/vue.config.js

@@ -13,7 +13,7 @@ function resolve(dir) {
 }
 
 module.exports = {
-    publicPath: process.env.NODE_ENV === 'sit' ? '/sc-login' : '/',
+    publicPath: process.env.NODE_ENV == 'development' ? '/' : '/sc-login',
     productionSourceMap: false,
     chainWebpack: config => {
         // 配置别名

operationSupport/src/views/payService/leaseBill/stepPage/bulk.vue

@@ -1,6 +1,8 @@
 <template>
     <div>
-        <div class="formContent-item_title marginNone">{{ chiData.address }}</div>
+        <div class="formContent-item_title marginNone">
+            客户名称：{{ chiData.residentName || '--' }} <br />租赁房屋： {{ chiData.address || '--' }}
+        </div>
         <div class="formContent-item_title noneBef">{{ assets }}</div>
         <zz-table :settings="{ showIndex: true, stripe: true, hidePagination: true }" :cols="cols" :data="tabList">
             <template slot-scope="scope" slot="payBeginTime">
@@ -38,14 +40,13 @@ export default {
                 },
                 {
                     label: '费用名称',
-                    prop: 'chargeName',
-                    width: '200'
+                    prop: 'chargeName'
                 },
                 {
-                    label: '计费日期',
+                    label: '计费周期',
                     prop: 'payBeginTime',
                     slot: 'payBeginTime',
-                    width: '150'
+                    width: '200'
                 },
                 {
                     label: '费用金额(元)',
@@ -160,6 +161,9 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
+.formContent-item_title {
+    font-weight: 600;
+}
 .marginNone {
     margin-bottom: 0;
 }

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

@@ -1,6 +1,8 @@
 <template>
     <div class="lookDetail">
-        <div class="formContent-item_title">{{ thisItem.billNumber }}-{{ thisItem.assets }}</div>
+        <div class="formContent-item_title">
+            客户名称：{{ thisItem.residentName || '--' }} <br />租赁房屋： {{ thisItem.assets || '--' }}
+        </div>
         <el-form ref="form" label-width="110px">
             <template v-for="(item, index) in formLook">
                 <el-col :span="12" :key="index">
@@ -9,9 +11,6 @@
                             <template v-if="item.slot == 'assetsArea' && thisItem['chargeType'] == 4">
                                 {{ !!thisItem['parkingDetail'] ? thisItem['parkingDetail'] : '--' }}
                             </template>
-                            <template v-else-if="item.slot == 'chargeMode'">
-                                {{ !!chargeModeValue[thisItem[item.prop]] ? chargeModeValue[thisItem[item.prop]] : '--' }}
-                            </template>
                             <template v-else-if="item.slot === 'chargeStatus'">
                                 <span v-if="thisItem['chargeStatus'] == 1" class="redText">未缴费</span>
                                 <span v-else class="greenText">已缴费</span>
@@ -38,18 +37,13 @@ export default {
     props: ['params'],
     data() {
         return {
-            chargeModeValue: {
-                1: '固定收费',
-                2: '价格*面积收费',
-                4: '单价*用量'
-            },
             formLook: [
                 {
                     label: '费用名称:',
                     prop: 'chargeName'
                 },
                 {
-                    label: '计费标准:',
+                    label: '计费方式:',
                     prop: 'chargeModeDict'
                 },
                 {
@@ -58,7 +52,7 @@ export default {
                     slot: 'assetsArea'
                 },
                 {
-                    label: '单价(元):',
+                    label: '单价(元/㎡/月):',
                     prop: 'chargePrice'
                 },
                 {
@@ -84,12 +78,8 @@ export default {
                     slot: 'chargeStatus'
                 },
                 {
-                    label: '业主:',
-                    prop: 'residentName'
-                },
-                {
-                    label: '业主手机号:',
-                    prop: 'phone'
+                    label: '支付方式:',
+                    prop: 'payTypeDict'
                 },
                 {
                     label: '收款人:',
@@ -106,6 +96,10 @@ export default {
                 {
                     label: '实收金额(元):',
                     prop: 'receivedAmount'
+                },
+                {
+                    label: '备注:',
+                    prop: 'remark'
                 }
             ],
             thisItem: {}
@@ -151,6 +145,9 @@ export default {
 <style lang="scss" scoped>
 @import '@assets/css/public-style.scss';
 .lookDetail {
+    .formContent-item_title {
+        font-weight: 600;
+    }
     /deep/ .el-form-item__label,
     /deep/.el-form-item__content {
         font-size: 12px;

operationSupport/src/views/payService/leaseBill/stepPage/single.vue

@@ -1,6 +1,8 @@
 <template>
     <div class="lookDetail">
-        <div class="formContent-item_title">{{ chiData.assets }}</div>
+        <div class="formContent-item_title">
+            客户名称：{{ thisItem.residentName || '--' }} <br />租赁房屋： {{ chiData.assets || '--' }}
+        </div>
         <el-form ref="form" :model="formData" :rules="formRules" label-width="110px">
             <template v-for="(item, index) in formLook">
                 <el-col :span="12" :key="index">
@@ -9,9 +11,6 @@
                             <template v-if="item.slot == 'assetsArea' && thisItem['chargeType'] == 4">
                                 {{ !!thisItem['parkingDetail'] ? thisItem['parkingDetail'] : '--' }}
                             </template>
-                            <template v-else-if="item.slot == 'chargeMode'">
-                                {{ !!chargeModeValue[thisItem[item.prop]] ? chargeModeValue[thisItem[item.prop]] : '--' }}
-                            </template>
                             <template v-else-if="item.slot == 'chargeStatus'">
                                 <span class="redText">未缴费</span>
                             </template>
@@ -56,11 +55,6 @@ export default {
     props: ['params'],
     data() {
         return {
-            chargeModeValue: {
-                1: '固定收费',
-                2: '价格*面积收费',
-                4: '单价*用量'
-            },
             formLook: [
                 {
                     label: '费用名称:',
@@ -68,8 +62,7 @@ export default {
                 },
                 {
                     label: '计费方式:',
-                    prop: 'chargeMode',
-                    slot: 'chargeMode'
+                    prop: 'chargeModeDict'
                 },
                 {
                     label: '面积(㎡):',
@@ -77,7 +70,7 @@ export default {
                     slot: 'assetsArea'
                 },
                 {
-                    label: '价格(元/月):',
+                    label: '单价(元/㎡/月):',
                     prop: 'chargePrice'
                 },
                 {
@@ -97,14 +90,6 @@ export default {
                     prop: 'chargeStatus',
                     slot: 'chargeStatus'
                 },
-                {
-                    label: '业主:',
-                    prop: 'residentName'
-                },
-                {
-                    label: '业主手机号:',
-                    prop: 'phone'
-                },
                 {
                     label: '账单计费日期:',
                     prop: 'payEndTime',
@@ -216,6 +201,9 @@ export default {
 </script>
 <style lang="scss" scoped>
 .lookDetail {
+    .formContent-item_title {
+        font-weight: 600;
+    }
     /deep/ .el-form-item__label,
     /deep/.el-form-item__content {
         font-size: 12px;