From 9870b9e10e1d0abcbc91fa2840c9ed6cc2854b68 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 30 七月 2024 13:31:30 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/components/orderDetl/show.vue | 118 ++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 81 insertions(+), 37 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index b9aac26..d517c0a 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -66,6 +66,20 @@
editable: true,
},
{
+ title: formatMessage('db.man_loc_detl.qty', '宸插畬鎴愭暟閲�'),
+ dataIndex: 'qty',
+ width: 140,
+ ellipsis: true,
+ editable: true,
+ },
+ {
+ title: formatMessage('db.man_loc_detl.workQty', '浣滀笟涓暟閲�'),
+ dataIndex: 'workQty',
+ width: 140,
+ ellipsis: true,
+ editable: true,
+ },
+ {
title: formatMessage('db.man_loc_detl.memo', '澶囨敞'),
dataIndex: 'memo',
width: 140,
@@ -119,33 +133,42 @@
openDetl.value = false;
}
-watch(orderId, (newVal, oldVal) => {
- get("/api/orderDetl/orderId/" + newVal, {}).then((resp) => {
- let result = resp.data;
- let index = 1;
- let tmp = [];
- result.data.forEach((item) => {
- let data = {
- _id: index++,
- detlId: item.id,
- matnr: item.mat$.matnr,
- maktx: item.mat$.maktx,
- batch: item.batch,
- anfme: item.anfme,
- memo: item.memo
- };
- fieldList.forEach((field) => {
- data[field] = item[field];
- })
- tmp.push(data)
- })
- tableData.value = tmp;
- })
+const handleCancel = () => {
+ openDetl.value = false;
+ orderId.value = null;
+}
- get("/api/order/" + newVal, {}).then((resp) => {
- let result = resp.data;
- orderInfo.value = result.data;
- })
+watch(orderId, (newVal, oldVal) => {
+ if (newVal != null) {
+ get("/api/orderDetl/orderId/" + newVal, {}).then((resp) => {
+ let result = resp.data;
+ let index = 1;
+ let tmp = [];
+ result.data.forEach((item) => {
+ let data = {
+ _id: index++,
+ detlId: item.id,
+ matnr: item.mat$.matnr,
+ maktx: item.mat$.maktx,
+ batch: item.batch,
+ anfme: item.anfme,
+ qty: item.qty,
+ workQty: item.workQty,
+ memo: item.memo
+ };
+ fieldList.forEach((field) => {
+ data[field] = item[field];
+ })
+ tmp.push(data)
+ })
+ tableData.value = tmp;
+ })
+
+ get("/api/order/" + newVal, {}).then((resp) => {
+ let result = resp.data;
+ orderInfo.value = result.data;
+ })
+ }
})
defineExpose({
@@ -164,16 +187,23 @@
<template>
<div>
- <a-modal v-model:open="openDetl" width="60%" @ok="handleOk">
- <h3>
- 璁㈠崟鍙凤細{{ orderInfo.orderNo }}
- </h3>
- <h3>
- 鍗曟嵁绫诲瀷锛歿{ orderInfo.orderType$ }}
- </h3>
- <h3>
- 鍗曟嵁鐘舵�侊細{{ orderInfo.orderSettle$ }}
- </h3>
+ <a-modal v-model:open="openDetl" width="60%" @ok="handleOk" @cancel="handleCancel">
+ <div class="component-header">
+ <div>
+ <h3>
+ 璁㈠崟鍙凤細{{ orderInfo.orderNo }}
+ </h3>
+ <h3>
+ 鍗曟嵁绫诲瀷锛歿{ orderInfo.orderType$ }}
+ </h3>
+ <h3>
+ 鍗曟嵁鐘舵�侊細{{ orderInfo.orderSettle$ }}
+ </h3>
+ </div>
+ <div class="qrcode">
+ <a-qrcode :value="orderInfo.orderNo" :size="100" :bordered="false" />
+ </div>
+ </div>
<a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
:scroll="{ y: 768 }" :columns="state.columns">
</a-table>
@@ -181,4 +211,18 @@
</div>
</template>
-<style></style>
+<style>
+.component-header {
+ display: flex;
+}
+
+.component-header>div {
+ flex: 1;
+}
+
+.qrcode {
+ display: flex;
+ justify-content: flex-end;
+ margin-right: 30px;
+}
+</style>
--
Gitblit v1.9.1