diff --git a/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue b/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue index 2371203e..192cea88 100644 --- a/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue +++ b/src/views/devConfig/energy/energyType/components/energyTypeAdd.vue @@ -220,10 +220,6 @@ export default { // 增加 emitButtonClick1() { let n = this.tableData1.length - if (n >=3) { - this.$modal.msgWarning('最多可添加3档计价') - return false - } let obj = {} obj.startTime = n === 0 ? '' : this.tableData1[n-1].endTime obj.endTime = '' @@ -232,10 +228,6 @@ export default { }, emitButtonClick2() { let n = this.tableData2.length - if (n >=3) { - this.$modal.msgWarning('最多可添加3档计价') - return false - } let obj = {} obj.startUsed = n === 0 ? 0 : this.tableData2[n-1].endUsed obj.endUsed = 0 diff --git a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue index 58c17c34..73b820cb 100644 --- a/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue +++ b/src/views/group/monitoring/groupTeamView/components/groupTeamViewDetail.vue @@ -13,6 +13,8 @@ moment(val).format('HH:mm') }, { prop: 'endTime', label: '下班时间', - filter: parseTime, - minWidth: 160 + filter: (val) => moment(val).format('HH:mm') }, { prop: 'classesName', @@ -70,7 +69,8 @@ const tableProps = [ { prop: 'teamName', label: '班组名称', - showOverflowtooltip: true + showOverflowtooltip: true, + minWidth: 100 } ] export default { diff --git a/src/views/produce/order/base/orderManage/index.vue b/src/views/produce/order/base/orderManage/index.vue index 6b12de46..a4b3cb99 100644 --- a/src/views/produce/order/base/orderManage/index.vue +++ b/src/views/produce/order/base/orderManage/index.vue @@ -97,7 +97,7 @@ " @click="handleClick({ data: scope.row, type: 'bind' })" v-hasPermi="['base:order-manage:bindWorkOrder']"> - 绑定工单 + 下发工单 |