Skip to content

D
dd_school
Commit d0f5ef37 by zhaopanyu
Options

zpy 11.8

parent 66f89d12
Showing with 75 additions and 31 deletions
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardEntry/index.vue
...@@ -298,8 +298,19 @@ export default { ...@@ -298,8 +298,19 @@ export default {
getAwards(id).then((response) => { getAwards(id).then((response) => {
this.form = response.data; this.form = response.data;
this.accessoryUrl = this.pev + this.picUrl this.accessoryUrl = this.pev + this.picUrl
this.dialogTableVisible = true; this.form.competentDeptId = response.data.competentDeptId;
const params = {
competentDeptId: this.form.competentDeptId
}
getDeptLeader(params).then(response => {
this.getDeptLeaders = response.rows;
}).catch(error => { }).catch(error => {
});
this.dialogTableVisible = true;
}
).catch(error => {
this.$modal.closeLoading(); this.$modal.closeLoading();
}) })
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardManagement/index.vue
...@@ -301,8 +301,19 @@ export default { ...@@ -301,8 +301,19 @@ export default {
getAwards(id).then((response) => { getAwards(id).then((response) => {
this.form = response.data; this.form = response.data;
this.accessoryUrl = this.pev + this.picUrl this.accessoryUrl = this.pev + this.picUrl
this.dialogTableVisible = true; this.form.competentDeptId = response.data.competentDeptId;
const params = {
competentDeptId: this.form.competentDeptId
}
getDeptLeader(params).then(response => {
this.getDeptLeaders = response.rows;
}).catch(error => { }).catch(error => {
});
this.dialogTableVisible = true;
}
).catch(error => {
this.$modal.closeLoading(); this.$modal.closeLoading();
}) })
...@@ -445,7 +456,7 @@ export default { ...@@ -445,7 +456,7 @@ export default {
}, },
getLeader(competentDeptId) { getLeader(competentDeptId) {
getDeptLeader({ competentDeptId }).then(response => { // 使用 ES6 简写对象字面量 getDeptLeader({ competentDeptId }).then(response => {
this.getDeptLeaders = response.rows; this.getDeptLeaders = response.rows;
console.log(response.rows, 'response.rows'); console.log(response.rows, 'response.rows');
console.log(this.getDeptLeaders, 'getDeptLeaders'); console.log(this.getDeptLeaders, 'getDeptLeaders');
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/schoolAwards/awardReview/index.vue
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<!-- 查看弹框 --> <!-- 查看弹框 -->
<el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1100px"> <el-dialog title="详细信息" :visible.sync="dialogTableVisible" width="1100px">
<el-form :model="form" ref="form" size="small" label-width="110px" :rules="rules"> <el-form :model="form" ref="form" size="small" label-width="110px" :rules="rules" :disabled="isEdit">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="比赛名称" prop="competitionName"> <el-form-item label="比赛名称" prop="competitionName">
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="获奖名称" prop="awardsName "> <el-form-item label="获奖名称" prop="awardsName">
<el-input v-model="form.awardsName" placeholder="请输入" clearable <el-input v-model="form.awardsName" placeholder="请输入" clearable
:style="{ width: '100%' }"></el-input> :style="{ width: '100%' }"></el-input>
</el-form-item> </el-form-item>
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
<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%' }" @change="onOrgSelect"
@change="onOrgSelect" /> :disabled="isEdit" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -168,7 +168,6 @@ ...@@ -168,7 +168,6 @@
</el-row> </el-row>
</el-form> </el-form>
<div slot="footer" class="dialog-footer" style="text-align: center;"> <div slot="footer" class="dialog-footer" style="text-align: center;">
<el-button type="primary" @click="submitForm"> 确 定</el-button>
<el-button @click="cancelDialog"> 取 消 </el-button> <el-button @click="cancelDialog"> 取 消 </el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -192,6 +191,7 @@ import { ...@@ -192,6 +191,7 @@ import {
import Treeselect from '@riophae/vue-treeselect' import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css' import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/profile/picAvatar' import picAvatar from '@/views/smartSchool/schoolManage/introduce/schoolInfo/profile/picAvatar'
import { InsertDropdownListsHeaders } from '@alicloud/dingtalk/dist/doc_1_0/client'
export default { export default {
name: 'index', name: 'index',
components: { Treeselect, picAvatar }, components: { Treeselect, picAvatar },
...@@ -209,6 +209,7 @@ export default { ...@@ -209,6 +209,7 @@ export default {
competentDeptId: null, competentDeptId: null,
}, },
isEdit: false,
uploadLoading: false, uploadLoading: false,
pev: process.env.VUE_APP_BASE_API, pev: process.env.VUE_APP_BASE_API,
getDeptLeaders: [], getDeptLeaders: [],
...@@ -275,7 +276,7 @@ export default { ...@@ -275,7 +276,7 @@ export default {
}, },
methods: { methods: {
//查看
handleEdit(row) { handleEdit(row) {
console.log(row); console.log(row);
const id = row.id || this.ids; const id = row.id || this.ids;
...@@ -283,6 +284,7 @@ export default { ...@@ -283,6 +284,7 @@ export default {
this.form = response.data; this.form = response.data;
this.accessoryUrl = this.pev + this.picUrl this.accessoryUrl = this.pev + this.picUrl
this.dialogTableVisible = true; this.dialogTableVisible = true;
this.isEdit = true;
}).catch(error => { }).catch(error => {
this.$modal.closeLoading(); this.$modal.closeLoading();
}) })
...@@ -384,26 +386,18 @@ export default { ...@@ -384,26 +386,18 @@ export default {
}, },
resetQuery() { resetQuery() {
this.form = { this.queryForm = {
pageNum: 1,
pageSize: 10,
competitionName: "",
organizer: "",
awardsName: "",
competentDeptId: null,
awardsLevel: "", awardsLevel: "",
deptDirectorId: null,
awardsTime: "",
awardsType: "", awardsType: "",
remark: "", startTime: "",
schoolAccessoryList: [], endTime: "",
competentDeptId: null,
}, },
this.schoolAccessoryList = [], this.schoolAccessoryList = [],
this.getList(); this.getList();
}, },
}, },
} }
</script> </script>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/ViolationDiscipline/index.vue
...@@ -45,7 +45,10 @@ ...@@ -45,7 +45,10 @@
<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-input v-model="queryForm.classTeacher" placeholder="请输入" clearable></el-input> <el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="违纪类别"> <el-form-item label="违纪类别">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;">
...@@ -166,8 +169,8 @@ ...@@ -166,8 +169,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="classId">
<el-select v-model="form.className" placeholder="请选择级部" clearable :style="{ width: '100%' }"> <el-select v-model="form.classId" placeholder="请选择级部" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in classList" :key="index" :label="item.classValue" <el-option v-for="(item, index) in classList" :key="index" :label="item.classValue"
:value="item.classId"></el-option> :value="item.classId"></el-option>
</el-select> </el-select>
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/disciplinaryManagemen/index.vue
...@@ -45,7 +45,10 @@ ...@@ -45,7 +45,10 @@
<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-input v-model="queryForm.classTeacher" placeholder="请输入" clearable></el-input> <el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="违纪类别"> <el-form-item label="违纪类别">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;">
...@@ -129,13 +132,16 @@ ...@@ -129,13 +132,16 @@
type="text" size="small">编辑</el-button> type="text" size="small">编辑</el-button>
<el-button v-if="['1', '3'].includes(scope.row.auditState)" @click="handleDelete(scope.row)" <el-button v-if="['1', '3'].includes(scope.row.auditState)" @click="handleDelete(scope.row)"
type="text" size="small">删除</el-button> type="text" size="small">删除</el-button>
<el-button v-if="['1', '3'].includes(scope.row.auditState)" @click="handleLook(scope.row)"
type="text" size="small">查看</el-button>
</div> </div>
<div> <div>
<el-button v-if="scope.row.auditState === '2'" @click="handleEdit(scope.row)" type="text" <el-button v-if="scope.row.auditState === '2'" @click="handleEdit(scope.row)" type="text"
size="small">编辑</el-button> size="small">编辑</el-button>
<el-button @click="handleLook(scope.row)" type="text" size="small">查看</el-button>
<el-button v-if="scope.row.auditState === '2'" @click="handleDelete(scope.row)" type="text" <el-button v-if="scope.row.auditState === '2'" @click="handleDelete(scope.row)" type="text"
size="small">删除</el-button> size="small">删除</el-button>
<el-button v-if="scope.row.auditState === '2'" @click="handleLook(scope.row)" type="text"
size="small">查看</el-button>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -180,8 +186,8 @@ ...@@ -180,8 +186,8 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item label="班级" prop="className"> <el-form-item label="班级" prop="classId">
<el-select v-model="form.className" placeholder="请选择级部" clearable :style="{ width: '100%' }"> <el-select v-model="form.classId" placeholder="请选择级部" clearable :style="{ width: '100%' }">
<el-option v-for="(item, index) in classList" :key="index" :label="item.classValue" <el-option v-for="(item, index) in classList" :key="index" :label="item.classValue"
:value="item.classId"></el-option> :value="item.classId"></el-option>
</el-select> </el-select>
...@@ -435,6 +441,13 @@ export default { ...@@ -435,6 +441,13 @@ export default {
const id = row.id || this.ids; const id = row.id || this.ids;
getDiscipline(id).then((response) => { getDiscipline(id).then((response) => {
this.form = response.data; this.form = response.data;
this.form.gradeId = response.data.gradeId;
const params = { gradeId: this.form.gradeId };
getClassList(params).then(response => {
this.loading = false;
this.classList = response.data;
console.log("this.classList", this.classList);
});
this.isEdit = false; this.isEdit = false;
this.dialogTableVisible = true; this.dialogTableVisible = true;
...@@ -563,6 +576,7 @@ export default { ...@@ -563,6 +576,7 @@ export default {
}, },
//确定按钮 //确定按钮
submitForm: function () { submitForm: function () {
this.$refs['form'].validate(valid => { this.$refs['form'].validate(valid => {
if (valid) { if (valid) {
if (this.form.id != null) { if (this.form.id != null) {
......
ruoyi-ui/src/views/smartSchool/awardsDisciplinary/studentViolation/violationDisciplineentry/index.vue
...@@ -45,7 +45,10 @@ ...@@ -45,7 +45,10 @@
<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-input v-model="queryForm.classTeacher" placeholder="请输入" clearable></el-input> <el-select v-model="queryForm.classTeacherId" placeholder="请选择" :style="{ width: '100%' }">
<el-option v-for="item in deptOptions" :key="item.userId" :label="item.userName"
:value="item.userId"></el-option>
</el-select>
</el-form-item> </el-form-item>
<el-form-item label="违纪类别"> <el-form-item label="违纪类别">
<el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;"> <el-select v-model="queryForm.violateType" placeholder="请选择" clearable style="width: 100%;">
...@@ -429,8 +432,16 @@ export default { ...@@ -429,8 +432,16 @@ export default {
const id = row.id || this.ids; const id = row.id || this.ids;
getDiscipline(id).then((response) => { getDiscipline(id).then((response) => {
this.form = response.data; this.form = response.data;
this.form.gradeId = response.data.gradeId;
const params = { gradeId: this.form.gradeId };
getClassList(params).then(response => {
this.loading = false;
this.classList = response.data;
console.log("this.classList", this.classList);
});
this.isEdit = false; this.isEdit = false;
this.dialogTableVisible = true; this.dialogTableVisible = true;
}).catch(error => { }).catch(error => {
this.$modal.closeLoading(); this.$modal.closeLoading();
}) })
......
ruoyi-ui/src/views/whitePage.vue
...@@ -29,8 +29,8 @@ export default { ...@@ -29,8 +29,8 @@ export default {
// 获取code // 获取code
getCode() { getCode() {
dd.getAuthCode({ dd.getAuthCode({
// corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69', corpId: 'dingaa3937ff8b7dd267f2c783f7214b6d69',
corpId: 'dingccea40788226c988f2c783f7214b6d69', // corpId: 'dingccea40788226c988f2c783f7214b6d69',
success: (res) => { success: (res) => {
console.log('获取新的免登码成功', res); console.log('获取新的免登码成功', res);
const code = res.code const code = res.code
......
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