linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dev

Browse Source
main
chenshuichuan 1 year ago
parent 4e23c443ce
commit 06766984a9
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File

4
.env.prod
Unescape Escape View File

@ -4,12 +4,12 @@ NODE_ENV=production
VITE_DEV=false
# 请求路径
VITE_BASE_URL='http://47.106.185.127:48080'
VITE_BASE_URL='http://47.106.185.127:48081'
# 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
VITE_UPLOAD_TYPE=server
# 上传路径
VITE_UPLOAD_URL='http://47.106.185.127:48080/admin-api/infra/file/upload'
VITE_UPLOAD_URL='http://47.106.185.127:48081/admin-api/infra/file/upload'
# 接口地址
VITE_API_URL=/admin-api

1
src/views/mes/producereport/AdminIndex.vue
Unescape Escape View File

@ -127,6 +127,7 @@
<el-table-column label="工位" align="center" prop="orgName" width="130px"/>
<el-table-column label="计时时段" align="center" prop="reportTime" />
<el-table-column label="计时时长" align="center" prop="totalTime" />
<el-table-column label="加班时长" align="center" prop="plusTime" />
<el-table-column label="班别" align="center" prop="groupType">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_GROUP_TYPE" :value="scope.row.groupType" />

1
src/views/mes/producereport/DailyReportIndex.vue
Unescape Escape View File

@ -180,6 +180,7 @@
<el-table-column label="工位" align="center" prop="orgName" sortable/>
<el-table-column label="计时时段" align="center" prop="reportTime" />
<el-table-column label="计时时长" align="center" prop="totalTime" />
<el-table-column label="加班时长" align="center" prop="plusTime" />
<el-table-column label="状态" align="center" prop="reportStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />

10
src/views/mes/producereport/ProduceReportForm.vue
Unescape Escape View File

@ -77,10 +77,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-text v-if="warningInfo" class="mx-1" type="warning">{{warningInfo}}</el-text>
<el-col :span="8">
<el-form-item label="加班时长" prop="plusTime">
<el-input-number v-model="formData.plusTime" :min="0" :precision="2" placeholder="请输入时长" class="!w-260px"/>
</el-form-item>
</el-col>
</el-row>
<el-text v-if="warningInfo" class="mx-1" type="warning">{{warningInfo}}</el-text>
<el-row>
<el-col :span="8">
<el-form-item label="计时时段" prop="reportTime">
@ -143,7 +146,8 @@ const formData = ref({
groupType: undefined,
reportType: undefined,
reportDateString: undefined,
reportDate: undefined
reportDate: undefined,
plusTime: undefined
})
const formRules = reactive({
reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }],

11
src/views/mes/producereport/components/AdminReplaceForm.vue
Unescape Escape View File

@ -92,11 +92,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8" >
<el-text v-if="warningInfo" class="mx-1" type="warning">{{warningInfo}}</el-text>
<el-col :span="8">
<el-form-item label="加班时长" prop="plusTime">
<el-input-number v-model="formData.plusTime" :min="0" :precision="2" placeholder="请输入时长" class="!w-260px"/>
</el-form-item>
</el-col>
</el-row>
<el-text v-if="warningInfo" class="mx-1" type="warning">{{warningInfo}}</el-text>
<el-row>
<el-col :span="8">
<el-form-item label="计时时段" prop="reportTime">
@ -161,7 +163,8 @@ const formData = ref({
groupType: undefined,
reportType: undefined,
reportDateString: undefined,
reportDate: undefined
reportDate: undefined,
plusTime: undefined
})
const formRules = reactive({
reportDate: [{ required: true, message: '日期不能为空', trigger: 'blur' }],

1
src/views/mes/producereport/index.vue
Unescape Escape View File

@ -101,6 +101,7 @@
<el-table-column label="工位" align="center" prop="orgName" width="130px"/>
<el-table-column label="计时时段" align="center" prop="reportTime" />
<el-table-column label="计时时长" align="center" prop="totalTime" />
<el-table-column label="加班时长" align="center" prop="plusTime" />
<el-table-column label="状态" align="center" prop="reportStatus">
<template #default="scope">
<dict-tag :type="DICT_TYPE.MES_RECORD_STATUS" :value="scope.row.reportStatus" />

Write Preview
Loading…
Cancel
Save