|
@@ -52,7 +52,6 @@ const generalInfo = ref({
|
|
|
is_send: false
|
|
is_send: false
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
-const testValue = ref('')
|
|
|
|
|
const tableRef = ref<VxeGridInstance | null>(null)
|
|
const tableRef = ref<VxeGridInstance | null>(null)
|
|
|
const tableData = ref<VxeGridProps<any>>({
|
|
const tableData = ref<VxeGridProps<any>>({
|
|
|
minHeight: 70,
|
|
minHeight: 70,
|
|
@@ -130,14 +129,14 @@ const handleColumns = (columns: any) => {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- if (item.title === 'VGM Weight') {
|
|
|
|
|
|
|
+ if (item.title === 'VGM Unit') {
|
|
|
curColumn = {
|
|
curColumn = {
|
|
|
...curColumn,
|
|
...curColumn,
|
|
|
editRender: {
|
|
editRender: {
|
|
|
- name: 'vWeightSelect'
|
|
|
|
|
|
|
+ name: 'vUnitSelect'
|
|
|
},
|
|
},
|
|
|
slots: {
|
|
slots: {
|
|
|
- edit: 'vWeightSelect'
|
|
|
|
|
|
|
+ edit: 'vUnitSelect'
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
} else if (item.title === 'VGM Method') {
|
|
} else if (item.title === 'VGM Method') {
|
|
@@ -230,14 +229,14 @@ const getData = () => {
|
|
|
tableData.value.columns = handleColumns(
|
|
tableData.value.columns = handleColumns(
|
|
|
res.data?.detail_information?.detail_information_column
|
|
res.data?.detail_information?.detail_information_column
|
|
|
)
|
|
)
|
|
|
- // tableData.value.data = res.data?.detail_information?.detail_information_data
|
|
|
|
|
|
|
+ tableData.value.data = res.data?.detail_information?.detail_information_data
|
|
|
nextTick(() => {
|
|
nextTick(() => {
|
|
|
tableRef.value && autoWidth(tableData.value, tableRef.value)
|
|
tableRef.value && autoWidth(tableData.value, tableRef.value)
|
|
|
tableData.value.columns.forEach((item) => {
|
|
tableData.value.columns.forEach((item) => {
|
|
|
if (item.title === 'SN') {
|
|
if (item.title === 'SN') {
|
|
|
item.width = 50
|
|
item.width = 50
|
|
|
} else if (item.title === 'VGM Time') {
|
|
} else if (item.title === 'VGM Time') {
|
|
|
- item.width = 190
|
|
|
|
|
|
|
+ item.width = 210
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
@@ -271,15 +270,32 @@ const handleSave = () => {
|
|
|
const tableInfo = {}
|
|
const tableInfo = {}
|
|
|
variableList.forEach((item) => {
|
|
variableList.forEach((item) => {
|
|
|
if (item === '_X_ROW_KEY') return
|
|
if (item === '_X_ROW_KEY') return
|
|
|
|
|
+ if (item === 'vgm_date' || item === 'vgm_time') {
|
|
|
|
|
+ Object.assign(tableInfo, {
|
|
|
|
|
+ [item]: tableRowData.map((row) =>
|
|
|
|
|
+ row[item] ? dayjs(row[item]).format('YYYY-MM-DD HH:mm:ss') : ''
|
|
|
|
|
+ )
|
|
|
|
|
+ })
|
|
|
|
|
+ return
|
|
|
|
|
+ }
|
|
|
Object.assign(tableInfo, {
|
|
Object.assign(tableInfo, {
|
|
|
[item]: tableRowData.map((row) => row[item])
|
|
[item]: tableRowData.map((row) => row[item])
|
|
|
})
|
|
})
|
|
|
})
|
|
})
|
|
|
- // $api.saveVGMData({
|
|
|
|
|
- // serial_no: allData.value.serial_no,
|
|
|
|
|
- // _schemas: allData.value.schemas,
|
|
|
|
|
- // ...generalData
|
|
|
|
|
- // })
|
|
|
|
|
|
|
+ console.log({ ...tableInfo, ...generalData })
|
|
|
|
|
+ $api
|
|
|
|
|
+ .saveVGMData({
|
|
|
|
|
+ serial_no: allData.value.serial_no,
|
|
|
|
|
+ _schemas: allData.value.schemas,
|
|
|
|
|
+ ...generalData,
|
|
|
|
|
+ ...tableInfo
|
|
|
|
|
+ })
|
|
|
|
|
+ .then((res) => {
|
|
|
|
|
+ console.log(res, '数据')
|
|
|
|
|
+ if (res.code === 200) {
|
|
|
|
|
+ // router.push({ name: 'Tracking' })
|
|
|
|
|
+ }
|
|
|
|
|
+ })
|
|
|
}
|
|
}
|
|
|
</script>
|
|
</script>
|
|
|
|
|
|
|
@@ -379,7 +395,7 @@ const handleSave = () => {
|
|
|
></el-input>
|
|
></el-input>
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
- <template #vWeightSelect="{ row, column }">
|
|
|
|
|
|
|
+ <template #vUnitSelect="{ row, column }">
|
|
|
<vxe-select v-model="row[column.field]" placeholder="Please select..." clearable>
|
|
<vxe-select v-model="row[column.field]" placeholder="Please select..." clearable>
|
|
|
<vxe-option label="KGS" value="KGS"></vxe-option>
|
|
<vxe-option label="KGS" value="KGS"></vxe-option>
|
|
|
<vxe-option label="LBS" value="LBS"></vxe-option>
|
|
<vxe-option label="LBS" value="LBS"></vxe-option>
|
|
@@ -397,10 +413,10 @@ const handleSave = () => {
|
|
|
<el-date-picker
|
|
<el-date-picker
|
|
|
v-model="row[column.field]"
|
|
v-model="row[column.field]"
|
|
|
type="datetime"
|
|
type="datetime"
|
|
|
- style="width: 170px"
|
|
|
|
|
|
|
+ style="width: 190px"
|
|
|
placeholder="Pick a Date"
|
|
placeholder="Pick a Date"
|
|
|
- format="MMM-DD-DD HH:mm:ss"
|
|
|
|
|
- date-format="MMM-DD-DD"
|
|
|
|
|
|
|
+ format="MMM-DD-YYYY HH:mm:ss"
|
|
|
|
|
+ date-format="MMM-DD-YYYY"
|
|
|
time-format="HH:mm:ss"
|
|
time-format="HH:mm:ss"
|
|
|
/>
|
|
/>
|
|
|
<!-- <a-date-picker
|
|
<!-- <a-date-picker
|
|
@@ -530,14 +546,14 @@ const handleSave = () => {
|
|
|
.el-checkbox__input.is-checked + .el-checkbox__label {
|
|
.el-checkbox__input.is-checked + .el-checkbox__label {
|
|
|
color: var(--color-neutral-1);
|
|
color: var(--color-neutral-1);
|
|
|
}
|
|
}
|
|
|
-.test-date-picker {
|
|
|
|
|
- .ant-picker-dropdown {
|
|
|
|
|
- // top: 40px !important;
|
|
|
|
|
- }
|
|
|
|
|
- .anticon svg {
|
|
|
|
|
- color: #202020;
|
|
|
|
|
- }
|
|
|
|
|
-}
|
|
|
|
|
|
|
+// .test-date-picker {
|
|
|
|
|
+// .ant-picker-dropdown {
|
|
|
|
|
+// // top: 40px !important;
|
|
|
|
|
+// }
|
|
|
|
|
+// .anticon svg {
|
|
|
|
|
+// color: #202020;
|
|
|
|
|
+// }
|
|
|
|
|
+// }
|
|
|
|
|
|
|
|
// .vgm-table {
|
|
// .vgm-table {
|
|
|
// .vxe-grid .vxe-grid--table-wrapper,
|
|
// .vxe-grid .vxe-grid--table-wrapper,
|