diff --git a/src/api/common/index.ts b/src/api/common/index.ts index 5d82834f..d3377ff7 100644 --- a/src/api/common/index.ts +++ b/src/api/common/index.ts @@ -67,8 +67,6 @@ enum Api { GetSupplierAndClientListByCode = '/mainApi/ClientCommon/GetSupplierAndClientListByCode', // 供应商客户类型 GetSupplierListByCode = '/mainApi/ClientCommon/GetSupplierListByCode', - // 全部单位下拉 - GetSupplierAndClientListByCode = '/mainApi/ClientCommon/GetSupplierAndClientListByCode', // 费用名称下拉数据 GetFeeCodeSelectList = '/mainApi/ClientCommon/GetFeeCodeSelectList', // 获取箱型下拉数据 @@ -227,14 +225,6 @@ export function GetSupplierListByCode(params) { params, }) } -// 全部单位下拉 -export function GetSupplierAndClientListByCode(params) { - return request({ - url: Api.GetSupplierAndClientListByCode, - method: 'get', - params, - }) -} // 获取费用名称下拉数据 export function GetFeeCodeSelectList() { return request({ diff --git a/src/components/HColSet/components/tableColDrag.vue b/src/components/HColSet/components/tableColDrag.vue index 77d95976..77b33e09 100644 --- a/src/components/HColSet/components/tableColDrag.vue +++ b/src/components/HColSet/components/tableColDrag.vue @@ -90,11 +90,11 @@ // 表单校验规则 const rules = { title: [ - { - required: true, - message: '请输入列头中文标题', - trigger: 'blur' - } + // { + // required: true, + // message: '请输入列头中文标题', + // trigger: 'blur' + // } ], // enTitle: [ // { @@ -133,7 +133,10 @@ } // 拖动结束处理数据 const handleDragEnd = () => { - if ((ending.data === dragging.data) || (ending.dataIndex === dragging.dataIndex)) { + if (tbType.value === 'excel' && ending.data === dragging.data) { + return + } + if (tbType.value === 'vxe' && ending.dataIndex === dragging.dataIndex) { return } // 新的数组 @@ -152,11 +155,19 @@ const tbType = ref('excel') const init = (list, type) => { if (type) tbType.value = type + list.forEach((item, index) => { + if (item.visible == undefined) item.visible = true + // 删除操作列,操作列,只在前端控制 + if (item.dataIndex == 'action') { + list.splice(index, 1) + } + }) colData.value = list } defineExpose({ getColList, - init + init, + colData }) diff --git a/src/components/HColSet/index.vue b/src/components/HColSet/index.vue index e30e34f3..3618922c 100644 --- a/src/components/HColSet/index.vue +++ b/src/components/HColSet/index.vue @@ -50,15 +50,23 @@