Merge remote-tracking branch 'origin/master'

jiangping

2024-12-23 406dc15a07638f1e6354fb57e2e5dace603c3248

Merge remote-tracking branch 'origin/master'

 admin/.env

@@ -3,7 +3,7 @@
# è·¯ç”±æ–¹å¼
VUE_APP_ROUTER_MODE = 'hash'

# é¡¹ç›®ä¸Šä¸‹æ–‡è·¯å¾„ 
# é¡¹ç›®ä¸Šä¸‹æ–‡è·¯å¾„
VUE_APP_CONTEXT_PATH = '/fn_admin'

# æŽ¥å£å‰ç¼€

 admin/.env.development

@@ -3,8 +3,8 @@
# é¡¹ç›®ä¸Šä¸‹æ–‡è·¯å¾„
VUE_APP_CONTEXT_PATH = './'

#VUE_APP_API_URL  = 'http://localhost:10010'
VUE_APP_API_URL  = 'http://192.168.0.163:10010'
# VUE_APP_API_URL  = 'https://dmtest.ahapp.net/fn_admin'
#  VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'
# VUE_APP_API_URL  = 'http://localhost:10010'
# VUE_APP_API_URL  = 'http://192.168.0.163:10010'
VUE_APP_API_URL  = 'https://dmtest.ahapp.net/fn_admin'
# VUE_APP_API_URL  = 'http://10.50.250.253:8088/gateway_interface'


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

@@ -295,7 +295,7 @@
        </div>
      </div>
    </div>
    <div class="window__footer" style="position: sticky; bottom: 0; left: 0; z-index: 9; background: #ffffff;">
    <div class="window__footer">
      <slot name="footer">
        <el-button @click="confirm" :loading="confirmWorking" type="primary">{{activeTabs === 0 ? '下一步' : '提交'}}</el-button>
        <slot name="btns" />
@@ -841,6 +841,7 @@
    close () {
      if (this.activeTabs === 0) {
        this.$emit('close')
        this.visible = false
      } else {
        this.activeTabs = 0
        this.zlList = []
@@ -860,6 +861,19 @@
  left: 0;
  z-index: 999;
}
.window__footer {
  position: absolute;
  width: 100%;
  bottom: 0;
  left: 0;
  z-index: 9;
  background: #ffffff;
  user-select: none;
  border-top: 1px solid #eee;
  height: 60px;
  line-height: 60px;
  text-align: center;
}
.tabs {
  border-bottom: 1px solid #DFE2E8;
  display: flex;

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

@@ -30,7 +30,7 @@
                                <el-option :value="0" label="租赁费"></el-option>
                                <el-option :value="1" label="物业费"></el-option>
                                <el-option :value="2" label="租赁押金"></el-option>
                                <el-option :value="3" label="物业证金"></el-option>
                                <el-option :value="3" label="物业押金"></el-option>
                                <el-option :value="4" label="水电费"></el-option>
                                <el-option :value="5" label="杂项费"></el-option>
                                <el-option :value="6" label="其他"></el-option>
@@ -210,7 +210,7 @@
        this.$refs.selectHouse.open('选择房源', { contractId: this.form.contractId, type: 0 })
      },
      getCompanyList () {
        companyList({})
        companyList({ type: 2 })
          .then(res => {
            this.comparyList = res
          })

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

@@ -1,41 +1,43 @@
<template>
    <GlobalWindow :title="title" :withFooter="false" :visible.sync="visible" :confirm-working="isWorking" @close="close"
        @confirm="confirm">
        <div class="home_title">
            <div class="left">
                <span class="mr10">对方单位名称：{{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 style="position: sticky; top: 0; left: 0; width: 100%; background: #ffffff;">
            <div class="home_title">
                <div class="left">
                    <span class="mr10">对方单位名称：{{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>
                <el-button type="danger" v-if="isShow(info.status, info.contractStatus)" @click="closeDW()">关闭流水</el-button>
            </div>
            <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">
            <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
                <div class="item" style="flex: 1;">
                    <div class="la">结清状态</div>
                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 0">待收款</div>
                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 1">已结清</div>
                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 2">部分结清</div>
                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 3">待付款</div>
                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 4">待退款</div>
                    <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 5">已关闭</div>
                </div>
                <div class="item" style="flex: 1;">
                    <div class="la">应{{info.revenueType === 0 ? '收' : '付'}}金额（元）</div>
                    <div class="val" style="margin-top: 10px;">{{info1.receivableFee}}</div>
                </div>
                <div class="item" style="flex: 1;">
                    <div class="la">实{{info.revenueType === 0 ? '收' : '付'}}金额（元）</div>
                    <div class="val" style="margin-top: 10px;">{{info1.actReceivableFee}}</div>
                </div>
                <div class="item" style="flex: 1;">
                    <div class="la">需{{info.revenueType === 0 ? '收' : '付'}}金额（元）</div>
                    <div class="val" style="margin-top: 10px;">{{info1.needReceivableFee}}</div>
                </div>
                <div class="item" style="flex: 1;">
                    <div class="la">应{{info.revenueType === 0 ? '收' : '付'}}日期</div>
                    <div class="val" style="margin-top: 10px;">{{info1.planPayDate}}</div>
            <div class="line"></div>
            <div class="main">
                <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
                    <div class="item" style="flex: 1;">
                        <div class="la">结清状态</div>
                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 0">待收款</div>
                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 1">已结清</div>
                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 2">部分结清</div>
                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 3">待付款</div>
                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 4">待退款</div>
                        <div class="val" style="margin-top: 10px;" v-if="info1.payStatus === 5">已关闭</div>
                    </div>
                    <div class="item" style="flex: 1;">
                        <div class="la">应{{info.revenueType === 0 ? '收' : '付'}}金额（元）</div>
                        <div class="val" style="margin-top: 10px;">{{info1.receivableFee}}</div>
                    </div>
                    <div class="item" style="flex: 1;">
                        <div class="la">实{{info.revenueType === 0 ? '收' : '付'}}金额（元）</div>
                        <div class="val" style="margin-top: 10px;">{{info1.actReceivableFee}}</div>
                    </div>
                    <div class="item" style="flex: 1;">
                        <div class="la">需{{info.revenueType === 0 ? '收' : '付'}}金额（元）</div>
                        <div class="val" style="margin-top: 10px;">{{info1.needReceivableFee}}</div>
                    </div>
                    <div class="item" style="flex: 1;">
                        <div class="la">应{{info.revenueType === 0 ? '收' : '付'}}日期</div>
                        <div class="val" style="margin-top: 10px;">{{info1.planPayDate}}</div>
                    </div>
                </div>
            </div>
        </div>
@@ -225,6 +227,11 @@
      tabsClick(val) {
        this.activeTabs = val
      },
      isShow (status, contractStatus) {
        if (status === 1) return false
        if (contractStatus === '3' || contractStatus === '4') return false
        return true
      },
      closeDW () {
        this.$confirm('确认关闭此流水吗?', '提示', {
          confirmButtonText: '确定',

 server/system_service/src/main/java/com/doumee/biz/system/impl/SystemDictDataBizImpl.java

@@ -68,7 +68,8 @@
        queryDto.setDeleted(Boolean.FALSE);
        SystemDict dictData = systemDictService.findOne(queryDto);
        if (dictData == null) {
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "数据值不存在");
            return new SystemDictData();
//            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "数据值不存在");
        }
        SystemDictData data = new SystemDictData();
        data.setDictId(dictData.getId());

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveParamController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ApproveTemplController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarDriverController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarEventController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarParksController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarUseBookController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CarsController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CategoryController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/CompanyController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceEventController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ERPSyncController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/EmpowerController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/FormParamController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerLogController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HiddenDangerParamController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/HkSyncController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/InoutDayCountController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberCardController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/MemberRoleController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParkBookController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ParksController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformEventController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformGroupController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformInterfaceLogController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformJobController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformLogController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformQueueController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformReasonController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformShowParamController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/PlatformWaterGasController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemLogController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/ProblemsController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/RetentionController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/StagingController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TasksController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/TrainTimeController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/UserActionController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitEventController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitParkController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemLogController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitProblemsController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitReasonController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitorController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/VisitsController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsInterfaceLogController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/api/business/WmsPushController.java

ÎļþÒÑɾ³ý

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CompanyCloudController.java

@@ -36,7 +36,7 @@
    @Autowired
    private CompanyService companyService;

    @Autowired
//    @Autowired
    private ERPSyncService erpSyncService;
    @Autowired
    private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/ERPSyncCloudController.java

@@ -21,7 +21,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/erpsync")
public class ERPSyncCloudController extends BaseController {
    @Autowired
//    @Autowired
    private ERPSyncService erpSyncService;

    @PreventRepeat

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/MemberCloudController.java

@@ -44,7 +44,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/member")
public class MemberCloudController extends BaseController {
    @Autowired
//    @Autowired
    private ERPSyncService erpSyncService;
    @Autowired
    private HkSyncOrgUserFromHKServiceImpl hkSyncOrgUserFHKService;

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

@@ -121,7 +121,7 @@
    private WxPlatNotice wxPlatNotice;

    @Override
    @PostConstruct
//    @PostConstruct
    public  int  initHkConfig(){
        ErpConstants.approveUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_APPROVE_URL).getCode();
        ErpConstants.orgListUrl=systemDictDataBiz.queryByCode(Constants.ERP,Constants.ERP_ORGLIST_URL).getCode();

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/ferp/HkSyncOrgUserToHKServiceImpl.java

@@ -59,7 +59,7 @@
    private MemberJoinMapper memberMapper;
    @Autowired
    private MemberMapper memberMapper1;
    @Autowired
//    @Autowired
    private ERPSyncService erpSyncService;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;