no message

src/views/agvTask/TesAgvList.vue

@@ -2,8 +2,47 @@
   <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
-      <a-form ref="formRef" @keyup.enter.native="searchQuery" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
+      <a-form ref="formRef" @keyup.enter.native="reload" :model="queryParam" :label-col="labelCol" :wrapper-col="wrapperCol">
-        <a-row :gutter="24"></a-row>
+        <a-row :gutter="24">
+          <a-col :lg="6">
+            <a-form-item name="id">
+              <template #label><span title="任务ID">任务ID</span></template>
+              <a-input v-model:value="queryParam.id" :placeholder="'请输入任务ID'" allow-clear />
+            </a-form-item>
+          </a-col>
+          <a-col :lg="6">
+            <a-form-item name="carrierCode">
+              <template #label><span title="容器">容器</span></template>
+              <StockSelect v-model:value="queryParam.carrierCode" :return-value="'carrierCode'" />
+            </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>
+          </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">
+                <a-button type="primary" preIcon="ant-design:search-outlined" @click="searchQuery">查询</a-button>
+                <a-button type="primary" preIcon="ant-design:reload-outlined" @click="searchReset" style="margin-left: 8px">重置</a-button>
+                <a @click="toggleSearchStatus = !toggleSearchStatus" style="margin-left: 8px">
+                  {{ toggleSearchStatus ? '收起' : '展开' }}
+                  <Icon :icon="toggleSearchStatus ? 'ant-design:up-outlined' : 'ant-design:down-outlined'" />
+                </a>
+              </a-col>
+            </span>
+          </a-col>
+        </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>
+          </a-col>
+        </a-row>
       </a-form>
     </div>
     <!--引用表格-->
@@ -59,6 +98,10 @@
   import ResendAgvModal from './components/ResendAgvModal.vue';
   import { useMessage } from '/@/hooks/web/useMessage';
   import { getDateByPicker } from '/@/utils';
+  import JRangeDate from '@/components/Form/src/jeecg/components/JRangeDate.vue';
+  import JSelectMultiple from '../../components/Form/src/jeecg/components/JSelectMultiple.vue';
+  import StockSelect from '@/views/base/stock/components/StockSelect.vue';
+  import { JInput } from '@/components/Form';
 
   const fieldPickers = reactive({});
 
@@ -82,12 +125,26 @@
         fixed: 'right',
       },
       beforeFetch: async (params) => {
-        for (let key in fieldPickers) {
+        // 创建新的查询参数对象，避免修改原始对象
-          if (queryParam[key] && fieldPickers[key]) {
+        const newQueryParam = { ...queryParam };
-            queryParam[key] = getDateByPicker(queryParam[key], fieldPickers[key]);
+
+        // 处理日期范围
+        if (newQueryParam.createTime) {
+          try {
+            const [begin, end] = newQueryParam.createTime.split(',');
+            if (begin !== undefined) newQueryParam.createTime_begin = begin;
+            if (end !== undefined) newQueryParam.createTime_end = end;
+            delete newQueryParam.createTime;
+          } catch (error) {
+            console.error('日期范围处理错误:', error);
           }
         }
-        return Object.assign(params, queryParam);
+        for (let key in fieldPickers) {
+          if (newQueryParam[key] && fieldPickers[key]) {
+            newQueryParam[key] = getDateByPicker(newQueryParam[key], fieldPickers[key]);
+          }
+        }
+        return Object.assign(params, newQueryParam);
       },
     },
     exportConfig: {

src/views/base/point/components/PointForm.vue

@@ -21,7 +21,7 @@
               </a-form-item>
             </a-col>
 
-            <a-col :span="12">
+            <a-col :span="12" v-if="formData.areaId!='1986328561044119554' && formData.areaId!='1986337742572707841'">
               <a-form-item label="状态" v-bind="validateInfos.status" id="PointForm-status" name="status">
                 <JDictSelectTag
                   v-model:value="formData.status"
@@ -66,16 +66,28 @@
             </a-col>
 
             <a-col :span="12" v-if="showCoordinateFields">
-              <a-form-item label="坐标X" v-bind="validateInfos.positionX" id="PointForm-positionX" name="positionX">
+              <a-form-item label="坐标X(1F)" v-bind="validateInfos.positionX" id="PointForm-positionX" name="positionX">
                 <a-input-number v-model:value="formData.positionX" placeholder="请输入坐标X" allow-clear style="width: 220px"></a-input-number>
               </a-form-item>
             </a-col>
 
             <a-col :span="12" v-if="showCoordinateFields">
-              <a-form-item label="坐标Y" v-bind="validateInfos.positionY" id="PointForm-positionY" name="positionY">
+              <a-form-item label="坐标Y(1F)" v-bind="validateInfos.positionY" id="PointForm-positionY" name="positionY">
                 <a-input-number v-model:value="formData.positionY" placeholder="请输入坐标Y" allow-clear style="width: 220px"></a-input-number>
               </a-form-item>
             </a-col>
+
+            <a-col :span="12"  v-if="showCoordinateFields && formData.areaId!='1988794761598668802' && formData.areaId!='1988795017837088770'">
+              <a-form-item label="坐标X(2F)" v-bind="validateInfos.positionTwoX" id="PointForm-positionTwoX" name="positionTwoX">
+                <a-input-number v-model:value="formData.positionTwoX" placeholder="请输入坐标X" allow-clear style="width: 220px"></a-input-number>
+              </a-form-item>
+            </a-col>
+
+            <a-col :span="12" v-if="showCoordinateFields && formData.areaId!='1988794761598668802' && formData.areaId!='1988795017837088770'">
+              <a-form-item label="坐标Y(2F)" v-bind="validateInfos.positionTwoY" id="PointForm-positionTwoY" name="positionTwoY">
+                <a-input-number v-model:value="formData.positionTwoY" placeholder="请输入坐标Y" allow-clear style="width: 220px"></a-input-number>
+              </a-form-item>
+            </a-col>
             <a-col :span="24">
               <a-form-item
                 label="描述"
@@ -155,6 +167,8 @@
     rowNum: null,
     positionX: 0,
     positionY: 0,
+    positionTwoX: 0,
+    positionTwoY: 0,
     izDoubleLane: 1,
     description: '',
     delFlag: 0,

src/views/base/point/components/PointSelect.vue

@@ -73,8 +73,7 @@
       immediateChange: propTypes.bool.def(false),
       // 返回值类型: 'id'(默认) | 'object' | 其他字段名
       returnValue: propTypes.string.def('id'),
-      //默认空闲
+      status: null,
-      status: propTypes.number.def(0),
       //默认启用
       izActive: propTypes.number.def(1),
       //默认未删除

src/views/base/stock/components/StockSelect.vue

@@ -74,8 +74,7 @@
       immediateChange: propTypes.bool.def(false),
       // 返回值类型: 'id'(默认) | 'object' | 其他字段名
       returnValue: propTypes.string.def('id'),
-      //默认空闲
+      status: null,
-      status: propTypes.number.def(0),
       //默认启用
       izActive: propTypes.number.def(1),
       //默认未删除

src/views/receive/asn/AsnList.vue

@@ -36,12 +36,12 @@
           </a-col>
         </a-row>
         <a-row :gutter="24">
-          <!--          <a-col :lg="6">
+          <a-col :lg="6">
-                      <a-form-item name="status">
+            <a-form-item  v-if="toggleSearchStatus" name="status_MultiString">
-                        <template #label><span title="状态">状态</span></template>
+              <template #label><span title="状态">状态</span></template>
-                        <JDictSelectTag v-model:value="queryParam.status" placeholder="请选择" dictCode="asn_status" allowClear />
+              <JSelectMultiple v-model:value="queryParam.status_MultiString" dictCode="asn_status" />
-                      </a-form-item>
+            </a-form-item>
-                    </a-col>-->
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -125,6 +125,7 @@
   import JRangeDate from '@/components/Form/src/jeecg/components/JRangeDate.vue';
   import ScanTrayModal from '@/views/receive/asn/components/scanTray/ScanTrayModal.vue';
   import { useMessage } from '@/hooks/web/useMessage';
+  import JSelectMultiple from '../../../components/Form/src/jeecg/components/JSelectMultiple.vue';
 
   const fieldPickers = reactive({});
   const formRef = ref();