From 997487c934abd2f480161a040235df26396f5ad6 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Thu, 17 Apr 2025 14:23:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:json=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hard/hard-door-flow.ts | 4 +- src/components/PreviewJson/index.vue | 55 +++++++++++++++++++ src/components/index.ts | 2 + src/views/hard/hard-door-flow/index.vue | 73 +++++++++++++++++++------ src/views/hard/third-door-log/index.vue | 35 +++--------- 5 files changed, 123 insertions(+), 46 deletions(-) create mode 100644 src/components/PreviewJson/index.vue diff --git a/src/api/hard/hard-door-flow.ts b/src/api/hard/hard-door-flow.ts index 4810f1f..988c84a 100644 --- a/src/api/hard/hard-door-flow.ts +++ b/src/api/hard/hard-door-flow.ts @@ -1,8 +1,8 @@ import request from "/@/utils/request" -export function fetchList(query?: Object) { +export function pageJoin(query?: Object) { return request({ - url: "/hard/hard-door-flow/page", + url: "/hard/hard-door-flow/page-join", method: "get", params: query, }) diff --git a/src/components/PreviewJson/index.vue b/src/components/PreviewJson/index.vue new file mode 100644 index 0000000..ae78d0b --- /dev/null +++ b/src/components/PreviewJson/index.vue @@ -0,0 +1,55 @@ + + + + + diff --git a/src/components/index.ts b/src/components/index.ts index 3e7ad0f..8c7316c 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -12,6 +12,7 @@ import Tip from "/@/components/Tip/index.vue" import TagList from "/@/components/TagList/index.vue" import SvgIcon from "/@/components/SvgIcon/index.vue" import PreviewImage from "/@/components/PreviewImage/index.vue" +import PreviewJson from "/@/components/PreviewJson/index.vue" import DraggableDepTree from "/@/components/DraggableDepTree/index.vue" // 业务组件 @@ -66,6 +67,7 @@ export default { app.component("TagList", TagList) app.component("SvgIcon", SvgIcon) app.component("PreviewImage", PreviewImage) + app.component("PreviewJson", PreviewJson) app.component("DraggableDepTree", DraggableDepTree) app.component("TreeMultipleSelect", TreeMultipleSelect) app.component("SelectHard", SelectHard) diff --git a/src/views/hard/hard-door-flow/index.vue b/src/views/hard/hard-door-flow/index.vue index e5adedb..bbca6ea 100644 --- a/src/views/hard/hard-door-flow/index.vue +++ b/src/views/hard/hard-door-flow/index.vue @@ -23,21 +23,60 @@ @sort-change="sortChangeHandle" > - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -53,7 +92,7 @@ import { useDict } from "/@/hooks/dict" // 引入组件 // 定义查询字典 - +const { yes_no_type } = useDict("yes_no_type") // 定义变量内容 // 搜索变量 const queryRef = ref() @@ -64,7 +103,7 @@ const multiple = ref(true) const state: BasicTableProps = reactive({ queryForm: {}, - pageList: hardDoorFlow.fetchList, + pageList: hardDoorFlow.pageJoin, }) // table hook diff --git a/src/views/hard/third-door-log/index.vue b/src/views/hard/third-door-log/index.vue index bea0b3f..d3574d8 100644 --- a/src/views/hard/third-door-log/index.vue +++ b/src/views/hard/third-door-log/index.vue @@ -39,20 +39,18 @@ - - + + - + - + - - + + @@ -76,14 +74,6 @@ - - - - - - @@ -94,8 +84,6 @@ import { BasicTableProps, useTable } from "/@/hooks/table" import * as thirdDoorLog from "/@/api/thirdparty/third-door-log" import { useMessage, useMessageBox } from "/@/hooks/message" import { useDict } from "/@/hooks/dict" -import VueJsonPretty from "vue-json-pretty" -import "vue-json-pretty/lib/styles.css" const FormDialog = defineAsyncComponent(() => import("./form.vue")) const LogDetail = defineAsyncComponent(() => import("./detail.vue")) @@ -108,7 +96,6 @@ const queryRef = ref() // 多选变量 const selectObjs = ref([]) as any const multiple = ref(true) -const jsonViewVisible = ref() const jsonData = ref() const logDetailRef = ref() @@ -140,12 +127,6 @@ const selectionChangHandle = (objs: { id: string }[]) => { multiple.value = !objs.length } -// 点击查看json -const handleClickJsonView = (json: any) => { - jsonViewVisible.value = true - jsonData.value = JSON.parse(json) -} - // 删除操作 const handleDelete = async (ids: string[]) => { try { From 95c3ad6c39f6b00d25a3f2875374451d58fce389 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 18 Apr 2025 14:35:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E6=AF=8F=E4=B8=AA=E8=B4=A7=E6=9F=9C?= =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hard/hard-door-flow.ts | 8 + src/api/hard/hard-door-manager.ts | 11 ++ src/components/Select/SelectCabinet.vue | 115 +++++++++++++ src/components/index.ts | 2 + src/views/hard/components/hard-door-log.vue | 158 ++++++++++++++++++ src/views/hard/components/shop-car.vue | 3 +- .../hard/hard-after-sale/order-refund.vue | 2 + src/views/hard/hard-door-flow/index.vue | 36 +++- src/views/hard/hard-door-manager/index.vue | 12 -- src/views/hard/hard-spu-repertory/form.vue | 8 +- src/views/hard/hard-spu-repertory/index.vue | 11 +- 11 files changed, 340 insertions(+), 26 deletions(-) create mode 100644 src/components/Select/SelectCabinet.vue create mode 100644 src/views/hard/components/hard-door-log.vue diff --git a/src/api/hard/hard-door-flow.ts b/src/api/hard/hard-door-flow.ts index 988c84a..df65d65 100644 --- a/src/api/hard/hard-door-flow.ts +++ b/src/api/hard/hard-door-flow.ts @@ -8,6 +8,14 @@ export function pageJoin(query?: Object) { }) } +export function getByOrderId(query?: Object) { + return request({ + url: "/hard/hard-door-flow/get-by-order-id", + method: "get", + params: query, + }) +} + export function addObj(obj?: Object) { return request({ url: "/hard/hard-door-flow", diff --git a/src/api/hard/hard-door-manager.ts b/src/api/hard/hard-door-manager.ts index 45a0f2e..8e62387 100644 --- a/src/api/hard/hard-door-manager.ts +++ b/src/api/hard/hard-door-manager.ts @@ -1,5 +1,16 @@ import request from "/@/utils/request" +/** + * 柜门下拉查询 + */ +export function selectCabinet(params?: { hardDoorId: any; cabinetNo: any }) { + return request({ + url: "/hard/hard-door-manager/select-cabinet", + method: "get", + params, + }) +} + /** * 刷新智能柜货柜二维码 * @param hardDoorId 柜子编号 diff --git a/src/components/Select/SelectCabinet.vue b/src/components/Select/SelectCabinet.vue new file mode 100644 index 0000000..46fb83a --- /dev/null +++ b/src/components/Select/SelectCabinet.vue @@ -0,0 +1,115 @@ + + + diff --git a/src/components/index.ts b/src/components/index.ts index 8c7316c..a36b255 100644 --- a/src/components/index.ts +++ b/src/components/index.ts @@ -32,6 +32,7 @@ import SelectHard from "/@/components/Select/SelectHard.vue" import SelectHardSpu from "/@/components/Select/SelectHardSpu.vue" import SelectHardGroup from "/@/components/Select/selectHardGroup.vue" import SelectRole from "/@/components/Select/SelectRole.vue" +import SelectCabinet from "/@/components/Select/SelectCabinet.vue" // 第三方组件 import ElementPlus from "element-plus" @@ -85,6 +86,7 @@ export default { app.component("SelectSupplier", SelectSupplier) app.component("SelectMchRule", SelectMchRule) app.component("SelectRole", SelectRole) + app.component("SelectCabinet", SelectCabinet) // 导入全部的elmenet-plus的图标 for (const [key, component] of Object.entries(ElementPlusIconsVue)) { diff --git a/src/views/hard/components/hard-door-log.vue b/src/views/hard/components/hard-door-log.vue new file mode 100644 index 0000000..cce0ea5 --- /dev/null +++ b/src/views/hard/components/hard-door-log.vue @@ -0,0 +1,158 @@ + + + diff --git a/src/views/hard/components/shop-car.vue b/src/views/hard/components/shop-car.vue index 133de39..ae6f65f 100644 --- a/src/views/hard/components/shop-car.vue +++ b/src/views/hard/components/shop-car.vue @@ -54,8 +54,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 openDialog = (id: string) => { diff --git a/src/views/hard/hard-after-sale/order-refund.vue b/src/views/hard/hard-after-sale/order-refund.vue index b972503..1877139 100644 --- a/src/views/hard/hard-after-sale/order-refund.vue +++ b/src/views/hard/hard-after-sale/order-refund.vue @@ -124,6 +124,7 @@ + @@ -142,6 +143,7 @@ import { ElLoading } from "element-plus" // 引入组件 const RefundRejectForm = defineAsyncComponent(() => import("./refund-reject.vue")) +const HardDoorLog = defineAsyncComponent(() => import("../components/hard-door-log.vue")) // 定义查询字典 const { hard_pay_type, hard_order_type, hard_order_status, hard_after_sale_way, hard_after_sale_type, hard_sale_status, hard_type } = diff --git a/src/views/hard/hard-door-flow/index.vue b/src/views/hard/hard-door-flow/index.vue index bbca6ea..00b369e 100644 --- a/src/views/hard/hard-door-flow/index.vue +++ b/src/views/hard/hard-door-flow/index.vue @@ -2,6 +2,23 @@
+ + + + + + + + + + + + + {{ $t("common.queryBtn") }} + {{ $t("common.resetBtn") }} + + +
+ + + + + + + + + @@ -77,7 +107,9 @@ - + + +
@@ -92,7 +124,7 @@ import { useDict } from "/@/hooks/dict" // 引入组件 // 定义查询字典 -const { yes_no_type } = useDict("yes_no_type") +const { yes_no_type, hard_door_flow_biz, hard_door_flow } = useDict("yes_no_type", "hard_door_flow_biz", "hard_door_flow") // 定义变量内容 // 搜索变量 const queryRef = ref() diff --git a/src/views/hard/hard-door-manager/index.vue b/src/views/hard/hard-door-manager/index.vue index 29835da..062f5aa 100644 --- a/src/views/hard/hard-door-manager/index.vue +++ b/src/views/hard/hard-door-manager/index.vue @@ -177,18 +177,6 @@
- - - - - -
- {{ "121121" }} -
- - - -
diff --git a/src/views/hard/hard-spu-repertory/form.vue b/src/views/hard/hard-spu-repertory/form.vue index 4c8f9e9..054f513 100644 --- a/src/views/hard/hard-spu-repertory/form.vue +++ b/src/views/hard/hard-spu-repertory/form.vue @@ -2,6 +2,11 @@ + + + + + @@ -39,13 +44,14 @@ const loading = ref(false) const form = reactive({ id: "", userId: "", - hardId: "", + cabinetId: "", spuId: "", count: 5, }) // 定义校验规则 const dataRules = ref({ + cabinetId: [{ required: true, message: "请选择柜门", trigger: "change" }], spuId: [{ required: true, message: "请选择商品", trigger: "change" }], count: [{ required: true, message: "请输入库存量", trigger: "blur" }], }) diff --git a/src/views/hard/hard-spu-repertory/index.vue b/src/views/hard/hard-spu-repertory/index.vue index aa397d5..9ac924b 100644 --- a/src/views/hard/hard-spu-repertory/index.vue +++ b/src/views/hard/hard-spu-repertory/index.vue @@ -69,13 +69,6 @@ - - - - + From 9a8ee5d0ed3a0975eaf2ec40be0da208b5b1c630 Mon Sep 17 00:00:00 2001 From: dzc <2388224167@qq.com> Date: Fri, 18 Apr 2025 19:38:59 +0800 Subject: [PATCH 3/5] =?UTF-8?q?feat:=E4=BA=BA=E5=B7=A5=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hard/hard-door-flow.ts | 11 +++ src/views/hard/components/hard-door-log.vue | 83 +++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/src/api/hard/hard-door-flow.ts b/src/api/hard/hard-door-flow.ts index df65d65..548c3c9 100644 --- a/src/api/hard/hard-door-flow.ts +++ b/src/api/hard/hard-door-flow.ts @@ -1,5 +1,16 @@ import request from "/@/utils/request" +/** + * 流程错误手动处理 + */ +export function errorChange(data?: Object) { + return request({ + url: "/hard/hard-auth/error-change", + method: "post", + data, + }) +} + export function pageJoin(query?: Object) { return request({ url: "/hard/hard-door-flow/page-join", diff --git a/src/views/hard/components/hard-door-log.vue b/src/views/hard/components/hard-door-log.vue index cce0ea5..6d18070 100644 --- a/src/views/hard/components/hard-door-log.vue +++ b/src/views/hard/components/hard-door-log.vue @@ -63,23 +63,86 @@
错误 {{ detail.errorDesc }} + + 处理 + +
+ + + + +
+ 手动处理智能柜订单 + {{ detail.hardAuth.manualChangeTime }} + {{ detail.hardAuth.manualChangeRemark }} +
+ +
+ + + + + + + + + + + + + + + + + +