|
|
@ -271,10 +271,7 @@
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
<script lang="ts" setup name="订单管理">
|
|
|
|
<script lang="ts" setup name="订单管理">
|
|
|
|
import TableActionBar from './components/tableActionBar.vue'
|
|
|
|
import TableActionBar from './components/tableActionBar.vue'
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
import { CheckCircleFilled, CloseCircleFilled, RedoOutlined } from '@ant-design/icons-vue';
|
|
|
|
import { CheckCircleFilled, CloseCircleFilled, RedoOutlined } from '@ant-design/icons-vue';
|
|
|
|
=======
|
|
|
|
|
|
|
|
>>>>>>> ljj_dev
|
|
|
|
|
|
|
|
import tableActionBarRight from './components/tableActionBarRight.vue'
|
|
|
|
import tableActionBarRight from './components/tableActionBarRight.vue'
|
|
|
|
import { onMounted, ref } from 'vue'
|
|
|
|
import { onMounted, ref } from 'vue'
|
|
|
|
import { BasicTable, useTable, TableAction } from '/@/components/Table'
|
|
|
|
import { BasicTable, useTable, TableAction } from '/@/components/Table'
|
|
|
@ -284,15 +281,8 @@ import { columns, searchFormSchema } from './columns'
|
|
|
|
import { useGo } from '/@/hooks/web/usePage'
|
|
|
|
import { useGo } from '/@/hooks/web/usePage'
|
|
|
|
import { useMessage } from '/@/hooks/web/useMessage'
|
|
|
|
import { useMessage } from '/@/hooks/web/useMessage'
|
|
|
|
import { formatTableData } from '/@/hooks/web/common'
|
|
|
|
import { formatTableData } from '/@/hooks/web/common'
|
|
|
|
<<<<<<< HEAD
|
|
|
|
|
|
|
|
import lstDraftCompareRlt from '../../../components/lstDraftCompareRlt/index.vue'
|
|
|
|
import lstDraftCompareRlt from '../../../components/lstDraftCompareRlt/index.vue'
|
|
|
|
import { RefreshYGT } from './api/BookingLedger.js'
|
|
|
|
import { RefreshYGT } from './api/BookingLedger.js'
|
|
|
|
=======
|
|
|
|
|
|
|
|
import { useOptionsStore } from '/@/store/modules/options'
|
|
|
|
|
|
|
|
import lstDraftCompareRlt from '../../../components/lstDraftCompareRlt/index.vue'
|
|
|
|
|
|
|
|
import { RefreshYGT } from './api/BookingLedger.js'
|
|
|
|
|
|
|
|
import { usePermissionStore } from '/@/store/modules/permission'
|
|
|
|
|
|
|
|
>>>>>>> ljj_dev
|
|
|
|
|
|
|
|
import { useI18n } from '/@/hooks/web/useI18n'
|
|
|
|
import { useI18n } from '/@/hooks/web/useI18n'
|
|
|
|
const { t } = useI18n()
|
|
|
|
const { t } = useI18n()
|
|
|
|
import { useAppStore } from '/@/store/modules/app'
|
|
|
|
import { useAppStore } from '/@/store/modules/app'
|
|
|
|