Merge remote-tracking branch 'origin/master'

fuliqi

2024-09-06 9e8d1bd0b6fb495920921214775b84d490e032a3

 src/views/system/check/template/index.vue

@@ -22,8 +22,8 @@
        </el-select>
      </el-form-item>
      <el-form-item>
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
        <el-button type="primary" icon="el-icon-search" size="small" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="small" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>

@@ -76,7 +76,7 @@
        <span>考核类型：</span>
        <dict-tag :options="dict.type.platform_examine_category" :value="item.examineCategory"/>
      </div>
      <div class="text item">考核频率：{{ item.frequency == 0 ? '月度考核' : '季度考核' }}</div>
      <!-- <div class="text item">考核频率：{{ item.frequency == 0 ? '月度考核' : '季度考核' }}</div> -->
      <div class="text item" style="display: flex">
        <span>考核对象：</span>
          <el-tooltip  effect="dark" :content="translateDeptIdList(item.deptId)" placement="top">
@@ -123,16 +123,16 @@
            />
          </el-select>
        </el-form-item>
        <el-form-item label="考核频率" prop="frequency">
          <el-select v-model="form.frequency" placeholder="考核频率">
            <el-option
              v-for="dict in dict.type.platform_examine_frequency"
              :key="dict.value"
              :label="dict.label"
              :value="parseInt(dict.value)"
            />
          </el-select>
        </el-form-item>
<!--        <el-form-item label="考核频率" prop="frequency">-->
<!--          <el-select v-model="form.frequency" placeholder="考核频率">-->
<!--            <el-option-->
<!--              v-for="dict in dict.type.platform_examine_frequency"-->
<!--              :key="dict.value"-->
<!--              :label="dict.label"-->
<!--              :value="parseInt(dict.value)"-->
<!--            />-->
<!--          </el-select>-->
<!--        </el-form-item>-->
        <el-form-item label="考核对象" prop="deptId">
          <el-select v-model="form.deptId" multiple placeholder="请选择">
            <el-option
@@ -213,8 +213,8 @@
        </el-form-item>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
        <el-button @click="cancel">取 消</el-button>
        <el-button type="primary" @click="submitForm">确 定</el-button>
      </div>
    </el-dialog>
  </div>
@@ -551,7 +551,7 @@
  .box-card {
    width: 20%;

    margin-right: 80px;
    margin-right: 50px;
    margin-bottom: 30px;
  }
.card-container {