lijingjia 2 weeks ago
parent 98ee8e0f70
commit 1be16a29c9

@ -185,7 +185,7 @@
</div>
</template>
<script lang="ts">
import { defineComponent, ref, defineExpose, unref } from 'vue'
import { defineComponent, ref } from 'vue'
import { SvgIcon } from '/@/components/Icon'
//
import { useMessage } from '/@/hooks/web/useMessage'

@ -44,7 +44,7 @@
</template>
<script lang="ts" setup>
import { ref, nextTick, defineProps } from 'vue'
import { ref, nextTick } from 'vue'
import FlowChart from '../FlowChart/index.vue'
import { BasicForm, useForm } from '/@/components/Form/index'
import { useRoute } from 'vue-router'

@ -168,7 +168,7 @@
</div>
</template>
<script lang="ts" setup>
import { defineEmits, defineProps, ref, onMounted, defineExpose } from 'vue'
import { ref } from 'vue'
import { useMessage } from '/@/hooks/web/useMessage'
import HistoryDrawer from './components/historyDrawer.vue'
import FeeTemDrawer from './components/feeTemDrawer.vue'

@ -33,7 +33,7 @@
</div>
</template>
<script lang="ts" setup>
import { defineEmits, defineProps, ref, reactive, onMounted, defineExpose, watch, nextTick } from 'vue'
import { ref, reactive, watch, nextTick } from 'vue'
import { useMessage } from '/@/hooks/web/useMessage'
import { BasicForm, useForm } from '/@/components/Form/index'
//

@ -43,7 +43,7 @@
</div>
</template>
<script lang="ts" setup>
import { defineEmits, defineProps, ref, reactive, onMounted, defineExpose, watch } from 'vue'
import { ref, onMounted } from 'vue'
import { useMessage } from '/@/hooks/web/useMessage'
const { createMessage } = useMessage()
import { BasicForm, useForm } from '/@/components/Form/index'

@ -37,7 +37,7 @@
</div>
</template>
<script lang="ts" setup>
import { ref, reactive, defineExpose, watch, defineProps } from 'vue'
import { ref, reactive, defineExpose } from 'vue'
//
import { feeColumns, feeApplyColumns } from './feeColumns'
import { feeStatusList } from '../columns'

@ -24,7 +24,7 @@
</div>
</template>
<script lang="ts" setup>
import { defineEmits, defineProps, ref, reactive, onMounted, defineExpose, watchEffect, watch } from 'vue'
import { ref, reactive, watch } from 'vue'
import { useMessage } from '/@/hooks/web/useMessage'
import { BasicTable, useTable } from '/@/components/Table'
//

@ -33,7 +33,7 @@
</div>
</template>
<script lang="ts" setup>
import { defineEmits, defineProps, ref, reactive, defineExpose, watch } from 'vue'
import { ref, reactive, watch } from 'vue'
import { useMessage } from '/@/hooks/web/useMessage'
import { BasicTable, useTable } from '/@/components/Table'
import { formatParams } from '/@/hooks/web/common'

@ -95,7 +95,7 @@
<script lang="ts" setup>
import { BasicTable, useTable } from '/@/components/Table'
import { onMounted, ref, defineProps, watch, defineExpose } from 'vue'
import { ref, watch, defineExpose } from 'vue'
import emitter from '/@/utils/Bus'
import { FeeStatistics } from './api'
import { currencyColumns, costomerColumns } from './columns'

@ -42,9 +42,6 @@
</template>
<script lang="ts" setup>
import {
defineProps,
defineExpose,
defineEmits,
ref,
watch,
watchEffect,

@ -52,7 +52,7 @@
</div>
</template>
<script lang="ts" setup>
import { defineProps, ref, watch, defineExpose, defineAsyncComponent } from 'vue'
import { ref, watch, defineAsyncComponent } from 'vue'
//
import MainInfo from './mainInfo.vue'
//

@ -22,7 +22,7 @@
</div>
</template>
<script lang="ts" setup>
import { defineProps, ref, watch } from 'vue'
import { ref, watch } from 'vue'
//
const list = ref([
{ label: '委托编号', field: 'customerNo', span: 4, value: '' },

@ -12,7 +12,7 @@
<slot name="formHeader"></slot>
<template v-for="schema in getSchema" :key="schema.field">
<FormItem
v-if="getFormItemVisible(schema)"
v-show="getFormItemVisible(schema)"
:is-advanced="fieldsIsAdvancedMap[schema.field]"
:table-action="tableAction"
:form-action-type="formActionType"
@ -28,7 +28,7 @@
</template>
</FormItem>
<!-- 只读 -->
<a-col :span="schema?.colProps?.span || 24" v-if="getReadonlyColItemVisible(schema)">
<a-col :span="schema?.colProps?.span || 24" v-show="getReadonlyColItemVisible(schema)">
<div class="ds-form-onlyread">
<span class="label">{{ schema.label }}</span>
<slot :name="schema.field" :model="formModel"><span>{{ formModel[schema.field] || '-' }}</span></slot>
@ -137,13 +137,12 @@
)
const getFormItemVisible = (schema: FormSchema) => {
const visibleFlag = schema.isEdit != 1 || schema.component == 'Divider'
const visibleFlag = (schema.isEdit != 1 || schema.component == 'Divider') && schema.show !== false
if (unref(getBindValue).textAreaReadOnly) return visibleFlag
return visibleFlag || schema.component == 'InputTextArea'
}
const getReadonlyColItemVisible = (schema: FormSchema) => {
const visibleFlag =
schema.show !== false && schema.isEdit == 1 && schema.component != 'Divider'
const visibleFlag = schema.show !== false && schema.isEdit == 1 && schema.component != 'Divider'
if (unref(getBindValue).textAreaReadOnly) return visibleFlag
return visibleFlag && schema.component != 'InputTextArea'
}

@ -133,11 +133,7 @@
<script lang="ts" setup name="AdvancedSearch">
import {
ref,
defineProps,
defineEmits,
defineExpose,
unref,
reactive,
reactive
} from 'vue'
// idname
import { permissionsInfo } from '/@/hooks/web/usePermission'

@ -166,7 +166,6 @@
})
function toggleAdvanced() {
console.log(props.isAdvanced)
const tb = document.getElementsByClassName("ds-table")
if (tb) {
const child = tb[0]?.getElementsByClassName('ant-table-body')

@ -110,7 +110,6 @@
? props.isAdvanced
: true
: true
let isShow = true
let isIfShow = true

@ -299,6 +299,7 @@ export function useFormEvents({
}
async function validate(nameList?: NamePath[] | undefined) {
console.log(unref(formElRef))
return await unref(formElRef)?.validate(nameList)
}

@ -101,6 +101,7 @@
colData.value = JSON.parse(JSON.stringify(props.columns))
}
})
const vid = ref(null)
const handleOk = (b) => {
if (props.type == 'excel') {
// handsontable
@ -112,6 +113,7 @@
id: props.columns?.id || 0
}).then(res => {
createMessage.success(res.message)
if (res.data) vid.value = res.data
emits('updateCol', TableColDragRef.value.getColList())
if (!b) visible.value = false
})

@ -130,7 +130,7 @@ import { basicProps } from './props'
import { isFunction } from '/@/utils/is'
import { warn } from '/@/utils/log'
// vxe
import { getColumnSetInfoByModule } from '/@/views/baseinfo/columnset/api'
import { getColumnSetInfoByModule, UpdateColumnSetField } from '/@/views/baseinfo/columnset/api'
// idname
import { permissionsInfo } from '/@/hooks/web/usePermission'
@ -163,7 +163,6 @@ export default defineComponent({
'columns-change'
],
setup(props, { attrs, emit, slots, expose }) {
console.log(props)
const tableElRef = ref(null)
const tableData = ref<Recordable[]>([])
@ -254,7 +253,6 @@ export default defineComponent({
getColumnsRef,
getCacheColumns,
} = useColumns(getProps, getPaginationInfo)
const { getScrollRef, redoHeight, tableHeightRef } = useTableScroll(
getProps,
tableElRef,
@ -262,7 +260,7 @@ export default defineComponent({
getRowSelectionRef,
getDataSourceRef,
wrapRef,
formRef,
formRef
)
const { scrollTo } = useTableScrollTo(tableElRef, getDataSourceRef)
@ -431,8 +429,13 @@ export default defineComponent({
}
// vxe
const resizableChangeEvent = (item) => {
console.log(item)
const postData = {
permissionId: permissionsInfo().permissionId,
columnNo: props.id,
field: item.column.field,
width: item.resizeWidth
}
UpdateColumnSetField(postData)
}
// vxe
const updateCol = (data) => {

@ -15,7 +15,7 @@ export function useTableScroll(
rowSelectionRef: ComputedRef<TableRowSelection | null>,
getDataSourceRef: ComputedRef<Recordable[]>,
wrapRef: Ref<HTMLElement | null>,
formRef: Ref<ComponentRef>,
formRef: Ref<ComponentRef>
) {
const tableHeightRef: Ref<Nullable<number | string>> = ref(167)
const modalFn = useModalContext()
@ -27,7 +27,12 @@ export function useTableScroll(
const { canResize, scroll } = unref(propsRef)
return canResize && !(scroll || {}).y
})
watch(
() => unref(propsRef).autoHeight,
(v) => {
tableHeightRef.value = v
}
)
watch(
() => [unref(getCanResize), unref(getDataSourceRef)?.length],
() => {

@ -200,7 +200,9 @@ export interface BasicTableProps<T = any> {
// 自适应高度偏移, 计算结果-偏移量
resizeHeightOffset?: number
// 选择table组件类型antd 或 vxe
tableComponent?: string
tableComponent?: string,
// vxe 空数据表格的默认高度
autoHeight?: number,
// 在分页改变的时候清空选项
clearSelectOnPageChange?: boolean
//

@ -18,7 +18,6 @@
</template>
<script lang="ts" setup name="ImportExcel">
import { defineProps, defineEmits } from 'vue'
import * as XLSX from 'xlsx'
//
import { useMessage } from '/@/hooks/web/useMessage'

@ -1,3 +1,8 @@
/*
* @Desc:
* @Author: lijj
* @Date: 2024-08-15 17:49:19
*/
// Used to configure the general configuration of some components without modifying the components
import type { SorterResult } from '../components/Table'
@ -18,7 +23,7 @@ export default {
totalField: 'total',
},
// Number of pages that can be selected
pageSizeOptions: ['10', '20', '50', '80', '100'],
pageSizeOptions: ['20', '50', '80', '100', '500'],
// Default display quantity on one page
defaultPageSize: 100,
// Default Size

@ -28,7 +28,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
import { onMounted, ref } from 'vue'
import { GetModifyValue } from '../api'
const props = defineProps({
// id

@ -39,7 +39,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
import { onMounted, ref } from 'vue'
import FlowChart from '/@/components/FlowChart/index.vue'
import FeeRejectModal from './feeRejectModal.vue'
import { useModal } from '/@/components/Modal'

@ -53,7 +53,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, defineProps, watch, defineEmits, defineExpose } from 'vue'
import { onMounted, ref, watch } from 'vue'
import { Divider } from 'ant-design-vue'
import { SvgIcon } from '/@/components/Icon'
import { AuditByBiz } from '../api'

@ -29,7 +29,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, defineProps, watch, defineExpose, defineEmits } from 'vue'
import { onMounted, watch } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import { columns } from './calcTable'
import { GetStat } from '../api'

@ -39,7 +39,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
import { onMounted, ref } from 'vue'
import FlowChart from '/@/components/FlowChart/index.vue'
import FeeRejectModal from './feeRejectModal.vue'
import { useModal } from '/@/components/Modal'

@ -36,7 +36,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, defineProps, watch, defineExpose, defineEmits } from 'vue'
import { onMounted, ref, defineProps, watch } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import { useMessage } from '/@/hooks/web/useMessage'
import { columns } from '/@/views/operation/paidApply/detail/components/applyInfoColumns'

@ -47,7 +47,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
import { onMounted, ref, watch } from 'vue'
import { Audit, OneClickAudit } from '../api'
import emitter from '/@/utils/Bus'
import { useMessage } from '/@/hooks/web/useMessage'

@ -10,6 +10,7 @@ const Api = {
edit: '/mainApi/ColumnSet/EditColumnSet',
newColunm: '/mainApi/ColumnSet/GetColumnSetInfoByModule',
del: '/mainApi/ColumnSet/BatchDelColumnSet',
UpdateColumnSetField: '/mainApi/ColumnSet/UpdateColumnSetField'
}
// 列表数据
export function getColumnSetList(data: PageRequest) {
@ -45,3 +46,11 @@ export function ApiDel(data: PageRequest) {
data,
})
}
// 更新列宽
export function UpdateColumnSetField(data: PageRequest) {
return request<DataResult>({
url: Api.UpdateColumnSetField,
method: 'post',
data,
})
}

@ -103,7 +103,7 @@
</BasicModal>
</template>
<script lang="ts" setup>
import { ref, unref, reactive, defineEmits } from 'vue'
import { ref, unref, reactive } from 'vue'
import { BasicModal, useModalInner } from '/@/components/Modal'
import { EditFormCopy, getCodeGoodsTypeInfo, getTablesByClient, getColumnsByClient } from '../api'
import { useMessage } from '/@/hooks/web/useMessage'

@ -152,7 +152,7 @@
</BasicModal>
</template>
<script lang="ts" setup>
import { ref, unref, reactive, defineEmits } from 'vue'
import { ref, unref, reactive } from 'vue'
import { BasicModal, useModalInner } from '/@/components/Modal'
import {
EditFormCopy,

@ -45,7 +45,7 @@
<!-- <Modal v-if="ModalType" :schema-arr="schemaArr" @register="register" @contentOk="contentOk" /> -->
</template>
<script lang="ts" setup>
import { ref, computed, unref, defineEmits } from 'vue'
import { ref, computed, unref } from 'vue'
import { BasicModal, useModalInner } from '/@/components/Modal'
import { editCodeGoodsType, getCodeGoodsTypeInfo } from './../api'
import { useMessage } from '/@/hooks/web/useMessage'

@ -130,7 +130,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, watch, defineExpose, defineProps, defineEmits, h } from 'vue'
import { onMounted, ref, reactive, watch, h } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import {
InvoiceSettlementGetInvoiceList, InvoiceSettlementGetInvoiceDetails, PaymentFreeSettlementGetFees,

@ -51,7 +51,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, defineEmits, defineProps, watch, defineExpose } from 'vue'
import { onMounted, ref, watch } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import { mainBusinessColumns } from '../columns'
import { Divider } from 'ant-design-vue'

@ -69,7 +69,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, watch, defineExpose, defineProps, defineEmits, h } from 'vue'
import { onMounted, ref, reactive, h } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import { GetApplicationList, Save, GetExchanges } from '../../api'
import { businessColumns, searchFormSchema, currencyFormSchema } from '../columns'

@ -129,7 +129,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, watch, defineExpose, defineProps, defineEmits, h } from 'vue'
import { onMounted, ref } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import {
InvoiceSettlementGetInvoiceList, InvoiceSettlementGetInvoiceDetails, PaymentFreeSettlementGetFees,

@ -55,7 +55,7 @@
</a-modal>
</template>
<script lang="ts" setup>
import { ref, defineEmits, computed, watch, unref } from 'vue'
import { ref, computed, watch, unref } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import { columns, searchFormSchema } from './columns'
import { GetInvoiceList } from '../../api'

@ -95,8 +95,6 @@
</template>
<script lang="ts" setup>
import {
defineProps,
defineEmits,
ref,
watch,
watchEffect,

@ -27,7 +27,7 @@
</div>
</template>
<script lang="ts" setup>
import { ref, defineProps, reactive, defineEmits } from 'vue'
import { ref, defineProps, reactive } from 'vue'
import { useGo } from '/@/hooks/web/usePage'
import { SvgIcon } from '/@/components/Icon'
import { useMessage } from '/@/hooks/web/useMessage'

@ -61,7 +61,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, defineEmits, defineProps, watch, defineExpose } from 'vue'
import { onMounted, ref, watch } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import { columns } from './applyInfoColumns'
import invoiceFile from '/@/views/operation/invoiceIssue/detail/invoiceFile.vue'

@ -95,7 +95,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, reactive, watch, defineExpose, defineProps, defineEmits, h } from 'vue'
import { onMounted, ref, reactive, watch } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import { GetBizList, GetCurrencies, BizSave } from '../../api'
import { businessColumns, searchFormSchema, currencyFormSchema } from '../columns'

@ -40,7 +40,7 @@
</div>
</template>
<script lang="ts" setup>
import { onMounted, ref, defineEmits, defineProps, watch, defineExpose } from 'vue'
import { ref } from 'vue'
import { GetExchangeRate } from '../../api'
const emit = defineEmits(['submit'])
const visible = ref(false)

@ -131,7 +131,7 @@
const status = ref(0)
//
const save = async (feeInfo) => {
const postData = await getFieldsValue()
const postData = await validate()
if (feeInfo && feeInfo.length) {
postData['details'] = [...feeData.value, ...feeInfo]
} else {

@ -41,7 +41,7 @@
</div>
</template>
<script lang="ts" setup>
import { ref, nextTick, defineProps, defineComponent, onMounted, defineExpose, watch, defineEmits } from 'vue'
import { ref, nextTick, defineComponent, onMounted, watch } from 'vue'
import { HotTable } from '@handsontable/vue3'
import 'handsontable/dist/handsontable.full.min.css'
import { GetOpCtnList, BatchDelBillManageCtn } from '/@/views/operation/seaexport/api/BookingLedger'

@ -12,7 +12,7 @@
</a-modal>
</template>
<script lang="ts" setup>
import { defineExpose, ref, defineProps, defineEmits } from 'vue'
import { ref } from 'vue'
import { BasicTable, useTable } from '/@/components/Table'
import { GetAvailableBookingSlots, BringInBookingSlotToOrder } from '../../api/BookingLedger.js'
import { storageColumns, storageSearchFormSchema } from './ladingInfo'

@ -40,7 +40,7 @@
</div>
</template>
<script lang="ts" setup>
import { ref, watch, defineExpose, defineEmits } from 'vue'
import { ref, watch } from 'vue'
import { SvgIcon } from '/@/components/Icon'
import { BasicForm, useForm } from '/@/components/Form/index'
//

@ -32,7 +32,7 @@
</BasicModal>
</template>
<script lang="ts" setup>
import { ref, computed, unref, defineEmits, onMounted } from 'vue'
import { ref, computed, unref, onMounted } from 'vue'
//
import { BasicModal, useModalInner } from '/@/components/Modal'
import { BasicForm, useForm } from '/@/components/Form/index'

@ -136,7 +136,7 @@
<script lang="ts" setup>
import { BasicForm, useForm } from '/@/components/Form/index'
import { basicInfoFormSchema, basicInfoFormAllSchema } from './baseInfo.tsx'
import { ref, watch, onMounted, reactive, getCurrentInstance, defineEmits } from 'vue'
import { ref, watch, onMounted, reactive, getCurrentInstance } from 'vue'
import { useMessage } from '/@/hooks/web/useMessage'
import emitter from '/@/utils/Bus'
const { createMessage } = useMessage()

@ -45,7 +45,7 @@
</template>
<script lang="ts" setup>
import { ref, defineEmits, watch, onMounted, onUnmounted } from 'vue'
import { ref, watch, onMounted } from 'vue'
import emitter from '/@/utils/Bus'
import { personColumns } from './baseInfo.tsx'
import { BasicTable, useTable, TableAction } from '/@/components/Table'

@ -15,7 +15,7 @@
import { BasicForm, useForm } from '/@/components/Form/index'
import { noteFormSchema } from './baseInfo.tsx'
import emitter from '/@/utils/Bus'
import { ref, watch, defineProps, defineExpose, onMounted, onUnmounted, defineEmits } from 'vue'
import { ref, watch, onMounted, onUnmounted } from 'vue'
import { useRoute } from 'vue-router'
const route = useRoute()
//

@ -54,7 +54,7 @@
<script lang="ts" setup>
import { BasicForm, useForm } from '/@/components/Form/index'
import { otherInfoFormSchema } from './baseInfo.tsx'
import { ref, watch, defineEmits, computed, onMounted, onUnmounted } from 'vue'
import { ref, watch, computed, onMounted, onUnmounted } from 'vue'
import emitter from '/@/utils/Bus'
import { useMessage } from '/@/hooks/web/useMessage'
import { getDictOption } from '/@/utils/dictUtil'

@ -485,7 +485,7 @@
EditSeaExportRemark,
DelSeaExportRemark
} from '/@/views/operation/seaexport/api/BookingLedger'
import { ref, Ref, watch, defineEmits, onMounted, onUnmounted, defineAsyncComponent } from 'vue'
import { ref, Ref, watch, onMounted, onUnmounted, defineAsyncComponent } from 'vue'
//
import { getDictOption } from '/@/utils/dictUtil'

@ -335,6 +335,8 @@ import { formatParams } from '/@/hooks/web/common'
const appStore = useAppStore()
const { createMessage } = useMessage()
const go = useGo()
//
const tbHeight = window.innerHeight - 310
//
const calcColumns = [
{
@ -428,7 +430,7 @@ console.log(columns)
const fieldFlag = ref(true)
//
const calcData = ref([{}])
const [registerTable, { reload, getVxeSelectRows, setLoading, setColumns }] = useTable({
const [registerTable, { reload, getVxeSelectRows, setLoading }] = useTable({
title: '',
api: async (p) => {
// queryData.value = p
@ -510,6 +512,7 @@ const [registerTable, { reload, getVxeSelectRows, setLoading, setColumns }] = us
resizeHeightOffset: 75,
immediate: false,
tableComponent: 'vxe',
autoHeight: tbHeight,
id: '0',
actionColumn: {
width: 60,

@ -126,9 +126,6 @@ import {
PropType,
ref,
watchEffect,
defineProps,
defineEmits,
defineExpose,
unref,
watch,
reactive,

@ -43,12 +43,8 @@
import {
ref,
nextTick,
defineProps,
defineComponent,
onMounted,
defineExpose,
watch,
defineEmits,
watch
} from 'vue'
import { HotTable } from '@handsontable/vue3'
import { registerAllModules } from 'handsontable/registry'

Loading…
Cancel
Save