Merge remote-tracking branch 'origin/master'

吴羡

6 天以前 78a3c898908bbb8827d1c2aa6299f92ff03f5847

 src/views/CNAS/personnel/personnelInfo/components/Edit.vue

@@ -10,40 +10,44 @@
    </div>
    <div class="form_title">
      <el-row>
        <el-col :span="7">
        <el-col :span="8">
          <span class="form_label">培训内容：</span>
          <span> {{ trainingForm.trainingContent }} </span>
        </el-col>
        <el-col :span="5">
        <el-col :span="4">
          <span class="form_label">状态：</span>
          <el-tag v-if="trainingForm.state === 1" type="success">已完成</el-tag>
          <el-tag v-if="trainingForm.state === 2" type="warning">待评价</el-tag>
          <el-tag v-if="trainingForm.state === 3" type="primary">未开始</el-tag>
        </el-col>
        <el-col :span="4">
        <el-col :span="5">
          <span class="form_label">培训讲师：</span>
          <span> {{ trainingForm.trainingLecturerName }} </span>
        </el-col>
        <el-col :span="7">
          <span class="form_label">培训日期：</span>
          <span> {{ trainingForm.trainingDate || '-' }} </span>
        </el-col>
      </el-row>
      <el-row style="margin: 15px 0">
        <el-form>
        <el-form label-width="130px">
          <el-row>
          <el-col :span="6">
            <el-form-item label="培训日期:">
            <el-form-item label="开始时间:">
              <el-date-picker v-model="trainingForm.openingTime" format="YYYY-MM-DD" :disabled="currentRow.state !== 3"
                              placeholder="选择日期" size="small" value-format="YYYY-MM-DD"
                              type="date" style="width: 60%"></el-date-picker>
                              placeholder="选择实际开始日期" size="small" value-format="YYYY-MM-DD"
                              type="date" style="width: 100%"></el-date-picker>
            </el-form-item>
          </el-col>
            <el-col :span="7">
            <el-col :span="9">
              <el-form-item label="培训地点">
                <el-input v-model="trainingForm.placeTraining" :disabled="currentRow.state !== 3" :rows="2" placeholder="请输入"
                          size="small" style="width: 60%" type="text"></el-input>
                          size="small" style="width: 100%" type="text"></el-input>
              </el-form-item>
            </el-col>
            <el-col :span="6">
            <el-col :span="9">
              <el-form-item label="评价人">
                <el-select v-model="trainingForm.assessmentUserId" :disabled="currentRow.state !== 3" placeholder="请选择" size="small" style="width: 50%">
                <el-select v-model="trainingForm.assessmentUserId" :disabled="currentRow.state !== 3" placeholder="请选择" size="small" style="width: 100%">
                  <el-option v-for="item in userList" :key="item.id" :label="item.name" :value="item.id"></el-option>
                </el-select>
              </el-form-item>
@@ -51,7 +55,7 @@
            <el-col :span="12">
              <el-form-item label="考核方式">
                <el-input v-model="trainingForm.assessmentMethod" :disabled="currentRow.state !== 3" :rows="2" placeholder="请输入"
                          size="small" style="width: 79%" type="textarea"></el-input>
                          size="small" style="width: 100%" type="textarea"></el-input>
              </el-form-item>
            </el-col>
          </el-row>
@@ -60,14 +64,14 @@
              <el-form-item label="评价时间">
                <el-date-picker v-model="trainingForm.assessmentDate" :disabled="currentRow.state !== 2 || isDisabled"
                                type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD" size="small"
                                placeholder="选择日期">
                                placeholder="选择日期" style="width: 100%">
                </el-date-picker>
              </el-form-item>
            </el-col>
          <el-col :span="12">
            <el-form-item label="本次培训综合评价">
              <el-input v-model="trainingForm.comprehensiveAssessment" :disabled="currentRow.state !== 2 || isDisabled" :rows="2" placeholder="请输入"
                        size="small" style="width: 68%" type="textarea"></el-input>
                        size="small" style="width: 100%" type="textarea"></el-input>
            </el-form-item>
          </el-col>
          </el-row>
@@ -76,15 +80,17 @@
    </div>
    <el-divider>人员详情</el-divider>
    <div>
      <div class="items_center">
        <span>姓名</span>
        <el-input v-model="userName" class="search" placeholder="请输入"
                  size="small"></el-input>
        <el-button size="small" type="primary" @click="getInfo">查询</el-button>
      </div>
      <div class="items_btn">
        <el-button :disabled="currentRow.state === 1" size="small" type="primary" @click="addPerson">新增人员</el-button>
        <el-button :disabled="currentRow.state === 1" size="small" @click="batchDelete">批量删除</el-button>
      <div class="items_header">
        <div class="items_center">
          <span>姓名</span>
          <el-input v-model="userName" class="person-search-input" placeholder="请输入"
                    size="small" clearable @keyup.enter="getInfo"></el-input>
          <el-button size="small" type="primary" @click="getInfo">查询</el-button>
        </div>
        <div class="items_btn">
          <el-button :disabled="currentRow.state === 1" size="small" type="primary" @click="addPerson">新增人员</el-button>
          <el-button :disabled="currentRow.state === 1" size="small" @click="batchDelete">批量删除</el-button>
        </div>
      </div>
      <el-table :data="trainingTableData" height="calc(100vh - 30em)" stripe style="width: 100%"
 border
@@ -117,7 +123,7 @@
        </el-form>
      </div>
      <div v-if="selectUserDia" class="body" style="height: 60vh;">
        <lims-table :tableData="tableData1" :column="column1"
        <lims-table :tableData="tableData1" :column="column1" :page="page1"
                    :isSelection="true" :handleSelectionChange="selectMethod"
                    height="500" :tableLoading="tableLoading1"></lims-table>
      </div>
@@ -402,15 +408,27 @@
}


.items_header {
  display: flex;
  align-items: center;
  justify-content: space-between;
  margin-bottom: 10px;
}
.items_center {
  float: left;
  width: 50%;
  text-align: left;
  display: flex;
  align-items: center;
  gap: 8px;
}
.items_center > span {
  line-height: 24px;
  white-space: nowrap;
}
.items_center .person-search-input {
  width: 200px;
}
.items_btn {
  text-align: right;
  width: 50%;
  float: right;
  margin-bottom: 1em;
  display: flex;
  align-items: center;
  gap: 8px;
}
</style>