Merge remote-tracking branch 'origin/master'

kongdeqiang

2 天以前 66cea4479288064e1e50ee8c0c1d5b38526c67bb

 src/components/page/repairAndMaintenance/index.vue

@@ -16,11 +16,13 @@
      <el-table :height="tableHeight" :data="pageData.rows" border v-loading="pageData.isLoading">
        <el-table-column type="index" width="50" label="序号" align="center">
        </el-table-column>
        <el-table-column prop="repairUser" header-align="center" align="center" label="维保人">
        <el-table-column prop="repairUser" header-align="center" align="center" label="维保人" width="150px">
        </el-table-column>
        <el-table-column prop="repairTime" header-align="center" align="center" label="维修时间" >
        </el-table-column>
        <el-table-column prop="parkName" header-align="center" align="center" label="停车场">
        </el-table-column>
        <el-table-column prop="status" header-align="center" align="center" label="状态">
        <el-table-column prop="status" header-align="center" align="center" label="状态" width="120px">
          <template slot-scope="scope">
            <p v-if="scope.row.status == 0">维修</p>
            <p v-if="scope.row.status == 1">保养</p>
@@ -45,7 +47,7 @@
    <el-dialog title="编辑" :visible.sync="flag" width="40%">
      <el-form :model="formData" ref="formData" label-width="100px">
        <el-form-item label="维保人" prop="repairUser" :rules="[{ required: true, message: '请输入维保人', trigger: 'blur' }]">
          <el-input v-model="formData.repairUser" placeholder="请输入维保人"></el-input>
          <el-input style="width: 200px" v-model="formData.repairUser" placeholder="请输入维保人"></el-input>
        </el-form-item>

        <el-form-item label="停车场" prop="parkId" :rules="[{ required: true, message: '请选择停车场', trigger: 'blur' }]">
@@ -66,7 +68,7 @@
          </el-date-picker>
        </el-form-item>

        <el-form-item label="维保状态" prop="status">
        <el-form-item label="维修建议" prop="status">
          <el-radio-group v-model="formData.status">
            <el-radio :label="0">维修</el-radio>
            <el-radio :label="1">保养</el-radio>
@@ -76,7 +78,11 @@

        <el-form-item label="维保详情" prop="repairContent"
          :rules="[{ required: true, message: '请输入维保详情', trigger: 'blur' }]">
          <el-input v-model="formData.repairContent" placeholder="请输入维保详情"></el-input>
          <el-input  type="textarea"
                     :rows="3"
                     v-model="formData.repairContent"
                     placeholder="请输入维保详情">
          </el-input>
        </el-form-item>
      </el-form>