账单

operationSupport/src/router/dynamicMuen.js

@@ -76,10 +76,10 @@ const staticMuen = [
     //     path: '/landlordReview',
     //     component: () => import(/* webpackChunkName: "404" */ '@views/payService/landlordBill/index.vue')
     // },
-    // {
-    //     path: '/receivableExamine',
-    //     component: () => import(/* webpackChunkName: "404" */ '@views/payService/receivableExamine/index.vue')
-    // },
+    {
+        path: '/receivableExamine',
+        component: () => import(/* webpackChunkName: "404" */ '@views/payService/receivableExamine/index.vue')
+    },
     {
         path: '*',
         redirect: '/404'

operationSupport/src/views/ownerManagement/landlordReview/index.vue

@@ -44,12 +44,17 @@
           <el-tooltip
             effect="light"
             placement="bottom"
-            content="审核"
+            :content="scope.row.auditStatus ==  0 ?'审核' : '无法审核'"
           >
             <i
+              v-if="scope.row.auditStatus ==  0"
               class="zoniot_font zoniot-icon-shenhe"
               @click="deleteOne(scope.row)"
             ></i>
+            <i
+              v-else
+              class="zoniot_font zoniot-icon-shenhe ashText"
+            ></i>
           </el-tooltip>
 
         </template>

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

@@ -210,6 +210,7 @@
               <i
                 class="zoniot_font zoniot-icon-shoukuan"
                 @click="collections('single', scope.row)"
+                style="margin-right: 20px;"
               ></i>
             </el-tooltip>
             <el-tooltip
@@ -319,17 +320,12 @@ export default {
           width: '150'
         },
         {
-          label: '费用金额(元)',
+          label: '账单金额(元)',
           prop: 'amount'
         },
-        {
-          label: '滞纳金(元)',
-          prop: 'lateFee'
-        },
-
         {
           label: '应收金额(元)',
-          prop: 'receivableAmount'
+          prop: 'discountAmount'
         },
         {
           label: '缴费状态',
@@ -539,7 +535,6 @@ export default {
     },
     // 修改应收金额
     receivableAmount (row) {
-      debugger
       new Promise((resolve) => {
         this.$store.dispatch('addPopup', {
           url: '/payService/landlordBill/stePage/receivable.vue',
@@ -695,7 +690,7 @@ export default {
       chargeStatus: this.chargeStatus,
       chargeType: '1,2,3,4,5,6,7',
       payType: '',
-      value: '1'
+      customerType: '1'
     };
     this.mixins_search();
     this.communityNameList();

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

@@ -57,15 +57,14 @@ export default {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           this.$http.post('/czc-charge/bill/amount/audit/submit', { billId: this.params.id, applicantReason: this.ruleForm.reason, amount: this.ruleForm.amountReceived, applyAmount: Number(this.ruleForm.applicationAmount) }).then(({ status, data, msg }) => {
-            debugger
             if (status == 0) {
+              this.$message.success('成功');
               this.$emit('close');
               this.params.callback();
+            } else {
+              this.$message.error(msg);
             }
           })
-
-
-
         } else {
           return;
         }
@@ -73,8 +72,6 @@ export default {
     }
   },
   created () {
-    debugger
-    this.params;
     this.ruleForm.amountReceived = this.params.amount;
 
   }

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

@@ -50,13 +50,13 @@
             <el-table-column
               label="原应收金额（元）"
               width="120"
-              prop="discountAmount"
+              prop="origAmount"
             >
             </el-table-column>
             <el-table-column
               label="申请应收金额（元）"
               width="130"
-              prop="receivableAmount"
+              prop="applyAmount"
             >
             </el-table-column>
             <el-table-column
@@ -102,32 +102,7 @@ export default {
       YearTime: '',
       MonTime: '',
       typeNum: '2',
-      tableData: [
-        // {
-        //   name: '1',
-        //   amount: '100'
-        // }, {
-        //   name: '2',
-        //   amount: '200'
-        // },
-        // {
-        //   name: '3'
-        // },
-        // ,
-        // {
-        //   name: '3'
-        // }
-        // ,
-        // {
-        //   name: '4'
-        // },
-        // {
-        //   name: '5'
-        // },
-        // {
-        //   name: '6'
-        // }
-      ]
+      tableData: []
     }
   },
   methods: {
@@ -153,34 +128,32 @@ export default {
           title: '修改应收金额'
         });
       }).then(() => {
-        debugger
+        this.audit();
       });
     },
     audit () {
       this.$http.get('/czc-charge/bill/amount/audit/list', { billId: this.params.id }).then(({ status, data, msg }) => {
-        debugger
         if (status == 0) {
           this.tableData = [];
           var dataNum = [];
           for (let i = 0; i < data.length; i++) {
             this.tableData.push({
-              receivableAmount: data[i].receivableAmount,
-              discountAmount: data[i].discountAmount,
+              applyAmount: data[i].applyAmount,//申请金额
+              origAmount: data[i].origAmount,//原金额
               applicantReason: data[i].applicantReason,
               applicantName: data[i].applicantName,
-              remarks: data[i].remarks,
-              reviewedBy: data[i].reviewedBy,
+              remarks: data[i].remarks || '-',
+              reviewedBy: data[i].reviewedBy || '-',
               status: data[i].status == 1 ? '审核中' : data[i].status == 2 ? '审核通过' : '审核未通过'
             })
             dataNum.push(data[i].status);
           }
           for (let k = 0; k < dataNum.length; k++) {
-            if (data[k] == 1) {
+            if (dataNum[k] == 1) {
               this.typeNum = '1'
             }
           }
         }
-        debugger
       })
     }
   },

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

@@ -168,8 +168,7 @@ export default {
       });
     },
     landlord () {
-      this.$http.get('/czc-community/landlord/list').then(({ data, status, msg }) => {
-
+      this.$http.get('/czc-community/landlord/list', { communityId: this.params.communityId }).then(({ data, status, msg }) => {
         if (status == 0) {
           this.dateLandlady = [];
           for (let i = 0; i < data.length; i++) {
@@ -178,13 +177,11 @@ export default {
               label: data[i].id,
             })
           }
-
-          // dateBuilding
-          // /czc-community/landlord/buildingList
         }
       })
     },
     dateLandladyChange () {
+      this.formData.assetsId = '';
       this.buildingList();
     },
     dateLandladyItemChange (item) {
@@ -207,7 +204,6 @@ export default {
   },
   created () {
     this.getSelect();
-    debugger
     this.formData.assetsId = this.params.chiData.value;
     this.landlord();
   }

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

@@ -202,6 +202,7 @@
               <i
                 class="zoniot_font zoniot-icon-shoukuan"
                 @click="collections('single', scope.row)"
+                style="margin: 0"
               ></i>
             </el-tooltip>
             <el-tooltip
@@ -209,13 +210,31 @@
               class="item"
               effect="light"
               placement="bottom"
-              content="修改金额"
+              content="修改账单金额"
             >
-              <i
-                class="zoniot_font zoniot-icon-koufeijilu"
+              <img
+                src="../../../assets/img/icon_xiugaizhangdanjine.png"
+                alt=""
                 @click="editAmount(scope.row)"
-              ></i>
+                style="margin: 0 10px;"
+              >
+            </el-tooltip>
+
+            <el-tooltip
+              v-show="chargeStatus == 1"
+              class="item"
+              effect="light"
+              placement="bottom"
+              content="修改应收金额"
+            >
+              <img
+                src="../../../assets/img/icon_xiugaiyingshoujine.png"
+                alt=""
+                @click="receivableAmount(scope.row)"
+                style="margin-right: 10px;"
+              >
             </el-tooltip>
+
             <el-tooltip
               v-show="chargeStatus == 1"
               class="item"
@@ -226,6 +245,7 @@
               <i
                 class="zoniot_font zoniot-icon-shanchu redText"
                 @click="deluserbyidFn(scope.row.id)"
+                style="margin: 0"
               ></i>
             </el-tooltip>
             <el-tooltip
@@ -292,10 +312,13 @@ export default {
           label: '滞纳金(元)',
           prop: 'lateFee'
         },
-
+        {
+          label: '账单金额(元)',
+          prop: 'amount'
+        },
         {
           label: '应收金额(元)',
-          prop: 'receivableAmount'
+          prop: 'discountAmount'
         },
         {
           label: '缴费状态',
@@ -562,7 +585,33 @@ export default {
           this['mixins_query'][thisObj] = val;
         }
       }
-    }
+    },
+    // 修改应收金额
+    receivableAmount (row) {
+      new Promise((resolve) => {
+        this.$store.dispatch('addPopup', {
+          url: '/payService/propertyFee/stepPage/receivable.vue',
+          width: '830px',
+          height: '500px',
+          props: {
+            id: row.id,
+            communityName: row.communityName,
+            assets: row.assets,
+            residentName: row.residentName,
+            paymentDaysDict: row.paymentDaysDict,
+            amount: row.amount,
+            discountAmount: row.discountAmount,
+            callback: resolve,
+          },
+          showConfirmButton: true,
+          showCancelButton: true,
+          hideStar: true,
+          title: '修改应收金额'
+        });
+      }).then(() => {
+        this.mixins_search();
+      });
+    },
   },
   watch: {
     currentId (newValue, oldValue) {
@@ -616,7 +665,7 @@ export default {
       chargeStatus: this.chargeStatus,
       chargeType: '1,2,3,4,5,6,7',
       payType: '',
-      value: '2'
+      customerType: '2,3'
     };
   }
 };

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

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <el-form
+      :model="ruleForm"
+      :rules="rules"
+      ref="ruleForm"
+      label-width="150px"
+      class="demo-ruleForm"
+    >
+      <el-form-item label="原收金额（元）">
+        <el-input
+          v-model="ruleForm.amountReceived"
+          disabled
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        label="申请应收金额（元）"
+        prop="applicationAmount"
+      >
+        <el-input
+          v-model="ruleForm.applicationAmount"
+          type="number"
+          class="input_number"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="申请原因">
+        <el-input
+          v-model="ruleForm.reason"
+          type="textarea"
+        ></el-input>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+
+
+
+<script>
+export default {
+  props: ['params'],
+  data () {
+    return {
+      ruleForm: {
+        amountReceived: '',
+        applicationAmount: '',
+        reason: ''
+      },
+      rules: {
+        applicationAmount: [
+          { required: true, message: '请输入申请应收金额（元）', trigger: 'blur' },
+        ]
+      }
+    }
+  },
+  methods: {
+    submit () {
+      this.$refs.ruleForm.validate((valid) => {
+        if (valid) {
+          this.$http.post('/czc-charge/bill/amount/audit/submit', { billId: this.params.id, applicantReason: this.ruleForm.reason, amount: this.ruleForm.amountReceived, applyAmount: Number(this.ruleForm.applicationAmount) }).then(({ status, data, msg }) => {
+            if (status == 0) {
+              this.$message.success('成功');
+              this.$emit('close');
+              this.params.callback();
+            } else {
+              this.$message.error(msg);
+            }
+          })
+        } else {
+          return;
+        }
+      })
+    }
+  },
+  created () {
+    this.ruleForm.amountReceived = this.params.amount;
+
+  }
+}
+
+
+
+</script>
+
+
+
+
+<style lang="scss" scoped>
+/deep/.input_number input::-webkit-outer-spin-button,
+/deep/.input_number input::-webkit-inner-spin-button {
+    -webkit-appearance: none;
+}
+/deep/.input_number input[type='number'] {
+    -moz-appearance: textfield;
+}
+</style>

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

@@ -0,0 +1,217 @@
+<template>
+  <div>
+    <el-row>
+      <el-col
+        :span="12"
+        class="el-col-hight"
+      >
+        <div class="formContent-item_title">
+          <span>{{this.params.communityName}}-</span>
+          <span>{{this.params.assets}}</span>
+          <span>({{this.params.residentName}})</span>
+        </div>
+      </el-col>
+
+      <el-col
+        :span="12"
+        class="el-col-hight"
+      >
+        <div class="search-icon btn_right">
+          <el-button
+            type="primary"
+            @click="addreceivable"
+            :disabled="typeNum == 1 ? true : false"
+          >新增</el-button>
+        </div>
+      </el-col>
+      <el-col
+        :span="24"
+        class="span_margin"
+        style="margin: 10px 0;"
+      >
+        <span>{{this.params.paymentDaysDict}}物业费账单</span>
+      </el-col>
+
+      <el-col :span="24">
+        <template>
+
+          <el-table
+            :data="tableData"
+            border
+            :height="tableData.length > 7 ? 280 : null"
+            :header-cell-style="{background:'#F8FCFF',color:'#424656'}"
+          >
+            <el-table-column
+              type="index"
+              label="NO"
+              :index="indexMethod"
+            >
+            </el-table-column>
+            <el-table-column
+              label="原应收金额（元）"
+              width="120"
+              prop="origAmount"
+            >
+            </el-table-column>
+            <el-table-column
+              label="申请应收金额（元）"
+              width="130"
+              prop="applyAmount"
+            >
+            </el-table-column>
+            <el-table-column
+              label="申请原因"
+              prop="applicantReason"
+            >
+            </el-table-column>
+            <el-table-column
+              label="申请人"
+              prop="applicantName"
+            >
+            </el-table-column>
+            <el-table-column
+              label="审核状态"
+              prop="status"
+            >
+            </el-table-column>
+            <el-table-column
+              label="审核信息"
+              prop="remarks"
+            >
+            </el-table-column>
+            <el-table-column
+              label="审核人"
+              prop="reviewedBy"
+            >
+            </el-table-column>
+          </el-table>
+        </template>
+
+      </el-col>
+
+    </el-row>
+  </div>
+
+</template>
+
+<script>
+export default {
+  props: ['params'],
+  data () {
+    return {
+      YearTime: '',
+      MonTime: '',
+      typeNum: '2',
+      tableData: []
+    }
+  },
+  methods: {
+    indexMethod (index) {
+      return index + 1;
+    },
+    timeCode () {
+      var time = new Date();
+      this.YearTime = time.getFullYear();
+      this.MonTime = time.getMonth() + 1;
+    },
+    addreceivable () {
+      debugger
+      new Promise((resolve) => {
+        this.$store.dispatch('addPopup', {
+          url: '/payService/propertyFee/stepPage/Addreceivable.vue',
+          width: '560px',
+          height: '310px',
+          props: {
+            id: this.params.id,
+            amount: this.params.discountAmount,
+            callback: resolve
+          },
+          title: '修改应收金额'
+        });
+      }).then(() => {
+        this.audit();
+      });
+    },
+    audit () {
+      this.$http.get('/czc-charge/bill/amount/audit/list', { billId: this.params.id }).then(({ status, data, msg }) => {
+        if (status == 0) {
+          this.tableData = [];
+          var dataNum = [];
+          for (let i = 0; i < data.length; i++) {
+            this.tableData.push({
+              applyAmount: data[i].applyAmount,//申请金额
+              origAmount: data[i].origAmount,//原金额
+              applicantReason: data[i].applicantReason,
+              applicantName: data[i].applicantName,
+              remarks: data[i].remarks || '-',
+              reviewedBy: data[i].reviewedBy || '-',
+              status: data[i].status == 1 ? '审核中' : data[i].status == 2 ? '审核通过' : '审核未通过'
+            })
+            dataNum.push(data[i].status);
+          }
+          for (let k = 0; k < dataNum.length; k++) {
+            if (dataNum[k] == 1) {
+              this.typeNum = '1'
+            }
+          }
+        }
+      })
+    }
+  },
+  created () {
+    this.timeCode();
+    this.audit();
+  }
+}
+
+
+</script>
+
+
+
+<style lang="scss" scoped>
+.body_padding {
+    padding: 20px;
+}
+.btn_right {
+    display: flex;
+    flex-direction: row-reverse;
+}
+.i_size {
+    font-size: 30px;
+}
+.span_margin {
+    margin: 20px;
+}
+
+// 滚动条的宽度
+/deep/ .el-table__body-wrapper::-webkit-scrollbar {
+    width: 10px; /*高宽分别对应横竖滚动条的尺寸*/
+    height: 1px;
+}
+// 滚动条的滑块
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
+    /*滚动条里面小方块*/
+    border-radius: 10px;
+    // -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    background: #c6c4c4a9;
+}
+/deep/ .el-table__body-wrapper::-webkit-scrollbar-track {
+    /*滚动条里面轨道*/
+    // -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+    border-radius: 10px;
+    background: #f4f7f9a8;
+}
+.el-col-hight {
+    height: 20px;
+}
+/deep/ .el-table {
+    tr th,
+    tr td {
+        border-right: none;
+    }
+}
+.el-table-column-background {
+    background: red;
+}
+</style>

operationSupport/src/views/payService/receivableExamine/detali.vue

@@ -15,8 +15,8 @@
           v-model="ruleForm.resource"
           @change="formDataRadio"
         >
-          <el-radio label="1">通过</el-radio>
-          <el-radio label="2">不通过</el-radio>
+          <el-radio label="2">通过</el-radio>
+          <el-radio label="3">不通过</el-radio>
         </el-radio-group>
 
       </el-form-item>
@@ -47,7 +47,7 @@ export default {
   data () {
     return {
       ruleForm: {
-        resource: '1',
+        resource: '2',
         desc: '',
       },
       businessRecordList: [
@@ -77,10 +77,17 @@ export default {
     submit () {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
-          this.$emit('close');
-
+          this.$http.post('/czc-charge/bill/amount/audit/update', { id: this.params.id, remarks: this.ruleForm.desc, status: Number(this.ruleForm.resource) }).then(({ data, status, msg }) => {
+            if (status == 0) {
+              this.$emit('close');
+              this.params.callback();
+              this.$message.success('成功');
+            } else {
+              this.$message.error(msg);
+            }
+          })
         } else {
-
+          return;
         }
       })
     }

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

@@ -6,13 +6,13 @@
         placeholder="姓名/地址/申请人"
         class="search-input"
         v-trim
+        v-model.trim="mixins_query.key"
       ></el-input>
-      <!-- v-model.trim="mixins_query.chargeName" -->
-      <!-- v-model="mixins_query.communityId" -->
       <el-select
         placeholder="所属社区"
         clearable
         class="width120"
+        v-model="mixins_query.communityId"
       >
         <el-option
           v-for="(item,indx) in communityList"
@@ -26,6 +26,7 @@
         placeholder="审核状态"
         clearable
         class="width120"
+        v-model="mixins_query.status"
       >
         <el-option
           value="1"
@@ -37,7 +38,7 @@
         ></el-option>
         <el-option
           value="3"
-          label="审核不通过"
+          label="审核未通过"
         ></el-option>
       </el-select>
       <el-button
@@ -57,6 +58,14 @@
       :selectable="selectable"
       @selection-change="selectionChange"
     >
+
+      <template
+        slot-scope="scope"
+        slot="home"
+      >
+        {{scope.row.communityName+'-'+scope.row.assets}}
+      </template>
+
       <template
         slot-scope="scope"
         slot="opt"
@@ -66,11 +75,10 @@
             class="item"
             effect="light"
             placement="bottom"
-            content="审核"
+            :content="scope.row.status == 1 ? '审核' : '无法审核'"
           >
-            <!--  :content="scope.row.auditStatus == 0 ? '审核' : '无法审核'" -->
             <i
-              v-if="scope.row.auditStatus == 0"
+              v-if="scope.row.status == 1"
               class="zoniot_font zoniot-icon-xiangqing"
               @click="viewDetails(scope.row)"
             ></i>
@@ -90,71 +98,97 @@
 
 
 <script>
+import list from '@/utils/list.js';
 export default {
+  mixins: [list],
   data () {
     return {
       communityList: [],
       cols: [
         {
           label: '订单号',
-          prop: ''
+          prop: 'billNumber'
         },
         {
           label: '姓名',
-          prop: ''
+          prop: 'residentName'
         }, {
           label: '客户类型',
-          prop: ''
+          prop: 'customerType',
+          format (val) {
+            if (val == 1) {
+              return '房东'
+            } else if (val == 2 || val == 3) {
+              return '租户'
+            }
+          }
         }, {
           label: '地址',
-          prop: ''
+          prop: 'home',
+          slot: 'home'
         }, {
           label: '费用类型',
-          prop: ''
+          prop: 'chargeType',
+          format (val) {
+            if (val == 1) {
+              return '物业费'
+            } else if (val == 2) {
+              return '水费'
+            } else if (val == 3) {
+              return '电费'
+            } else if (val == 4) {
+              return '车位费'
+            } else if (val == 5) {
+              return '二次供水费'
+            }
+          }
         }, {
           label: '计费周期',
-          prop: ''
+          prop: 'paymentDaysDict'
         }
         , {
           label: '账单金额(元)',
-          prop: ''
+          prop: 'receivableAmount'
         }
         , {
           label: '原应收金额(元)',
-          prop: ''
+          prop: 'origAmount'
         }
         , {
           label: '申请应收金额(元)',
-          prop: ''
+          prop: 'applyAmount'
         }
         , {
           label: '申请原因',
-          prop: ''
+          prop: 'applicantReason'
         }
         , {
           label: '申请人',
-          prop: ''
+          prop: 'applicantName'
         }
         , {
           label: '审核状态',
-          prop: '',
+          prop: 'status',
           format (val) {
-            if (val == 1) {
-              return '<span class="redText">审核不通过</span>';
+            if (val == 3) {
+              return '<span class="redText">审核未通过</span>';
             } else if (val == 2) {
               return '审核通过';
+            } else if (val == 1) {
+              return '审核中'
             }
           }
         }
         , {
           label: '审核人员',
-          prop: ''
+          prop: 'reviewedBy'
         }
         , {
           label: '操作',
           slot: 'opt'
         }
-      ]
+      ],
+      mixins_post: 'post',
     }
   },
   methods: {
@@ -170,27 +204,30 @@ export default {
       });
     },
     viewDetails (row) {
-      // detali
+      debugger
       new Promise((resolve) => {
         this.$store.dispatch('addPopup', {
           url: '/payService/receivableExamine/detali.vue',
           width: '550px',
           height: '280px',
           props: {
-            // data: row,
+            id: row.id,
             callback: resolve
           },
-          title: '修改应收金额'
+          title: '应收金额审核'
         });
       }).then(() => {
         this.mixins_search();
       });
-    }
+    },
   },
   created () {
+
+    this.mixins_dataUrl = '/czc-charge/bill/amount/audit/page'; // 分页查询接口
+    this.mixins_query = {};
+    this.mixins_search();
     // 获取社区选项
     this.communityNameList();
-
   }
 }