Merge remote-tracking branch 'origin/master'

jiangping

2025-01-16 1da4ccbf33281b669c40488be047700a298927de

Merge remote-tracking branch 'origin/master'

 admin/src/views/system/user.vue

@@ -45,7 +45,7 @@
<!--            <img :src="row.avatar == null ? '/static/avatar/man.png' : row.avatar">-->
<!--          </template>-->
<!--        </el-table-column>-->
        <el-table-column prop="realname" label="姓名" min-width="100px" fixed="left"></el-table-column>
        <el-table-column prop="realname" label="姓名" width="80px" fixed="left"></el-table-column>
        <el-table-column prop="username" label="用户名" min-width="120px"></el-table-column>
        <el-table-column prop="empNo" label="工号" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
        <el-table-column prop="companyName" label="所属组织"    min-width="250px"></el-table-column>

 h5/pages/driver/taskDetail.vue

@@ -207,8 +207,8 @@
                //         'openLocation'

                //     ] // 必填，需要使用的JS接口列表

                // })

                this.getLocation()
                // this.getDetail()

                // this.getLocation()
                this.getDetail()

            } else {

                this.getDetail()

            }


 h5/pages/staff/meetingCalendar.vue

@@ -252,7 +252,8 @@
    initData() {

      // 当月数据

      monthMeetingPage({

        yearMonth: this.currentDate.slice(0, 7)

        yearMonth: this.currentDate.slice(0, 7),
                queryType: 1

      }).then(res => {

        this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {

          return {


 h5/pages/staff/meetingManager.vue

@@ -165,7 +165,8 @@
    initData() {

      // 当月数据

      monthMeetingPage({

        yearMonth: this.currentDate.slice(0, 7)

        yearMonth: this.currentDate.slice(0, 7),
                queryType: 3

      }).then(res => {

        this.monthMark = res.data.filter(i => i.meetingNum > 0).map(j => {

          return {

@@ -234,7 +235,7 @@
      // 当天我参与的会议

      myMeetingPage({

        model: {

          queryType: '1',

          queryType: '3',

          roomsId: activeRoom.id,

          queryDate: currentDate

        },


 h5/pages/staff/task/vDangetAppr.vue

@@ -506,7 +506,7 @@
        getMemList() {

            findHiddenAreaMemberList({

                ...this.transferModel,

                id: this.info.areaId,

                // id: this.info.areaId,

                ...this.pagination

            }).then(res => {

                this.memberList = res.data || []


 h5/pages/waybill/waybillDetail.vue

@@ -4,12 +4,12 @@
        <map id="map" :latitude="latitude" :longitude="longitude" :polyline="polyline" :markers="markers" :scale="scale">



        </map>

        <view class="main_content">
            <view class="stock_status" v-if="info.overStock && info.overStock == 1">
                <image src="@/static/ic_tip@2x.png" mode=""></image>
                <view class="">因库存不足，订单暂时无法配载</view>
            </view>

            <view class="info">

        <view class="main_content">

            <view class="info">
                <view class="stock_status" v-if="info.overStock && info.overStock == 1">
                    <image src="@/static/ic_tip@2x.png" mode=""></image>
                    <view class="">因库存不足，订单暂时无法配载</view>
                </view>

                <view class="head">

                    <view class="code">{{info.contractNumber}}</view>

                    <view class="status">{{info.orderStatusDesc}}</view>

@@ -354,24 +354,6 @@
                }

            }

        }

        .stock_status{
            background: #FFEEEE;
            font-size: 26rpx;
            color: #ED4545;
            display: flex;
            align-items: center;
            border-radius: 8rpx 8rpx 0rpx 0rpx;
            height: 80rpx;
            position: relative;
            z-index: 1;
            padding: 0 30rpx 4rpx;
            top: 8rpx;
            image{
                width: 28rpx;
                height: 28rpx;
                margin-right: 10rpx;
            }
        }

        .info {

            border-radius: 12rpx;

            margin-bottom: 20rpx;

@@ -379,17 +361,37 @@
            background-color: #fff;

            overflow: hidden;

            position: relative;

            z-index: 1;

            z-index: 1;
            .stock_status{
                background: #FFEEEE;
                font-size: 26rpx;
                color: #ED4545;
                display: flex;
                align-items: center;
                border-radius: 8rpx 8rpx 0rpx 0rpx;
                height: 80rpx;
                margin: 0rpx -30rpx 0;
                position: relative;
                z-index: 1;
                padding: 0 30rpx;
                image{
                    width: 28rpx;
                    height: 28rpx;
                    margin-right: 10rpx;
                }
            }

            .head {

                display: flex;

                justify-content: space-between;

                align-items: center;

                padding: 0 30rpx;

                width: 690rpx;

                width: 690rpx;
                border-radius: 8rpx 8rpx 0rpx 0rpx;

                height: 84rpx;

                margin: 0 -30rpx;

                background: linear-gradient(270deg, #FEFEFF 0%, #E1F7FE 100%);



                position: relative;
                z-index: 11;

                .code {

                    font-weight: 500;

                    font-size: 32rpx;


 screen/src/views/LogisticsCenter.vue

@@ -56,8 +56,8 @@
                    </div>
                    <div class="hover_wrap">
                      <div class="triangle"></div>
                      <div class="title">调拨出库量：{{ StockOutData.currentProvinceNum || 0 }}箱</div>
                      <div class="title">其他出库量：{{ StockOutData.currentOtherNum || 0 }}箱</div>
                      <div class="title" v-if="StockOutData.currentProvinceNum || StockOutData.currentProvinceNum == 0">调拨出库量：{{ StockOutData.currentProvinceNum.toFixed(0) }}箱</div>
                      <div class="title" v-if="StockOutData.currentOtherNum || StockOutData.currentOtherNum == 0">其他出库量：{{ StockOutData.currentOtherNum.toFixed(0) }}箱</div>
                    </div>
                  </div>

@@ -1031,7 +1031,7 @@
      image: fahuoImg, // 图标图片URL
      imageSize: new AMap.Size(28, 32), // 图标实际大小
    }),
    title: '标记点1', // 鼠标悬停时显示的标题
    title: obj.deliveryEnterprise, // 鼠标悬停时显示的标题
  })
  map.add(marker1)
  const marker2 = new AMap.Marker({
@@ -1041,7 +1041,7 @@
      image: shouImg, // 图标图片URL
      imageSize: new AMap.Size(28, 32), // 图标实际大小
    }),
    title: '标记点1', // 鼠标悬停时显示的标题
    title: obj.receiveEnterprise, // 鼠标悬停时显示的标题
  })
  map.add(marker2)
  // 绘制轨迹
@@ -2569,7 +2569,6 @@
    }

    .title {
      font-weight: 600;
      color: #e2ebfd;
    }
  }