From 587a747a56f076457f6d9839cbe874b60f6f696c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 01 八月 2024 13:40:40 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/components/orderDetl/show.vue | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-admin/src/components/orderDetl/show.vue b/zy-asrs-admin/src/components/orderDetl/show.vue
index d517c0a..dd0f657 100644
--- a/zy-asrs-admin/src/components/orderDetl/show.vue
+++ b/zy-asrs-admin/src/components/orderDetl/show.vue
@@ -6,6 +6,8 @@
import { logout } from '@/config.js';
import { formatMessage } from '@/utils/localeUtils.js';
import useTableSearch from '@/utils/tableUtils.jsx';
+import WorkTaskView from '@/components/order/workTask/index.vue'
+import CompleteTaskView from '@/components/order/completeTask/index.vue'
const context = getCurrentInstance()?.appContext.config.globalProperties;
const router = useRouter();
@@ -20,6 +22,10 @@
orderType$: '',
orderSettle$: '',
});
+const workTaskChild = ref(null)
+const completeTaskChild = ref(null)
+
+const showWidth = ref("60%")
getColumns();
const {
@@ -166,15 +172,30 @@
get("/api/order/" + newVal, {}).then((resp) => {
let result = resp.data;
- orderInfo.value = result.data;
+ if(result.data != null) {
+ orderInfo.value = result.data;
+ }
})
}
})
+
+const openWorkTask = (record) => {
+ workTaskChild.value.open = true;
+ workTaskChild.value.showWidth = '55%';
+ workTaskChild.value.orderDetlId = record.detlId;
+}
+
+const openCompleteQty = (record) => {
+ completeTaskChild.value.open = true;
+ completeTaskChild.value.showWidth = '55%';
+ completeTaskChild.value.orderDetlId = record.detlId;
+}
defineExpose({
tableData,
orderId,
openDetl,
+ showWidth,
})
</script>
@@ -187,7 +208,7 @@
<template>
<div>
- <a-modal v-model:open="openDetl" width="60%" @ok="handleOk" @cancel="handleCancel">
+ <a-modal v-model:open="openDetl" :width="showWidth" @ok="handleOk" @cancel="handleCancel">
<div class="component-header">
<div>
<h3>
@@ -206,7 +227,19 @@
</div>
<a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
:scroll="{ y: 768 }" :columns="state.columns">
+ <template #bodyCell="{ column, text, record }">
+ <template v-if="column.dataIndex === 'workQty'">
+ <a-button type="link" @click="openWorkTask(record)">{{ text }}</a-button>
+ </template>
+
+ <template v-if="column.dataIndex === 'qty'">
+ <a-button type="link" @click="openCompleteQty(record)">{{ text }}</a-button>
+ </template>
+ </template>
</a-table>
+
+ <WorkTaskView ref="workTaskChild" />
+ <CompleteTaskView ref="completeTaskChild" />
</a-modal>
</div>
</template>
--
Gitblit v1.9.1