Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunw...

liukangdong

2025-02-08 105be897f4e9555c2d3166a13278bbad78e2ef35

Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/funingyunwei into 2.0.1

 admin/src/views/contract/components/terminateLease.vue

@@ -27,6 +27,7 @@
                            <el-date-picker
                                v-model="form.btDate"
                                type="date"
                                :picker-options="pickerOptions"
                                @change="changeBtDate"
                                value-format="yyyy-MM-dd"
                                placeholder="请选择">
@@ -56,12 +57,12 @@
                        <el-table-column prop="projectName" label="项目名称" show-overflow-tooltip />
                        <el-table-column label="房源名称" show-overflow-tooltip>
                            <template slot-scope="{row}">
                                {{row.buildingName}}/{{row.code}}
                                {{row.buildingName}}/{{row.roomNum}}
                            </template>
                        </el-table-column>
                        <el-table-column label="租赁面积(㎡)" show-overflow-tooltip>
                            <template slot-scope="{row}">
                                {{row.area}}㎡
                                {{row.rentArea}}㎡
                            </template>
                        </el-table-column>
                    </el-table>
@@ -250,7 +251,7 @@
        },
        
        list: [],

        pickerOptions: {},
        agentList: [],

        receivable: '',
@@ -263,6 +264,14 @@
      open (title, info) {
        this.title = title
        this.info = info
        this.pickerOptions = {
          disabledDate(time) {
            // 如果没有后面的 -8.64e7 就是不可以选择今天的
            const beginDate = new Date(info.startDate).getTime() - 8.64e7
            const endDate = new Date(info.endDate).getTime()
            return beginDate > time.getTime() || endDate < time.getTime()
          }
        }
        this.form.id = info.id
        this.form.btSignDate = this.getDay()
        this.form.btUserId = this.userInfo.id

 admin/src/views/contract/components/terminationAgreement.vue

@@ -23,7 +23,7 @@
                    </el-table-column>
                    <el-table-column label="面积" show-overflow-tooltip>
                        <template slot-scope="{row}">
                            {{row.area}}㎡
                            {{row.rentArea}}㎡
                        </template>
                    </el-table-column>
                </el-table>

 admin/src/views/finance/components/bullDetail.vue

@@ -9,7 +9,7 @@
          <el-tag type="info" v-if="info.status === 1">关闭</el-tag>
        </div>
        <div style="display: flex; align-items: center;">
          <el-button @click="$refs.call.open('发送催缴通知', [info.id])">发送缴费通知</el-button>
          <el-button @click="$refs.call.open('发送催缴通知', [info.id])" v-if="info.billType === 0">发送缴费通知</el-button>
          <el-button plain type="primary" v-if="![1].includes(info.payStatus)" @click="$refs.flowingWater.open('创建收支流水', {
            billType: returnBillType(),
            billId: info.id,

 admin/src/views/roomStatus/index.vue

@@ -587,7 +587,7 @@
                                            <el-table-column
                                                label="设备编码">
                                                <template slot-scope="{row}">
                                                    <el-button type="text">{{row.code}}</el-button>
                                                    <el-button type="text" @click="handledeviveDetail(row.id)">{{row.code}}</el-button>
                                                </template>
                                            </el-table-column>
                                            <el-table-column
@@ -646,6 +646,8 @@
        <Edit v-if="showEdit1" ref="EditRef" @success="getDevicePage" @close="showEdit1 = false" />
        <!--    合同详情    -->
        <ContractDetail ref="ContractDetailRef" />
        <!--    设备详情    -->
        <deviceDetail ref="deviceDetail" />
    </div>
</template>

@@ -662,9 +664,10 @@
  import { fetchList as devicePage, getDeviceCateData, getDeviceStatus } from '@/api/Inspection/device'
  import Edit from '../operation/components/deviceEdit'
  import ContractDetail from '../contract/components/contractDetail'
  import deviceDetail from '../operation/components/deviceDetail'
  export default {
    name: 'index',
    components: { OperaYwWorkorderWindow, Detail, Edit, ContractDetail },
    components: { OperaYwWorkorderWindow, Detail, Edit, ContractDetail, deviceDetail },
    data() {
      return {
        showDetail: false,
@@ -719,6 +722,11 @@
      }
    },
    methods: {
      handledeviveDetail(id) {
        this.$refs.deviceDetail.visible = true
        this.$refs.deviceDetail.id = id
        this.$refs.deviceDetail.getDetail()
      },
      nodeClick(e) {
        this.tableData = []
        this.pageSize = 10