Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxingli...

rk

2 天以前 a59ff44b2eaa7020f0529632d9ec064c4dc38e27

 admin/src/components/business/OperaDriverApproval.vue

@@ -7,14 +7,32 @@
  >
    <div class="driver-approval">
      <div class="section">
        <div class="section-header checkinfo"   v-if="detailInfo.auditStatus != 0" :style="detailInfo.auditStatus === 3 || detailInfo.auditStatus === 1?'background:rgb(233 249 225)':''">
          <div class="info-grid" style="display: block; ">
            <div class="info-item" >
              <el-tag   type="danger" class="status-tag"  v-if="detailInfo.auditStatus ===2" style="font-weight: 800;" >审批驳回</el-tag>
              <el-tag   type="danger" class="status-tag"   v-if="detailInfo.auditStatus === 3 || detailInfo.auditStatus === 1" style="font-weight: 800;color: #67c23a;" >审批通过</el-tag>
            </div>
            <div class="info-item"  style="display: block;padding-top: 20px;font-weight: 600;">
              <span class="label">审批意见：</span>
              <span class="value">{{ detailInfo.auditRemark || '-' }}</span>
            </div>
          </div>
          <div class="info-item"  style="display: block; padding-left: 10px;font-size: 12px;">
            <span class="label">时间:</span>
            <span style="margin-left: 10px;" class="value">{{ detailInfo.auditTime || '-' }}</span>
            <span style="margin-left: 50px;" class="label">审核人:</span>
            <span style="margin-left: 10px;" class="value">{{ detailInfo.auditUserName || '-' }}</span>
          </div>
        </div>
        <div class="section-header">
          <span class="section-title">司机信息</span>
          <el-tag type="success" v-if="detailInfo.auditStatus">已授权手机号</el-tag>
          <el-tag type="warning" v-else>未授权手机号</el-tag>
          <div class="approval-status">
           <div class="approval-status">
            <el-tag v-if="detailInfo.auditStatus === 0" type="warning" class="status-tag">待审核</el-tag>
            <el-tag v-else-if="detailInfo.auditStatus === 1" type="success" class="status-tag">审批通过</el-tag>
            <el-tag v-else-if="detailInfo.auditStatus === 2" type="danger" class="status-tag">审批驳回</el-tag>
<!--            <el-tag v-else-if="detailInfo.auditStatus === 1" type="success" class="status-tag">审批通过</el-tag>
            <el-tag v-else-if="detailInfo.auditStatus === 2" type="danger" class="status-tag">审批驳回</el-tag>-->
          </div>
        </div>
        <div class="info-grid">
@@ -46,9 +64,14 @@
            <span class="label">现居住地址：</span>
            <span class="value">{{ detailInfo.livePlace || '-' }}</span>
          </div>
          <div class="info-item">
          <div class="info-item"  v-if="detailInfo.auditStatus === 3 || detailInfo.auditStatus === 1" >
            <span class="label">评级：</span>
            <span class="value">{{ detailInfo.driverLevel || '-' }}</span>
            <span class="value" v-if="detailInfo.driverLevel ==5">S</span>
            <span class="value" v-else-if="detailInfo.driverLevel ==4">A</span>
            <span class="value" v-else-if="detailInfo.driverLevel ==3">B</span>
            <span class="value" v-else-if="detailInfo.driverLevel ==2">C</span>
            <span class="value" v-else-if="detailInfo.driverLevel ==1">D</span>
            <span class="value" v-else>-</span>
          </div>
          <div class="info-item">
            <span class="label">状态：</span>
@@ -153,15 +176,15 @@
        </div>
      </div>

      <div class="approval-form" v-if="detailInfo.auditStatus === 0">
        <el-form ref="approvalForm" :model="approvalForm" :rules="approvalRules">
      <div class="approval-form" v-if="detailInfo.auditStatus === 0" >
        <el-form ref="approvalForm" :model="approvalForm" :rules="approvalForm.auditStatus ===0?approvalRules:approvalRules1">
          <el-form-item label="审批结果" prop="auditStatus">
            <el-radio-group v-model="approvalForm.auditStatus">
            <el-radio-group v-model="approvalForm.auditStatus" @change="changeRadio">
              <el-radio :label="0">通过</el-radio>
              <el-radio :label="1">拒绝</el-radio>
            </el-radio-group>
          </el-form-item>
          <el-form-item label="司机评级" prop="driverLevel">
          <el-form-item label="司机评级" prop="driverLevel" v-if="approvalForm.auditStatus ===0">
            <el-select v-model="approvalForm.driverLevel" placeholder="请选择司机评级" style="width: 300px">
              <el-option label="S" :value="5"></el-option>
              <el-option label="A" :value="4"></el-option>
@@ -170,7 +193,7 @@
              <el-option label="D" :value="1"></el-option>
            </el-select>
          </el-form-item>
          <el-form-item label="审批意见" prop="auditRemark">
          <el-form-item label="审批意见" prop="auditRemark"  >
            <el-input
              type="textarea"
              v-model="approvalForm.auditRemark"
@@ -210,17 +233,23 @@
      },
      approvalRules: {
        auditStatus: [{ required: true, message: '请选择审批结果', trigger: 'change' }],
        driverLevel: [{ required: true, message: '请选择司机评级', trigger: 'change' }],
        driverLevel: [{ required: true, message: '请选择司机评级', trigger: 'change' }]
      },
      approvalRules1: {
        auditStatus: [{ required: true, message: '请选择审批结果', trigger: 'change' }],
        auditRemark: [{ required: true, message: '请输入审批意见', trigger: 'blur' }]
      }
    }
  },
  methods: {
    changeRadio(){
      this.$refs.approvalForm.clearValidate()
    },
    open (title, row) {
      this.title = title
      this.approvalForm = {
        id: row.id,
        auditStatus: 1,
        auditStatus: 0,
        driverLevel: '',
        auditRemark: ''
      }
@@ -267,11 +296,20 @@

<style scoped>
.driver-approval {
  

}
.section {
  margin-bottom: 25px;
}
.checkinfo {
  align-items:start   !important;
  display: flex !important;
  flex-direction: column   !important;
  background-color: rgb(254 242 242);
  min-height: 100px;
  margin-bottom: 30px;
  padding: 20px;
}
.section-header {
  display: flex;
  align-items: center;