最新版本541200007

jiangping

2025-06-16 8fc9e2cb7c40ff840ca40e0491124bc1d166a15e

最新版本541200007

 admin/src/views/business/visits.vue

@@ -97,6 +97,12 @@
            <span v-if="row.status === 9" style="color: gray">已失效</span>
          </template>
        </el-table-column>
        <el-table-column label="在园状态" min-width="100px">
          <template slot-scope="{row}">
            <span v-if="row.status == 7 && row.retentionNum && row.retentionNum >0 ">是</span>
            <span v-else >否</span>
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="下发备注" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="170px"></el-table-column>
        <el-table-column   label="操作"

 admin/src/views/meeting/bookings.vue

@@ -93,8 +93,8 @@
            <!-- {{ row.status==0 ? '正常' : '取消' }} -->
          </template>
        </el-table-column>
        <el-table-column prop="remark" label="会议需求" align="center" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" align="center" min-width="150px"></el-table-column>
        <!-- <el-table-column prop="content" label="会议内容" min-width="100px"></el-table-column> -->
        <el-table-column v-if="
          containPermissions([
            'business:bookings:update',

 admin/src/views/meeting/components/OperaBookingsDetailWindow.vue

@@ -21,6 +21,10 @@
        <div class="item-title">会议内容</div>
        <div class="item-value">{{ form.content || "无" }}</div>
      </div>
      <div class="item">
        <div class="item-title">会议需求</div>
        <div class="item-value">{{ form.remark || "无" }}</div>
      </div>
      <div v-if="form.projectList && form.projectList.length" class="item">
        <div class="">服务项</div>
        <div class="item-value">

 admin/src/views/meeting/components/OperaBookingsWindow.vue

@@ -53,8 +53,8 @@
          <FileLink :links="form.fileList" linkName="fileFullUrl" />
        </div>
      </el-form-item>
      <el-form-item label="会议备注" prop="remark">
        <el-input type="textarea" v-model="form.remark" placeholder="请输入会议备注" v-trim />
      <el-form-item label="会议需求" prop="remark">
        <el-input type="textarea" v-model="form.remark" placeholder="请输入会议需求" v-trim />
      </el-form-item>
      <input type="file" @change="upFiles" ref="upFile" style="display: none;" />
    </el-form>

 h5/packagesMine/confirmAppointment/confirmAppointment.vue

@@ -97,7 +97,7 @@
            </view>

            <view class="confirm_b_item">

                <view class="label">

                    <text>备注</text>

                    <text>会议需求</text>

                </view>

                <view class="input">

                    <textarea


 h5/pages/staff/meetingCalendar.vue

@@ -89,7 +89,7 @@
              <view class="value">{{ item.bookingUser }}</view>

            </view>

            <view class="line">

              <view class="label">备注：</view>

              <view class="label">会议需求：</view>

              <view class="value">{{ item.remark || item.meetingRemark }}</view>

            </view>

          </view>


 h5/pages/staff/meetingManager.vue

@@ -70,7 +70,7 @@
              <view class="value">{{ item.bookingUser }}</view>

            </view>

            <view class="line">

              <view class="label">备注：</view>

              <view class="label">会议需求：</view>

              <view class="value">{{ item.remark || item.meetingRemark }}</view>

            </view>

          </view>


 h5/pages/staff/meetingSubOrder.vue

@@ -85,7 +85,7 @@
            </view>

            <view class="item">

                <view class="name">

                    <text>备注</text>

                    <text>会议需求</text>

                </view>

                <view class="line">

                    <u-textarea  border="none" autoHeight v-model="param.remark" :maxlength="-1" placeholder="请输入" placeholder-class="placeholder9"


 server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java

@@ -43,6 +43,7 @@
    private Integer isdeleted;

    @ApiModelProperty(value = "备注")
    @ExcelColumn(name="会议需求",index = 7,width = 10)
    private String remark;

    @ApiModelProperty(value = "会议主题")

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

@@ -326,6 +326,9 @@
    @ApiModelProperty(value = "通知描述")
    @TableField(exist = false)
    private String info;
    @ApiModelProperty(value = "当前是否在园")
    @TableField(exist = false)
    private Integer retentionNum;

    @ApiModelProperty(value = "审批信息数据")
    @TableField(exist = false)

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

@@ -382,8 +382,7 @@
                || Objects.isNull(platformBooksApplyDTO.getDriverId())
                || StringUtils.isBlank(platformBooksApplyDTO.getDriverPhone())
                || StringUtils.isBlank(platformBooksApplyDTO.getDriverName())
                || StringUtils.isBlank(platformBooksApplyDTO.getTransportImg())
        ){
                || StringUtils.isBlank(platformBooksApplyDTO.getTransportImg())){
            throw new BusinessException(ResponseStatus.BAD_REQUEST);
        }
        //查询车辆是否为自有车

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

@@ -1296,6 +1296,7 @@

        queryWrapper.selectAll(Visits.class);
        queryWrapper.select("  ( select count(distinct(v.CAR_NOS)) from visits v where v.PARENT_ID = t.ID and v.CAR_NOS is not null  and v.CAR_NOS != ''  and v.CAR_NOS != t.CAR_NOS ) as carNum  ");
        queryWrapper.select("  ( select count(distinct(v.id)) from retention v where v.member_id = t.member_id and v.type=1 )",Visits::getRetentionNum);
        queryWrapper.selectAs(Member::getName,Visits::getReceptMemberName);
        queryWrapper.selectAs(Company::getName,Visits::getReceptMemberDepartment);
        queryWrapper.leftJoin(Member.class,Member::getId,Visits::getReceptMemberId);