Merge remote-tracking branch 'origin/master'

jiangping

2025-04-14 417b355cf5b25c0dced403abb99aa152d219e9db

 admin/src/views/task/visSubDetail.vue

@@ -1,5 +1,5 @@
<template>
  <GlobalWindow :title="title" :visible.sync="isShowModal" @confirm="confirm">
  <GlobalWindow :title="title" :visible.sync="isShowModal" @close="close" @confirm="confirm">
    <div class="modal_wrap">
      <div class="modal_content">
        <div class="header">
@@ -37,7 +37,7 @@
              <div class="value">{{ info.carNos }}</div>
            </div>
            <div class="item">
              <div class="label">施工人员</div>
              <div class="label">涉及施工作业</div>
              <div class="value">{{ info.type == "0" ? "否" : "是" }}</div>
            </div>
            <div class="item">
@@ -78,7 +78,7 @@
            <el-table-column label="公司名称" prop="companyName" min-width="120" />
            <el-table-column label="人脸照片" prop="" min-width="80">
              <template slot-scope="{ row }">
                <el-image :src="row.prefix + row.faceImg" :preview-src-list="[row.prefix + row.faceImg]">
                <el-image v-if="row.prefix && row.faceImg" :src="row.prefix + row.faceImg" :preview-src-list="[row.prefix + row.faceImg]">
                </el-image>
              </template>
            </el-table-column>
@@ -154,7 +154,7 @@
        info.approveDateVO.canBeApproved != null &&
        info.approveDateVO.canBeApproved == 1
      ">拒绝</el-button>
      <el-button @click="isShowModal = false">返回</el-button>
      <el-button @click="close">返回</el-button>
    </template>
    <!--  同意/拒绝 -->
    <el-dialog append-to-body :title="param.status == 2 ? '同意' : '拒绝'" :visible.sync="isShowAppr" width="480px">
@@ -260,6 +260,8 @@
                this.subLoading = false
                this.$tip.apiSuccess('处理成功')
                this.getDetail()
                this.$emit('success')
                this.$emit('close')
                this.isShowAppr = false
              })
              .finally(() => {
@@ -267,6 +269,10 @@
              })
          })
      })
    },
    close(){
      this.isShowModal = false
      this.$emit('close')
    },
    getDetail() {
      const { id, type } = this
@@ -510,7 +516,7 @@
          color: #888888;

          .status {
            color: #00ba67;
            color: $primaryColor;
          }
        }