Skip to content

D
dd_school
Commit a0077cde by zhaopanyu
Options

zpy 7.20

parent b32e66f7
Showing with 23 additions and 28 deletions
ruoyi-ui/src/api/smartSchool/personWork/venueReservation/recordingroomManagement/index.js
...@@ -10,10 +10,11 @@ export function addStudio(data) { ...@@ -10,10 +10,11 @@ export function addStudio(data) {
} }
// 查看录播室列表 // 查看录播室列表
export function getStudio() { export function getStudio(query) {
return request({ return request({
url: "/studio/list", url: "/studio/list",
method: "get", method: "get",
params: query,
}); });
} }
......
ruoyi-ui/src/views/smartSchool/personWork/auditoriumReservation/index.vue
...@@ -161,8 +161,10 @@ ...@@ -161,8 +161,10 @@
<el-form-item label="分管领导" prop="leadershipName"> <el-form-item label="分管领导" prop="leadershipName">
<el-input :value="postForm.leadershipName" placeholder="请选择分管领导" <el-input :value="postForm.leadershipName" placeholder="请选择分管领导"
@focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input> @focus="openSelect('选择分管领导', 'leaderList', 2)"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
...@@ -243,7 +245,7 @@ ...@@ -243,7 +245,7 @@
<tr> <tr>
<td rowspan="2" class="btntxt">附件</td> <td rowspan="2" class="btntxt">附件</td>
<td colspan="3"> <td colspan="6">
<p v-for="(item, index) in fileList" :key="index"> <p v-for="(item, index) in fileList" :key="index">
<el-link :underline="false" :href="item.fjlj" type="primary" target="_blank"> <el-link :underline="false" :href="item.fjlj" type="primary" target="_blank">
{{ item.fjmc }} {{ item.fjmc }}
...@@ -420,6 +422,7 @@ export default { ...@@ -420,6 +422,7 @@ export default {
fjmc: "", fjmc: "",
fjlj: "", fjlj: "",
leadershipId: "", leadershipId: "",
leadershipName: "",
}, },
// 分管领导id // 分管领导id
...@@ -457,9 +460,7 @@ export default { ...@@ -457,9 +460,7 @@ export default {
activityArea: [ activityArea: [
{ required: true, message: "活动场地不能为空", trigger: "blur" } { required: true, message: "活动场地不能为空", trigger: "blur" }
], ],
activityTime: [
{ required: true, message: "活动不能为空", trigger: "blur" }
],
specificUserName: [ specificUserName: [
{ required: true, message: "具体负责人不能为空", trigger: "blur" } { required: true, message: "具体负责人不能为空", trigger: "blur" }
...@@ -488,9 +489,9 @@ export default { ...@@ -488,9 +489,9 @@ export default {
{ required: true, message: "是否需要大屏不能为空", trigger: "blur" } { required: true, message: "是否需要大屏不能为空", trigger: "blur" }
], ],
// leadershipName: [ leadershipName: [
// { required: true, message: "分管领导不能为空", trigger: "change" } { required: true, message: "分管领导不能为空", trigger: "change" }
// ], ],
fjmc: [ fjmc: [
{ required: true, message: "流程单附件不能为空", trigger: "blur" } { required: true, message: "流程单附件不能为空", trigger: "blur" }
...@@ -508,6 +509,7 @@ export default { ...@@ -508,6 +509,7 @@ export default {
}, },
created() { created() {
this.getList(); this.getList();
const rules = JSON.parse('[{ "required": true, "message": "请选择分管领导" }]');
...@@ -702,15 +704,6 @@ export default { ...@@ -702,15 +704,6 @@ export default {
}, },
// getFormatDate(timeDate) {
// let date = new Date(timeDate);
// let year = date.getFullYear();
// let month = date.getMonth() + 1;
// let day = date.getDate();
// return [year, '-', month, '-', day].join('');
// },
readNodes(nodes = [], arr = []) { readNodes(nodes = [], arr = []) {
for (let item of nodes) { for (let item of nodes) {
...@@ -726,16 +719,20 @@ export default { ...@@ -726,16 +719,20 @@ export default {
this.selectHandles.title = title; this.selectHandles.title = title;
this.selectHandles.method = method; this.selectHandles.method = method;
this.selectHandles.type = type; this.selectHandles.type = type;
console.log('this.selectHandles', this.selectHandles);
}, },
// 选择处理人 // 选择处理人
selectUser(select) { selectUser(select) {
console.log('select', select); console.log('select', select);
console.log('this.postForm', this.postForm);
// 这种写法存在一定危险，后续最好是可以有更好的字段名对应 // 这种写法存在一定危险，后续最好是可以有更好的字段名对应
this.$set(this.form, `handUserName${this.selectHandles.type}`, select.name); // this.$set(this.postForm, leadershipName, select.name);
this.$set(this.form, `handUserId${this.selectHandles.type}`, select.id); // this.$set(this.postForm, leadershipId, select.id);
this.postForm.leadershipName = select.name; this.postForm.leadershipName = select.name;
this.postForm.leadershipId = select.id; this.postForm.leadershipId = select.id;
console.log('this.postForm', this.postForm);
}, },
...@@ -875,6 +872,7 @@ export default { ...@@ -875,6 +872,7 @@ export default {
leadershipId: "", leadershipId: "",
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
leadershipName: ""
}; };
this.resetForm("postForm"); this.resetForm("postForm");
}, },
......
ruoyi-ui/src/views/smartSchool/personWork/leaveApply/components/SelectUser.vue
...@@ -154,6 +154,7 @@ export default { ...@@ -154,6 +154,7 @@ export default {
}, },
/** 选项选中发生变化 */ /** 选项选中发生变化 */
selectionChange(selections) { selectionChange(selections) {
console.log('seselections', selections);
this.selectUser = selections[0]; this.selectUser = selections[0];
}, },
/** 点击选中、取消 */ /** 点击选中、取消 */
......
ruoyi-ui/src/views/smartSchool/venueReservation/recordingroomManagement/index.vue
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" <!-- <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" /> @pagination="getList" /> -->
<!-- 新增/修改弹窗 --> <!-- 新增/修改弹窗 -->
<el-dialog :title="title" :visible.sync="open" width="1200px"> <el-dialog :title="title" :visible.sync="open" width="1200px">
<el-form ref="form" :model="form" label-width="114px" :rules="rules"> <el-form ref="form" :model="form" label-width="114px" :rules="rules">
...@@ -90,12 +90,7 @@ export default { ...@@ -90,12 +90,7 @@ export default {
return { return {
studioStatu: "", studioStatu: "",
queryParams: { queryParams: {
id: "", studioArea: "",
studioName: "",
studioStatu: "",
studioArea: '',
pageNum: 1,
pageSize: 10,
}, },
title: "", title: "",
rules: { rules: {
...@@ -125,7 +120,7 @@ export default { ...@@ -125,7 +120,7 @@ export default {
methods: { methods: {
/** 查询 */ /** 查询 */
getList() { getList() {
getStudio(this.queryParams.studioArea).then((response) => { getStudio(this.queryParams).then((response) => {
this.tableData = response.rows; this.tableData = response.rows;
this.loading = false; this.loading = false;
console.log(111, response.rows); console.log(111, response.rows);
......
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