From a8800e46f1f00a11064ff18417ba744f526f6f5a Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <Jin980303>
Date: Wed, 7 Jan 2026 22:47:50 +0800
Subject: [PATCH] no message

---
 src/views/agvTask/AgvTask.api.ts  |  2 +-
 src/views/agvTask/TesAgvList.vue  | 33 +++++++++++++++++--------------
 src/views/monitor/log/log.data.ts |  8 ++++++++
 src/views/receive/asn/AsnList.vue | 12 +++++------
 src/views/shipping/Pick.data.ts   | 16 +++++++++++++++
 src/views/shipping/PickList.vue   | 12 +++++------
 6 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/src/views/agvTask/AgvTask.api.ts b/src/views/agvTask/AgvTask.api.ts
index 6e2684c..11b16ae 100644
--- a/src/views/agvTask/AgvTask.api.ts
+++ b/src/views/agvTask/AgvTask.api.ts
@@ -12,7 +12,7 @@ enum Api {
   importExcel = '/agvTask/importExcel',
   exportXls = '/agvTask/exportXls',
   taskReporter = '/api/robot/reporter/task',
-  callBackTask = '/tes/apiv2/callBackTask',
+  callBackTask = '/tes/callBackTask',
   cancelTes = '/tes/cancelTes',
   cancelAgv = '/api/robot/cancelAgv',
   resendTes = '/tes/apiv2/resendTes',
diff --git a/src/views/agvTask/TesAgvList.vue b/src/views/agvTask/TesAgvList.vue
index 9101f20..bc0ffc4 100644
--- a/src/views/agvTask/TesAgvList.vue
+++ b/src/views/agvTask/TesAgvList.vue
@@ -13,15 +13,17 @@
           <a-col :lg="6">
             <a-form-item name="carrierCode">
               <template #label><span title="容器">容器</span></template>
-              <StockSelect v-model:value="queryParam.carrierCode" :return-value="'carrierCode'" />
+              <StockSelect v-model:value="queryParam.carrierCode" :return-value="'stockCode'" />
             </a-form-item>
           </a-col>
+
           <a-col :lg="6">
-            <a-form-item name="createTime">
-              <template #label><span title="创建日期">创建日期</span></template>
-              <JRangeDate v-model:value="queryParam.createTime" />
+            <a-form-item name="status_MultiString">
+              <template #label><span title="状态">状态</span></template>
+              <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="agv_task_status" />
             </a-form-item>
           </a-col>
+
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left; overflow: hidden" class="table-page-search-submitButtons">
               <a-col :lg="6">
@@ -37,9 +39,9 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :lg="6">
-            <a-form-item  v-if="toggleSearchStatus" name="status_MultiString">
-              <template #label><span title="状态">状态</span></template>
-              <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="asn_status" />
+            <a-form-item v-if="toggleSearchStatus" name="createTime">
+              <template #label><span title="创建日期">创建日期</span></template>
+              <JRangeDate v-model:value="queryParam.createTime" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -158,6 +160,7 @@
     },
   });
   const [registerTable, { reload }, { rowSelection, selectedRowKeys }] = tableContext;
+  const toggleSearchStatus = ref<boolean>(false);
   const labelCol = reactive({
     xs: 24,
     sm: 4,
@@ -188,10 +191,10 @@
   /**
    * 详情
    */
-/*  function handleDetail(record: Recordable) {
-    registerModal.value.disableSubmit = true;
-    registerModal.value.edit(record);
-  }*/
+  /*  function handleDetail(record: Recordable) {
+      registerModal.value.disableSubmit = true;
+      registerModal.value.edit(record);
+    }*/
 
   /**
    * 删除事件
@@ -286,10 +289,10 @@
    */
   function getDropDownAction(record) {
     return [
-     /* {
-        label: '任务详情',
-        onClick: handleDetail.bind(null, record),
-      },*/
+      /* {
+         label: '任务详情',
+         onClick: handleDetail.bind(null, record),
+       },*/
       {
         label: '任务完成',
         popConfirm: {
diff --git a/src/views/monitor/log/log.data.ts b/src/views/monitor/log/log.data.ts
index e4ad8ec..ec4e38d 100644
--- a/src/views/monitor/log/log.data.ts
+++ b/src/views/monitor/log/log.data.ts
@@ -33,6 +33,12 @@ export const columns: BasicColumn[] = [
     width: 100,
     align: 'left',
   },
+  {
+    title: '耗时',
+    dataIndex: 'costTime',
+    sorter: true,
+    width: 60,
+  },
 
   {
     title: '创建时间',
@@ -47,6 +53,7 @@ export const columns: BasicColumn[] = [
  */
 export const operationLogColumn: BasicColumn[] = [
   ...columns,
+
   /*  {
       title: '操作类型',
       dataIndex: 'operateType_dictText',
@@ -86,6 +93,7 @@ export const exceptionColumns: BasicColumn[] = [
     align: 'left',
   },
 
+
   {
     title: '创建时间',
     dataIndex: 'createTime',
diff --git a/src/views/receive/asn/AsnList.vue b/src/views/receive/asn/AsnList.vue
index 9ce2eac..5738853 100644
--- a/src/views/receive/asn/AsnList.vue
+++ b/src/views/receive/asn/AsnList.vue
@@ -17,9 +17,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="orderDate">
-              <template #label><span title="订单日期">订单日期</span></template>
-              <JRangeDate v-model:value="queryParam.orderDate" />
+            <a-form-item name="status_MultiString">
+              <template #label><span title="状态">状态</span></template>
+              <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="asn_status" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -37,9 +37,9 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :lg="6">
-            <a-form-item  v-if="toggleSearchStatus" name="status_MultiString">
-              <template #label><span title="状态">状态</span></template>
-              <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="asn_status" />
+            <a-form-item v-if="toggleSearchStatus" name="orderDate">
+              <template #label><span title="订单日期">订单日期</span></template>
+              <JRangeDate v-model:value="queryParam.orderDate" />
             </a-form-item>
           </a-col>
         </a-row>
diff --git a/src/views/shipping/Pick.data.ts b/src/views/shipping/Pick.data.ts
index b00ab51..50f19f8 100644
--- a/src/views/shipping/Pick.data.ts
+++ b/src/views/shipping/Pick.data.ts
@@ -116,6 +116,14 @@ export const pickDetailColumns: JVxeColumn[] = [
     placeholder: '请选择${title}',
     defaultValue: '托',
   },
+  {
+    title: '容器',
+    key: 'stockId',
+    type: JVxeTypes.selectDictSearch,
+    width: 150,
+    async: true, // 异步搜索，默认为 true
+    dict: 'base_stock,stock_code,id',
+  },
   {
     title: '需求数量',
     key: 'orderQty',
@@ -226,6 +234,14 @@ export const taskColumns: JVxeColumn[] = [
     async: true, // 异步搜索，默认为 true
     dict: 'base_item,item_code,id',
   },
+  {
+    title: '容器',
+    key: 'stockId',
+    type: JVxeTypes.selectDictSearch,
+    disabled: true,
+    async: true, // 异步搜索，默认为 true
+    dict: 'base_stock,stock_code,id',
+  },
   {
     title: '原库位',
     key: 'fromPointId',
diff --git a/src/views/shipping/PickList.vue b/src/views/shipping/PickList.vue
index 8dd508c..ab24db9 100644
--- a/src/views/shipping/PickList.vue
+++ b/src/views/shipping/PickList.vue
@@ -17,9 +17,9 @@
             </a-form-item>
           </a-col>
           <a-col :lg="6">
-            <a-form-item name="orderDate">
-              <template #label><span title="订单日期">订单日期</span></template>
-              <JRangeDate v-model:value="queryParam.orderDate" />
+            <a-form-item name="status_MultiString">
+              <template #label><span title="状态">状态</span></template>
+              <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="pick_status" />
             </a-form-item>
           </a-col>
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -37,9 +37,9 @@
         </a-row>
         <a-row :gutter="24">
           <a-col :lg="6">
-            <a-form-item  v-if="toggleSearchStatus" name="status_MultiString">
-              <template #label><span title="状态">状态</span></template>
-              <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="pick_status" />
+            <a-form-item v-if="toggleSearchStatus" name="orderDate">
+              <template #label><span title="订单日期">订单日期</span></template>
+              <JRangeDate v-model:value="queryParam.orderDate" />
             </a-form-item>
           </a-col>
         </a-row>