Skip to content

D
dd_school
Commit b7329b2b by Cat
Options

Merge branch 'master' of http://49.232.152.146:6688/qangqi/dd_school

parents 2199c8a2 5702575e
Showing with 163 additions and 30 deletions
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
......@@ -21,7 +21,7 @@
</el-form-item>
<el-form-item label="主导部门">
<Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true" placeholder="请选择"
:defaultExpandLevel=1 style="width: 208px" />
:defaultExpandLevel=1 style="width: 208px" filterable />
</el-form-item>
<el-form-item>
......@@ -66,17 +66,17 @@
</template>
</el-table-column>
<el-table-column align="center" prop="remark" label="备注" />
<el-table-column align="center" fixed="right" label="操作" width="150">
<el-table-column align="center" fixed="right" label="操作" width="200">
<template slot-scope="scope">
<div>
<div v-if="scope.row.auditState === '0' || scope.row.auditState === '3'">
<el-button @click="handleExamine(scope.row)" type="text" size="small">提交</el-button>
<el-button @click="handleEdit(scope.row)" type="text" size="small">编辑</el-button>
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
<el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
</div>
<div v-else>
<el-button @click="handleEdit(scope.row)" type="text" size="small">编辑</el-button>
<el-button @click="handleDelete(scope.row)" type="text" size="small">删除</el-button>
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
</div>
</div>
......@@ -117,6 +117,110 @@
<el-col :span="12">
<el-form-item label="主管部门" prop="competentDeptId">
<Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true"
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }" @select="deptIdAndName"
filterable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="部门主任" prop="deptDirectorId">
<el-select v-model="form.deptDirectorId" placeholder="请选择" :style="{ width: '100%' }"
filterable>
<el-option v-for="item in getDeptLeaders" :key="item.id" :label="item.teacherName"
:value="item.id"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖时间" prop="awardsTime">
<el-date-picker v-model="form.awardsTime" type="date" placeholder="选择" value-format="yyyy-MM-dd"
:style="{ width: '100%' }">
</el-date-picker>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖等级" prop="awardsLevel">
<el-select v-model="form.awardsLevel" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.awards_level" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="获奖类型" prop="awardsType">
<el-select v-model="form.awardsType" placeholder="请选择" clearable style="width: 100%;">
<el-option v-for="dict in dict.type.awards_type" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" placeholder="请输入" clearable type="textarea" :rows="2"
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="证书图片" prop="schoolAccessoryList">
<el-upload v-loading="uploadLoading" class="avatar-uploader" :action="uploadFileUrl"
accept="image/*" :show-file-list="false" :on-success="handleAvatarSuccess"
:before-upload="beforeAvatarUpload" :on-remove="handleRemove">
<div v-if="form.schoolAccessoryList.length === 0">
<i class="el-icon-plus avatar-uploader-icon"></i>
</div>
<div v-else>
<div v-for="(item, index) in form.schoolAccessoryList" :key="index">
<img :src="pev + item.accessoryUrl" class="avatar" />
</div>
</div>
</el-upload>
<i class="el-icon-delete" @click="handleRemove(index)"></i>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="submitForm"> 确 定</el-button>
<el-button @click="cancelDialog"> 取 消 </el-button>
</div>
</el-dialog>
<!-- 查看 -->
<el-dialog title="详细信息" :visible.sync="open" width="1100px">
<el-form :model="form" ref="form" size="small" label-width="110px" :rules="rules" :disabled="isEdit">
<el-row>
<el-col :span="24">
<el-form-item label="比赛名称" prop="competitionName">
<el-input v-model="form.competitionName" placeholder="请输入" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="主办单位" prop="organizer">
<el-input v-model="form.organizer" placeholder="请输入" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="获奖名称" prop="awardsName">
<el-input v-model="form.awardsName" placeholder="请输入" clearable
:style="{ width: '100%' }"></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="主管部门" prop="competentDeptId">
<Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true"
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }"
@select="deptIdAndName" />
</el-form-item>
......@@ -186,11 +290,9 @@
</el-row>
</el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="submitForm"> 确 定</el-button>
<el-button @click="cancelDialog"> 取 消 </el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -218,6 +320,7 @@ export default {
dicts: ['awards_type', 'awards_level', 'audit_state1'],
data() {
return {
isEdit: false,
uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传的图片服务器地址
queryForm: {
pageNum: 1,
......@@ -285,6 +388,7 @@ export default {
},
//弹窗
dialogTableVisible: false,
open: false,
total: 0,
}
},
......@@ -298,6 +402,31 @@ export default {
this.reset();
this.dialogTableVisible = true;
},
handleLook(row) {
console.log(row);
const id = row.id || this.ids;
getAwards(id).then((response) => {
this.form = response.data;
this.isEdit = true;
this.accessoryUrl = this.pev + this.picUrl
this.form.competentDeptId = response.data.competentDeptId;
const params = {
competentDeptId: this.form.competentDeptId
}
getDeptLeader(params).then(response => {
this.getDeptLeaders = response.rows;
}).catch(error => {
});
this.open = true;
}
).catch(error => {
this.$modal.closeLoading();
})
},
handleEdit(row) {
console.log(row);
const id = row.id || this.ids;
......@@ -323,6 +452,7 @@ export default {
},
cancelDialog() {
this.dialogTableVisible = false;
this.open = false;
},
reset() {
this.form = {
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardManagement/index.vue
......@@ -21,7 +21,7 @@
</el-form-item>
<el-form-item label="主导部门">
<Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true" placeholder="请选择"
:defaultExpandLevel=1 style="width: 208px" />
:defaultExpandLevel=1 style="width: 208px" filterable />
</el-form-item>
<el-form-item>
......@@ -120,15 +120,16 @@
<el-col :span="12">
<el-form-item label="主管部门" prop="competentDeptId">
<Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true"
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }"
@select="deptIdAndName" />
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }" @select="deptIdAndName"
filterable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="部门主任" prop="deptDirectorId">
<el-select v-model="form.deptDirectorId" placeholder="请选择" :style="{ width: '100%' }">
<el-select v-model="form.deptDirectorId" placeholder="请选择" :style="{ width: '100%' }"
filterable>
<el-option v-for="item in getDeptLeaders" :key="item.id" :label="item.teacherName"
:value="item.id"></el-option>
</el-select>
......@@ -223,7 +224,7 @@
<el-form-item label="主管部门" prop="competentDeptId">
<Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true"
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }" @select="deptIdAndName"
:disabled="isEdit" />
:disabled="isEdit" filterable />
</el-form-item>
</el-col>
</el-row>
......@@ -459,7 +460,7 @@ export default {
this.form.id = response.data.id;
console.log(this.form.id, ' this.form.id ');
this.isEdit = true,
this.accessoryUrl = this.pev + this.picUrl
this.accessoryUrl = this.pev + this.picUrl
this.form.competentDeptId = response.data.competentDeptId;
const params = {
competentDeptId: this.form.competentDeptId
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardReview/index.vue
......@@ -21,7 +21,7 @@
</el-form-item>
<el-form-item label="主导部门">
<Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true" placeholder="请选择"
:defaultExpandLevel=1 style="width: 208px" />
:defaultExpandLevel=1 style="width: 208px" filterable />
</el-form-item>
<el-form-item>
......@@ -167,7 +167,7 @@
</div>
</div>
</el-upload>
</el-form-item>
</el-col>
</el-row>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
......@@ -45,7 +45,7 @@
<el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="班主任">
<el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }" filterable>
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
......@@ -45,7 +45,7 @@
<el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="班主任">
<el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }" filterable>
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
......@@ -231,7 +231,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="班主任" prop="classTeacherId">
<el-select v-model="form.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-select v-model="form.classTeacherId" placeholder="请选择" :style="{ width: '100%' }"
filterable>
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
......@@ -239,7 +240,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="级部主任" prop="gradeDirectorId">
<el-select v-model="form.gradeDirectorId" placeholder="请选择" :style="{ width: '100%' }">
<el-select v-model="form.gradeDirectorId" placeholder="请选择" :style="{ width: '100%' }"
filterable>
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
......@@ -45,7 +45,7 @@
<el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input>
</el-form-item>
<el-form-item label="班主任">
<el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }" filterable>
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
......@@ -222,7 +222,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="班主任" prop="classTeacherId">
<el-select v-model="form.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-select v-model="form.classTeacherId" placeholder="请选择" :style="{ width: '100%' }" filterable>
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
......@@ -230,7 +230,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="级部主任" prop="gradeDirectorId">
<el-select v-model="form.gradeDirectorId" placeholder="请选择" :style="{ width: '100%' }">
<el-select v-model="form.gradeDirectorId" placeholder="请选择" :style="{ width: '100%' }" filterable>
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
......
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/laboratoryAppointment/index.vue
......@@ -82,7 +82,7 @@
<el-col :span="8">
<el-form-item label="实验名称" prop="experimentName">
<el-select v-model="form.experimentName" clearable style="width: 100%;" @change="getName"
:disabled="nowType === 1 || nowType === 2">
:disabled="nowType === 1 || nowType === 2" filterable>
<el-option v-for="item in tableList" :key="item.id" :value="item.experimentName"
:label="item.experimentName"></el-option>
</el-select>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
......@@ -76,7 +76,7 @@
<el-col :span="10">
<el-form-item label="参赛老师" prop="teacherId">
<el-select v-model="form.teacherId
" placeholder="请选择" clearable style="width: 100%;" :disabled="nowType == 2 ? true : false">
" placeholder="请选择" clearable style="width: 100%;" :disabled="nowType == 2 ? true : false" filterable>
<el-option v-for="(item, index) in teacherList" :key="index" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryManagementlist/index.vue
......@@ -76,7 +76,7 @@
<el-col :span="10">
<el-form-item label="负责人" prop="inChargeId">
<el-select v-model="form.inChargeId" placeholder="请选择" style="width: 100%;"
:disabled="nowType === 2">
:disabled="nowType === 2" filterable>
<el-option v-for="item in adminList" :key="item.userId" :label="item.userName"
:value="item.userId">
</el-option>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
......@@ -10,7 +10,7 @@
<el-col :span="5">
<el-form-item label="分类编码">
<treeselect v-model="queryParams.classificationCode" :options="classificationOptions" :normalizer="normalizer"
placeholder="请选择分类编码" />
placeholder="请选择分类编码" filterable />
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -113,7 +113,7 @@
<el-col :span="12">
<el-form-item label="分类编码:" prop="classificationCode">
<treeselect v-model="form.classificationCode" :options="classificationOptions" :normalizer="normalizer"
@select="selectNode" placeholder="请选择分类编码" :disabled="nowOptionType == 2 ? true : false" />
@select="selectNode" placeholder="请选择分类编码" :disabled="nowOptionType == 2 ? true : false" filterable />
</el-form-item>
</el-col>
<el-col :span="12">
......@@ -220,7 +220,7 @@
<el-col :span="12">
<el-form-item label="使用人:" prop="useName">
<el-select v-model="form.useId" filterable placeholder="请选择使用人"
:disabled="nowOptionType == 2 ? true : false" clearable>
:disabled="nowOptionType == 2 ? true : false" clearable >
<el-option v-for="(item, index) in userList" :key="index" :label="item.userName" :value="item.userId">
</el-option>
</el-select>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
......@@ -78,8 +78,8 @@
</el-col>
<el-col :span="12">
<el-form-item label="报修人" prop="reportRepairId">
<el-select v-model="postForm.reportRepairId" placeholder="请选择维修人" clearable style="width: 100%;"
:disabled="nowType == 2 ? true : false">
<el-select v-model="postForm.reportRepairId" placeholder="请选择维修人" style="width: 100%;"
:disabled="nowType == 2 ? true : false" filterable>
<el-option v-for="(item, index) in userList" :key="index" :label="item.userName"
:value="item.userId">
</el-option>
......@@ -112,7 +112,7 @@
<el-col :span="12">
<el-form-item label="维修人" prop="repairId">
<el-select v-model="postForm.repairId" placeholder="请选择维修人" clearable style="width: 100%;"
:disabled="nowType == 2 ? true : false">
:disabled="nowType == 2 ? true : false" filterable>
<el-option v-for="item in sbflOptions" :key="item.repairId" :label="item.repairName"
:value="item.repairId" />
</el-select>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment