From 1e9b7415acf64c37a39d1822f40e417a2e176e93 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925259474@qq.com>
Date: Mon, 9 Feb 2026 22:25:17 +0800
Subject: [PATCH] no message

---
 src/views/shipping/Pick.data.ts            | 13 +++++++++++++
 src/views/shipping/components/PickForm.vue | 22 ++++++++++++++++++----
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/views/shipping/Pick.data.ts b/src/views/shipping/Pick.data.ts
index 1d58524..d94730c 100644
--- a/src/views/shipping/Pick.data.ts
+++ b/src/views/shipping/Pick.data.ts
@@ -86,6 +86,19 @@ export const columns: BasicColumn[] = [
     align: 'center',
     dataIndex: 'customerCode',
   },
+  {
+    title: '优先级',
+    align: 'center',
+    dataIndex: 'priority',
+    customRender: ({ text }) => {
+      const priorityMap = {
+        0: '普通',
+        1: '加急',
+        2: '紧急',
+      };
+      return priorityMap[text];
+    },
+  },
   {
     title: '订单日期',
     align: 'center',
diff --git a/src/views/shipping/components/PickForm.vue b/src/views/shipping/components/PickForm.vue
index 646cda8..ede153d 100644
--- a/src/views/shipping/components/PickForm.vue
+++ b/src/views/shipping/components/PickForm.vue
@@ -56,7 +56,11 @@
                 <a-input v-model:value="formData.conNo" placeholder="请输入柜号" allow-clear></a-input>
               </a-form-item>
             </a-col>
-
+            <a-col class="form-row" :span="8">
+              <a-form-item label="优先级" v-bind="validateInfos.priority" id="PickForm-priority" name="priority">
+                <JSearchSelect v-model:value="formData.priority" placeholder="请选择"  :dict-options="priorityOptions" />
+              </a-form-item>
+            </a-col>
           </a-row>
           <a-row class="form-row" :gutter="24">
             <a-col :span="24">
@@ -115,11 +119,11 @@
 <script lang="ts">
   import { defineComponent, ref, reactive, computed, toRaw } from 'vue';
   import { useValidateAntFormAndTable } from '/@/hooks/system/useJvxeMethods';
-  import { queryPickDetailListByMainId, queryDataById, saveOrUpdate,queryTaskByMainId } from '../Pick.api';
+  import { queryPickDetailListByMainId, queryDataById, saveOrUpdate, queryTaskByMainId } from '../Pick.api';
   import { JVxeTable } from '/@/components/jeecg/JVxeTable';
   import { pickDetailColumns, taskColumns } from '../Pick.data';
   import JFormContainer from '/@/components/Form/src/container/JFormContainer.vue';
-  import { JDictSelectTag } from '@/components/Form';
+  import { JDictSelectTag, JSearchSelect } from '@/components/Form';
   import { Form } from 'ant-design-vue';
   import { getDateByPicker } from '/@/utils';
   import { getTenantId } from '@/utils/auth';
@@ -127,9 +131,12 @@
 
   const useForm = Form.useForm;
 
+
+
   export default defineComponent({
     name: 'PickForm',
     components: {
+      JSearchSelect,
       JVxeTable,
       JDictSelectTag,
       JFormContainer,
@@ -147,6 +154,12 @@
     },
     emits: ['success'],
     setup(props, { emit }) {
+      //优先级
+      const priorityOptions = [
+        { value: '0', text: '普通' },
+        { value: '1', text: '加急' },
+        { value: '2', text: '紧急' },
+      ];
       const loading = ref(false);
       const formRef = ref();
       //出库明细
@@ -165,7 +178,6 @@
         dataSource: [],
       });
 
-
       const activeKey = ref('pickDetail');
       //仓库 ID
       let tenantId = getTenantId();
@@ -179,6 +191,7 @@
         conNo: '',
         orderType: '',
         status: 1,
+        priority: '0',
         orderDate: dayjs(),
         tenantId: tenantId,
         description: '',
@@ -342,6 +355,7 @@
         add,
         edit,
         formRef,
+        priorityOptions
       };
     },
   });