feature-JimuReport-1106-yjl
sunzehua 1 month ago
parent 0dec8ee6ff
commit 70a34682c8

@ -2,10 +2,9 @@
import { ref, onMounted } from 'vue'
import { BasicColumn, FormSchema } from '/@/components/Table'
import { GetTaskPlatEnumDict } from './api'
import { GetClientListByCode,GetCarrierSelectList } from '/@/api/common'
import { GetClientListByCode,GetCarrierSelectList,GetControllerClientList } from '/@/api/common'
import { pl } from 'element-plus/es/locales.mjs'
import {
GetControllerClientList,
GetCustomerServiceList,
GetSaleList,
GetVesselSelectList,
@ -110,24 +109,19 @@ export const searchFormSchema: FormSchema[] = [
required: false,
dynamicDisabled: false,
colProps: { span: 4 },
componentProps: () => {
componentProps: ({ formModel, formActionType }) => {
return {
api: () => {
return new Promise((resolve) => {
GetControllerClientList().then((res) => {
res.data.forEach((item) => {
if (item.codeName) item.shortName = item.codeName + '/' + item.shortName
})
resolve(res)
})
})
},
immediate: false,
labelField: 'shortName',
valueField: 'codeName',
api: GetControllerClientList,
labelField: 'pinYinCode',
valueField: 'id',
showName: 'shortName',
resultField: 'data',
filterOption: (input: string, option: any) => {
return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
immediate: false,
onChange: (e, obj) => {
if (e && obj) {
}
if (!e && !obj) {
}
},
}
},

@ -567,7 +567,6 @@
levelreLoading.value = true
levelLoading.value = true
levelTop.value = []
activeTopKey.value = ''
levelNextAll.value = []
levelNext.value = []
levelTreeAll.value = []
@ -616,7 +615,9 @@
levelNextAll.value = res.data.levelNext
levelTreeAll.value = res.data.levelTree
if (levelTop.value.length > 0) {
activeTopKey.value = levelTop.value[0].key
if(type!='search'){
activeTopKey.value = levelTop.value[0].key
}
levelNext.value = selectNextLevel(levelNextAll.value, activeTopKey.value)
if (levelNext.value.length > 0) {
if (!activeNextKey.value) {
@ -882,9 +883,6 @@
})
},
beforeFetch: (p) => {
// if (taskType.value) {
// p['task_TYPE'] = taskType.value
// }
const data = {} as any
const queryData = JSON.parse(formatParams(p).queryCondition)
data.pageCondition = formatParams(p).pageCondition
@ -986,7 +984,7 @@
}
function handleNext() {
activeNextKey.value = ''
getCurrentTotalStat('')
getCurrentTotalStat('search')
}
function handledbclick(row) {
handleEdit(row)

Loading…
Cancel
Save