Commit 0e6967e0 authored by 黄奎's avatar 黄奎

页面修改

parent 44ef7d4a
...@@ -249,7 +249,6 @@ ...@@ -249,7 +249,6 @@
this.AllInvitationList = JSON.parse(JSON.stringify(jsonData)); this.AllInvitationList = JSON.parse(JSON.stringify(jsonData));
this.InvitationList = JSON.parse(JSON.stringify(jsonData)); this.InvitationList = JSON.parse(JSON.stringify(jsonData));
} }
console.log("this.InvitationList",this.InvitationList);
} }
}) })
}, },
......
...@@ -98,7 +98,6 @@ ...@@ -98,7 +98,6 @@
computed: {}, computed: {},
created() {}, created() {},
mounted() { mounted() {
console.log(this.msg.Name)
if (this.saveObj && this.saveObj.Id > 0) { if (this.saveObj && this.saveObj.Id > 0) {
let schoolids=this.saveObj.School_Ids.split(","); let schoolids=this.saveObj.School_Ids.split(",");
this.schoolArr=[] this.schoolArr=[]
...@@ -118,7 +117,6 @@ ...@@ -118,7 +117,6 @@
}, },
methods: { methods: {
changeschool(){ changeschool(){
console.log(this.msg.School_Ids)
}, },
//保存信息 //保存信息
saveRule() { saveRule() {
......
...@@ -11,60 +11,22 @@ ...@@ -11,60 +11,22 @@
class="col-6 q-pr-lg q-pb-lg" label="事项名称" :rules="[val => !!val || '请填写事项名称']" /> class="col-6 q-pr-lg q-pb-lg" label="事项名称" :rules="[val => !!val || '请填写事项名称']" />
</div> </div>
<div class="col-6"> <div class="col-6">
<q-select <q-select stack-label color="primary" filled clearable label="选择事项类型" option-value="Id" option-label="Name"
stack-label :options="itemTypeOptions" v-model="msg.ItemType" ref="ItemType" :rules="[val => !!val || '请选择事项类型']" />
color="primary"
filled
clearable
label="选择事项类型"
option-value="Id"
option-label="Name"
:options="itemTypeOptions"
v-model="msg.ItemType"
ref="ItemType"
:rules="[val => !!val || '请选择事项类型']"
/>
</div> </div>
</div> </div>
<div class="row wrap"> <div class="row wrap">
<div class="col-6"> <div class="col-6">
<q-select <q-select stack-label v-model="FrequencyArr" multiple :options="frequencyOptions" color="primary" filled
stack-label clearable label="选择班次" option-label="Name" option-value="Id" ref="Shifts"
v-model="FrequencyArr" @input="getSchoolListByFrequencyIds" :rules="[val => !!val || '请选择班次']" class="col-6 q-pr-lg q-pb-lg" />
multiple
:options="frequencyOptions"
color="primary"
filled
clearable
label="选择班次"
option-label="Name"
option-value="Id"
ref="Shifts"
@input="getSchoolListByFrequencyIds"
:rules="[val => !!val || '请选择班次']"
class="col-6 q-pr-lg q-pb-lg"
/>
</div> </div>
<div class="col-6"> <div class="col-6">
<q-select <q-select stack-label v-model="schoolArr" multiple :options="schoolOptions" color="primary" filled clearable
stack-label label="选择校区" option-label="SName" option-value="SId" ref="ItemSchools"
v-model="schoolArr" @input="getDutyFrequencyBySchoolIds" :rules="[val => !!val || '请选择校区']" />
multiple
:options="schoolOptions"
color="primary"
filled
clearable
label="选择校区"
option-label="SName"
option-value="SId"
ref="ItemSchools"
@input="getDutyFrequencyBySchoolIds"
:rules="[val => !!val || '请选择校区']"
/>
</div> </div>
</div> </div>
</q-card-section> </q-card-section>
<q-card-actions align="right" class="bg-white"> <q-card-actions align="right" class="bg-white">
<q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeRuleForm" /> <q-btn label="取消" flat color="grey-10" style="font-weight:400 !important" @click="closeRuleForm" />
...@@ -75,12 +37,15 @@ ...@@ -75,12 +37,15 @@
</template> </template>
<script> <script>
import { getSetDutyItemModel, import {
getSetDutyItemModel,
getSchoolListByFrequencyIds, getSchoolListByFrequencyIds,
getDutyFrequencyBySchoolIds, getDutyFrequencyBySchoolIds,
getDutyFrequencyList getDutyFrequencyList
} from "../../api/duty/index" } from "../../api/duty/index"
import { getSchoolDropdown } from '../../api/school/index';//获取校区列表 import {
getSchoolDropdown
} from '../../api/school/index'; //获取校区列表
export default { export default {
props: { props: {
saveObj: { saveObj: {
...@@ -88,27 +53,26 @@ ...@@ -88,27 +53,26 @@
default: null default: null
}, },
itemTypeOptions:{ itemTypeOptions: {
type:Array, type: Array,
default:[] default: []
}, },
}, },
data() { data() {
return { return {
itemArr:[], itemArr: [],
FrequencyArr:[], FrequencyArr: [],
schoolArr:[], schoolArr: [],
msg: { msg: {
Id: 0, Id: 0,
ItemName:"", ItemName: "",
ItemSchools:"", ItemSchools: "",
ItemType:"", ItemType: "",
Shifts:"" Shifts: ""
}, },
persistent: true, persistent: true,
schoolOptions:[], schoolOptions: [],
frequencyOptions:[], frequencyOptions: [],
} }
}, },
computed: {}, computed: {},
...@@ -117,25 +81,21 @@ ...@@ -117,25 +81,21 @@
this.getDutyFrequencyList(); this.getDutyFrequencyList();
}, },
mounted() { mounted() {
console.log(this.saveObj)
if (this.saveObj && this.saveObj.Id > 0) { if (this.saveObj && this.saveObj.Id > 0) {
let schoolids=this.saveObj.ItemSchools.split(","); let schoolids = this.saveObj.ItemSchools.split(",");
this.schoolArr=[] this.schoolArr = []
console.log(schoolids,this.schoolOptions) schoolids.map((item) => {
schoolids.map((item)=>{ this.schoolOptions.map((_item) => {
this.schoolOptions.map((_item)=>{ if (_item.SId == item) {
if( _item.SId==item){
this.schoolArr.push(_item) this.schoolArr.push(_item)
} }
}) })
}) })
let frequencyids = this.saveObj.Shifts.split(",");
let frequencyids=this.saveObj.Shifts.split(","); this.FrequencyArr = []
this.FrequencyArr=[] frequencyids.map((item) => {
frequencyids.map((item)=>{ this.frequencyOptions.map((_item) => {
this.frequencyOptions.map((_item)=>{ if (_item.Id == item) {
if( _item.Id==item){
this.FrequencyArr.push(_item) this.FrequencyArr.push(_item)
} }
}) })
...@@ -152,12 +112,11 @@ ...@@ -152,12 +112,11 @@
this.$refs.ItemType.validate(); this.$refs.ItemType.validate();
this.$refs.Shifts.validate(); this.$refs.Shifts.validate();
this.$refs.ItemSchools.validate(); this.$refs.ItemSchools.validate();
if (!this.$refs.ItemName.hasError && if (!this.$refs.ItemName.hasError &&
!this.$refs.ItemType.hasError && !this.$refs.ItemType.hasError &&
!this.$refs.Shifts.hasError && !this.$refs.Shifts.hasError &&
!this.$refs.ItemSchools.hasError ) { !this.$refs.ItemSchools.hasError) {
this.msg.ItemSchools=this.schoolArr.map(item=>item.SId).toString(); this.msg.ItemSchools = this.schoolArr.map(item => item.SId).toString();
getSetDutyItemModel(this.msg).then(res => { getSetDutyItemModel(this.msg).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.$emit('success'); this.$emit('success');
...@@ -171,19 +130,22 @@ ...@@ -171,19 +130,22 @@
this.$emit('close'); this.$emit('close');
this.persistent = false this.persistent = false
}, },
//根据班次获取学校信息 //根据班次获取学校信息
getSchoolListByFrequencyIds(){ getSchoolListByFrequencyIds() {
let Shifts=this.FrequencyArr.map(item=>item.Id).toString(); let Shifts = this.FrequencyArr.map(item => item.Id).toString();
getSchoolListByFrequencyIds({Shifts:Shifts}).then((res)=>{ getSchoolListByFrequencyIds({
Shifts: Shifts
}).then((res) => {
this.schoolOptions = res.Data; this.schoolOptions = res.Data;
}) })
}, },
//根据学校id获取对应的班次 //根据学校id获取对应的班次
getDutyFrequencyBySchoolIds(){ getDutyFrequencyBySchoolIds() {
let SchoolIds=this.schoolArr.map(item=>item.SId).toString(); let SchoolIds = this.schoolArr.map(item => item.SId).toString();
getDutyFrequencyBySchoolIds({SchoolIds:SchoolIds}).then((res)=>{ getDutyFrequencyBySchoolIds({
this.frequencyOptions=res.Data SchoolIds: SchoolIds
}).then((res) => {
this.frequencyOptions = res.Data
}) })
}, },
//获取校区列表 //获取校区列表
...@@ -195,11 +157,10 @@ ...@@ -195,11 +157,10 @@
}) })
}, },
//获取班次列表 //获取班次列表
getDutyFrequencyList(){ getDutyFrequencyList() {
getDutyFrequencyList({}).then(res => { getDutyFrequencyList({}).then(res => {
if (res.Code == 1) { if (res.Code == 1) {
this.frequencyOptions = res.Data; this.frequencyOptions = res.Data;
console.log(this.frequencyOptions)
} }
}) })
}, },
......
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
}, },
computed: {}, computed: {},
created() { created() {
console.log("this.saveObj",this.saveObj);
}, },
mounted() { mounted() {
if (this.saveObj && this.saveObj.Id > 0) { if (this.saveObj && this.saveObj.Id > 0) {
......
...@@ -150,8 +150,7 @@ ...@@ -150,8 +150,7 @@
}) })
that.getList() that.getList()
}) })
}).onCancel(() => { }).onCancel(() => {});
});
}, },
//关闭弹窗 //关闭弹窗
closeruleset() { closeruleset() {
...@@ -199,8 +198,7 @@ ...@@ -199,8 +198,7 @@
if (res.Code == 1) { if (res.Code == 1) {
this.EmployeeListOption = res.Data; this.EmployeeListOption = res.Data;
} }
}).catch(() => { }).catch(() => {})
})
}, },
} }
} }
...@@ -208,4 +206,5 @@ ...@@ -208,4 +206,5 @@
</script> </script>
<style lang="sass"> <style lang="sass">
@import url('~assets/css/table.sass') @import url('~assets/css/table.sass')
</style> </style>
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