fix:修复命令行报错
This commit is contained in:
1 parent
c17731dd86
commit
7c6cc51751
9 files changed
+40
-49
No files matched your search
@@ -215,10 +215,10 @@ const handleDelete = async (row: any) => {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
::v-deep(.el-table .el-table__row .cell) {
|
||||
:v-deep(.el-table .el-table__row .cell) {
|
||||
display: flex;
|
||||
}
|
||||
::v-deep(.el-table .el-table__row .cell .el-table__expand-icon .el-icon) {
|
||||
:v-deep(.el-table .el-table__row .cell .el-table__expand-icon .el-icon) {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
font-size: 20px;
|
||||
|
||||
@@ -1,45 +1,45 @@
|
||||
<template>
|
||||
<formCreate
|
||||
<!-- <formCreate
|
||||
:rule="rule"
|
||||
:option="options"
|
||||
:modelValue="modelValue"
|
||||
@update:modelValue="emit('update:modelValue', $event)"
|
||||
:api="api"
|
||||
@update:api="emit('update:api', $event)"
|
||||
/>
|
||||
/> -->
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { Api, Rule } from '@form-create/element-ui';
|
||||
// import { Api, Rule } from '@form-create/element-ui';
|
||||
|
||||
interface Props {
|
||||
rule: Rule;
|
||||
modelValue: any;
|
||||
api?: Api;
|
||||
submitBtn?: boolean;
|
||||
}
|
||||
// interface Props {
|
||||
// rule: Rule
|
||||
// modelValue: any
|
||||
// api?: Api
|
||||
// submitBtn?: boolean
|
||||
// }
|
||||
|
||||
const props = withDefaults(defineProps<Props>(), {
|
||||
rule: () => [],
|
||||
modelValue: () => ({}),
|
||||
api: undefined,
|
||||
submitBtn: false,
|
||||
});
|
||||
// const props = withDefaults(defineProps<Props>(), {
|
||||
// rule: () => [],
|
||||
// modelValue: () => ({}),
|
||||
// api: undefined,
|
||||
// submitBtn: false,
|
||||
// })
|
||||
|
||||
const emit = defineEmits(['update:modelValue', 'update:api']);
|
||||
// const emit = defineEmits(["update:modelValue", "update:api"])
|
||||
|
||||
// Default options
|
||||
const options = computed(() => ({
|
||||
submitBtn: props.submitBtn,
|
||||
}));
|
||||
// const options = computed(() => ({
|
||||
// submitBtn: props.submitBtn,
|
||||
// }))
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
:deep(.fc-form-row) {
|
||||
/* :deep(.fc-form-row) {
|
||||
margin-top: 20px !important;
|
||||
}
|
||||
|
||||
:deep(.el-col.el-col-24.fc-form-col) {
|
||||
margin-top: 10px !important;
|
||||
}
|
||||
} */
|
||||
</style>
|
||||
@@ -90,16 +90,10 @@
|
||||
import { BasicTableProps, useTable } from "/@/hooks/table"
|
||||
import * as mchDeptUserApi from "/@/api/wallet/mch-dept"
|
||||
import { useMessage, useMessageBox } from "/@/hooks/message"
|
||||
import { useDict } from "/@/hooks/dict"
|
||||
import { ro } from "element-plus/es/locale"
|
||||
|
||||
// 引入组件
|
||||
const FormDialog = defineAsyncComponent(() => import("./form.vue"))
|
||||
// 定义查询字典
|
||||
|
||||
// 定义变量内容
|
||||
const formDialogRef = ref()
|
||||
// 搜索变量
|
||||
const queryRef = ref()
|
||||
const showSearch = ref(true)
|
||||
// 多选变量
|
||||
|
||||
@@ -316,7 +316,7 @@ const handleDelete = async (ids: string[]) => {
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
}
|
||||
::v-deep .el-table .success-row {
|
||||
:deep(.el-table) .success-row {
|
||||
--el-table-tr-bg-color: var(--el-color-success-light-9);
|
||||
}
|
||||
</style>
|
||||
@@ -484,7 +484,7 @@ onMounted(() => {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
::v-deep .receive-amount-input .el-input__inner {
|
||||
:deep(.receive-amount-input .el-input__inner) {
|
||||
color: red !important;
|
||||
font-weight: bold !important;
|
||||
font-size: large;
|
||||
|
||||
@@ -111,15 +111,15 @@
|
||||
<el-input v-model="row.quantity" />
|
||||
</template>
|
||||
</vxe-column>
|
||||
<vxe-column field="costPrice" title="成本价">
|
||||
<template #default="{ row }">
|
||||
{{
|
||||
row.costPrice
|
||||
? displayPrice(row.costPrice)
|
||||
: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.costPrice)
|
||||
}}
|
||||
</template>
|
||||
</vxe-column>
|
||||
<vxe-column field="costPrice" title="成本价">
|
||||
<template #default="{ row }">
|
||||
{{
|
||||
row.costPrice
|
||||
? displayPrice(row.costPrice)
|
||||
: displayPrice(row.erpUnitVos?.find((item: any) => item.id == row.unitId)?.costPrice)
|
||||
}}
|
||||
</template>
|
||||
</vxe-column>
|
||||
<vxe-column field="retailPrice" title="零售价">
|
||||
<template #default="{ row }">
|
||||
{{
|
||||
@@ -361,7 +361,7 @@ const clearData = () => {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
::v-deep .receive-amount-input .el-input__inner {
|
||||
:deep(.receive-amount-input .el-input__inner) {
|
||||
color: red !important;
|
||||
font-size: large;
|
||||
text-align: center;
|
||||
|
||||
@@ -478,7 +478,7 @@ const clearData = () => {
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
::v-deep(.editableTable-style.vxe-table .vxe-body--column.table-padding) {
|
||||
:v-deep(.editableTable-style.vxe-table .vxe-body--column.table-padding) {
|
||||
padding: 6px 0;
|
||||
}
|
||||
</style>
|
||||
@@ -301,11 +301,8 @@ const onSubmit = async () => {
|
||||
} catch (err: any) {
|
||||
useMessage().error(err.msg)
|
||||
} finally {
|
||||
let timer = null
|
||||
timer = setTimeout(() => {
|
||||
loading.value = false
|
||||
timer = null
|
||||
}, 500)
|
||||
await new Promise((resolve) => setTimeout(resolve, 500))
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -319,7 +316,7 @@ defineExpose({
|
||||
overflow-y: auto;
|
||||
height: 54vh;
|
||||
}
|
||||
::v-deep .el-tabs .el-tabs__nav .is-active {
|
||||
:deep(.el-tabs .el-tabs__nav) .is-active {
|
||||
color: #2e5cf6 !important;
|
||||
font-weight: bold !important;
|
||||
}
|
||||
|
||||
@@ -199,7 +199,7 @@ const handleDelete = async (ids: string[]) => {
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
::v-deep .el-table .success-row {
|
||||
:deep(.el-table) .success-row {
|
||||
--el-table-tr-bg-color: var(--el-color-success-light-9);
|
||||
}
|
||||
</style>
|
||||
Reference in new issue
Block a user