快速调令修改

master
xy 8 months ago
parent 1e0628ef4e
commit 60fe452416

@ -140,11 +140,11 @@ export default {
op: "eq",
value: ""
},
// {
// key: "status",
// op: "eq",
// value: 1
// }
{
key: "status",
op: "eq",
value: 1
}
]
},
total: 0,

@ -102,13 +102,16 @@ export default {
align: 'center',
key: 'start_time',
render: (h,{ row }) => {
return h('DatePicker',{
return h('el-date-picker',{
style: {
width: '100%'
},
props: {
value: row.start_time,
type: 'datetime',
size: 'small',
size: 'mini',
transfer: true,
format: "yyyy-MM-dd HH:mm:ss"
'value-format': "yyyy-MM-dd HH:mm:ss"
},
on: {
['on-change']:e => row.start_time = e
@ -122,13 +125,16 @@ export default {
align: 'center',
key: 'end_time',
render: (h,{ row }) => {
return h('DatePicker',{
return h('el-date-picker',{
style: {
width: '100%'
},
props: {
value: row.end_time,
type: 'datetime',
size: 'small',
size: 'mini',
transfer: true,
format: "yyyy-MM-dd HH:mm:ss"
'value-format': "yyyy-MM-dd HH:mm:ss"
},
on: {
['on-change']:e => row.end_time = e
@ -254,7 +260,7 @@ export default {
data: [],
showModal: false,
bindValue: '',
bindDate: new Date()
bindDate: this.$moment().format('YYYY-MM-DD'),
}
},
methods: {
@ -302,11 +308,12 @@ export default {
group.forEach((item,index) => {
let dataArr = item.split(/\s+/);
if (dataArr.length === 8 && this.equipments.find(i => i.name === dataArr[0]) && (this.isTimeFormat(dataArr[1]) && this.isTimeFormat(dataArr[2]))) {
console.log(33, this.bindDate,`${this.bindDate} ${dataArr[1]}`)
this.data.push({
no: uid,
equipment_id: this.equipments.find(i => i.name === dataArr[0])?.id,
start_time: `${this.bindDate} ${dataArr[1]}`,
end_time: `${this.bindDate} ${dataArr[2]}`,
start_time: this.$moment(`${this.bindDate} ${dataArr[1]}`).format('YYYY-MM-DD HH:mm:ss'),
end_time: this.$moment(`${this.bindDate} ${dataArr[2]}`).format('YYYY-MM-DD HH:mm:ss'),
content: dataArr[3] ?? '',
kaiqishuliang: dataArr[4] ?? 0,
kaiqishuliang1: dataArr[5] ?? 0,
@ -316,6 +323,7 @@ export default {
status: 1
})
}
console.log(this.data)
})
// this.$prompt('','', {
// confirmButtonText: '',
@ -356,8 +364,6 @@ export default {
return save({
table_name: 'transfers',
...form,
start_time: form.start_time,
end_time: form.end_time,
},false)
})
let loadingInstance = this.$loading({

Loading…
Cancel
Save