Merge remote-tracking branch 'origin/master'

renkang

2024-12-06 b40f8dfb6ce225bbc133d88e26b9166219b64a31

Merge remote-tracking branch 'origin/master'

 admin/.env

@@ -3,8 +3,8 @@
# 路由方式
VUE_APP_ROUTER_MODE = 'hash'

# 项目上下文路径 fn_admin/#/
VUE_APP_CONTEXT_PATH = '/'
# 项目上下文路径
VUE_APP_CONTEXT_PATH = '/fn_admin/#/'

# 接口前缀
VUE_APP_API_PREFIX = '/gateway_interface'

 admin/.env.test

@@ -7,7 +7,7 @@
# VUE_APP_API_URL  = 'http://192.168.0.163:10010/'

# 萍姐
VUE_APP_API_URL  = 'http://192.168.0.105:10010/'
VUE_APP_API_URL  = 'http://192.168.0.108:10010/'

# 测试服务
# VUE_APP_API_URL  = 'https://dmtest.ahapp.net/gateway_interface'

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

@@ -843,6 +843,8 @@
        this.$emit('close')
      } else {
        this.activeTabs = 0
        this.zlList = []
        this.wyList = []
      }
    }
  }

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

@@ -463,6 +463,11 @@
            flex-direction: column;
            border-bottom: 1px solid #ececec;
            margin-bottom: 15px;
            position: sticky;
            top: 0;
            left: 0;
            z-index: 999;
            background: #ffffff;
            span {
                color: black;
                font-size: 16px;

 admin/src/views/finance/bull.vue

@@ -147,7 +147,7 @@
            label: '结清状态',
            options: [
              { value: 0, label: '待收款' },
              { value: 1, label: '已结算' },
              { value: 1, label: '已结清' },
              { value: 2, label: '部分结清' },
              { value: 3, label: '待付款' },
              { value: 4, label: '待退款' }

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

@@ -4,7 +4,7 @@
    <div style="width: 100%; position: sticky; top: 0; left: 0; z-index: 999; background: #ffffff;">
      <div class="home_title">
        <div class="left">
          <span class="mr10">付款方：{{info.customerName}}</span>
          <span class="mr10">{{info.billType === 0 ? '收款方' : '付款方'}}：{{info.customerName}}</span>
          <el-tag type="success" v-if="info.status === 0">开启</el-tag>
          <el-tag type="info" v-if="info.status === 1">关闭</el-tag>
        </div>

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

@@ -177,10 +177,11 @@
    changeContract (e) {
      this.form.renterName = this.contract.filter(item => {
        if (item.id === e) {
          this.form.companyId = item.companyId
          return item
        }
      })[0].renterName
      this.getHouseDate()
      // this.getHouseDate()
    },
    getHouseDate () {
      getContractRoom({ contractId: this.form.contractId, type: 0 })
@@ -219,7 +220,7 @@
      this.$refs.selectHouse.open('选择房源', { contractId: this.form.contractId, type: 0 })
    },
    getCompanyList () {
      companyList({})
      companyList({ type: 2, status: 0 })
        .then(res => {
          this.comparyList = res
        })

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

@@ -7,7 +7,7 @@
                <el-tag type="success" v-if="info.status === 0">开启</el-tag>
                <el-tag type="info" v-if="info.status === 1">关闭</el-tag>
            </div>
            <el-button type="danger" v-if="info.status === 0" @click="closeDW()">关闭流水</el-button>
            <el-button type="danger" v-if="info.status !== 1 || !['3','4'].includes(info.contractStatus)" @click="closeDW()">关闭流水</el-button>
        </div>
        <div class="line"></div>
        <div class="main">
@@ -225,13 +225,13 @@
      tabsClick(val) {
        this.activeTabs = val
      },
      closeDW (id) {
      closeDW () {
        this.$confirm('确认关闭此流水吗?', '提示', {
          confirmButtonText: '确定',
          cancelButtonText: '取消',
          type: 'warning'
        }).then(() => {
          close(id)
          close(this.info.id)
            .then(res => {
              this.getDetails()
            })

 admin/src/views/finance/payments.vue

@@ -45,7 +45,7 @@
      <el-table-column label="操作" min-width="190" fixed="right">
        <template slot-scope="{row}">
          <el-button type="text" @click="$refs.details.open('收支流水详情', row.id)">查看详情</el-button>
          <el-button type="text" @click="closeDW(row.id)" v-if="row.status !== 1 || !['3','4'].includes(row.contractStatus)">关闭流水</el-button>
          <el-button type="text" @click="closeDW(row.id)" v-if="isShow(row.status, row.contractStatus)">关闭流水</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -123,6 +123,11 @@
    this.getList()
  },
  methods: {
    isShow (status, contractStatus) {
      if (status === 1) return false
      if (contractStatus === '3' || contractStatus === '4') return false
      return true
    },
    getList(page) {
      const { pagination, filters } = this
      let form = JSON.parse(JSON.stringify(filters))

 server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java

@@ -53,8 +53,8 @@
    private String title;
    @ApiModelProperty(value = "账单编号")
    private String code;
    @ApiModelProperty(value = "类型 0合同账单 1自建账单", example = "1")
    @ExcelColumn(name="账单来源",index = 12,width = 6,valueMapping = "0=合同账单;1=自建账单;")
    @ApiModelProperty(value = "类型 0合同账单 1自建账单 2退款账单", example = "1")
    @ExcelColumn(name="账单来源",index = 12,width = 6,valueMapping = "0=合同账单;1=自建账单;2=退款账单")
    private Integer type;

    @ApiModelProperty(value = "状态 0开始；1关闭；", example = "1")

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java

@@ -210,7 +210,8 @@
        );

        //房源数据
        ywContractBill.setYwContractRoomList(ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
        ywContractBill.setYwContractRoomList(
                ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
                .selectAll(YwContractRoom.class)
                .selectAs(YwProject::getName,YwRoom::getProjectName)
                .selectAs(YwFloor::getName,YwRoom::getFloorName)
@@ -223,8 +224,8 @@
                .leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ONE),YwContractRoom::getContractId,id)
                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ONE),YwContractRoom::getType,Constants.ONE)
                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO),YwContractRoom::getContractId,ywContractBill.getContractId())
                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO),YwContractRoom::getType,Constants.ZERO)
                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO) || Constants.equalsInteger(ywContractBill.getType(),Constants.TWO),YwContractRoom::getContractId,ywContractBill.getContractId())
                .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)| Constants.equalsInteger(ywContractBill.getType(),Constants.TWO),YwContractRoom::getType,Constants.ZERO)
        ));

        //收支记录
@@ -394,7 +395,7 @@
                for (YwContractBill ywContractBill:ywContractBillList) {
                    if(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)){
                        ywContractBill.setYwContractRoomList(
                                ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)&&Constants.equalsInteger(i.getContractId(),ywContractBill.getContractId())).collect(Collectors.toList())
                                ywContractRoomList.stream().filter(i->(Constants.equalsInteger(i.getType(),Constants.TWO)||Constants.equalsInteger(i.getType(),Constants.ZERO))&&Constants.equalsInteger(i.getContractId(),ywContractBill.getContractId())).collect(Collectors.toList())
                        );
                    }else{
                        ywContractBill.setYwContractRoomList(

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java

@@ -485,7 +485,7 @@
            for(YwContractBill addBill : param.getAddBillList()){
                addBill.setIsdeleted(Constants.ZERO);
                addBill.setContractId(param.getId());
                addBill.setType(Constants.ONE);
                addBill.setType(Constants.TWO);
                addBill.setStatus(Constants.ZERO);
                addBill.setTotleFee(addBill.getReceivableFee());
                addBill.setCompanyId(param.getCompanyId());