Merge remote-tracking branch 'origin/master'

k94314517

2025-04-10 45bcd3eb3f5e245636fb7295998c328de9d76f3e

Merge remote-tracking branch 'origin/master'

 admin/src/components/business/OperaWorkorderDetailSheWindow.vue

@@ -1,7 +1,7 @@
<template>
  <GlobalWindow
      :title="title"
      width="80%"
      width="85%"
      :visible.sync="visible"
      :confirm-working="isWorking"
      @confirm="confirm">
@@ -20,34 +20,73 @@
          <div class="right"  :class="{ scs: info.status == '3' || info.status == '4' || info.status == '5',  msg: info.status == '6' }">{{statusMap[info.status] }}</div>
        </div>
        <div class="info">
          <div class="title">访客预约信息</div>
          <div class="title">工单信息</div>
          <div class="list">
            <div class="item">
              <div class="label">被访人</div>
              <div class="value">{{ info.visitUserName }}</div>
              <div class="label">员工姓名</div>
              <div class="value">{{ info.memberName }} - {{ info.memberPhone || '[无手机号]' }}</div>
            </div>
            <div class="item">
              <div class="label">来访时间</div>
              <div class="value">{{ info.visitTime }}</div>
              <div class="label">上报时间</div>
              <div class="value">{{ info.createDate }}</div>
            </div>
            <div class="item">
              <div class="label">来访事由</div>
              <div class="value">{{ info.visitReason }}</div>
              <div class="label">涉及人员</div>
              <div class="value" v-if="info.memberType == 2">供应商-{{info.memberNames}}</div>
              <div class="value" v-else-if="info.memberType == 1">同事-{{info.memberNames}}</div>
              <div class="value" v-else>本人</div>
            </div>
            <div class="item">
              <div class="label">随行车辆</div>
              <div class="value">{{ info.carNos }}</div>
              <div class="label">发生地点</div>
              <div class="value">{{ info.locationName }}</div>
            </div>
            <div class="item">
              <div class="label">涉及施工作业</div>
              <div class="value">{{ info.type == "0" ? "否" : "是" }}</div>
              <div class="label">是否外部就医</div>
              <div class="value">{{ info.outJiuyi == "0" ? "否" : "是" }}</div>
            </div>
            <div class="item" v-if="info.outJiuyi == '0'">
              <div class="label">是否医务室</div>
              <div class="value">{{ info.isYiwushi == "0" ? "否" : "是" }}</div>
            </div>
            <div class="item" v-if="info.isYiwushi == '0'">
              <div class="label">是否受伤</div>
              <div class="value">{{ info.isHurted == "0" ? "否" : "是" }}</div>
            </div>
            <div class="item">
              <div class="label">施工内容</div>
              <div class="label">伤害类型</div>
              <div class="value">{{ info.typeName }}</div>
            </div>
            <div class="label">是否和工作相关</div>
            <div class="value">{{ info.workRelated == "0" ? "否" : "是" }}</div>
          </div>
            <div class="item">
              <div class="label">事件说明</div>
              <div class="value">{{ info.constructionReason }}</div>
            </div>
          </div>
        </div>
      <div class="item" style="width: 100%">
        <div class="label">图片</div>
        <div class="value" v-if="info.multifileList ==null || !info.multifileList.length">无</div>
        <div class="value" v-if="info.multifileList !=null && info.multifileList.length">
          <div v-for="item in info.multifileList" :key="item.id" style="display: inline;margin-right: 20px">
            <video
                v-if="item.fileurlFull && item.fileurlFull.endsWith('.mp4')"
                ref="videoRef"
                controls
                preload="auto"
                style="width: 80px;height: 80px;object-fit: contain;"
                :src="item.fileurlFull"
            />
            <el-image
                v-else-if="item.fileurlFull"
                style="width:80px; height: 80px"
                :src="item.fileurlFull"
                :preview-src-list="[item.fileurlFull]">
            </el-image>
          </div>
        </div>
      </div>
      </div>
      <div class="side">
        <div class="side_title">操作历史</div>

 admin/src/views/business/workorderShe.vue

@@ -63,17 +63,17 @@
            <span v-else>本人</span>
          </template>
        </el-table-column>
        <el-table-column prop="localtionName" label="发生地点" min-width="100px"></el-table-column>
        <el-table-column prop="locationName" label="发生地点" min-width="100px"></el-table-column>
          <el-table-column prop="outJiuyi" label="就医情况" min-width="100px">
            <template slot-scope="{row}">
              <span v-if="row.outJiuyi == 1">外部就医-
                  <span v-if="row.isYiwushi == 1">医务室-
                     <span v-if="row.isHurted == 1">受伤</span>
                     <span v-else>未受伤</span>
              <span v-if="row.outJiuyi == 0">非外部就医-
                  <span v-if="row.isYiwushi == 0">非医务室-
                     <span v-if="row.isHurted == 0">未受伤</span>
                     <span v-else>受伤</span>
                  </span>
                   <span v-else>非医务室</span>
                   <span v-else>医务室</span>
              </span>
              <span v-else>非外部就医</span>
              <span v-else>外部就医</span>
            </template>
          </el-table-column>
          <el-table-column prop="workRelated" label="和工作相关" min-width="100px">