From c635d78b479510ebe2556a420948effcd30a0731 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 21 十二月 2024 18:40:43 +0800
Subject: [PATCH] 新建德森项目分支
---
zy-asrs-admin/src/components/order/completeTask/index.vue | 364 ++++++++++++++++++++++++++--------------------------
1 files changed, 182 insertions(+), 182 deletions(-)
diff --git a/zy-asrs-admin/src/components/order/completeTask/index.vue b/zy-asrs-admin/src/components/order/completeTask/index.vue
index 2a379d0..453865f 100644
--- a/zy-asrs-admin/src/components/order/completeTask/index.vue
+++ b/zy-asrs-admin/src/components/order/completeTask/index.vue
@@ -1,182 +1,182 @@
-<script setup>
-import { getCurrentInstance, ref, watch, reactive } from 'vue';
-import { useRouter } from "vue-router";
-import { get, post, postForm } from '@/utils/request.js'
-import { message, Modal } from 'ant-design-vue';
-import { logout } from '@/config.js';
-import { formatMessage } from '@/utils/localeUtils.js';
-import useTableSearch from '@/utils/tableUtils.jsx';
-const context = getCurrentInstance()?.appContext.config.globalProperties;
-
-const router = useRouter();
-
-const TABLE_KEY = 'table-locDetl';
-
-let tableData = ref([]);
-let open = ref(false);
-const orderDetlId = ref(null);
-
-const showWidth = ref("60%")
-
-const {
- getColumnSearchProps,
-} = useTableSearch();
-
-const state = reactive({
- selectedRowKeys: [],
- loading: false,
- columns: [],
-});
-
-state.columns = [
- {
- title: formatMessage('db.man_task.task_no', '浠诲姟缂栧彿'),
- dataIndex: 'taskNo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('taskNo'),
- },
- {
- title: formatMessage('db.man_task.task_sts', '浠诲姟鐘舵��'),
- dataIndex: 'taskSts$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('taskSts$'),
- },
- {
- title: formatMessage('db.man_task.task_type', '浠诲姟绫诲瀷'),
- dataIndex: 'taskType$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('taskType$'),
- },
- {
- title: formatMessage('db.man_task.io_pri', '浼樺厛绾�'),
- dataIndex: 'ioPri',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('ioPri'),
- },
- {
- title: formatMessage('db.man_task.origin_loc', '婧愬簱浣�'),
- dataIndex: 'originLoc',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('originLoc'),
- },
- {
- title: formatMessage('db.man_task.target_loc', '鐩爣搴撲綅'),
- dataIndex: 'targetLoc',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('targetLoc'),
- },
- {
- title: formatMessage('db.man_task.origin_site', '婧愮珯鐐�'),
- dataIndex: 'originSite',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('originSite'),
- },
- {
- title: formatMessage('db.man_task.target_site', '鐩爣绔欑偣'),
- dataIndex: 'targetSite',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('targetSite'),
- },
- {
- title: formatMessage('db.man_task.barcode', '鎵樼洏鐮�'),
- dataIndex: 'barcode',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('barcode'),
- },
- {
- title: formatMessage('db.man_task.status', '鐘舵��'),
- dataIndex: 'status$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('status$'),
- },
- {
- title: formatMessage('db.man_task.create_time', '娣诲姞鏃堕棿'),
- dataIndex: 'createTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createTime$'),
- },
- {
- title: formatMessage('db.man_task.create_by', '娣诲姞浜哄憳'),
- dataIndex: 'createBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('createBy$'),
- },
- {
- title: formatMessage('db.man_task.update_time', '淇敼鏃堕棿'),
- dataIndex: 'updateTime$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateTime$'),
- },
- {
- title: formatMessage('db.man_task.update_by', '淇敼浜哄憳'),
- dataIndex: 'updateBy$',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('updateBy$'),
- },
- {
- title: formatMessage('db.man_task.memo', '澶囨敞'),
- dataIndex: 'memo',
- width: 140,
- ellipsis: true,
- ...getColumnSearchProps('memo'),
- },
-];
-
-const handleOk = () => {
- open.value = false;
-}
-
-const handleCancel = () => {
- open.value = false;
- orderDetlId.value = null;
-}
-
-watch(orderDetlId, (newVal, oldVal) => {
- if (newVal != null) {
- get("/api/taskLog/orderDetlId/" + newVal, {}).then((resp) => {
- let result = resp.data;
- tableData.value = result.data;
- })
- }
-})
-
-defineExpose({
- tableData,
- orderDetlId,
- open,
- showWidth,
-})
-
-</script>
-
-<script>
-export default {
- name: 'completeTaskComponent'
-}
-</script>
-
-<template>
- <div>
- <a-modal v-model:open="open" :width="showWidth" @ok="handleOk" @cancel="handleCancel">
- <a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
- :scroll="{ y: 768 }" :columns="state.columns">
- </a-table>
- </a-modal>
- </div>
-</template>
-
-<style></style>
+<script setup>
+import { getCurrentInstance, ref, watch, reactive } from 'vue';
+import { useRouter } from "vue-router";
+import { get, post, postForm } from '@/utils/request.js'
+import { message, Modal } from 'ant-design-vue';
+import { logout } from '@/config.js';
+import { formatMessage } from '@/utils/localeUtils.js';
+import useTableSearch from '@/utils/tableUtils.jsx';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-locDetl';
+
+let tableData = ref([]);
+let open = ref(false);
+const orderDetlId = ref(null);
+
+const showWidth = ref("60%")
+
+const {
+ getColumnSearchProps,
+} = useTableSearch();
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+ columns: [],
+});
+
+state.columns = [
+ {
+ title: formatMessage('db.man_task.task_no', '浠诲姟缂栧彿'),
+ dataIndex: 'taskNo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('taskNo'),
+ },
+ {
+ title: formatMessage('db.man_task.task_sts', '浠诲姟鐘舵��'),
+ dataIndex: 'taskSts$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('taskSts$'),
+ },
+ {
+ title: formatMessage('db.man_task.task_type', '浠诲姟绫诲瀷'),
+ dataIndex: 'taskType$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('taskType$'),
+ },
+ {
+ title: formatMessage('db.man_task.io_pri', '浼樺厛绾�'),
+ dataIndex: 'ioPri',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('ioPri'),
+ },
+ {
+ title: formatMessage('db.man_task.origin_loc', '婧愬簱浣�'),
+ dataIndex: 'originLoc',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('originLoc'),
+ },
+ {
+ title: formatMessage('db.man_task.target_loc', '鐩爣搴撲綅'),
+ dataIndex: 'targetLoc',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('targetLoc'),
+ },
+ {
+ title: formatMessage('db.man_task.origin_site', '婧愮珯鐐�'),
+ dataIndex: 'originSite',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('originSite'),
+ },
+ {
+ title: formatMessage('db.man_task.target_site', '鐩爣绔欑偣'),
+ dataIndex: 'targetSite',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('targetSite'),
+ },
+ {
+ title: formatMessage('db.man_task.barcode', '鎵樼洏鐮�'),
+ dataIndex: 'barcode',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('barcode'),
+ },
+ {
+ title: formatMessage('db.man_task.status', '鐘舵��'),
+ dataIndex: 'status$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('status$'),
+ },
+ {
+ title: formatMessage('db.man_task.create_time', '娣诲姞鏃堕棿'),
+ dataIndex: 'createTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createTime$'),
+ },
+ {
+ title: formatMessage('db.man_task.create_by', '娣诲姞浜哄憳'),
+ dataIndex: 'createBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('createBy$'),
+ },
+ {
+ title: formatMessage('db.man_task.update_time', '淇敼鏃堕棿'),
+ dataIndex: 'updateTime$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateTime$'),
+ },
+ {
+ title: formatMessage('db.man_task.update_by', '淇敼浜哄憳'),
+ dataIndex: 'updateBy$',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('updateBy$'),
+ },
+ {
+ title: formatMessage('db.man_task.memo', '澶囨敞'),
+ dataIndex: 'memo',
+ width: 140,
+ ellipsis: true,
+ ...getColumnSearchProps('memo'),
+ },
+];
+
+const handleOk = () => {
+ open.value = false;
+}
+
+const handleCancel = () => {
+ open.value = false;
+ orderDetlId.value = null;
+}
+
+watch(orderDetlId, (newVal, oldVal) => {
+ if (newVal != null) {
+ get("/api/taskLog/orderDetlId/" + newVal, {}).then((resp) => {
+ let result = resp.data;
+ tableData.value = result.data;
+ })
+ }
+})
+
+defineExpose({
+ tableData,
+ orderDetlId,
+ open,
+ showWidth,
+})
+
+</script>
+
+<script>
+export default {
+ name: 'completeTaskComponent'
+}
+</script>
+
+<template>
+ <div>
+ <a-modal v-model:open="open" :width="showWidth" @ok="handleOk" @cancel="handleCancel">
+ <a-table :data-source="tableData" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
+ :scroll="{ y: 768 }" :columns="state.columns">
+ </a-table>
+ </a-modal>
+ </div>
+</template>
+
+<style></style>
--
Gitblit v1.9.1