From 587a747a56f076457f6d9839cbe874b60f6f696c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 01 八月 2024 13:40:40 +0800
Subject: [PATCH] #

---
 /dev/null                                          |  232 -------------------
 zy-asrs-admin/src/components/order/index.vue       |   11 
 zy-asrs-admin/src/views/task/taskDetl/index.vue    |    2 
 zy-asrs-admin/src/components/orderLog/index.vue    |    4 
 zy-asrs-admin/src/views/task/taskLog/index.vue     |    2 
 zy-asrs-admin/src/views/task/task/index.vue        |    2 
 zy-asrs-admin/src/components/order/edit.vue        |    2 
 zy-asrs-admin/src/views/order/order/index.vue      |  225 ------------------
 zy-asrs-admin/src/views/task/taskDetlLog/index.vue |  226 +++++++++---------
 9 files changed, 131 insertions(+), 575 deletions(-)

diff --git a/zy-asrs-admin/src/components/order/edit.vue b/zy-asrs-admin/src/components/order/edit.vue
index c8de695..c0fd6c3 100644
--- a/zy-asrs-admin/src/components/order/edit.vue
+++ b/zy-asrs-admin/src/components/order/edit.vue
@@ -14,7 +14,7 @@
 const orderDetlChild = ref(null);
 
 const props = defineProps({
-    ioModel: 1
+    ioModel: null
 })
 
 const emit = defineEmits(['tableReload'])
diff --git a/zy-asrs-admin/src/components/order/index.vue b/zy-asrs-admin/src/components/order/index.vue
index cb1076e..c5cdfde 100644
--- a/zy-asrs-admin/src/components/order/index.vue
+++ b/zy-asrs-admin/src/components/order/index.vue
@@ -131,7 +131,14 @@
 };
 
 function getPage() {
-  post(props.ioModel == 'in' ? '/api/order/in/page' : '/api/order/out/page', {
+  let apiUrl = '/api/order/page';
+  if (props.ioModel == 'in') {
+    apiUrl = '/api/order/in/page';
+  } else if (props.ioModel == 'out') {
+    apiUrl = '/api/order/out/page';
+  }
+
+  post(apiUrl, {
     current: currentPage,
     pageSize: pageSize,
     condition: searchInput.value,
@@ -220,7 +227,7 @@
 
 <template>
   <div>
-    <EditView ref="editChild" @tableReload="handleTableReload" :ioModel="ioModel == 'in' ? 1 : 2" />
+    <EditView ref="editChild" @tableReload="handleTableReload" :ioModel="ioModel == 'in' ? 1 : ioModel == 'out' ? 2 : null" />
     <div class="table-header">
       <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
         style="width: 200px;" @search="onSearch" />
diff --git a/zy-asrs-admin/src/components/orderLog/index.vue b/zy-asrs-admin/src/components/orderLog/index.vue
index 68d8b64..a19313f 100644
--- a/zy-asrs-admin/src/components/orderLog/index.vue
+++ b/zy-asrs-admin/src/components/orderLog/index.vue
@@ -225,7 +225,7 @@
       <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
         style="width: 200px;" @search="onSearch" />
       <div class="table-header-right">
-        <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+        <!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button> -->
         <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
       </div>
     </div>
@@ -238,7 +238,7 @@
           <div style="display: flex;justify-content: space-evenly;">
             <a-button type="link" primary @click="showDetl(record)">{{ formatMessage('page.order.orderDetl', '璁㈠崟鏄庣粏')
               }}</a-button>
-            <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
+            <!-- <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button> -->
             <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
               }}</a-button>
           </div>
diff --git a/zy-asrs-admin/src/views/order/order/edit.vue b/zy-asrs-admin/src/views/order/order/edit.vue
deleted file mode 100644
index cbf4c43..0000000
--- a/zy-asrs-admin/src/views/order/order/edit.vue
+++ /dev/null
@@ -1,232 +0,0 @@
-<script setup>
-import { ref, nextTick } from 'vue';
-import { get, post, postBlob, postForm } from '@/utils/request.js'
-import { formatMessage } from '@/utils/localeUtils.js';
-import { message } from 'ant-design-vue';
-
-const formTable = ref(null);
-const submitButton = ref(null);
-const isSave = ref(true);
-const open = ref(false);
-const initFormData = {}
-let formData = ref(initFormData);
-
-const emit = defineEmits(['tableReload'])
-
-const handleOk = (e) => {
-    nextTick(() => {
-        setTimeout(() => {
-            submitButton.value.$el.click();
-        }, 100);
-    });
-};
-
-const onFinish = values => {
-    // console.log('Success:', values);
-    open.value = false;
-    post(isSave.value ? '/api/order/save' : '/api/order/update', formData.value).then((resp) => {
-        let result = resp.data;
-        if (result.code === 200) {
-            message.success(isSave.value ? formatMessage('page.add.success', '鏂板鎴愬姛') : formatMessage('page.update.success', '鏇存柊鎴愬姛'));
-        } else {
-            message.error(result.msg);
-        }
-        emit('tableReload', 'reload')
-        nextTick(() => {
-            formTable.value.resetFields()
-        })
-    })
-};
-const onFinishFailed = errorInfo => {
-    console.log('Failed:', errorInfo);
-};
-
-const orderTypeQueryList = ref(null); 
-orderTypeQuery();
-function orderTypeQuery() { 
-    postForm('/api/orderType/query', {}).then(resp => { 
-        let result = resp.data;
-        orderTypeQueryList.value = result.data;
-    })
-}
-const orderSettleQueryList = ref(null); 
-orderSettleQuery();
-function orderSettleQuery() { 
-    postForm('/api/orderSettle/query', {}).then(resp => { 
-        let result = resp.data;
-        orderSettleQueryList.value = result.data;
-    })
-}
-const userQueryList = ref(null); 
-userQuery();
-function userQuery() { 
-    postForm('/api/user/query', {}).then(resp => { 
-        let result = resp.data;
-        userQueryList.value = result.data;
-    })
-}
-
-
-defineExpose({
-    open,
-    formData,
-    initFormData,
-    isSave,
-})
-
-</script>
-
-<script>
-export default {
-    name: '璁㈠崟-edit'
-}
-</script>
-
-<template>
-    <div>
-        <a-modal v-model:open="open"
-            :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
-            style="width: 600px;">
-            <a-form :model="formData" ref="formTable" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
-                style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
-                @finish="onFinish" @finishFailed="onFinishFailed">
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿') " 
-                      name="orderNo" 
-                      style="width: 250px;" 
-                            >
-                    <a-input 
-                        v-model:value="formData.orderNo" 
-                     /> 
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡') " 
-                      name="orderTime" 
-                      style="width: 250px;" 
-                            >
-                    <a-input 
-                        v-model:value="formData.orderTime" 
-                     /> 
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.order_type', '鍗曟嵁绫诲瀷') " 
-                      name="orderType" 
-                      style="width: 250px;" 
-                            >
-                    <a-select 
-                        v-model:value="formData.orderType" 
-                        :placeholder="formatMessage('common.select', '璇烽�夋嫨')" 
-                        style="width: 100%" 
-                        show-search 
-                        :options="orderTypeQueryList" 
-                        optionFilterProp="label" 
-                        optionLabelProp="label" 
-                     > 
-                    </a-select>
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��') " 
-                      name="orderSettle" 
-                      style="width: 250px;" 
-                            >
-                    <a-select 
-                        v-model:value="formData.orderSettle" 
-                        :placeholder="formatMessage('common.select', '璇烽�夋嫨')" 
-                        style="width: 100%" 
-                        show-search 
-                        :options="orderSettleQueryList" 
-                        optionFilterProp="label" 
-                        optionLabelProp="label" 
-                     > 
-                    </a-select>
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.status', '鐘舵��') " 
-                      name="status" 
-                      style="width: 250px;" 
-                            >
-                    <a-select 
-                        v-model:value="formData.status" 
-                        :options="[
-                                { label: '姝e父', value: 1 },
-                                { label: '绂佺敤', value: 0 },
-                            ]"
-                        >
-                    </a-select>
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.create_time', '娣诲姞鏃堕棿') " 
-                      name="createTime" 
-                      style="width: 250px;" 
-                            >
-                    <a-date-picker 
-                        v-model:value="formData.createTime" 
-                        show-time 
-                        format="YYYY-MM-DD HH:mm:ss" 
-                        value-format="YYYY-MM-DD HH:mm:ss" 
-                     /> 
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.create_by', '娣诲姞浜哄憳') " 
-                      name="createBy" 
-                      style="width: 250px;" 
-                            >
-                    <a-select 
-                        v-model:value="formData.createBy" 
-                        :placeholder="formatMessage('common.select', '璇烽�夋嫨')" 
-                        style="width: 100%" 
-                        show-search 
-                        :options="userQueryList" 
-                        optionFilterProp="label" 
-                        optionLabelProp="label" 
-                     > 
-                    </a-select>
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.update_time', '淇敼鏃堕棿') " 
-                      name="updateTime" 
-                      style="width: 250px;" 
-                            >
-                    <a-date-picker 
-                        v-model:value="formData.updateTime" 
-                        show-time 
-                        format="YYYY-MM-DD HH:mm:ss" 
-                        value-format="YYYY-MM-DD HH:mm:ss" 
-                     /> 
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.update_by', '淇敼浜哄憳') " 
-                      name="updateBy" 
-                      style="width: 250px;" 
-                            >
-                    <a-select 
-                        v-model:value="formData.updateBy" 
-                        :placeholder="formatMessage('common.select', '璇烽�夋嫨')" 
-                        style="width: 100%" 
-                        show-search 
-                        :options="userQueryList" 
-                        optionFilterProp="label" 
-                        optionLabelProp="label" 
-                     > 
-                    </a-select>
-                        </a-form-item>
-                    <a-form-item 
-                      :label="formatMessage('db.man_order.memo', '澶囨敞') " 
-                      name="memo" 
-                      style="width: 250px;" 
-                            >
-                    <a-input 
-                        v-model:value="formData.memo" 
-                     /> 
-                        </a-form-item>
-
-                <a-form-item>
-                    <a-button type="primary" html-type="submit" ref="submitButton"
-                        style="visibility: hidden;">Submit</a-button>
-                </a-form-item>
-            </a-form>
-        </a-modal>
-    </div>
-</template>
-
-<style></style>
diff --git a/zy-asrs-admin/src/views/order/order/index.vue b/zy-asrs-admin/src/views/order/order/index.vue
index 9a4bd4f..3ec9f48 100644
--- a/zy-asrs-admin/src/views/order/order/index.vue
+++ b/zy-asrs-admin/src/views/order/order/index.vue
@@ -1,235 +1,16 @@
 <script setup>
-import { getCurrentInstance, ref, computed, reactive } from 'vue';
-import { useRouter } from "vue-router";
-import { get, post, postBlob } from '@/utils/request.js'
-import { message, Modal } from 'ant-design-vue';
-import { logout } from '@/config.js';
-import EditView from './edit.vue'
-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-order';
-let currentPage = 1;
-let pageSize = 10;
-const searchInput = ref("")
-const editChild = ref(null)
-
-let tableData = ref([]);
-getPage();
-
-const {
-  getColumnSearchProps,
-  handleResizeColumn,
-} = useTableSearch();
-
-const columns = [
-        {
-            title: formatMessage('db.man_order.order_no', '璁㈠崟缂栧彿'),
-            dataIndex: 'orderNo',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('orderNo'),
-        },
-        {
-            title: formatMessage('db.man_order.order_time', '鍗曟嵁鏃ユ湡'),
-            dataIndex: 'orderTime',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('orderTime'),
-        },
-        {
-            title: formatMessage('db.man_order.order_type', '鍗曟嵁绫诲瀷'),
-            dataIndex: 'orderType$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('orderType$'),
-        },
-        {
-            title: formatMessage('db.man_order.order_settle', '鍗曟嵁鐘舵��'),
-            dataIndex: 'orderSettle$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('orderSettle$'),
-        },
-        {
-            title: formatMessage('db.man_order.status', '鐘舵��'),
-            dataIndex: 'status$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('status$'),
-        },
-        {
-            title: formatMessage('db.man_order.create_time', '娣诲姞鏃堕棿'),
-            dataIndex: 'createTime$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('createTime$'),
-        },
-        {
-            title: formatMessage('db.man_order.create_by', '娣诲姞浜哄憳'),
-            dataIndex: 'createBy$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('createBy$'),
-        },
-        {
-            title: formatMessage('db.man_order.update_time', '淇敼鏃堕棿'),
-            dataIndex: 'updateTime$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('updateTime$'),
-        },
-        {
-            title: formatMessage('db.man_order.update_by', '淇敼浜哄憳'),
-            dataIndex: 'updateBy$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('updateBy$'),
-        },
-        {
-            title: formatMessage('db.man_order.memo', '澶囨敞'),
-            dataIndex: 'memo',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('memo'),
-        },
-
-  {
-    title: formatMessage('common.operation', '鎿嶄綔'),
-    name: 'oper',
-    dataIndex: 'oper',
-    key: 'oper',
-    width: 140,
-  },
-];
-
-const state = reactive({
-  selectedRowKeys: [],
-  loading: false,
-});
-const hasSelected = computed(() => state.selectedRowKeys.length > 0);
-const start = () => {
-  state.loading = true;
-  // ajax request after empty completing
-  setTimeout(() => {
-    state.loading = false;
-    state.selectedRowKeys = [];
-  }, 1000);
-};
-const onSelectChange = selectedRowKeys => {
-  // console.log('selectedRowKeys changed: ', selectedRowKeys);
-  state.selectedRowKeys = selectedRowKeys;
-};
-
-function getPage() {
-  post('/api/order/page', {
-    current: currentPage,
-    pageSize: pageSize,
-    condition: searchInput.value
-  }).then((resp) => {
-    let result = resp.data;
-    if (result.code == 200) {
-      let data = result.data;
-      tableData.value = data;
-    } else if (result.code === 401) {
-      message.error(result.msg);
-      logout()
-    } else {
-      message.error(result.msg);
-    }
-  })
-}
-
-const handleEdit = (item) => {
-  editChild.value.open = true;
-  editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
-  editChild.value.isSave = item == null;
-}
-
-const handleDel = (rows) => {
-  Modal.confirm({
-    title: formatMessage('page.delete', '鍒犻櫎'),
-    content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
-    maskClosable: true,
-    onOk: async () => {
-      const hide = message.loading(formatMessage('common.loading', '璇锋眰涓�'));
-      try {
-        post('/api/order/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
-          let result = resp.data;
-          if (result.code === 200) {
-            message.success(result.msg);
-          } else {
-            message.error(result.msg);
-          }
-          getPage()
-          hide()
-        })
-      } catch (error) {
-        message.error(formatMessage('common.fail', '璇锋眰澶辫触'));
-      }
-    },
-  });
-}
-
-const handleExport = async (intl) => {
-  postBlob('/api/order/export', {}).then(result => {
-    const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
-    window.location.href = window.URL.createObjectURL(blob);
-    return true;
-  })
-};
-
-const onSearch = () => {
-  // console.log('search');
-  getPage()
-}
-
-const onPageChange = (page, size) => {
-  currentPage = page;
-  pageSize = size;
-  getPage();
-}
-
-function handleTableReload(value) {
-  getPage()
-}
-
+import OrderView from '@/components/order/index.vue';
 </script>
 
 <script>
 export default {
-  name: '璁㈠崟'
+  name: '璁㈠崟绠$悊'
 }
 </script>
 
 <template>
   <div>
-    <EditView ref="editChild" @tableReload="handleTableReload" />
-    <div class="table-header">
-      <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
-        style="width: 200px;" @search="onSearch" />
-      <div class="table-header-right">
-        <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
-        <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
-      </div>
-    </div>
-    <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
-      :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
-      :pagination="{ total: tableData.total, onChange: onPageChange }"
-      :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns" @resizeColumn="handleResizeColumn">
-      <template #bodyCell="{ column, text, record }">
-        <template v-if="column.dataIndex === 'oper'">
-          <div style="display: flex;justify-content: space-evenly;">
-            <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
-            <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
-              }}</a-button>
-          </div>
-        </template>
-      </template>
-    </a-table>
+    <OrderView  />
   </div>
 </template>
 
diff --git a/zy-asrs-admin/src/views/task/task/index.vue b/zy-asrs-admin/src/views/task/task/index.vue
index c894643..1ebbd22 100644
--- a/zy-asrs-admin/src/views/task/task/index.vue
+++ b/zy-asrs-admin/src/views/task/task/index.vue
@@ -304,7 +304,7 @@
       <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
         style="width: 200px;" @search="onSearch" />
       <div class="table-header-right">
-        <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+        <!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button> -->
         <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
       </div>
     </div>
diff --git a/zy-asrs-admin/src/views/task/taskDetl/index.vue b/zy-asrs-admin/src/views/task/taskDetl/index.vue
index 0061b5c..7884245 100644
--- a/zy-asrs-admin/src/views/task/taskDetl/index.vue
+++ b/zy-asrs-admin/src/views/task/taskDetl/index.vue
@@ -254,7 +254,7 @@
       <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
         style="width: 200px;" @search="onSearch" />
       <div class="table-header-right">
-        <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+        <!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button> -->
         <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
       </div>
     </div>
diff --git a/zy-asrs-admin/src/views/task/taskDetlLog/index.vue b/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
index 8072548..c560196 100644
--- a/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
+++ b/zy-asrs-admin/src/views/task/taskDetlLog/index.vue
@@ -26,118 +26,118 @@
 } = useTableSearch();
 
 const columns = [
-        {
-            title: formatMessage('db.man_task_detl_log.task_id', '浠诲姟ID'),
-            dataIndex: 'taskId$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('taskId$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.task_no', '浠诲姟缂栧彿'),
-            dataIndex: 'taskNo',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('taskNo'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.anfme', '鏁伴噺'),
-            dataIndex: 'anfme',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('anfme'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.stock', '搴撳瓨'),
-            dataIndex: 'stock',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('stock'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.batch', '鎵瑰彿'),
-            dataIndex: 'batch',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('batch'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.barcode', '鎵樼洏鐮�'),
-            dataIndex: 'barcode',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('barcode'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.order_id', '璁㈠崟ID'),
-            dataIndex: 'orderId$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('orderId$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.order_no', '璁㈠崟缂栧彿'),
-            dataIndex: 'orderNo',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('orderNo'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.detl_id', '鏄庣粏ID'),
-            dataIndex: 'detlId$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('detlId$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.mat_id', '鐗╂枡ID'),
-            dataIndex: 'matId$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('matId$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.status', '鐘舵��'),
-            dataIndex: 'status$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('status$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.create_time', '娣诲姞鏃堕棿'),
-            dataIndex: 'createTime$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('createTime$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.create_by', '娣诲姞浜哄憳'),
-            dataIndex: 'createBy$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('createBy$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.update_time', '淇敼鏃堕棿'),
-            dataIndex: 'updateTime$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('updateTime$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.update_by', '淇敼浜哄憳'),
-            dataIndex: 'updateBy$',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('updateBy$'),
-        },
-        {
-            title: formatMessage('db.man_task_detl_log.memo', '澶囨敞'),
-            dataIndex: 'memo',
-            width: 140,
-            ellipsis: true,
-            ...getColumnSearchProps('memo'),
-        },
+  {
+    title: formatMessage('db.man_task_detl_log.task_id', '浠诲姟ID'),
+    dataIndex: 'taskId$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('taskId$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.task_no', '浠诲姟缂栧彿'),
+    dataIndex: 'taskNo',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('taskNo'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.anfme', '鏁伴噺'),
+    dataIndex: 'anfme',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('anfme'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.stock', '搴撳瓨'),
+    dataIndex: 'stock',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('stock'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.batch', '鎵瑰彿'),
+    dataIndex: 'batch',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('batch'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.barcode', '鎵樼洏鐮�'),
+    dataIndex: 'barcode',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('barcode'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.order_id', '璁㈠崟ID'),
+    dataIndex: 'orderId$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('orderId$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.order_no', '璁㈠崟缂栧彿'),
+    dataIndex: 'orderNo',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('orderNo'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.detl_id', '鏄庣粏ID'),
+    dataIndex: 'detlId$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('detlId$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.mat_id', '鐗╂枡ID'),
+    dataIndex: 'matId$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('matId$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.status', '鐘舵��'),
+    dataIndex: 'status$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('status$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.create_time', '娣诲姞鏃堕棿'),
+    dataIndex: 'createTime$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('createTime$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.create_by', '娣诲姞浜哄憳'),
+    dataIndex: 'createBy$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('createBy$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.update_time', '淇敼鏃堕棿'),
+    dataIndex: 'updateTime$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('updateTime$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.update_by', '淇敼浜哄憳'),
+    dataIndex: 'updateBy$',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('updateBy$'),
+  },
+  {
+    title: formatMessage('db.man_task_detl_log.memo', '澶囨敞'),
+    dataIndex: 'memo',
+    width: 140,
+    ellipsis: true,
+    ...getColumnSearchProps('memo'),
+  },
 
   {
     title: formatMessage('common.operation', '鎿嶄綔'),
@@ -254,7 +254,7 @@
       <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
         style="width: 200px;" @search="onSearch" />
       <div class="table-header-right">
-        <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+        <!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button> -->
         <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
       </div>
     </div>
diff --git a/zy-asrs-admin/src/views/task/taskLog/index.vue b/zy-asrs-admin/src/views/task/taskLog/index.vue
index e4c406e..5acd241 100644
--- a/zy-asrs-admin/src/views/task/taskLog/index.vue
+++ b/zy-asrs-admin/src/views/task/taskLog/index.vue
@@ -254,7 +254,7 @@
       <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
         style="width: 200px;" @search="onSearch" />
       <div class="table-header-right">
-        <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+        <!-- <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button> -->
         <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
       </div>
     </div>

--
Gitblit v1.9.1