Skip to content

D
dd_school
Commit a72d21bd by zhaopanyu
Options

zpy 10.27

parent b969a69b
Showing with 56 additions and 33 deletions
ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentClassification/index.vue
...@@ -119,7 +119,7 @@ export default { ...@@ -119,7 +119,7 @@ export default {
}, },
selectedRows: [], // 用于存储选择的行数据 selectedRows: [], // 用于存储选择的行数据
//表格数据 //表格数据
tableData: [ ], tableData: [],
nowType: 0, // 0新增、1编辑、2查看 nowType: 0, // 0新增、1编辑、2查看
title: '', title: '',
// 弹窗 // 弹窗
...@@ -140,9 +140,9 @@ export default { ...@@ -140,9 +140,9 @@ export default {
// 重新渲染表格状态 // 重新渲染表格状态
refreshTable: true, refreshTable: true,
rules: { rules: {
parentId: [ // parentId: [
{ required: true, message: "上级分类不能为空", trigger: "blur" } // { required: true, message: "上级分类不能为空", trigger: "blur" }
], // ],
instrumentTypeName: [ instrumentTypeName: [
{ required: true, message: "仪器名称不能为空", trigger: "blur" } { required: true, message: "仪器名称不能为空", trigger: "blur" }
], ],
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
Object.keys(this.form).forEach(key => { Object.keys(this.form).forEach(key => {
if (res.data[key]) { if (res.data[key]) {
this.$set(this.form, key, res.data[key]); this.$set(this.form, key, res.data[key]);
} }
}); });
} }
......
ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentManagement/index.vue
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<el-col :span="20"> <el-col :span="20">
<el-form-item label="仪器分类" prop="instrumentTypeName"> <el-form-item label="仪器分类" prop="instrumentTypeName">
<treeselect v-model="form.instrumentTypeName" :options="equiList" :normalizer="normalizer" <treeselect v-model="form.instrumentTypeName" :options="equiList" :normalizer="normalizer"
placeholder="选择" clearable style="width: 100%" noOptionsText="暂无数据"/> placeholder="选择" clearable style="width: 100%" noOptionsText="暂无数据" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
...@@ -399,6 +399,8 @@ export default { ...@@ -399,6 +399,8 @@ export default {
}, },
// 仪器确定 // 仪器确定
submitparentForm: function () { submitparentForm: function () {
const useId = this.form.useId
this.form.useName = useId == '' ? '' : this.equiList.find(item => item.userId == useId).userName
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/personWork/leaveApply/index.vue
...@@ -502,14 +502,13 @@ export default { ...@@ -502,14 +502,13 @@ export default {
this.reset(); this.reset();
this.$set(this.form, 'teacherName', this.$store.state.user.name); this.$set(this.form, 'teacherName', this.$store.state.user.name);
const id = row.id || this.ids; const id = row.id || this.ids;
this.formReady(); // this.formReady();
getTeacherLeave(id).then(response => { getTeacherLeave(id).then(response => {
this.form = response.data; this.form = response.data;
if (this.form.applyType == 0) { if (this.form.applyType == 0) {
this.form.startTime = this.getFormatDate(this.form.startTime) this.form.startTime = this.getFormatDate(this.form.startTime)
this.form.endTime = this.getFormatDate(this.form.endTime) this.form.endTime = this.getFormatDate(this.form.endTime)
} }
this.dialogTeacherLeave = true; this.dialogTeacherLeave = true;
this.dialogTitle = "修改教师请假信息"; this.dialogTitle = "修改教师请假信息";
}); });
...@@ -717,7 +716,6 @@ export default { ...@@ -717,7 +716,6 @@ export default {
}, },
/** 【已提交】查看详情 */ /** 【已提交】查看详情 */
handleDetail(row) { handleDetail(row) {
this.form = row this.form = row
this.progress.open = true; this.progress.open = true;
}, },
......
ruoyi-ui/src/views/smartSchool/schoolProperty/equipmenTledger/index.vue
...@@ -166,11 +166,17 @@ ...@@ -166,11 +166,17 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="是否允许借出:" prop="isAllowLend"> <el-form-item label="是否允许借出:" prop="isAllowLend">
<el-select v-model="form.isAllowLend" clearable placeholder="请选择是否允许借出" <el-select v-if="form.affiliationType === '3'" v-model="form.isAllowLend" clearable placeholder="请选择是否允许借出"
:disabled="nowOptionType == 2 ? true : false" class="selectWidth"> :disabled="true" class="selectWidth">
<el-option :key="'0'" :label="'否'" :value="'0'" />
</el-select>
<el-select v-else v-model="form.isAllowLend" clearable placeholder="请选择是否允许借出"
:disabled="isAllowLendDisabled || (nowOptionType == 2)" class="selectWidth">
<el-option v-for="dict in dict.type.is_lend" :key="dict.value" :label="dict.label" :value="dict.value" /> <el-option v-for="dict in dict.type.is_lend" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -370,7 +376,10 @@ export default { ...@@ -370,7 +376,10 @@ export default {
useId: '', useId: '',
useName: '', useName: '',
remark: '', remark: '',
affiliationType: '', // 其他属性
isAllowLend: '', // 其他属性
}, },
isAllowLendDisabled: false, // 默认禁用状态为false
rules: { // 表单校验 rules: { // 表单校验
equipmentName: [ equipmentName: [
{ required: true, message: '请输入设备名称', trigger: 'blur' }, { required: true, message: '请输入设备名称', trigger: 'blur' },
...@@ -397,6 +406,17 @@ export default { ...@@ -397,6 +406,17 @@ export default {
userList: [] //使用人列表 userList: [] //使用人列表
}; };
}, },
watch: {
'form.affiliationType'(newVal) {
if (newVal === '3') {
this.form.isAllowLend = '0'; // 固定为0
this.isAllowLendDisabled = true; // 禁用状态为true
} else {
this.isAllowLendDisabled = false; // 禁用状态为false
}
},
},
created() { created() {
this.getClassificationCodeTree() this.getClassificationCodeTree()
this.getList() this.getList()
...@@ -624,7 +644,7 @@ export default { ...@@ -624,7 +644,7 @@ export default {
//点击批量打印跳转 //点击批量打印跳转
printBarcodes() { printBarcodes() {
const baseUrl = window.location.origin +'/printBarcodes'; const baseUrl = window.location.origin + '/printBarcodes';
console.log(baseUrl, 'baseUrl'); console.log(baseUrl, 'baseUrl');
this.printList = this.chooseList; this.printList = this.chooseList;
console.log(11, this.printList); console.log(11, this.printList);
......
ruoyi-ui/src/views/smartSchool/schoolProperty/repairApplicant/index.vue
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
</el-form-item> </el-form-item>
<el-form-item label="处理状态" prop="disposeState"> <el-form-item label="处理状态" prop="disposeState">
<el-select v-model="queryParams.disposeState" placeholder="维修状态" clearable> <el-select v-model="queryParams.disposeState" placeholder="维修状态" clearable>
<el-option v-for="(item, index) in dict.type.repair_state" :key="index" :label="item.label" <el-option v-for="(item, index) in dict.type.dispose_state" :key="index" :label="item.label"
:value="item.value"></el-option> :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -43,12 +43,12 @@ ...@@ -43,12 +43,12 @@
<el-table-column align="center" prop="repairTime" label="修理时间" width="160px" /> <el-table-column align="center" prop="repairTime" label="修理时间" width="160px" />
<el-table-column align="center" prop="repairState" label="修理结果"> <el-table-column align="center" prop="repairState" label="修理结果">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.dispose_state, row.repairState) }}</div> <div>{{ selectDictLabel(dict.type.repair_state, row.repairState) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="disposeState" label="处理状态"> <el-table-column align="center" prop="disposeState" label="处理状态">
<template slot-scope="{ row }"> <template slot-scope="{ row }">
<div>{{ selectDictLabel(dict.type.repair_state, row.disposeState) }}</div> <div>{{ selectDictLabel(dict.type.dispose_state, row.disposeState) }}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="evaluate" label="评价" width="150px"> <el-table-column align="center" prop="evaluate" label="评价" width="150px">
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 新增/修改/查看对话框 --> <!-- 新增/修改/查看对话框 -->
<el-dialog title="详细信息" :visible.sync="dialogVisible" width="1200px" append-to-body> <el-dialog title="详细信息" :visible.sync="dialogVisible" width="1200px" append-to-body>
<el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px"> <el-form ref="postForm" :model="postForm" :rules="rules" label-width="110px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -145,10 +145,19 @@ ...@@ -145,10 +145,19 @@
<el-form-item label="处理状态" prop="disposeState"> <el-form-item label="处理状态" prop="disposeState">
<el-select v-model="postForm.disposeState" placeholder="处理状态" clearable style="width: 100%;" <el-select v-model="postForm.disposeState" placeholder="处理状态" clearable style="width: 100%;"
:disabled="nowType == 2 ? true : false"> :disabled="nowType == 2 ? true : false">
<el-option v-for="(item, index) in dict.type.dispose_state" :key="index" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<!-- 根据处理状态为1显示repairState下拉框 -->
<el-form-item v-if="postForm.disposeState === '1'" label="维修状态" prop="repairState">
<el-select v-model="postForm.repairState" placeholder="维修状态" clearable style="width: 100%;">
<el-option v-for="(item, index) in dict.type.repair_state" :key="index" :label="item.label" <el-option v-for="(item, index) in dict.type.repair_state" :key="index" :label="item.label"
:value="item.value"></el-option> :value="item.value"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
...@@ -260,7 +269,9 @@ export default { ...@@ -260,7 +269,9 @@ export default {
reportRepairTime: "", reportRepairTime: "",
model: null, model: null,
place: null, place: null,
dateOfProduction: null dateOfProduction: null,
disposeState: '', // 处理状态
repairState: '' // 维修状态
}, },
//报修人列表 //报修人列表
...@@ -292,6 +303,14 @@ export default { ...@@ -292,6 +303,14 @@ export default {
} }
}, },
watch: {
'postForm.disposeState'(newVal) {
if (newVal === 0) {
this.postForm.repairState = ''; // 将repairState重置为空
}
}
},
created() { created() {
this.getList(); this.getList();
...@@ -432,14 +451,6 @@ export default { ...@@ -432,14 +451,6 @@ export default {
this.$refs["postForm"].validate(valid => { this.$refs["postForm"].validate(valid => {
if (valid) { if (valid) {
if (this.nowType == 1) { // 修改操作 if (this.nowType == 1) { // 修改操作
if (this.postForm.disposeState === "1" || this.postForm.disposeState === "0") {
this.postForm.repairState = "1";
} else if (this.postForm.disposeState === null) {
this.postForm.repairState = "0";
} else {
this.postForm.repairState = "0"; // 当 disposeState 不满足上述条件时，默认设置为 0
}
if (this.postForm.id != null) { if (this.postForm.id != null) {
editRepair(this.postForm) editRepair(this.postForm)
.then(response => { .then(response => {
...@@ -453,14 +464,6 @@ export default { ...@@ -453,14 +464,6 @@ export default {
}); });
} }
} else if (this.nowType == 0) { // 新增操作 } else if (this.nowType == 0) { // 新增操作
if (this.postForm.disposeState === "1" || this.postForm.disposeState === "0") {
this.postForm.repairState = "1";
} else if (this.postForm.disposeState === null) {
this.postForm.repairState = "0";
} else {
this.postForm.repairState = "0"; // 当 disposeState 不满足上述条件时，默认设置为 0
}
addRepair(this.postForm) addRepair(this.postForm)
.then(response => { .then(response => {
console.log('this.postForm', this.postForm); console.log('this.postForm', this.postForm);
......
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