LAPTOP-FO2T5SIU\35838 8 달 전
부모
커밋
94f24d1a84

+ 22 - 22
src/views/customerManagement/roomChose/roomIndex.vue

@@ -128,28 +128,28 @@
             <el-col :span="4">
               <el-input v-model="queryParam.actualBuildArea" size="small" placeholder="请输入面积" class="ch-input-size" @keyup.enter.native="handleSearch()" />
             </el-col>
-            <el-col :span="4">
-              <div style="margin-top: 6px">选房状态:</div>
-            </el-col>
-            <el-col :span="4">
-              <el-select
-                v-model="queryParam.isChooseStr"
-                placeholder="请选择"
-                size="small"
-                clearable
-                :popper-append-to-body="false"
-                popper-class="statistic_base"
-              >
-                <el-option
-                  v-for="item in chooseOptions"
-                  :key="item.value"
-                  :popper-append-to-body="false"
-                  popper-class="statistic_base"
-                  :label="item.label"
-                  :value="item.value"
-                />
-              </el-select>
-            </el-col>
+<!--            <el-col :span="4">-->
+<!--              <div style="margin-top: 6px">选房状态:</div>-->
+<!--            </el-col>-->
+<!--            <el-col :span="4">-->
+<!--              <el-select-->
+<!--                v-model="queryParam.isChooseStr"-->
+<!--                placeholder="请选择"-->
+<!--                size="small"-->
+<!--                clearable-->
+<!--                :popper-append-to-body="false"-->
+<!--                popper-class="statistic_base"-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item in chooseOptions"-->
+<!--                  :key="item.value"-->
+<!--                  :popper-append-to-body="false"-->
+<!--                  popper-class="statistic_base"-->
+<!--                  :label="item.label"-->
+<!--                  :value="item.value"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-col>-->
           </el-row>
           <el-row class="lineheight20">
             <el-col :span="4">

+ 1 - 1
src/views/receiveRefundsManagement/maintenanceFundsManagement/index.vue

@@ -117,7 +117,7 @@ import BaseData from '@/views/base/baseData'
 import AddFunds from '@/views/receiveRefundsManagement/maintenanceFundsManagement/addFunds.vue'
 
 export default {
-    name: 'ContractIndex',
+    name: 'MaintenanceFundsManagementIndex',
     components: { AddFunds },
     mixins: [Base, BaseData],
     data() {

+ 310 - 0
src/views/receiveRefundsManagement/paymentManagement/addPayment.vue

@@ -0,0 +1,310 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form" style="width: 100%;padding: 5px" :rules="rules">
+      <el-row>
+        <el-col style="padding-bottom: 10px">
+          <span class="card_title">新增</span>
+          <el-card shadow="always" style="padding: 15px 5px 5px 15px">
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>款项内容</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-select
+                    v-model="form.contentType"
+                    clearable
+                    filterable
+                    :popper-append-to-body="false"
+                    popper-class="statistic_base"
+                  >
+                    <el-option
+                      v-for="item in dc_data.CONTENT_TYPE"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                      :popper-append-to-body="false"
+                      popper-class="statistic_base"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>支付方式</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-select
+                    v-model="form.paymentMethod"
+                    clearable
+                    filterable
+                    :popper-append-to-body="false"
+                    popper-class="statistic_base"
+                  >
+                    <el-option
+                      v-for="item in dc_data.PAYMENT_METHODS"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                      :popper-append-to-body="false"
+                      popper-class="statistic_base"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3" class="col-txt"><span>到账日期</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-date-picker
+                    v-model="form.payTime"
+                    popper-class="statistic_base"
+                    type="date"
+                    placeholder="年月日"
+                    value-format="yyyy-MM-dd"
+                  />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>到账银行账号</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-select
+                    v-model="bankObject"
+                    :popper-append-to-body="false"
+                    popper-class="statistic_base"
+                    placeholder=""
+                    filterable
+                    clearable
+                    @change="bankChange"
+                  >
+                    <el-option
+                      v-for="item in bankOptions"
+                      :key="item.value"
+                      popper-class="statistic_base"
+                      :popper-append-to-body="false"
+                      :label="item.bankName + (item.bankBranchName?item.bankBranchName:'') + item.bankNumber"
+                      :value="item"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="3" class="col-txt"><span>到账金额</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.payMoney" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>备注</span></el-col>
+              <el-col :span="21" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.remark" type="textarea" :autosize="{ minRows: 2, maxRows: 100}" placeholder="请输入内容" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>缴费凭证</span></el-col>
+              <el-col :span="15" class="col-input">
+                <el-form-item>
+                  <el-upload
+                    class="upload-demo"
+                    action="/server/wx/fileController/uploadImage"
+                    :http-request="uploadPhoto"
+                    :before-remove="beforeRemove"
+                    multiple
+                    :file-list="fileList"
+                  >
+                    <el-button v-if="!isView" size="small" type="primary">点击上传</el-button>
+                    <div slot="file" slot-scope="{file}" style="overflow:hidden;white-space: nowrap;text-overflow:ellipsis">
+                      <el-tooltip class="item" effect="dark" :content="file.name" placement="top-start">
+                        <a :href="file.url">{{ file.name }}</a>
+                      </el-tooltip>
+                      <span class="el-upload-list__item-actions">
+                        <i class="el-icon-delete" @click="handlePictureRemove(file,fileList)" />
+                      </span>
+                    </div>
+                  </el-upload>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>经办时间</span></el-col>
+              <el-col :span="3" class="col-input"><span>{{ dateStr }}</span></el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>经办人</span></el-col>
+              <el-col :span="3" class="col-input"><span>{{ username }}</span></el-col>
+            </el-row>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div style="text-align: right">
+      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="confirmSubmit()">提 交</el-button>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import Base from '@/views/base/base'
+import BaseData from '@/views/base/baseData'
+import { upload } from '@/static/utils/channel'
+
+export default {
+    name: 'AddPayment',
+    components: { },
+    mixins: [Base, BaseData],
+    data() {
+        return {
+            dc_key: ['CONTENT_TYPE', 'PAYMENT_METHODS'],
+            form: {
+
+            },
+            rules: {
+
+            },
+            AllData: [],
+            loading: false,
+            bankOptions: [],
+            bankObject: '',
+            dateStr: '',
+            username: '',
+            isView: false,
+            fileList: [],
+            contractId: '',
+            houseId: '',
+            customerManagementId: ''
+        }
+    },
+    mounted() {
+        const myDate = new Date()
+        const dateStr = myDate.getFullYear() + '-' + (myDate.getMonth() + 1) + '-' + myDate.getDate()
+        const username = this.$common.currUser().username
+        this.dateStr = dateStr
+        this.username = username
+    },
+    methods: {
+        initData(data) {
+            console.log('data', data)
+            this.isView = data.isView
+            this.contractId = data.contractId
+            this.houseId = data.houseId
+            this.customerManagementId = data.customerManagementId
+
+            this.getBankOptions()
+            this.initDict(this.dc_key).then(res => {
+                if (data.id) {
+                    this.getById(data)
+                } else {
+                    this.getBankTaxRateByFloor()
+                }
+            })
+        },
+        getById(data) {
+            const postData = {
+                id: data.id
+            }
+            this.baseRequest('', postData).then(res => {
+                this.form = res.data
+                if (this.form.paymentVoucher) {
+                    this.fileList = JSON.parse(this.form.paymentVoucher)
+                }
+                if (res.data.createdName) {
+                    this.username = res.data.createdName
+                }
+                if (res.data.createdAt) {
+                    this.dateStr = res.data.createdAt
+                }
+                this.bankObject = res.data.bankName + res.data.bankBranchName + res.data.bankNumber
+            })
+        },
+        confirmSubmit: function() {
+            const _this = this
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    const soaUrl = 'add'
+                    const extraData = {
+                        fileList: JSON.stringify(_this.fileList),
+                        contractId: this.contractId,
+                        houseId: this.houseId,
+                        customerManagementId: this.customerManagementId,
+                        payType: '1'
+                    }
+                    const postData = Object.assign({}, _this.form, extraData)
+                    this.baseRequest(soaUrl, postData).then(res => {
+                        if (res.data.code === 200) {
+                            _this.$message({
+                                message: '新增成功',
+                                type: 'success'
+                            })
+                            _this.cancel()
+                        } else {
+                            _this.$message({
+                                message: res.msg,
+                                type: 'warning'
+                            })
+                        }
+                    }).catch(err => {
+                        _this.$message({
+                            message: err,
+                            type: 'warning'
+                        })
+                    })
+                } else {
+                    console.log('error submit!!')
+                    return false
+                }
+            })
+        },
+        cancel() {
+            this.$emit('cancel')
+        },
+        // 删除单个行
+        handleDelete(index) {
+            this.AllData.splice(index, 1)
+        },
+        getBankOptions() {
+            this.bankRequest('listAll', {}).then(res => {
+                this.bankOptions = res.data || []
+            })
+        },
+        bankChange(val) {
+            console.log(val)
+            this.form.bankName = val.bankName
+            this.form.bankBranchName = val.bankBranchName
+            this.form.bankNumber = val.bankNumber
+        },
+        getBankTaxRateByFloor() {
+            this.fundRequest('getBankTaxRateByFloor', { contractId: this.contractId }).then(res => {
+                if (res.data) {
+                    this.bankObject = res.data.bankFullName
+                    this.form.bankName = res.data.bankName
+                    this.form.bankBranchName = res.data.bankBranchName
+                    this.form.bankNumber = res.data.bankNumber
+                }
+            })
+        },
+        uploadPhoto: function(param) {
+            upload(param, true).then((res) => {
+                this.fileList.push(res)
+            })
+        },
+        baseRequest(opUrl, postData) {
+            return this.$channel.globeRequest('PayLogController', opUrl, postData, 'project')
+        },
+        bankRequest(opUrl, postData) {
+            return this.$channel.globeRequest('InvoiceBankController', opUrl, postData, 'project')
+        },
+        fundRequest(opUrl, postData) {
+            return this.$channel.globeRequest('MaintenanceFundsManagementController', opUrl, postData, 'project')
+        }
+
+    }
+}
+</script>
+
+<style scoped>
+
+</style>

+ 8 - 8
src/views/receiveRefundsManagement/paymentManagement/index.vue

@@ -73,7 +73,7 @@
               </span>
             </template>
           </el-table-column>
-          <el-table-column header-align="center" label="操作" width="180">
+          <el-table-column header-align="center" label="操作" width="200">
             <template scope="scope">
               <el-button :disabled="scope.row.collectionStatus !== 1" size="mini" type="text" @click="handleEdit(scope.row)">预收款登记</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
@@ -109,7 +109,7 @@
       custom-class="tagdialog"
       @close="getData"
     >
-      <add-funds v-if="dialogVisible" ref="addFunds" @cancel="cancel" />
+      <payment-registration v-if="dialogVisible" ref="paymentRegistration" @cancel="cancel" />
     </el-dialog>
 
   </div>
@@ -117,11 +117,11 @@
 <script>
 import Base from '@/views/base/base'
 import BaseData from '@/views/base/baseData'
-import AddFunds from '@/views/receiveRefundsManagement/maintenanceFundsManagement/addFunds.vue'
+import PaymentRegistration from '@/views/receiveRefundsManagement/paymentManagement/paymentRegistration.vue'
 
 export default {
-    name: 'ContractIndex',
-    components: { AddFunds },
+    name: 'PaymentManagementIndex',
+    components: { PaymentRegistration },
     mixins: [Base, BaseData],
     data() {
         return {
@@ -186,7 +186,7 @@ export default {
             val.isView = false
             // 新vue时调用的方法
             this.$nextTick(() => {
-                this.$refs.addFunds.initData(val)
+                this.$refs.paymentRegistration.initData(val)
             })
         },
         handleView(val) {
@@ -194,14 +194,14 @@ export default {
             val.isView = true
             // 新vue时调用的方法
             this.$nextTick(() => {
-                this.$refs.addFunds.initData(val)
+                this.$refs.paymentRegistration.initData(val)
             })
         },
         cancel: function() {
             this.dialogVisible = false
         },
         baseRequest(opUrl, postData) {
-            return this.$channel.globeRequest('BillPayLogController', opUrl, postData, 'project')
+            return this.$channel.globeRequest('PayLogController', opUrl, postData, 'project')
         }
     }
 }

+ 301 - 0
src/views/receiveRefundsManagement/paymentManagement/paymentRegistration.vue

@@ -0,0 +1,301 @@
+<template>
+  <div>
+    <el-form ref="form" :model="form" style="width: 100%;padding: 5px" :rules="rules">
+      <el-row>
+        <el-col style="padding-bottom: 10px">
+          <span class="card_title">预收款登记</span>
+          <el-card shadow="always" style="padding: 15px 5px 5px 15px">
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>合同编号</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.contractNumber" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="3" class="col-txt"><span>买受人</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-select
+                    v-model="form.buyerName"
+                    :popper-append-to-body="false"
+                    popper-class="statistic_base"
+                    placeholder=""
+                    filterable
+                    clearable
+                  >
+                    <el-option
+                      v-for="item in dc_data.COLLECTION_METHODS"
+                      :key="item.value"
+                      popper-class="statistic_base"
+                      :popper-append-to-body="false"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>房屋</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.houseName" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="3" class="col-txt"><span>付款方式</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.paymentMethodStr" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>付款截止日</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-date-picker
+                    v-model="form.deadline"
+                    popper-class="statistic_base"
+                    type="date"
+                    placeholder="年月日"
+                    value-format="yyyy-MM-dd"
+                  />
+                </el-form-item>
+              </el-col>
+              <el-col :span="3" class="col-txt"><span>应收房款(元)</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.receivableMoney" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="3" class="col-txt"><span>已收房款(元)</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.receivedMoney" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="3" class="col-txt"><span>尚欠房款(元)</span></el-col>
+              <el-col :span="9" class="col-input">
+                <el-form-item>
+                  <el-input v-model="form.arrears" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-form>
+    <el-divider />
+    <el-row>
+      <el-col style="padding-bottom: 10px">
+        <span class="card_title">缴费收款信息</span>
+        <el-card shadow="always" style="padding: 15px 5px 5px 15px">
+          <el-row style="text-align: right">
+            <el-button type="primary" @click="handleAdd">新增</el-button>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-table v-loading="loading" :data="AllData" row-class-name="g_table_row" stripe>
+                <el-table-column type="index" width="60" />
+                <el-table-column label="款项内容" prop="contentTypeStr" />
+                <el-table-column label="支付方式" prop="paymentMethodStr" />
+                <el-table-column label="到账日期" prop="payTime" width="200" />
+                <el-table-column label="到账银行账号" prop="bankFullName" width="200" />
+                <el-table-column label="到账金额" prop="payMoney" width="110" />
+                <el-table-column header-align="center" label="操作" width="180">
+                  <template scope="scope">
+                    <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
+                    <el-button size="mini" type="text" @click="handleDelete(scope.row)">删除</el-button>
+                    <el-button size="mini" type="text" @click="downLoad(scope.row)">电子收据</el-button>
+                  </template>
+                </el-table-column>
+              </el-table>
+            </el-col>
+          </el-row>
+        </el-card>
+      </el-col>
+    </el-row>
+    <div style="text-align: right">
+      <el-button @click="cancel">取 消</el-button>
+      <el-button type="primary" @click="cancel">确 定</el-button>
+    </div>
+
+    <!-- 新增收款 -->
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      title=""
+      width="90%"
+      top="20px"
+      class="statistic_base"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      custom-class="tagdialog"
+      @close="getData"
+    >
+      <add-payment v-if="dialogVisible" ref="addPayment" @cancel="addPaymentCancel" />
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import Base from '@/views/base/base'
+import BaseData from '@/views/base/baseData'
+import AddPayment from '@/views/receiveRefundsManagement/paymentManagement/addPayment.vue'
+
+export default {
+    name: 'PaymentRegistration',
+    components: { AddPayment },
+    mixins: [Base, BaseData],
+    data() {
+        return {
+            dc_key: ['PAYMENT_METHODS', 'COLLECTION_METHODS'],
+            form: {
+
+            },
+            rules: {
+
+            },
+            AllData: [],
+            loading: false,
+            dialogVisible: false,
+            contractId: '',
+            houseId: '',
+            customerManagementId: ''
+        }
+    },
+    computed: {
+
+    },
+    mounted() {
+
+    },
+    methods: {
+        initData(data) {
+            this.isView = data.isView
+            this.contractId = data.id
+            this.houseId = data.houseId
+            this.customerManagementId = data.customerManagementId
+            this.initDict(this.dc_key).then(res => {
+                this.getData()
+            })
+        },
+        getData() {
+            this.getContractPart()
+            this.getList()
+        },
+        getContractPart() {
+            const _this = this
+            const data = {
+                contractId: this.contractId
+            }
+            this.baseRequest('getContractPart', data).then((res) => {
+                if (res.data) {
+                    _this.form = res.data
+                    _this.form.paymentMethodStr = this.dc_map.PAYMENT_METHODS[res.data.paymentMethod]
+                }
+            }).catch((e) => {
+                // console.log(e)
+            })
+        },
+        getList() {
+            const _this = this
+            _this.AllData = []
+            const data = {
+                contractId: this.contractId
+            }
+            this.baseRequest('payListAll', data).then((res) => {
+                if (res.data) {
+                    res.data.forEach(function(item) {
+                        const json = _this.getItemJson(item)
+                        _this.AllData.push(json)
+                    })
+                    _this.allpage = res.data.total
+                }
+                _this.loading = false
+            }).catch((e) => {
+                // console.log(e)
+            })
+        },
+        getItemJson: function(item) {
+            item.paymentMethodStr = this.dc_map.PAYMENT_METHODS[item.paymentMethod]
+            item.contentTypeStr = this.dc_map.COLLECTION_METHODS[item.contentType]
+            item.bankFullName = item.bankName + item.bankBranchName + item.bankNumber
+            return item
+        },
+        cancel() {
+            this.$emit('cancel')
+        },
+        addPaymentCancel() {
+            this.dialogVisible = false
+        },
+        downLoad() {
+
+        },
+        handleAdd() {
+            this.dialogVisible = true
+            const data = {
+                isView: false,
+                contractId: this.contractId,
+                houseId: this.houseId,
+                customerManagementId: this.customerManagementId
+            }
+            // 新vue时调用的方法
+            this.$nextTick(() => {
+                this.$refs.addPayment.initData(data)
+            })
+        },
+        handleView(data) {
+            this.dialogVisible = true
+            data.isView = true
+            // 新vue时调用的方法
+            this.$nextTick(() => {
+                this.$refs.addPayment.initData(data)
+            })
+        },
+        handleDelete(val) {
+            this.$confirm('确认删除该数据,删除后将无法恢复,确认删除吗?', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning'
+            }).then(() => {
+                this.baseRequest('delete', { id: val.id }).then(res => {
+                    if (res.data.code == 200) {
+                        this.getData()
+                        this.$message({
+                            type: 'success',
+                            message: '删除成功!'
+                        })
+                    } else {
+                        this.$message({
+                            type: 'error',
+                            message: res.data.msg
+                        })
+                    }
+                }).catch((err) => {
+                    this.$message({
+                        type: 'error',
+                        message: err
+                    })
+                })
+            }).catch(() => {
+                this.$message({
+                    type: 'info',
+                    message: '已取消删除'
+                })
+            })
+        },
+        baseRequest(opUrl, postData) {
+            return this.$channel.globeRequest('PayLogController', opUrl, postData, 'project')
+        }
+    }
+}
+</script>
+
+<style scoped>
+
+</style>