jiangping
2025-04-16 fee184ae9a10e661b9904e06d2dfb91bc71c9474
代码初始化
已修改5个文件
26 ■■■■ 文件已修改
admin/src/views/business/workorderDbh.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/workorderShe.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/system/job.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/system/snippet.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
server/src/main/java/com/doumee/api/business/WorkorderController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/workorderDbh.vue
@@ -62,15 +62,15 @@
        </el-table-column>
        <el-table-column prop="submitDate" label="上报时间" min-width="150px"></el-table-column>
        <el-table-column prop="happenTime" label="发现时间" min-width="150px"></el-table-column>
        <el-table-column prop="locationName" label="发生地点" min-width="100px"></el-table-column>
        <el-table-column prop="riskInfo" label="风险描述" min-width="100px"></el-table-column>
        <el-table-column prop="memberName" label="上报人员" min-width="100px">
        <el-table-column prop="locationName" label="发生地点" min-width="150px"></el-table-column>
        <el-table-column prop="riskInfo" label="风险描述" min-width="200px"></el-table-column>
        <el-table-column prop="memberName" label="上报人员" min-width="150px">
          <template slot-scope="{row}">
            <span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>
            <span v-else >{{row.memberName}} </span>
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="150px"></el-table-column>
        <el-table-column prop="memberNames" label="通知人" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="150px"></el-table-column>
        <el-table-column
admin/src/views/business/workorderShe.vue
@@ -69,7 +69,7 @@
          </template>
        </el-table-column>
        <el-table-column prop="happenTime" label="发现时间" min-width="150px"></el-table-column>
        <el-table-column prop="locationName" label="发生地点" min-width="100px"></el-table-column>
        <el-table-column prop="locationName" label="发生地点" min-width="200px"></el-table-column>
        <el-table-column prop="remark" label="具体位置" min-width="100px"></el-table-column>
          <el-table-column prop="outJiuyi" label="就医情况" min-width="100px">
            <template slot-scope="{row}">
@@ -89,14 +89,14 @@
              <span v-else>否</span>
            </template>
          </el-table-column>
        <el-table-column prop="eventInfo" label="事件说明" min-width="100px"></el-table-column>
        <el-table-column prop="memberName" label="上报人员" min-width="100px">
        <el-table-column prop="eventInfo" label="事件说明" min-width="200px"></el-table-column>
        <el-table-column prop="memberName" label="上报人员" min-width="150px">
          <template slot-scope="{row}">
            <span v-if="row.memberPhone" >{{row.memberName}} - {{row.memberPhone }}</span>
            <span v-else >{{row.memberName}} </span>
          </template>
        </el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="100px"></el-table-column>
        <el-table-column prop="companyName" label="所属部门" min-width="150px"></el-table-column>
        <el-table-column prop="createDate" label="提交时间" min-width="150px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:workorder:update', 'business:workorder:delete'])"
admin/src/views/system/job.vue
@@ -17,6 +17,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:job:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
@@ -59,7 +60,7 @@
        <el-table-column
          v-if="containPermissions(['system:job:update', 'system:job:delete'])"
          label="操作"
          min-width="160"
          min-width="200"
          fixed="right"
        >
          <template slot-scope="{row}">
admin/src/views/system/snippet.vue
@@ -22,6 +22,7 @@
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['system:job:snippet:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
server/src/main/java/com/doumee/api/business/WorkorderController.java
@@ -111,11 +111,11 @@
                    }
                    t.setMemberNames("本人");
                    if(Constants.equalsInteger(model.getMemberType(),Constants.ONE)){
                        t.setMemberNames("同事");
                    }else  if(Constants.equalsInteger(model.getIsHurted(),Constants.TWO)){
                        t.setMemberNames( "同事-"+StringUtils.defaultString(model.getMemberNames(),""));
                    }else  if(Constants.equalsInteger(model.getMemberType(),Constants.TWO)){
                        t.setMemberNames("供应商");
                        t.setMemberNames( "供应商-"+StringUtils.defaultString(model.getMemberNames(),""));
                    }
                    t.setMemberNames(t.getMemberNames()+"-"+StringUtils.defaultString(model.getMemberNames(),""));
                    list.add(t);
                }
            }