Merge remote-tracking branch 'origin/master'

jiangping

2024-08-09 249a271a867df4802a8d59371e0ff10d3eb54298

 admin/src/components/business/OperaCarUseBookWindow.vue

@@ -122,9 +122,9 @@
        :visible.sync="isShowProblem"
        width="480px"
    >
      <el-form :model="dealForm" ref="dealForm" >
      <el-form :model="dealForm" :rules="rules" ref="dealForm" >
        <!-- <el-form-item label="派车司机" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.driverParam === 1"> -->
        <el-form-item label="派车司机" prop="driverId" required v-if="model.approveDateVO!=null && model.approveDateVO.driverParam == 1">
        <el-form-item label="派车司机" prop="driverId" v-if="model.approveDateVO!=null && model.approveDateVO.driverParam == 1">
          <el-select v-model="dealForm.driverId" style="width: 300px"  filterable clearable placeholder="请选择派遣司机">
            <el-option
                v-for="item in memberList"
@@ -200,6 +200,9 @@
      },
      backForm: {
        checkInfo: null
      },
      rules: {
        driverId: [{ required: true, message: '请选择派遣司机', trigger: 'blur' }]
      }
    }
  },
@@ -263,7 +266,7 @@
          objId: this.dataId,
          objType: this.model.type == 1 ? 4 : 3,
          status: 3,
          checkInfo: this.dealForm.checkInfo
          checkInfo: this.backForm.checkInfo
        }).then(res => {
          this.$tip.apiSuccess('退回成功')
          this.getDetail()