Commit 3c6621eb authored by 黄奎's avatar 黄奎

页面修改

parent 9c9ac7ff
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div class="page-search row items-center"> <div class="page-search row items-center">
<div class="col row wrap q-mr-lg q-col-gutter-md"> <div class="col row wrap q-mr-lg q-col-gutter-md">
<div class="col-3"> <div class="col-3">
<q-input @input="resetSearch" clearable standout="bg-primary text-white" <q-input @input="resetSearch" clearable standout="bg-primary text-white" v-model="qMsg.ItemName" label="事项名称"
v-model="qMsg.ItemName" label="事项名称" maxlength="20" @clear="resetSearch" /> maxlength="20" @clear="resetSearch" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" clearable multiple standout="bg-primary text-white" option-value="SId" <q-select @input="resetSearch" clearable multiple standout="bg-primary text-white" option-value="SId"
...@@ -12,8 +12,9 @@ ...@@ -12,8 +12,9 @@
@clear="resetSearch" /> @clear="resetSearch" />
</div> </div>
<div class="col-3"> <div class="col-3">
<q-select @input="resetSearch" clearable stack-label v-model="qMsg.DutyCategory" :options="dutyCategoryList" color="primary" filled <q-select @input="resetSearch" clearable stack-label v-model="qMsg.DutyCategory" :options="dutyCategoryList"
label="分类" option-label="Name" option-value="Id" ref="DutyCategory" emit-value map-options @clear="resetSearch" /> color="primary" filled label="分类" option-label="Name" option-value="Id" ref="DutyCategory" emit-value
map-options @clear="resetSearch" />
</div> </div>
</div> </div>
</div> </div>
...@@ -43,7 +44,9 @@ ...@@ -43,7 +44,9 @@
<div>{{props.row.DutyTypeStr}}</div> <div>{{props.row.DutyTypeStr}}</div>
</q-td> </q-td>
<q-td key="ItemType" :props="props"> <q-td key="ItemType" :props="props">
{{props.row.ItemType==1?'选择':'手动填写'}} <template v-if="props.row.DutyType==2">
{{props.row.ItemType==1?'选择':'手动填写'}}
</template>
</q-td> </q-td>
<q-td key="ShiftsName" :props="props"> <q-td key="ShiftsName" :props="props">
{{props.row.ShiftsName}} {{props.row.ShiftsName}}
...@@ -104,7 +107,7 @@ ...@@ -104,7 +107,7 @@
}, },
{ {
name: 'ItemType', name: 'ItemType',
label: '事项类型', label: '填写方式',
field: 'ItemType', field: 'ItemType',
align: 'left', align: 'left',
}, },
...@@ -133,7 +136,7 @@ ...@@ -133,7 +136,7 @@
rowsPerPage: 10, rowsPerPage: 10,
ItemName: "", //事项名称 ItemName: "", //事项名称
ItemSchools: [], //所属校区 ItemSchools: [], //所属校区
DutyCategory:'' DutyCategory: ''
}, },
pageCount: 0, pageCount: 0,
isShowAdd: false, //是否显示添加事项弹窗 isShowAdd: false, //是否显示添加事项弹窗
......
...@@ -532,7 +532,8 @@ ...@@ -532,7 +532,8 @@
import { import {
SetDutyContent, SetDutyContent,
RemoveDutyContent, RemoveDutyContent,
queryDutyWork queryDutyWork,
queryDutyWork_V2
} from '../../api/scheduling/schedu' } from '../../api/scheduling/schedu'
import { import {
UploadSelfFile UploadSelfFile
......
...@@ -279,6 +279,7 @@ ...@@ -279,6 +279,7 @@
<script> <script>
import { import {
OnDuty, OnDuty,
OnDuty_V2,
saveDutyCheck, //值班打卡 saveDutyCheck, //值班打卡
} from '../../api/scheduling/schedu' } from '../../api/scheduling/schedu'
......
...@@ -254,6 +254,7 @@ ...@@ -254,6 +254,7 @@
<script> <script>
import { import {
OnDuty, OnDuty,
OnDuty_V2,
saveDutyCheck, //值班打卡 saveDutyCheck, //值班打卡
} from '../../api/scheduling/schedu' } from '../../api/scheduling/schedu'
......
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