diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..bcbc94e --- /dev/null +++ b/.env.development @@ -0,0 +1,26 @@ +# port 端口号 +VITE_PORT = 8888 + +#浏览器自动打开 +VITE_OPEN = true + +# 本地环境 +ENV = 'development' + +# ADMIN 服务地址 +# VITE_ADMIN_PROXY_PATH = http://123.156.230.15:8089/api/ # 线上 +# VITE_ADMIN_PROXY_PATH = http://pjcloud.center.takin.cc/ +# VITE_ADMIN_PROXY_PATH = http://localhost:9999/ +VITE_ADMIN_PROXY_PATH = http://192.168.101.50:9999/ # 邓-本地 + +# VITE_ADMIN_PROXY_PATH = http://59.202.170.152:81/api # 正式环境 + +# 图片访问基础地址 +# VITE_IMAGE_BASE_PATH = http://123.156.230.15:8089/api # 线上 +# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc +# VITE_IMAGE_BASE_PATH = http://localhost:9999 +VITE_IMAGE_BASE_PATH = http://192.168.101.50:9999 # 邓-本地 +# VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api/ # 正式环境 + +# 代码生成服务地址 +VITE_GEN_PROXY_PATH = http://192.168.110.156:5003 diff --git a/src/components/Select/SelectUser.vue b/src/components/Select/SelectUser.vue index 0f44675..f805969 100644 --- a/src/components/Select/SelectUser.vue +++ b/src/components/Select/SelectUser.vue @@ -59,6 +59,7 @@ async function getOptions() { try { state.loading = true const _pa = { + userId: selectId.value, ...queryForm, } const { data } = await userApi.pageList(_pa) diff --git a/src/router/route.ts b/src/router/route.ts index 0b754ae..a04053d 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -57,14 +57,6 @@ export const dynamicRoutes: Array = [ isHide: true, }, }, - { - path: "/createCgPlan", - name: "创建采购计划", - component: () => import("/@/views/supermarketerp/smErpCgPlan/createCgPlan.vue"), - meta: { - isHide: true, - }, - }, ] /** diff --git a/src/views/admin/log/index.vue b/src/views/admin/log/index.vue index 6bfc3e7..7cad3b1 100644 --- a/src/views/admin/log/index.vue +++ b/src/views/admin/log/index.vue @@ -1,202 +1,215 @@ diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue index 1092b2a..d5d8ab7 100644 --- a/src/views/hard/hard-order/index.vue +++ b/src/views/hard/hard-order/index.vue @@ -20,7 +20,7 @@ - + @@ -184,19 +184,9 @@ 打印发票 - - 购物车 - - - 钱包明细 - - + 购物车 + 钱包明细 + 订单详情 @@ -219,13 +209,7 @@ > 退款 - 删除 @@ -288,8 +272,7 @@ const state: BasicTableProps = reactive({ }) // table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = - useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) onMounted(async () => { const { data } = await getDicts("hard_order_type") diff --git a/src/views/hard/hard-sb/index.vue b/src/views/hard/hard-sb/index.vue index 22a58e1..f4b6144 100644 --- a/src/views/hard/hard-sb/index.vue +++ b/src/views/hard/hard-sb/index.vue @@ -5,7 +5,7 @@ - + @@ -92,8 +92,7 @@ const state: BasicTableProps = reactive({ }) // table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = - useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) // 导出excel const exportExcel = () => { diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue index 7c17e80..6387d16 100644 --- a/src/views/hard/hard-sh/index.vue +++ b/src/views/hard/hard-sh/index.vue @@ -5,7 +5,7 @@ - + @@ -80,8 +80,7 @@ const state: BasicTableProps = reactive({ }) // table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = - useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) // 清空搜索条件 const resetQuery = () => { diff --git a/src/views/supermarketerp/smErpCgPlan/createCgPlan.vue b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue similarity index 98% rename from src/views/supermarketerp/smErpCgPlan/createCgPlan.vue rename to src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue index 7345376..ab584a2 100644 --- a/src/views/supermarketerp/smErpCgPlan/createCgPlan.vue +++ b/src/views/supermarketerp/smErpCgPlan/cgPlanOption.vue @@ -334,7 +334,15 @@ const getInitData = async () => { loading.value = true getObj(id) .then((res: any) => { - Object.assign(baseDataForm, res.data) + Object.assign(baseDataForm, { + planCode: res.data.planCode, + orderNumber: res.data.orderNumber, + planDate: res.data.planDate, + supplierId: res.data.supplierId, + handlerUserId: res.data.handlerUserId, + remark: res.data.remark, + }) + state.editableTableData = res.data.items }) .finally(() => { loading.value = false diff --git a/src/views/supermarketerp/smErpCgPlan/form.vue b/src/views/supermarketerp/smErpCgPlan/form.vue deleted file mode 100644 index a79a479..0000000 --- a/src/views/supermarketerp/smErpCgPlan/form.vue +++ /dev/null @@ -1,196 +0,0 @@ - - - diff --git a/src/views/supermarketerp/smErpCgPlan/index.vue b/src/views/supermarketerp/smErpCgPlan/index.vue index c841ee5..109c9f1 100644 --- a/src/views/supermarketerp/smErpCgPlan/index.vue +++ b/src/views/supermarketerp/smErpCgPlan/index.vue @@ -142,9 +142,9 @@ const selectionChangHandle = (objs: { id: string }[]) => { } // 点击创建采购清单 -const handleClickCreateCgPlan = () => router.push({ path: "/createCgPlan" }) +const handleClickCreateCgPlan = () => router.push({ path: "/supermarketerp/smErpCgPlan/cgPlanOption" }) // 点击编辑采购清单 -const handleClickEditCgPlan = (id: string) => router.push({ path: "/createCgPlan", query: { id } }) +const handleClickEditCgPlan = (id: string) => router.push({ path: "/supermarketerp/smErpCgPlan/cgPlanOption", query: { id } }) // 删除操作 const handleDelete = async (ids: string[]) => { diff --git a/src/views/wallet/wallet-active/bind-user-form.vue b/src/views/wallet/wallet-active/bind-user-form.vue new file mode 100644 index 0000000..a993ceb --- /dev/null +++ b/src/views/wallet/wallet-active/bind-user-form.vue @@ -0,0 +1,97 @@ + + + diff --git a/src/views/wallet/wallet-active/form.vue b/src/views/wallet/wallet-active/form.vue index 04f3ad6..61602ad 100644 --- a/src/views/wallet/wallet-active/form.vue +++ b/src/views/wallet/wallet-active/form.vue @@ -1,107 +1,112 @@ \ No newline at end of file + openDialog, +}) + diff --git a/src/views/wallet/wallet-active/index.vue b/src/views/wallet/wallet-active/index.vue index 63c24dc..581a0f9 100644 --- a/src/views/wallet/wallet-active/index.vue +++ b/src/views/wallet/wallet-active/index.vue @@ -29,13 +29,7 @@
- + 开 卡
- + @@ -125,10 +108,12 @@ import { ElLoading } from "element-plus" // 引入组件 const FormDialog = defineAsyncComponent(() => import("./form.vue")) +const BindUserFormDialog = defineAsyncComponent(() => import("./bind-user-form.vue")) // 定义查询字典 const { wallet_type, yes_no_type } = useDict("wallet_type", "yes_no_type") // 定义变量内容 const formDialogRef = ref() +const bindUserFormDialogRef = ref() // 搜索变量 const queryRef = ref() const showSearch = ref(true) @@ -142,8 +127,7 @@ const state: BasicTableProps = reactive({ }) // table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = - useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) // 清空搜索条件 const resetQuery = () => { diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue index ff70c7f..206ebe1 100644 --- a/src/views/wallet/wallet-recharge-water/index.vue +++ b/src/views/wallet/wallet-recharge-water/index.vue @@ -25,11 +25,7 @@ - + @@ -111,12 +107,7 @@ @@ -133,12 +124,7 @@ import { useDict } from "/@/hooks/dict" import { useMessage, useMessageBox } from "/@/hooks/message" import * as walletRechargeImportApi from "/@/api/wallet/wallet-recharge-import" -const { wallet_biz_recharge, wallet_type, check_status } = useDict( - "wallet_biz_recharge", - "wallet_type", - "check_status", - "check_status", -) +const { wallet_biz_recharge, wallet_type, check_status } = useDict("wallet_biz_recharge", "wallet_type", "check_status", "check_status") // 搜索变量 const queryRef = ref() const showSearch = ref(true) @@ -155,8 +141,7 @@ const state: BasicTableProps = reactive({ }) // table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = - useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) // 恢复操作 const handleRecover = async (id: string) => { @@ -188,11 +173,7 @@ const getSummaries = (param: any) => { // 导出excel const exportExcel = () => { - downBlobFile( - "/wallet/walletRechargeApply/export", - Object.assign(state.queryForm, { ids: selectObjs }), - "walletRechargeApply.xlsx", - ) + downBlobFile("/wallet/walletRechargeApply/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletRechargeApply.xlsx") } // 多选事件 diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue index f0a10ec..0d9b724 100644 --- a/src/views/wallet/wallet-xf/index.vue +++ b/src/views/wallet/wallet-xf/index.vue @@ -89,13 +89,7 @@ @click="formDialogRef.openDialog(row.id)" >编辑 - 删除 @@ -137,8 +131,7 @@ const state: BasicTableProps = reactive({ }) // table hook -const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = - useTable(state) +const { getDataList, currentChangeHandle, sizeChangeHandle, sortChangeHandle, downBlobFile, tableStyle } = useTable(state) // 清空搜索条件 const resetQuery = () => {