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/awardManagement/index.vue
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
<el-form-item label="主导部门"> <el-form-item label="主导部门">
<Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true" placeholder="请选择" <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>
<el-form-item> <el-form-item>
...@@ -120,15 +120,16 @@ ...@@ -120,15 +120,16 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="主管部门" prop="competentDeptId"> <el-form-item label="主管部门" prop="competentDeptId">
<Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true" <Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true"
placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }" placeholder="请选择" :default-expand-level=1 :style="{ width: '100%' }" @select="deptIdAndName"
@select="deptIdAndName" /> filterable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="部门主任" prop="deptDirectorId"> <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" <el-option v-for="item in getDeptLeaders" :key="item.id" :label="item.teacherName"
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
...@@ -223,7 +224,7 @@ ...@@ -223,7 +224,7 @@
<el-form-item label="主管部门" prop="competentDeptId"> <el-form-item label="主管部门" prop="competentDeptId">
<Treeselect v-model="form.competentDeptId" :options="deptOptions" :show-count="true" <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"
:disabled="isEdit" /> :disabled="isEdit" filterable />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -459,7 +460,7 @@ export default { ...@@ -459,7 +460,7 @@ export default {
this.form.id = response.data.id; this.form.id = response.data.id;
console.log(this.form.id, ' this.form.id '); console.log(this.form.id, ' this.form.id ');
this.isEdit = true, this.isEdit = true,
this.accessoryUrl = this.pev + this.picUrl this.accessoryUrl = this.pev + this.picUrl
this.form.competentDeptId = response.data.competentDeptId; this.form.competentDeptId = response.data.competentDeptId;
const params = { const params = {
competentDeptId: this.form.competentDeptId competentDeptId: this.form.competentDeptId
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardReview/index.vue
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</el-form-item> </el-form-item>
<el-form-item label="主导部门"> <el-form-item label="主导部门">
<Treeselect v-model="queryForm.competentDeptId" :options="deptOptions" :show-count="true" placeholder="请选择" <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>
<el-form-item> <el-form-item>
...@@ -167,7 +167,7 @@ ...@@ -167,7 +167,7 @@
</div> </div>
</div> </div>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input> <el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="班主任"> <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" <el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input> <el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="班主任"> <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" <el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
...@@ -231,7 +231,8 @@ ...@@ -231,7 +231,8 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="班主任" prop="classTeacherId"> <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" <el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
...@@ -239,7 +240,8 @@ ...@@ -239,7 +240,8 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="级部主任" prop="gradeDirectorId"> <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" <el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input> <el-input v-model="queryForm.idCard" placeholder="请输入" clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="班主任"> <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" <el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="班主任" prop="classTeacherId"> <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" <el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
...@@ -230,7 +230,7 @@ ...@@ -230,7 +230,7 @@
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="级部主任" prop="gradeDirectorId"> <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" <el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
......
ruoyi-ui/src/views/smartSchool/gradeWork/laboratoryManagement/laboratoryAppointment/index.vue
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<el-col :span="8"> <el-col :span="8">
<el-form-item label="实验名称" prop="experimentName"> <el-form-item label="实验名称" prop="experimentName">
<el-select v-model="form.experimentName" clearable style="width: 100%;" @change="getName" <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" <el-option v-for="item in tableList" :key="item.id" :value="item.experimentName"
:label="item.experimentName"></el-option> :label="item.experimentName"></el-option>
</el-select> </el-select>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item label="参赛老师" prop="teacherId"> <el-form-item label="参赛老师" prop="teacherId">
<el-select v-model="form.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" <el-option v-for="(item, index) in teacherList" :key="index" :label="item.userName"
:value="item.userId"></el-option> :value="item.userId"></el-option>
</el-select> </el-select>
......
ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryManagementlist/index.vue
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item label="负责人" prop="inChargeId"> <el-form-item label="负责人" prop="inChargeId">
<el-select v-model="form.inChargeId" placeholder="请选择" style="width: 100%;" <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" <el-option v-for="item in adminList" :key="item.userId" :label="item.userName"
:value="item.userId"> :value="item.userId">
</el-option> </el-option>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-col :span="5"> <el-col :span="5">
<el-form-item label="分类编码"> <el-form-item label="分类编码">
<treeselect v-model="queryParams.classificationCode" :options="classificationOptions" :normalizer="normalizer" <treeselect v-model="queryParams.classificationCode" :options="classificationOptions" :normalizer="normalizer"
placeholder="请选择分类编码" /> placeholder="请选择分类编码" filterable />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5"> <el-col :span="5">
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="分类编码:" prop="classificationCode"> <el-form-item label="分类编码:" prop="classificationCode">
<treeselect v-model="form.classificationCode" :options="classificationOptions" :normalizer="normalizer" <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-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="使用人:" prop="useName"> <el-form-item label="使用人:" prop="useName">
<el-select v-model="form.useId" filterable placeholder="请选择使用人" <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 v-for="(item, index) in userList" :key="index" :label="item.userName" :value="item.userId">
</el-option> </el-option>
</el-select> </el-select>
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
...@@ -78,8 +78,8 @@ ...@@ -78,8 +78,8 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="报修人" prop="reportRepairId"> <el-form-item label="报修人" prop="reportRepairId">
<el-select v-model="postForm.reportRepairId" placeholder="请选择维修人" clearable style="width: 100%;" <el-select v-model="postForm.reportRepairId" placeholder="请选择维修人" style="width: 100%;"
:disabled="nowType == 2 ? true : false"> :disabled="nowType == 2 ? true : false" filterable>
<el-option v-for="(item, index) in userList" :key="index" :label="item.userName" <el-option v-for="(item, index) in userList" :key="index" :label="item.userName"
:value="item.userId"> :value="item.userId">
</el-option> </el-option>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<el-col :span="12"> <el-col :span="12">
<el-form-item label="维修人" prop="repairId"> <el-form-item label="维修人" prop="repairId">
<el-select v-model="postForm.repairId" placeholder="请选择维修人" clearable style="width: 100%;" <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" <el-option v-for="item in sbflOptions" :key="item.repairId" :label="item.repairName"
:value="item.repairId" /> :value="item.repairId" />
</el-select> </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