projects/mes-zjl #425

Merged
juzi merged 3 commits from projects/mes-zjl into projects/mes-test 2025-03-17 10:36:14 +08:00
5 changed files with 11 additions and 16 deletions

View File

@ -220,10 +220,6 @@ export default {
// //
emitButtonClick1() { emitButtonClick1() {
let n = this.tableData1.length let n = this.tableData1.length
if (n >=3) {
this.$modal.msgWarning('最多可添加3档计价')
return false
}
let obj = {} let obj = {}
obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime
obj.endTime = '' obj.endTime = ''
@ -232,10 +228,6 @@ export default {
}, },
emitButtonClick2() { emitButtonClick2() {
let n = this.tableData2.length let n = this.tableData2.length
if (n >=3) {
this.$modal.msgWarning('最多可添加3档计价')
return false
}
let obj = {} let obj = {}
obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed
obj.endUsed = 0 obj.endUsed = 0

View File

@ -13,6 +13,8 @@
</el-col> </el-col>
</el-row> </el-row>
<base-table <base-table
:page="1"
:limit="5000"
:table-props="tableProps" :table-props="tableProps"
:table-data="tableData" :table-data="tableData"
:max-height="tableH" :max-height="tableH"
@ -43,7 +45,7 @@ const tableProps = [
}, },
{ {
prop: 'workTime', prop: 'workTime',
label: '工作时长' label: '工作时长(h)'
} }
] ]
export default { export default {

View File

@ -62,7 +62,8 @@ export default {
selectOptions: [], selectOptions: [],
param: 'workOrderId', param: 'workOrderId',
clearable: false, clearable: false,
filterable: true filterable: true,
required: true
}, },
{ {
type: 'button', type: 'button',

View File

@ -38,6 +38,7 @@ import { groupTeamSchedulingPage, groupClassesListAll } from '@/api/monitoring/t
import { parseTime } from '@/utils/ruoyi' import { parseTime } from '@/utils/ruoyi'
import TeamProductionDetail from './components/teamProductionDetail' import TeamProductionDetail from './components/teamProductionDetail'
import tableHeightMixin from '@/mixins/tableHeightMixin'; import tableHeightMixin from '@/mixins/tableHeightMixin';
import moment from 'moment'
const tableProps = [ const tableProps = [
{ {
prop: 'createTime', prop: 'createTime',
@ -53,14 +54,12 @@ const tableProps = [
{ {
prop: 'startTime', prop: 'startTime',
label: '上班时间', label: '上班时间',
filter: parseTime, filter: (val) => moment(val).format('HH:mm')
minWidth: 160
}, },
{ {
prop: 'endTime', prop: 'endTime',
label: '下班时间', label: '下班时间',
filter: parseTime, filter: (val) => moment(val).format('HH:mm')
minWidth: 160
}, },
{ {
prop: 'classesName', prop: 'classesName',
@ -70,7 +69,8 @@ const tableProps = [
{ {
prop: 'teamName', prop: 'teamName',
label: '班组名称', label: '班组名称',
showOverflowtooltip: true showOverflowtooltip: true,
minWidth: 100
} }
] ]
export default { export default {

View File

@ -97,7 +97,7 @@
" "
@click="handleClick({ data: scope.row, type: 'bind' })" @click="handleClick({ data: scope.row, type: 'bind' })"
v-hasPermi="['base:order-manage:bindWorkOrder']"> v-hasPermi="['base:order-manage:bindWorkOrder']">
绑定工单 下发工单
</el-button> </el-button>
<span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span> <span style="margin: 0 4px; font-size: 18px; color: #e5e7eb">|</span>
<el-button <el-button