Browse Source

修复测试bug

master
ljlong_2630 8 months ago
parent
commit
bd109c9240
  1. 3
      src/components/Detail/src/DetailDeviceLedger.vue
  2. 2
      src/views/eam/device/deviceinspectionjob/index.vue
  3. 7
      src/views/eam/device/devicemaintenancejob/index.vue
  4. 3
      src/views/eam/mold/moldAccounts/index.vue
  5. 5
      src/views/eam/mold/moldinspectionjob/index.vue

3
src/components/Detail/src/DetailDeviceLedger.vue

@ -104,6 +104,7 @@
:pagination="{ total: tableObjectRef.total }" :pagination="{ total: tableObjectRef.total }"
v-model:pageSize="tableObjectRef.pageSize" v-model:pageSize="tableObjectRef.pageSize"
v-model:currentPage="tableObjectRef.currentPage" v-model:currentPage="tableObjectRef.currentPage"
:key="milestoneUpdateKey"
> >
<template #action="{ row }"> <template #action="{ row }">
<ButtonBase :Butttondata="butttondata" @button-base-click="buttonMilestoneClick($event, row)" /> <ButtonBase :Butttondata="butttondata" @button-base-click="buttonMilestoneClick($event, row)" />
@ -208,7 +209,6 @@
:rules="dialogFormAllSchemasRules" :rules="dialogFormAllSchemasRules"
:formAllSchemas="dialogFormAllSchemas" :formAllSchemas="dialogFormAllSchemas"
:isBusiness="false" :isBusiness="false"
:key="milestoneUpdateKey"
/> />
</div> </div>
</template> </template>
@ -898,7 +898,6 @@ const buttonMilestoneClick = async (val, row) => {
const submitDialogForm = async (type, row) => { const submitDialogForm = async (type, row) => {
await props.diaLogApiUpdate(row) await props.diaLogApiUpdate(row)
dialogFormRef.value.dialogVisible = false dialogFormRef.value.dialogVisible = false
debugger
await getList() await getList()
milestoneUpdateKey.value += 1 milestoneUpdateKey.value += 1
} }

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

@ -90,6 +90,7 @@ import { useUserStore } from '@/store/modules/user'
import { selectAllFactoryArea } from '@/api/system/dept' import { selectAllFactoryArea } from '@/api/system/dept'
import * as UserApi from '@/api/system/user' import * as UserApi from '@/api/system/user'
import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts' import * as DeviceAccountsApi from '@/api/eam/device/deviceAccounts'
import * as DeviceMaintenanceMainApi from '@/api/eam/device/deviceMaintenanceMain'
// import TableHead from '@/components/TableHead/src/TableHead.vue' // import TableHead from '@/components/TableHead/src/TableHead.vue'
// import ImportForm from '@/components/ImportForm/src/ImportForm.vue' // import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
@ -217,6 +218,7 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */ /** 添加/修改操作 */
const basicFormRef = ref() const basicFormRef = ref()
const openForm = async (type: string, row?: any) => { const openForm = async (type: string, row?: any) => {
tableData.value = [] //
const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({}) const deviceListAll = await DeviceAccountsApi.getDeviceAccountsAllNoPage({})
const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({}) const deviceList = await DeviceAccountsApi.getDeviceAccountsNoPage({})
if (type == 'update') { if (type == 'update') {

7
src/views/eam/device/devicemaintenancejob/index.vue

@ -613,8 +613,13 @@ const buttonTableClick = async (val, row) => {
/** 添加/修改操作 */ /** 添加/修改操作 */
const openForm = (type: string, row?: any) => { const openForm = async (type: string, row?: any) => {
tableData.value = [] // tableData.value = [] //
await DeviceAccountsApi.getDeviceAccountsNoPage({}).then(res => {
DeviceMaintenanceMain.allSchemas.formSchema.find(item => {
return item.field == 'deviceNumber'
}).componentProps.options = res
})
formRef.value.open(type, row) formRef.value.open(type, row)
} }
const openFormSec = async (type: string, row?: any) => { const openFormSec = async (type: string, row?: any) => {

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

@ -391,9 +391,6 @@ const changeTabs = (item) => {
} }
apiPage.value = MoldMilestoneApi.getMoldMilestonePage apiPage.value = MoldMilestoneApi.getMoldMilestonePage
detailAllSchemas.value = MoldMilestone.allSchemas detailAllSchemas.value = MoldMilestone.allSchemas
// dialogFormAllSchemasRules.value = MoldMilestoneRules
// dialogFormAllSchemas.value = MoldMilestone.allSchemas
} }
tableObjectExtend.value = [ tableObjectExtend.value = [
{ {

5
src/views/eam/mold/moldinspectionjob/index.vue

@ -219,6 +219,11 @@ const buttonTableClick = async (val, row) => {
const basicFormRef = ref() const basicFormRef = ref()
const openForm = async (type: string, row?: any) => { const openForm = async (type: string, row?: any) => {
tableData.value = [] // tableData.value = [] //
await MoldAccountsApi.getMoldAccountsNoPage({}).then(res => {
MoldMaintenanceMain.allSchemas.formSchema.find(item => {
return item.field == 'deviceNumber'
}).componentProps.options = res
})
const res = await MoldInspectionMainApi.getMoldInspectionMainNoPage() const res = await MoldInspectionMainApi.getMoldInspectionMainNoPage()
const moldList = await MoldAccountsApi.getMoldAccountsNoPage({}) const moldList = await MoldAccountsApi.getMoldAccountsNoPage({})
const repairList = await MoldMaintenanceMainApi.getMoldMainTempList('MOLD') const repairList = await MoldMaintenanceMainApi.getMoldMainTempList('MOLD')

Loading…
Cancel
Save