Merge remote-tracking branch 'origin/master'

jiangping

2024-06-03 e7b6e88a424a751ac657e150f52d72f1173321c9

 admin/src/components/business/OperaCarsWindow.vue

@@ -6,41 +6,28 @@
        :confirm-working="isWorking"
        @confirm="confirm"
    >
        <el-form :model="form" ref="form" :rules="rules">
            <el-form-item label="车牌号" prop="code">
                <el-input v-model="form.code" placeholder="请输入车牌号" v-trim/>
            </el-form-item>
            <el-form-item label="用户类型" prop="code">
                <el-radio-group v-model="form.code">
                    <el-radio label="内部员工"></el-radio>
                    <el-radio label="劳务人员"></el-radio>
                </el-radio-group>
            </el-form-item>
            <el-form-item label="选择用户" prop="code">
                <el-select v-model="form.code" filterable placeholder="请选择">
                    <el-option
                        v-for="item in options"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="授权有效期" prop="code">
                <el-date-picker
                    v-model="form.code"
                    type="daterange"
                    range-separator="至"
                    start-placeholder="开始日期"
                    end-placeholder="结束日期">
                </el-date-picker>
            </el-form-item>
            <el-form-item label="授权停车场" prop="code">
                <el-radio-group v-model="form.code">
                    <el-radio label="全部停车场"></el-radio>
                    <el-radio label="部分停车场"></el-radio>
                </el-radio-group>
            </el-form-item>
      <el-form :model="form" ref="form" :rules="rules">
          <el-form-item label="车牌号" prop="code">
            <el-input v-model="form.code" placeholder="请输入车牌号" v-trim/>
          </el-form-item>
          <el-form-item label="车辆类型" prop="type">
            <el-radio-group v-model="form.type" >
              <el-radio :label="0"  >员工车辆</el-radio>
              <el-radio  :label="1"  >安泰公务车</el-radio>
              <el-radio  :label="2"  >安泰物流车</el-radio>
              <el-radio  :label="3"  >市公司公车</el-radio>
            </el-radio-group>
          </el-form-item>
          <el-form-item label="选择车主：" prop="memberId">
            <el-select v-model="form.memberId" filterable placeholder="请选择">
              <el-option
                  v-for="item in memberList"
                  :key="item.id"
                  :label="item.name"
                  :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
        </el-form>
    </GlobalWindow>
</template>
@@ -48,21 +35,30 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { allList } from '@/api/business/member'
export default {
  name: 'OperaCarsWindow',
  name: 'OperaInternalCompanyWindow',
  extends: BaseOpera,
  components: { GlobalWindow },
  data () {
    return {
      // 表单数据
      memberList: [],
      form: {
        id: null,
        code: ''
        code: null,
        memberId: null,
        type: 0
      },
      // 验证规则
      rules: {
      },
      options: []
        code: [
          { required: true, message: '请输入车牌号' }
        ],
        type: [
          { required: true, message: '请选择车辆类型' }
        ]
      }
    }
  },
  created () {
@@ -70,6 +66,42 @@
      api: '/business/cars',
      'field.id': 'id'
    })
  },
  methods: {
    open (title, target) {
      this.title = title
      this.visible = true
      this.loadMember()
      // 新建组织
      if (target == null) {
        this.$nextTick(() => {
          this.$refs.form.resetFields()
          this.form[this.configData['field.id']] = null
          this.form.type=0
        })
        return
      }
      // 编辑
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
        }
      })
    },
    loadMember () {
      allList({
        type: 2
      })
        .then(res => {
          this.memberList = res
        })
        .catch(e => {
          this.$tip.apiFailed(e)
        })
        .finally(() => {
          this.isWorking = false
        })
    }
  }
}
</script>