1
This commit is contained in:
@@ -69,7 +69,7 @@ const checkIsFullScreen = () => {
|
||||
|
||||
// 进入全屏
|
||||
const goFullScreen = () => {
|
||||
const appEl = document.getElementById('app');
|
||||
const appEl = document.documentElement;
|
||||
if (appEl) {
|
||||
appEl.requestFullscreen();
|
||||
checkIsFullScreen(); // 更新状态
|
||||
@@ -130,11 +130,9 @@ const userInfo = ref({
|
||||
})
|
||||
function getUser() {
|
||||
getUserProfile().then((response) => {
|
||||
|
||||
if (response.code === 200) {
|
||||
userInfo.value.user = response.data.user
|
||||
userInfo.value.roles = response.data.roles
|
||||
console.log(userInfo);
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -146,8 +144,8 @@ import { useDisplay } from "vuetify";
|
||||
const { mobile, name } = useDisplay();
|
||||
|
||||
onMounted(() => {
|
||||
console.log(mobile.value); // false
|
||||
console.log(name.value); // false
|
||||
console.log('是否是移动设备', mobile.value); // false
|
||||
console.log('桌面大小', name.value); // false
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
@@ -4,13 +4,15 @@
|
||||
<v-col cols="8">
|
||||
<v-card color="blue-darken-4" class="left-content">
|
||||
<v-tabs v-model="tab" bg-color="primary">
|
||||
<v-tab value="报工">报工</v-tab>
|
||||
<v-tab value="历史报工记录">历史报工记录</v-tab>
|
||||
<v-tab value="工序报工">工序报工</v-tab>
|
||||
<v-tab value="此工单工序记录">此工单工序记录</v-tab>
|
||||
<v-tab value="此工序今日记录">此工序今日记录</v-tab>
|
||||
<v-tab value="员工报工记录">员工报工记录</v-tab>
|
||||
</v-tabs>
|
||||
<v-card-text>
|
||||
<v-fade-transition>
|
||||
<v-tabs-window v-model="tab">
|
||||
<v-tabs-window-item value="报工">
|
||||
<v-tabs-window-item value="工序报工">
|
||||
<el-card v-if="formData.workorder" class="mt-4">
|
||||
<v-text-field type="number" :label="processId === 10 ? '报工数' : '完成数'"
|
||||
v-model="formData.finishNum"></v-text-field>
|
||||
@@ -29,21 +31,59 @@
|
||||
</div>
|
||||
</el-card>
|
||||
</v-tabs-window-item>
|
||||
<v-tabs-window-item value="历史报工记录">
|
||||
<v-tabs-window-item value="此工单工序记录">
|
||||
<el-card v-if="formData.workorder" class="mt-4">
|
||||
<v-list lines="two" class="bg-transparent">
|
||||
<v-list-item v-for="(item, index) in reportWorkerOrderList" :key="index"
|
||||
:title="item.processName">
|
||||
<v-list-item-subtitle class="d-flex justify-space-between">
|
||||
<span class="text-subtitle-1">
|
||||
{{
|
||||
`完成数:${item.finishNum ?? 0} 不良数:${item.badNum ?? 0}`
|
||||
}}
|
||||
</span>
|
||||
<span>{{ `作业员:${item.worker} 提交时间:${item.jobDate}` }}</span>
|
||||
</v-list-item-subtitle>
|
||||
</v-list-item>
|
||||
</v-list>
|
||||
<vxe-table align="center" :data="reportWorkerOrderList">
|
||||
<vxe-column type="seq" width="60"></vxe-column>
|
||||
<vxe-column field="processName" title="工序"></vxe-column>
|
||||
<vxe-column field="finishNum" title="完成数"></vxe-column>
|
||||
<vxe-column field="badNum" title="不良数"></vxe-column>
|
||||
<vxe-column field="worker" title="作业员"></vxe-column>
|
||||
<vxe-column field="jobDateTime" title="提交时间"></vxe-column>
|
||||
</vxe-table>
|
||||
</el-card>
|
||||
</v-tabs-window-item>
|
||||
<v-tabs-window-item value="此工序今日记录">
|
||||
<el-card class="mt-4">
|
||||
<v-btn style="margin-bottom: 20px" class="bg-blue-darken-1 margin-bottom-4"
|
||||
size="x-large" @click="nowdayReportOrderList()">
|
||||
搜索
|
||||
</v-btn>
|
||||
<vxe-table align="center" :data="nowdayReportDataList">
|
||||
<vxe-column type="seq" width="60"></vxe-column>
|
||||
<vxe-column field="processName" title="工序"></vxe-column>
|
||||
<vxe-column field="finishNum" title="完成数"></vxe-column>
|
||||
<vxe-column field="badNum" title="不良数"></vxe-column>
|
||||
<vxe-column field="worker" title="作业员"></vxe-column>
|
||||
<vxe-column field="jobDateTime" title="提交时间"></vxe-column>
|
||||
</vxe-table>
|
||||
<pagination :total="total1" v-model:page="queryParams1.pageNum"
|
||||
v-model:limit="queryParams1.pageSize" @pagination="nowdayReportOrderList" />
|
||||
</el-card>
|
||||
</v-tabs-window-item>
|
||||
<v-tabs-window-item value="员工报工记录">
|
||||
<el-card class="mt-4">
|
||||
<div>
|
||||
<v-text-field label="作业员" v-model="queryParams2.name">
|
||||
<template v-slot:append>
|
||||
<v-btn class="bg-blue-darken-1" size="x-large"
|
||||
@click="queryUserReport()">
|
||||
搜索
|
||||
</v-btn>
|
||||
</template>
|
||||
</v-text-field>
|
||||
</div>
|
||||
<vxe-table v-loading="loading" align="center" :data="userReportDataList">
|
||||
<vxe-column type="seq" width="60"></vxe-column>
|
||||
<vxe-column field="workorder" title="工单号"></vxe-column>
|
||||
<vxe-column field="processName" title="工序"></vxe-column>
|
||||
<vxe-column field="finishNum" title="完成数"></vxe-column>
|
||||
<vxe-column field="badNum" title="不良数"></vxe-column>
|
||||
<vxe-column field="worker" title="作业员"></vxe-column>
|
||||
<vxe-column field="jobDateTime" title="提交时间"></vxe-column>
|
||||
</vxe-table>
|
||||
<pagination :total="total2" v-model:page="queryParams2.pageNum"
|
||||
v-model:limit="queryParams2.pageSize" @pagination="queryUserReport" />
|
||||
</el-card>
|
||||
</v-tabs-window-item>
|
||||
</v-tabs-window>
|
||||
@@ -202,7 +242,6 @@ const formData = ref({
|
||||
// routeCode: '路线编码',
|
||||
// groupCode: '组编码'
|
||||
})
|
||||
|
||||
const reportWorkerOrderList = ref([])
|
||||
|
||||
function handleScanInput(val) {
|
||||
@@ -300,6 +339,55 @@ function submit() {
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
const queryParams1 = reactive({
|
||||
name: '',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
processId: null,
|
||||
})
|
||||
const queryParams2 = reactive({
|
||||
name: '',
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
processId: null,
|
||||
})
|
||||
const loading = ref(false)
|
||||
const total1 = ref(0)
|
||||
const nowdayReportDataList = ref([])
|
||||
function nowdayReportOrderList() {
|
||||
loading.value = true
|
||||
queryParams1.processId = processId.value
|
||||
ReportApi.GetReportByProcessId(queryParams1).then(res => {
|
||||
const { code, data } = res
|
||||
if (code == 200) {
|
||||
nowdayReportDataList.value = data.result
|
||||
total1.value = data.totalNum
|
||||
loading.value = false
|
||||
}
|
||||
})
|
||||
}
|
||||
const total2 = ref(0)
|
||||
const userReportDataList = ref([])
|
||||
function queryUserReport() {
|
||||
loading.value = true
|
||||
if (queryParams2.name === '') {
|
||||
dialog.show = true
|
||||
dialog.class = 'bg-amber'
|
||||
dialog.title = '异常提示'
|
||||
dialog.text = '请输入姓名拼音'
|
||||
return
|
||||
}
|
||||
ReportApi.GetReportInfoByName(queryParams2).then(res => {
|
||||
const { code, data } = res
|
||||
if (code == 200) {
|
||||
userReportDataList.value = data.result
|
||||
total2.value = data.totalNum
|
||||
loading.value = false
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
Reference in New Issue
Block a user