Merge remote-tracking branch 'origin/master'

jiangping

2024-11-12 0f272e2cd2ce4363453213dc9861cc8a5614d9db

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	admin/src/views/operation/serviceCar/apprRecord.vue

 admin/src/views/operation/serviceCar/apprConfig.vue

@@ -153,7 +153,7 @@
              type="primary">保存配置项</el-button>
            <el-button v-if="activeIndex !== 0 && activeIndex !== apprList.length - 1" type="danger" plain
              @click="handleDel">删除节点</el-button>
          </div>
          </div>3
        </div>
      </div>
    </template>

 h5/pages/staff/meetingCalendar.vue

@@ -228,7 +228,8 @@
    this.getRoomList()

  },

  onShow() {

    this.tabClick('0')

    // this.tabClick('0')
        this.getRecordList()

  },

  onReachBottom() {

    const { activeTab } = this


 h5/pages/staff/vehicle/sendACar.vue

@@ -7,8 +7,7 @@
        <u-icon class="ml12" name="arrow-down" color="#999999" />
      </view>
      <view class="item" @click="isShowCar = true">
        <text v-if="param.carCode">{{ param.carCode }}</text>
        <text v-else class="placeholder9">选择车辆</text>
        <text>{{ param.carCode || '全部车辆' }}</text>
        <u-icon class="ml12" name="arrow-down" color="#999999" />
      </view>
    </view>
@@ -140,6 +139,7 @@
    seletedCar(e) {
      const item = e.value[0]
      this.pagination.page = 0
            this.dataList = []
      this.$set(this.param, 'carCode', item.code)
      this.$set(this.param, 'carId', item.id)
      this.isShowCar = false
@@ -150,6 +150,7 @@
        this.param.queryDate = dayjs(e.value).format('YYYY-MM-DD')
        this.pagination.page = 0
        this.isShowDate = false
                this.dataList = []
        this.getList()
      })
    },
@@ -168,7 +169,7 @@
      getCarsList({
        type: 0
      }).then(res => {
        this.carsList = [res.data]
        this.carsList = [[{ code: '全部车辆', id: '' }, ...res.data]]
      })
    },
  }

 h5/pages/staff/vehicle/sendACarDetail.vue

@@ -99,18 +99,23 @@
        info.approveDateVO.canBeApproved != null &&

        info.approveDateVO.canBeApproved == 1

      ">

            <template v-if="appr == '1'">

            <template>

                <view class="btn" @click="handleSub(3)">拒绝</view>

                <view class="btn agree" @click="handleSub(2)">同意</view>

            </template>

            <view v-else class="btn agree" @click="isShowBack = true">撤销用车</view>

        </view>

        </view>
        <template v-else>
            <view v-if="(info.approveDateVO.canBeApproved == 1 || userInfo.memberId == info.memberId) && info.status == 0" class="main_footer"  @click="isShowBack = true">
                <view class="agree btn">撤回用车</view>
            </view>
        </template>
		


        <!-- 撤销 -->

        <u-popup :show="isShowBack" :round="10" :safeAreaInsetBottom="true" mode="bottom" @close="isShowBack = false">

            <view class="appr_modal">

                <view class="title">撤销用车</view>

                <view class="line"> 撤销说明 </view>

                <view class="title">撤回用车</view>

                <view class="line"> 撤回说明 </view>

                <textarea v-model="backParam.info" placeholder="非必填" placeholder-class="placeholder9" />

                <view class="main_footer">

                    <view class="btn agree" @click="onSubBack">提交</view>

@@ -154,7 +159,8 @@
                showApprModal: false,

                isShowBack: false,

                backParam: {},

                isShowDrive: false,

                isShowDrive: false,
                userInfo: uni.getStorageSync('userInfo') || {},

                id: '',

                appr: '',

                infoStatus: '',

@@ -262,8 +268,13 @@
                this.showApprModal = true

            },

            getDriveList() {

                driveListPost({}).then(res => {

                    this.driveList = [res.data]

                driveListPost({}).then(res => {
                    const temp = res.data || []

                    this.driveList = [res.data]
                    if(this.param.driverId){
                        const item = temp.find(i=>i.id == this.param.driverId)
                        this.$set(this.param, 'driverName', item.name)
                    }

                })

            },

            seletedDrive(e) {


 h5/utils/config.js

@@ -1,6 +1,7 @@

export const baseUrl = 'gateway_interface/'
// export const baseUrl = 'http://192.168.0.173/gateway_interface/'
// export const baseUrl = 'http://10.50.250.253:8088/gateway_interface/'

export const uploadAvatar = `${baseUrl}visitsAdmin/cloudService/web/public/uploadFtp.do`
export const uploadUrl = `${baseUrl}visitsAdmin/cloudService/public/uploadBatch`

 screen/src/views/FireFighting.vue

@@ -1347,7 +1347,7 @@
          margin-right: 7px;
        }
      }

      
      .static_wrap {
        display: flex;
        justify-content: space-evenly;
@@ -1401,7 +1401,7 @@
        overflow: auto;
        margin-top: 15px;
        scrollbar-width: none;
        

        .item {
          display: flex;
          font-size: 13px;