Browse Source

修复模具台账界面bug

master
ljlong_2630 9 months ago
parent
commit
0ce46235d0
  1. 2
      src/views/eam/device/deviceAccounts/index.vue
  2. 6
      src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts
  3. 11
      src/views/eam/mold/moldAccounts/index.vue

2
src/views/eam/device/deviceAccounts/index.vue

@ -219,6 +219,7 @@ const butttondata = [
// - // -
const buttonTableClick = async (val, row) => { const buttonTableClick = async (val, row) => {
debugger
if (val == 'edit') { if (val == 'edit') {
// //
openForm('update', row) openForm('update', row)
@ -228,6 +229,7 @@ const buttonTableClick = async (val, row) => {
} else if (val == 'selectItem') { } else if (val == 'selectItem') {
openItem(row.number) openItem(row.number)
} else if (val == 'qrCode') { } else if (val == 'qrCode') {
debugger
window.open(src.value + "&number='" + row.number + "'") window.open(src.value + "&number='" + row.number + "'")
} else { } else {
// //

6
src/views/eam/device/deviceSpotInspectionRecordMain/deviceSpotInspectionRecordMain.data.ts

@ -97,7 +97,7 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive<CrudSchema
dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS, dictType: DICT_TYPE.WEI_XIU_ORDER_STATUS,
dictClass: 'string', dictClass: 'string',
table: { table: {
width: '150', width: 'c',
}, },
form: { form: {
component: 'Select' component: 'Select'
@ -108,7 +108,7 @@ export const DeviceSpotInspectionRecordMain = useCrudSchemas(reactive<CrudSchema
field: 'type', field: 'type',
sort: 'custom', sort: 'custom',
table: { table: {
width: '150', width: 'getDeviceSpotInspectionRecordMainSenior',
}, },
formatter: (_: Recordable, __: TableColumn, cellValue: number) => { formatter: (_: Recordable, __: TableColumn, cellValue: number) => {
return deviceMoldTypeList.find((account) => account.value == cellValue)?.label return deviceMoldTypeList.find((account) => account.value == cellValue)?.label
@ -182,7 +182,7 @@ export const DeviceSpotInspectionRecordDetail = useCrudSchemas(reactive<CrudSche
sort: 'custom', sort: 'custom',
isSearch: true, isSearch: true,
table: { table: {
width: '300', width: 'auto',
}, },
}, },

11
src/views/eam/mold/moldAccounts/index.vue

@ -116,6 +116,7 @@ import * as MoldMaintainOrderMainApi from '@/api/eam/mold/moldMaintainOrderMain'
import * as MoldMaintenanceMainApi from '@/api/eam/mold/moldMaintenanceMain' import * as MoldMaintenanceMainApi from '@/api/eam/mold/moldMaintenanceMain'
import * as moldMaintenanceDetailApi from '@/api/eam/mold/moldMaintenanceDetail' import * as moldMaintenanceDetailApi from '@/api/eam/mold/moldMaintenanceDetail'
import * as MoldMilestoneApi from '@/api/eam/basic/moldMilestone' import * as MoldMilestoneApi from '@/api/eam/basic/moldMilestone'
import { getAccessToken } from '@/utils/auth'
import { import {
MoldMaintainOrderMain, MoldMaintainOrderMain,
@ -149,7 +150,7 @@ const dialogAllSchemas = ref()
const dialogAllSchemasRules = ref() const dialogAllSchemasRules = ref()
const milestone = ref("milestone") const milestone = ref("milestone")
const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
const src = ref(BASE_URL + '/jmreport/view/924818618605031424?token=' + getAccessToken()) const src = ref(BASE_URL + '/jmreport/view/924987924638945280?token=' + getAccessToken())
// //
const searchTableSuccess = (formField, searchField, val, formRef) => { const searchTableSuccess = (formField, searchField, val, formRef) => {
@ -229,9 +230,6 @@ const buttonTableClick = async (val, row) => {
if (val == 'edit') { if (val == 'edit') {
// //
openForm('update', row) openForm('update', row)
} else if (val == 'qrCode') {
//
openQrCode(row.number)
} else if (val == 'qrCode') { } else if (val == 'qrCode') {
window.open(src.value + "&number='" + row.number + "'") window.open(src.value + "&number='" + row.number + "'")
} else if (val == 'selectItem') { } else if (val == 'selectItem') {
@ -494,4 +492,9 @@ const getDeviceItemList = async () => {
} }
const qrCodeBatch = async (val,item) => {
const qrCodeList = tableObject.tableList.map(item => `'${item?.number}'`).join(', ')
window.open(src.value + "&number=" + qrCodeList)
}
</script> </script>

Loading…
Cancel
Save