Browse Source

bug处理

LAPTOP-FO2T5SIU\35838 9 months ago
parent
commit
458fdea7e8

+ 2 - 1
src/views/customerManagement/roomChose/addHouse.vue

@@ -62,7 +62,7 @@
       <!--      </el-row>-->
     </div>
     <div style="text-align: right;margin-top: 50px">
-      <el-button @click="cancel">取 消</el-button>
+      <el-button @click="cancel()">取 消</el-button>
       <el-button v-if="fromAddress!== 'intentionalDepositManagement'" type="primary" @click="confirmSubmit()">提交选房</el-button>
       <el-button v-if="fromAddress=== 'intentionalDepositManagement'" type="primary" @click="intentionalDepositConfirmSubmit()">意向金提交选房</el-button>
     </div>
@@ -170,6 +170,7 @@ export default {
                     message: '请选择房间',
                     type: 'warning'
                 })
+                return
             }
             const data = {
                 houseIds: this.AllData.map(obj => { return obj.houseId }).join(','),

+ 4 - 11
src/views/invoice/components/invoiceBankEdit.vue

@@ -48,17 +48,6 @@
             <el-row>
               <el-col :span="3" class="col-txt"><span style="color: red">*</span><span>适用费用类型</span></el-col>
               <el-col :span="20" class="col-input">
-                <!--                <el-form-item prop="suitCostType">-->
-                <!--                  <el-checkbox-group v-model="checkList" @change="checkBoxChange">-->
-                <!--                    <el-checkbox label="租赁费(保证金)" />-->
-                <!--                    <el-checkbox label="物业费" />-->
-                <!--                    <el-checkbox label="水费" />-->
-                <!--                    <el-checkbox label="电费" />-->
-                <!--                    <el-checkbox label="停车费" />-->
-                <!--                    <el-checkbox label="场地费" />-->
-                <!--                    <el-checkbox label="其他" />-->
-                <!--                  </el-checkbox-group>-->
-                <!--                </el-form-item>-->
                 <el-table
                   ref="multipleTable"
                   v-loading="itemLoading"
@@ -191,6 +180,10 @@ export default {
         confirmSubmit() {
             const _this = this
             let flag = false
+            if (!_this.multipleSelection.length) {
+                _this.$message.warning('请勾选数据')
+                flag = true
+            }
             _this.multipleSelection.forEach(item => {
                 if (!item.taxRate) {
                     _this.$message.warning('请选择税率')

+ 15 - 210
src/views/invoice/receiptManage.vue

@@ -13,94 +13,11 @@
       <el-col :span="4" class="col-input">
         <el-input v-model="search.houseName" @keyup.enter.native="handleSearch()" />
       </el-col>
-      <el-col :span="2" class="col-txt">
-        <span>推送状态</span>
-      </el-col>
-      <el-col :span="4" class="col-input">
-        <el-select v-model="search.sendStatus" placeholder="请选择" popper-class="statistic_base">
-          <el-option
-            v-for="item in dc_data.SEND_STATUS"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-col>
-      <el-col :span="2" class="col-txt">
-        <span>开票状态</span>
-      </el-col>
-      <el-col :span="4" class="col-input">
-        <el-select
-          v-model="search.invoiceStatus"
-          filterable
-          popper-class="statistic_base"
-        >
-          <el-option
-            v-for="item in dc_data.INVOICE_STATUS"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          />
-        </el-select>
-      </el-col>
-    </el-row>
-    <el-row class="handle-box" style="margin-bottom: 10px">
-      <el-col :span="2" class="col-txt">
-        <span>推送日期</span>
-      </el-col>
-      <el-col :span="4" class="col-input">
-        <el-date-picker
-          v-model="search.sendDateFrom"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
-      </el-col>
-      <el-col :span="1">
-        <span>至</span>
-      </el-col>
-      <el-col :span="4" class="col-input">
-        <el-date-picker
-          v-model="search.sendDateTo"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
-      </el-col>
-      <el-col :span="2" class="col-txt">
-        <span>开票日期</span>
-      </el-col>
-      <el-col :span="4" class="col-input">
-        <el-date-picker
-          v-model="search.invoiceDateFrom"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
-      </el-col>
-      <el-col :span="1">
-        <span>至</span>
-      </el-col>
-      <el-col :span="4" class="col-input">
-        <el-date-picker
-          v-model="search.invoiceDateTo"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
-      </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px;text-align: right">
       <el-col :span="24" style="margin-top: 20px">
         <el-button size="small" class="ch-button-warning" @click="handleReset()"><i class="el-icon-refresh" />&nbsp;重置</el-button>
         <el-button size="small" class="ch-button" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
-        <el-button size="small" class="ch-button-export" @click="batchInvoice()">批量开票</el-button>
-        <!--        <el-button size="small" type="danger" @click="handleBatchBadDebt()">红冲</el-button>-->
-        <el-button size="small" class="ch-button-export" :loading="excelFlag" @click="handleExportAll()">导出</el-button>
       </el-col>
     </el-row>
     <el-row class="handle-box">
@@ -115,46 +32,25 @@
         >
           <el-table-column type="selection" width="55" />
           <el-table-column type="index" width="60" />
-          <el-table-column label="款项名称" prop="paymentTypeStr" />
-          <el-table-column label="合同编号" prop="contractNumber" />
-          <el-table-column label="网签备案号" prop="recordNumber" />
+          <el-table-column label="批次号" prop="" />
           <el-table-column label="买受人" prop="buyerName" width="200" />
           <el-table-column label="房屋" prop="houseName" width="200" />
-          <el-table-column label="应收(元)" prop="receivableMoney" />
-          <el-table-column label="已收(元)" prop="receivedMoney" />
-          <el-table-column label="收款状态" prop="collectionStatusStr" width="110">
-            <template scope="scope">
-              <span
-                :style="{'color':scope.row.collectionStatusStr==='已退款'?'red':scope.row.collectionStatusStr==='完全收款'?'green':'gray'}"
-              >
-                {{ scope.row.collectionStatusStr }}
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column label="推送状态" prop="sendStatusStr">
+
+          <el-table-column label="票据类型" prop="receiptType" />
+          <el-table-column label="票面金额" prop="receiptMoney" />
+          <el-table-column label="票据编号" prop="receiptNumber" />
+          <el-table-column label="经办人" prop="createdName" />
+          <el-table-column label="经办时间" prop="createdAt" width="110" />
+          <el-table-column label="票据状态" prop="receiptStatusStr">
             <template scope="scope">
               <span
                 style="color: green"
               >
-                {{ scope.row.sendStatusStr }}
+                {{ scope.row.receiptStatusStr }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column label="开票状态" prop="invoiceStatusStr">
-            <template scope="scope">
-              <span
-                :style="{'color':scope.row.invoiceStatusStr==='已红冲'?'red':scope.row.invoiceStatusStr==='待开票'?'green':'gray'}"
-              >
-                {{ scope.row.invoiceStatusStr }}
-              </span>
-            </template>
-          </el-table-column>
-          <el-table-column header-align="center" label="操作" width="180">
-            <template scope="scope">
-              <el-button v-if="scope.row.sendStatus === '0'" type="text" size="mini" @click="handleInvoice(scope.row)">开票</el-button>
-              <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
-            </template>
-          </el-table-column>
+          <el-table-column label="关联票号" prop="associationNumber" width="110" />
 
         </el-table>
         <div class="table-page">
@@ -172,55 +68,19 @@
       </el-col>
     </el-row>
 
-    <!--开票-->
-    <el-dialog
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="dialogTitle"
-      width="90%"
-      top="20px"
-      class="statistic_base"
-      :append-to-body="true"
-      :modal-append-to-body="true"
-      custom-class="tagdialog"
-      @close="getData"
-    >
-      <formal-invoice-manage-edit v-if="dialogVisible" ref="editInvoice" @cancel="cancel" />
-    </el-dialog>
-
-    <!-- 批量开票 -->
-    <el-dialog
-      :title="dialogBatchTitle"
-      :visible.sync="dialogBatchVisible"
-      width="75%"
-      top="50px"
-      :close-on-press-escape="false"
-      :close-on-click-modal="false"
-      class="statistic_base"
-      :append-to-body="true"
-      :modal-append-to-body="true"
-      custom-class="tagdialog"
-      @close="handleBatchClose"
-    >
-      <batch-invoice v-if="dialogBatchVisible" ref="batchInvoice" @editClose="handleBatchClose" />
-    </el-dialog>
-
   </div>
 </template>
 <script>
 import Base from '@/views/base/base'
 import BaseData from '@/views/base/baseData'
-import FormalInvoiceManageEdit from '@/views/invoice/components/formalInvoiceManageEdit.vue'
-import BatchInvoice from '@/views/invoice/components/batchInvoice.vue'
 
 export default {
     name: 'ReceiptManage',
-    components: { FormalInvoiceManageEdit, BatchInvoice },
+    components: { },
     mixins: [Base, BaseData],
     data() {
         return {
-            dc_key: ['INVOICE_STATUS', 'SEND_STATUS', 'HOUSE_PAYMENT_STATUS'],
+            dc_key: [],
             // 列表相关
             search: {
             },
@@ -249,7 +109,7 @@ export default {
 
             this.search.pageNum = this.currentPage
             this.search.pageSize = this.pageSize
-            this.baseRequest('formalInvoiceList', this.search).then((res) => {
+            this.baseRequest('listByModel', this.search).then((res) => {
                 if (res.data.rows) {
                     res.data.rows.forEach(function(item) {
                         const json = _this.getItemJson(item)
@@ -275,59 +135,10 @@ export default {
             this.handleSearch()
         },
         getItemJson: function(item) {
-            item.invoiceStatusStr = this.dc_map.INVOICE_STATUS[item.invoiceStatus]
-            item.sendStatusStr = this.dc_map.SEND_STATUS[item.sendStatus]
-            if (item.paymentType === '1') {
-                item.collectionStatusStr = this.dc_map.HOUSE_PAYMENT_STATUS[item.collectionStatus]
-            }
-            if (item.paymentType === '2') {
-                item.collectionStatusStr = this.dc_map.HOUSE_PAYMENT_STATUS[item.fundCollectionStatus]
-            }
-            item.paymentTypeStr = item.paymentType === '1' ? '房款' : '专项维修资金'
             return item
         },
-        handleInvoice(row) {
-            this.dialogTitle = '开票'
-            this.dialogVisible = true
-            const data = {
-                isView: false,
-                id: row.id
-            }
-            this.$nextTick(() => {
-                this.$refs.editInvoice.initData(data)
-            })
-        },
+
         handleView(val) {
-            this.dialogVisible = true
-            this.dialogTitle = ''
-            val.isView = true
-            // 新vue时调用的方法
-            this.$nextTick(() => {
-                this.$refs.editInvoice.initData(val)
-            })
-        },
-        batchInvoice() {
-            if (!this.selected.length) {
-                this.$message.warning('请先勾选要批量开票的数据')
-                return
-            }
-            let check = true
-            this.selected.forEach(item => {
-                if (item.sendStatus !== '0') {
-                    check = false
-                }
-            })
-            if (!check) {
-                this.$message.warning('仅可对待推送的数据进行批量开票')
-                return
-            }
-            this.dialogBatchVisible = true
-            this.dialogBatchTitle = '批量开票'
-            this.$nextTick(() => {
-                this.$refs.batchInvoice.initData(this.selected)
-            })
-        },
-        handleExportAll() {
 
         },
         handleSelectionChange(val) {
@@ -336,14 +147,8 @@ export default {
         cancel: function() {
             this.dialogVisible = false
         },
-        handleBatchClose(refresh) {
-            this.dialogBatchVisible = false
-            if (refresh) {
-                this.getData()
-            }
-        },
         baseRequest(opUrl, postData) {
-            return this.$channel.globeRequest('InvoiceManageController', opUrl, postData, 'project')
+            return this.$channel.globeRequest('ReceiptManageController', opUrl, postData, 'project')
         }
     }
 }

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

@@ -33,7 +33,7 @@
           <el-table-column label="经办人" prop="createdAt" />
           <el-table-column header-align="center" label="操作" width="380">
             <template scope="scope">
-              <el-button :disabled="scope.row.status === 3" size="mini" type="text" @click="handleEdit(scope.row)">转定金</el-button>
+              <el-button :disabled="scope.row.status !== 1" size="mini" type="text" @click="handleEdit(scope.row)">转定金</el-button>
               <el-button size="mini" type="text" @click="handleView(scope.row)">查看</el-button>
               <el-button :disabled="scope.row.status === 1" size="mini" type="text" @click="downLoad(scope.row)">意向金收据</el-button>
               <el-button :disabled="scope.row.status === 2" size="mini" type="text" @click="handleRefund(scope.row)">退意向金</el-button>

+ 5 - 2
src/views/receiveRefundsManagement/intentionalDepositManagement/toDeposit.vue

@@ -223,8 +223,11 @@ export default {
             this.$emit('cancel')
         },
         handleRoomCancel(data) {
-            this.form.houseName = data.buildName + '-' + data.roomNo
-            this.form.houseId = data.houseId
+            console.log('data', data)
+            if (data) {
+                this.form.houseName = data.buildName + '-' + data.roomNo
+                this.form.houseId = data.houseId
+            }
             this.dialogHouseVisible = false
         },
 

+ 8 - 21
src/views/receiveRefundsManagement/maintenanceFundsManagement/index.vue

@@ -6,19 +6,18 @@
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
         <span>房屋&nbsp;</span>
         <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="房屋" size="small" @keyup.enter.native="handleSearch()" />
-        <span>合同状态&nbsp;</span>
+        <span>收款状态&nbsp;</span>
         <el-select
-          v-model="search.status"
+          v-model="search.fundCollectionStatus"
           clearable
           filterable
-          placeholder="合同状态"
+          placeholder="收款状态"
           :popper-append-to-body="false"
           popper-class="statistic_base"
-          size="small"
           @change="handleSearch"
         >
           <el-option
-            v-for="item in dc_data.CONTRACT_STATUS"
+            v-for="item in dc_data.MAINTENANCE_FUNDS_STATUS"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -26,28 +25,13 @@
             popper-class="statistic_base"
           />
         </el-select>
-        <span>签约日期&nbsp;</span>
-        <el-date-picker
-          v-model="search.signingDateFrom"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至&nbsp;</span>
-        <el-date-picker
-          v-model="search.signingDateTo"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
       </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">
       <el-col :span="24" style="margin-top: 20px">
         <el-button class="ch-button-warning" size="small" style="float: right" @click="handleReset()"><i class="el-icon-search" />&nbsp;重置</el-button>
         <el-button class="ch-button" size="small" style="float: right" @click="handleSearch()"><i class="el-icon-search" />&nbsp;查询</el-button>
+        <el-button type="primary" size="small" style="float: right" @click="downLoad()">&nbsp;专项维修资金凭证</el-button>
       </el-col>
     </el-row>
     <el-row class="handle-box">
@@ -201,6 +185,9 @@ export default {
         },
         cancel: function() {
             this.dialogVisible = false
+        },
+        downLoad() {
+
         },
         baseRequest(opUrl, postData) {
             return this.$channel.globeRequest('MaintenanceFundsManagementController', opUrl, postData, 'project')

+ 4 - 20
src/views/receiveRefundsManagement/paymentManagement/index.vue

@@ -6,19 +6,19 @@
         <el-input v-model="search.buyerName" class="ch-input ch-input-size" placeholder="买受人" size="small" @keyup.enter.native="handleSearch()" />
         <span>房屋&nbsp;</span>
         <el-input v-model="search.houseName" class="ch-input ch-input-size" placeholder="房屋" size="small" @keyup.enter.native="handleSearch()" />
-        <span>合同状态&nbsp;</span>
+        <span>收款状态&nbsp;</span>
         <el-select
-          v-model="search.status"
+          v-model="search.collectionStatus"
           clearable
           filterable
-          placeholder="合同状态"
+          placeholder="收款状态"
           :popper-append-to-body="false"
           popper-class="statistic_base"
           size="small"
           @change="handleSearch"
         >
           <el-option
-            v-for="item in dc_data.CONTRACT_STATUS"
+            v-for="item in dc_data.HOUSE_PAYMENT_STATUS"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -26,22 +26,6 @@
             popper-class="statistic_base"
           />
         </el-select>
-        <span>签约日期&nbsp;</span>
-        <el-date-picker
-          v-model="search.signingDateFrom"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
-        <span>至&nbsp;</span>
-        <el-date-picker
-          v-model="search.signingDateTo"
-          popper-class="statistic_base"
-          type="date"
-          placeholder="年月日"
-          value-format="yyyy-MM-dd"
-        />
       </el-col>
     </el-row>
     <el-row class="handle-box" style="margin-bottom: 10px">

+ 1 - 2
src/views/saleManage/checkIn/checkIn.vue

@@ -17,8 +17,7 @@
     <el-row class="handle-box">
       <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="contractNumber" />
+          <el-table-column label="序号" type="index" width="60" />
           <el-table-column label="合同编号">
             <template scope="scope">
               <el-link :underline="false" type="primary" @click="handleView2(scope.row)">{{ scope.row.contractNumber }}</el-link>