diff --git a/src/api/wms/unplannedreceiptRequestMain/index.ts b/src/api/wms/unplannedreceiptRequestMain/index.ts
index 5c2982d11..30b024382 100644
--- a/src/api/wms/unplannedreceiptRequestMain/index.ts
+++ b/src/api/wms/unplannedreceiptRequestMain/index.ts
@@ -62,9 +62,37 @@ export const exportUnplannedreceiptRequestMain = async (params) => {
   }
 }
 
-
-
 // 下载用户导入模板
 export const importTemplate = () => {
   return request.download({ url: '/wms/unplannedreceipt-request-main/get-import-template' })
-}
\ No newline at end of file
+}
+
+// 关闭-计划外入库申请
+export const closeUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/close?id=` + id })
+}
+
+// 重新添加-计划外入库申请
+export const reAddUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/reAdd?id=` + id })
+}
+
+// 提交审批-计划外入库申请
+export const submitUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/submit?id=` + id })
+}
+
+// 审批驳回-计划外入库申请
+export const refusedUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/refused?id=` + id })
+}
+
+// 审批通过-计划外入库申请
+export const agreeUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/agree?id=` + id })
+}
+
+// 处理-计划外入库申请
+export const handleUnplannedreceiptRequestMain = async (id) => {
+  return await request.put({ url: `/wms/unplannedreceipt-request-main/handle?id=` + id })
+}
diff --git a/src/components/ImportForm/src/ImportForm.vue b/src/components/ImportForm/src/ImportForm.vue
index b71ee0cb2..15369c6ea 100644
--- a/src/components/ImportForm/src/ImportForm.vue
+++ b/src/components/ImportForm/src/ImportForm.vue
@@ -1,6 +1,6 @@
 <!-- 导入组件 -->
 <template>
-  <Dialog v-model="dialogVisible" title="导入" width="600">
+  <Dialog v-model="dialogVisible" title="导入" width="600" :close-on-click-modal="false">
     <el-upload
       ref="uploadRef"
       v-model:file-list="fileList"
@@ -27,6 +27,7 @@
       :accept="accept"
       drag
       style="width: 300px; margin: 0 auto"
+      v-loading="formLoading"
     >
       <Icon icon="ep:upload-filled" color="#c0c4cc" size="60" />
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
diff --git a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
index 6c51d21ef..bd2b34118 100644
--- a/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
+++ b/src/views/wms/basicDataManage/strategySetting/strategy/upShelfStrategy/AddForm.vue
@@ -1,135 +1,287 @@
 <!-- 上架策略弹窗 -->
 <template>
-      <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px;">
-        <div class="p-20px m--10px" style="max-height: 50vh;overflow-y: auto;">
-      <el-form ref="formRef" :model="formData" :rules="rules" label-width="120px" label-position="left">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" style="width: 700px">
+    <div class="p-20px m--10px" style="max-height: 50vh; overflow-y: auto">
+      <el-form
+        ref="formRef"
+        :model="formData"
+        :rules="rules"
+        label-width="120px"
+        label-position="left"
+      >
         <!-- 规则 -->
-          <div class="item">
-            <div class="title">规则</div>
-            <el-row>
-              <el-col :span="24">
-                <el-form-item label="代码" prop="strategyCode">
-                  <el-input v-model="formData.strategyCode" placeholder="请输入代码" clearable disabled />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="名称" prop="name">
-                  <el-input v-model="formData.name" placeholder="请输入名称" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="描述" prop="description">
-                  <el-input v-model="formData.description" placeholder="请输入描述" clearable />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="优先级" prop="priority">
-                  <el-input-number v-model="formData.priority" :min="0" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="状态" prop="status">
-                  <el-switch v-model="formData.status" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
+        <div class="item">
+          <div class="title">规则</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="代码" prop="strategyCode">
+                <el-input
+                  v-model="formData.strategyCode"
+                  placeholder="请输入代码"
+                  clearable
+                  disabled
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="名称" prop="name">
+                <el-input v-model="formData.name" placeholder="请输入名称" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="描述" prop="description">
+                <el-input v-model="formData.description" placeholder="请输入描述" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="优先级" prop="priority">
+                <el-input-number v-model="formData.priority" :min="0" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="状态" prop="status">
+                <el-switch v-model="formData.status" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </div>
 
         <!-- 规则条件 -->
 
         <div class="item mt-20px">
-
           <div class="title">规则条件</div>
           <el-row>
             <el-col :span="24" v-for="(item, index) in formData.condition" :key="index">
               <!-- 选择供应商和客户 -->
               <el-form-item label="" label-width="0" class="err-240" v-if="index == 0">
-                <el-select v-model="item.ParamCode" placeholder="" style="width: 110px;margin-right: 10px;"
-                  @change="changeSupplierCustomer">
-                  <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.typeOptions"
-                    :key="index" />
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeSupplierCustomer"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.typeOptions"
+                    :key="index"
+                  />
                 </el-select>
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
-                  style="flex: 1;" clearable>
-                  <el-option v-for="cur in options.supplierList" :key="cur.id" :label="cur.name" :value="cur.id" />
+                <el-select
+                  v-model="item.Value"
+                  :placeholder="`请选择${item.ParamCode == 'SupplierCode' ? '供应商' : '客户'}`"
+                  style="flex: 1"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in options.supplierList"
+                    :key="cur.id"
+                    :label="cur.name"
+                    :value="cur.id"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 选择物品类型 -->
               <el-form-item label="" label-width="0" class="err-240" v-if="index == 1">
-                <el-select v-model="item.ParamCode" placeholder="" @change="changeItemsType"
-                  style="width: 110px;margin-right: 10px;">
-                  <el-option :label="item.label" :value="item.value" v-for="item in options.itemTypeOptions"
-                    :key="item.value" />
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeItemsType"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="item.label"
+                    :value="item.value"
+                    v-for="item in options.itemTypeOptions"
+                    :key="item.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择物品类型" style="flex: 1;" clearable
-                  v-if="item.ParamCode == 'ItemType'">
-                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)" :key="cur.value" :label="cur.label"
-                    :value="cur.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择物品类型"
+                  style="flex: 1"
+                  clearable
+                  v-if="item.ParamCode == 'ItemType'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ITEM_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择ABC类" style="flex: 1;" clearable
-                  v-else-if="item.ParamCode == 'AbcClass'">
-                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)" :key="cur.value" :label="cur.label"
-                    :value="cur.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择ABC类"
+                  style="flex: 1"
+                  clearable
+                  v-else-if="item.ParamCode == 'AbcClass'"
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.ABC_CLASS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
                 </el-select>
-                <el-input v-model="item.Value" placeholder="请输入物品分组" clearable style="flex: 1;"
-                  v-else-if="item.ParamCode == 'ItemGroup'" />
-                <el-input v-model="item.Value" placeholder="请输入项目" clearable style="flex: 1;"
-                  v-else-if="item.ParamCode == 'Project'" />
-                <el-input v-model="item.Value" placeholder="请输入物品" clearable style="flex: 1;"
-                  v-else-if="item.ParamCode == 'ItemCode'" />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物品分组"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemGroup'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入项目"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'Project'"
+                />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入物品"
+                  clearable
+                  style="flex: 1"
+                  v-else-if="item.ParamCode == 'ItemCode'"
+                />
               </el-form-item>
               <!-- 选择重量体积还是面积 -->
               <el-form-item label="" label-width="0" class="err-240" v-if="index == 2">
-                <el-select v-model="item.ParamCode" placeholder="" @change="changeCalculation"
-                  style="width: 110px;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.calculationTypeOptions"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.ParamCode"
+                  placeholder=""
+                  @change="changeCalculation"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.calculationTypeOptions"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions2"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions2"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-input v-model="item.Value"
-                  :placeholder="`请输入${item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'}`"
-                  clearable style="flex: 1;" />
+                <el-input
+                  v-model="item.Value"
+                  :placeholder="`请输入${
+                    item.ParamCode == 'Weight' ? '重量' : item.ParamCode == 'Area' ? '面积' : '体积'
+                  }`"
+                  clearable
+                  style="flex: 1"
+                />
               </el-form-item>
               <!-- 库存状态 -->
               <el-form-item label="库存状态" class="err-120" v-if="index == 3">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择库存状态" style="flex: 1;" clearable>
-                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)" :key="cur.value"
-                    :label="cur.label" :value="cur.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择库存状态"
+                  style="flex: 1"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.INVENTORY_STATUS)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 存储类型 -->
               <el-form-item label="存储类型" class="err-120" v-if="index == 4">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-select v-model="item.Value" placeholder="请选择存储类型" style="flex: 1;" clearable>
-                  <el-option v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)" :key="cur.value" :label="cur.label"
-                    :value="cur.value" />
+                <el-select
+                  v-model="item.Value"
+                  placeholder="请选择存储类型"
+                  style="flex: 1"
+                  clearable
+                >
+                  <el-option
+                    v-for="cur in getStrDictOptions(DICT_TYPE.STORAGE_TYPE)"
+                    :key="cur.value"
+                    :label="cur.label"
+                    :value="cur.value"
+                  />
                 </el-select>
               </el-form-item>
               <!-- 库存事务 -->
               <el-form-item label="库存事务" class="err-120" v-if="index == 5">
-                <el-select v-model="item.Operator" placeholder="请选择范围" style="width: 110px;margin-right: 10px;">
-                  <el-option :label="cur.label" :value="cur.value" v-for="cur in options.rangeOptions1"
-                    :key="cur.value" />
+                <el-select
+                  v-model="item.Operator"
+                  placeholder="请选择范围"
+                  style="width: 110px; margin-right: 10px"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="cur in options.rangeOptions1"
+                    :key="cur.value"
+                  />
                 </el-select>
-                <el-input v-model="item.Value" placeholder="请输入库存事务" clearable style="flex: 1;" />
+                <el-input
+                  v-model="item.Value"
+                  placeholder="请输入库存事务"
+                  clearable
+                  style="flex: 1"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -142,54 +294,186 @@
             <!-- 仓库 库区  库位组 库位 -->
             <el-col :span="24">
               <el-form-item label="" label-width="0" prop="warehouse" class="err-120">
-                <el-select v-model="warehouseType" placeholder="" style="width: 110px;margin-right: 10px;"
-                  @change="changeWarehouse">
-                  <el-option :label="cur.label" :value="cur.value" v-for="(cur, index) in options.warehouseTypeOptions"
-                    :key="index" />
+                <el-select
+                  v-model="warehouseType"
+                  placeholder=""
+                  style="width: 110px; margin-right: 10px"
+                  @change="changeWarehouse"
+                >
+                  <el-option
+                    :label="cur.label"
+                    :value="cur.value"
+                    v-for="(cur, index) in options.warehouseTypeOptions"
+                    :key="index"
+                  />
                 </el-select>
-                <el-select v-model="formData.configuration.WarehouseCode" v-if="warehouseType == 'WarehouseCode'" placeholder="请选择仓库"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.WarehouseCode"
+                  v-if="warehouseType == 'WarehouseCode'"
+                  placeholder="请选择仓库"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
-                <el-select v-model="formData.configuration.AreaCode" v-if="warehouseType == 'AreaCode'" placeholder="请选择库区"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.AreaCode"
+                  v-if="warehouseType == 'AreaCode'"
+                  placeholder="请选择库区"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
-                <el-select v-model="formData.configuration.LocationGroupCode" v-if="warehouseType == 'LocationGroupCode'" placeholder="请选择库位组"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.LocationGroupCode"
+                  v-if="warehouseType == 'LocationGroupCode'"
+                  placeholder="请选择库位组"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
 
-                <el-select v-model="formData.configuration.LocationCode" v-if="warehouseType == 'LocationCode'" placeholder="请选择库位"  clearable style="flex: 1;">
-                  <el-option v-for="cur in options.warehouseList" :key="cur.code" :label="cur.name" :value="cur.code" />
+                <el-select
+                  v-model="formData.configuration.LocationCode"
+                  v-if="warehouseType == 'LocationCode'"
+                  placeholder="请选择库位"
+                  clearable
+                  style="flex: 1"
+                >
+                  <el-option
+                    v-for="cur in options.warehouseList"
+                    :key="cur.code"
+                    :label="cur.name"
+                    :value="cur.code"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
-              <!-- 优先空位库 -->
+            <!-- 优先空位库 -->
             <el-col :span="24">
               <el-form-item label="优先空位库">
-                <el-switch v-model="formData.configuration.EmptyLocationFirst" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.EmptyLocationFirst"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
               </el-form-item>
             </el-col>
-              <!-- 优先非空位库 -->
+            <!-- 优先非空位库 -->
             <el-col :span="24">
               <el-form-item label="优先非空位库">
-                <el-switch v-model="formData.configuration.NotEmptyLocationFirst" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.NotEmptyLocationFirst"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
               </el-form-item>
             </el-col>
-              <!-- 可以混物品 -->
+            <!-- 可以混物品 -->
             <el-col :span="24">
               <el-form-item label="可以混物品">
-                <el-switch v-model="formData.configuration.EnableMixItem" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.EnableMixItem"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
               </el-form-item>
             </el-col>
-              <!-- 可以混批次 -->
+            <!-- 可以混批次 -->
             <el-col :span="24">
               <el-form-item label="可以混批次">
-                <el-switch v-model="formData.configuration.EnableMixLot" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.EnableMixLot"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
               </el-form-item>
             </el-col>
-              <!-- 可以混状态 -->
+            <!-- 可以混状态 -->
             <el-col :span="24">
               <el-form-item label="可以混状态">
-                <el-switch v-model="formData.configuration.EnableMixStatus" active-value="TRUE" inactive-value="FALSE"/>
+                <el-switch
+                  v-model="formData.configuration.EnableMixStatus"
+                  active-value="TRUE"
+                  inactive-value="FALSE"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- 巷道排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="巷道排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.AisleOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 货架排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="货架排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ShelfOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 货架排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="货架排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.RowOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
+              </el-form-item>
+            </el-col>
+            <!-- 列排序方向 -->
+            <el-col :span="24">
+              <el-form-item label="列排序方向" class="flex-top">
+                <div class="checkbox">
+                  <el-radio-group v-model="formData.configuration.ColumOrder">
+                    <el-radio
+                      :label="cur.value"
+                      v-for="cur in getStrDictOptions(DICT_TYPE.BATCH_DIRECTION)"
+                      :key="cur.value"
+                      >{{ cur.label }}</el-radio
+                    >
+                  </el-radio-group>
+                </div>
               </el-form-item>
             </el-col>
           </el-row>
@@ -224,7 +508,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formRef = ref() // 表单 Ref
 
-
 const formStrategyCode = ref('')
 
 // 仓库类型
@@ -233,45 +516,53 @@ const warehouseType = ref('WarehouseCode')
 // form表单数据
 const formData = ref({
   id: '',
-  strategyCode: formStrategyCode.value,//策略代码id
-  name: '',//名称
-  description: '',//描述
-  priority: '',//优先级
-  status: true,//状态
+  strategyCode: formStrategyCode.value, //策略代码id
+  name: '', //名称
+  description: '', //描述
+  priority: '', //优先级
+  status: true, //状态
   //规则条件集合
   condition: [
     // 供应商
-    { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
+    { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
     // 物品类型/物品分组/物品/abc类/项目/
-    { ParamCode: 'ItemType', Operator: "IN", Value: "" },
+    { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
     // 重量/体积/面积
-    { ParamCode: 'Weight', Operator: ">", Value: [] },
+    { ParamCode: 'Weight', Operator: '>', Value: [] },
     // 库存状态
-    { ParamCode: 'InventoryStatus', Operator: "IN", Value: [] },
+    { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
     // 存储类型
-    { ParamCode: 'StorageType', Operator: "IN", Value: [] },
+    { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
     // 库存事务
-    { ParamCode: 'TransactionType', Operator: "IN", Value: [] }
+    { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
   ],
   configuration: {
     // 仓库代码
-    WarehouseCode:"",
+    WarehouseCode: '',
     // 库区代码
-    AreaCode:"",
+    AreaCode: '',
     // 库位组代码
-    LocationGroupCode:"",
+    LocationGroupCode: '',
     // 库位代码
-    LocationCode:"",
+    LocationCode: '',
     // 优先空库位
-    EmptyLocationFirst:'FALSE',
+    EmptyLocationFirst: 'FALSE',
     // 优先非空库位
-    NotEmptyLocationFirst:'FALSE',
+    NotEmptyLocationFirst: 'FALSE',
     // 可以混物品
-    EnableMixItem:'TRUE',
+    EnableMixItem: 'TRUE',
     // 可以混批次
-    EnableMixLot:'TRUE',
+    EnableMixLot: 'TRUE',
     // 可以混状态
-    EnableMixStatus:'TRUE',
+    EnableMixStatus: 'TRUE',
+    // 巷道排序方向
+    AisleOrder: 'ASC',
+    // 货架排序方向
+    ShelfOrder: 'ASC',
+    // 行排序方向
+    RowOrder: 'ASC',
+    // 列排序方向
+    ColumOrder: 'ASC'
   }
 })
 // 验证规则
@@ -279,8 +570,7 @@ const rules = ref({
   strategyCode: [{ required: true, message: '请输入代码', trigger: 'blur' }],
   name: [{ required: true, message: '请输入名字', trigger: 'blur' }],
   description: [{ required: true, message: '请输入描述', trigger: 'blur' }],
-  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }],
-
+  priority: [{ required: true, message: '请输入优先级', trigger: 'blur' }]
 })
 
 // 所有的范围类型
@@ -294,11 +584,11 @@ const rangeOptions = [
   { value: 'IN', label: '包含' },
   { value: 'NOT IN', label: '不包含' },
   { value: 'NULL', label: '为空' },
-  { value: 'NOT NULL', label: '不为空' },
+  { value: 'NOT NULL', label: '不为空' }
 ]
 const formatRangeOptions = (...rest) => {
   // 交集
-  let result = rangeOptions.filter(aItem => rest.some(bItem => aItem.value === bItem));
+  let result = rangeOptions.filter((aItem) => rest.some((bItem) => aItem.value === bItem))
   return result
 }
 
@@ -308,27 +598,45 @@ const options = reactive({
   rangeOptions1: formatRangeOptions('IN', 'NOT IN'),
   rangeOptions2: formatRangeOptions('>', '<', '>=', '<='),
   // 供应商客户下拉框列表
-  typeOptions: [{ value: 'SupplierCode', label: '供应商' }, { value: 'CustomerCode', label: '客户' }],
+  typeOptions: [
+    { value: 'SupplierCode', label: '供应商' },
+    { value: 'CustomerCode', label: '客户' }
+  ],
   //供应商列表
   supplierList: [],
   // 物品类型列表
-  itemTypeOptions: [{ value: 'ItemType', label: '物品类型' }, { value: 'ItemGroup', label: '物品分组' }, { value: 'ItemCode', label: '物品' }, { value: 'Project', label: '项目' }, { value: 'AbcClass', label: 'ABC类' }],
+  itemTypeOptions: [
+    { value: 'ItemType', label: '物品类型' },
+    { value: 'ItemGroup', label: '物品分组' },
+    { value: 'ItemCode', label: '物品' },
+    { value: 'Project', label: '项目' },
+    { value: 'AbcClass', label: 'ABC类' }
+  ],
 
   // 重量体积面积类型列表
-  calculationTypeOptions: [{ value: 'Weight', label: '重量' }, { value: 'Volume', label: '体积' }, { value: 'Area', label: '面积' }],
+  calculationTypeOptions: [
+    { value: 'Weight', label: '重量' },
+    { value: 'Volume', label: '体积' },
+    { value: 'Area', label: '面积' }
+  ],
 
-  warehouseTypeOptions: [{ value: 'WarehouseCode', label: '仓库' }, { value: 'AreaCode', label: '库区' }, { value: 'LocationGroupCode', label: '库位组' }, { value: 'LocationCode', label: '库位' }],
+  warehouseTypeOptions: [
+    { value: 'WarehouseCode', label: '仓库' },
+    { value: 'AreaCode', label: '库区' },
+    { value: 'LocationGroupCode', label: '库位组' },
+    { value: 'LocationCode', label: '库位' }
+  ],
   //仓库列表
-  warehouseList: [],
+  warehouseList: []
 })
 
 // 获取供应商列表
 const getFormSupplierList = async () => {
-  options.supplierList = await getSupplierList();
+  options.supplierList = await getSupplierList()
 }
 // 获取客户列表
 const getFormCustomerList = async () => {
-  options.supplierList = await getCustomerList();
+  options.supplierList = await getCustomerList()
 }
 // 选择客户还是承运商
 const changeSupplierCustomer = (e) => {
@@ -350,27 +658,27 @@ const changeCalculation = () => {
 }
 // 获取仓库列表
 const getFormWarehouseList = async () => {
-  options.warehouseList = await getWarehouseList();
+  options.warehouseList = await getWarehouseList()
 }
 // 获取库区列表
 const getFormAreaList = async () => {
-  options.warehouseList = await getAreaList();
+  options.warehouseList = await getAreaList()
 }
 // 获取库位组列表
 const getFormLocationgrouList = async () => {
-  options.warehouseList = await getLocationgroupList();
+  options.warehouseList = await getLocationgroupList()
 }
 // 获取库位列表
 const getFormLocationList = async () => {
-  options.warehouseList = await getLocationList();
+  options.warehouseList = await getLocationList()
 }
 getFormLocationList()
 // 选择仓库/库位/库位组/库区
 const changeWarehouse = (e) => {
-    formData.value.configuration.WarehouseCode = ''
-    formData.value.configuration.AreaCode = ''
-    formData.value.configuration.LocationGroupCode = ''
-    formData.value.configuration.LocationCode = ''
+  formData.value.configuration.WarehouseCode = ''
+  formData.value.configuration.AreaCode = ''
+  formData.value.configuration.LocationGroupCode = ''
+  formData.value.configuration.LocationCode = ''
   if (e == 'WarehouseCode') {
     getFormWarehouseList()
   } else if (e == 'AreaCode') {
@@ -407,26 +715,37 @@ const open = async (type: string, strategyCode: string, id?: number) => {
         formData.value.configuration = JSON.parse(data.configuration)
       }
       // 判断是获取客户列表还是供应上列表
-      if(formData.value.condition[0].ParamCode == 'SupplierCode'){
+      if (formData.value.condition[0].ParamCode == 'SupplierCode') {
         getFormSupplierList()
-      }else{
+      } else {
         getFormCustomerList()
       }
       // 判断是获取仓库/库位/库位组/库区列表
-      if ('WarehouseCode' in formData.value.configuration && formData.value.configuration.WarehouseCode) {
+      if (
+        'WarehouseCode' in formData.value.configuration &&
+        formData.value.configuration.WarehouseCode
+      ) {
         warehouseType.value = 'WarehouseCode'
         getFormWarehouseList()
-      } else if ('AreaCode' in formData.value.configuration && formData.value.configuration.AreaCode) {
+      } else if (
+        'AreaCode' in formData.value.configuration &&
+        formData.value.configuration.AreaCode
+      ) {
         warehouseType.value = 'AreaCode'
         getFormAreaList()
-      } else if ('LocationGroupCode' in formData.value.configuration && formData.value.configuration.LocationGroupCode) {
+      } else if (
+        'LocationGroupCode' in formData.value.configuration &&
+        formData.value.configuration.LocationGroupCode
+      ) {
         warehouseType.value = 'LocationGroupCode'
         getFormLocationgrouList()
-      } else if ('LocationCode' in formData.value.configuration && formData.value.configuration.LocationCode) {
+      } else if (
+        'LocationCode' in formData.value.configuration &&
+        formData.value.configuration.LocationCode
+      ) {
         warehouseType.value = 'LocationCode'
         getFormLocationList()
       }
-
     } finally {
       formLoading.value = false
     }
@@ -446,11 +765,11 @@ const submitForm = async () => {
   try {
     let data = {
       id: formData.value.id,
-      strategyCode: formData.value.strategyCode,//策略代码
-      name: formData.value.name,//名称
-      description: formData.value.description,//描述
-      priority: formData.value.priority,//优先级
-      status: formData.value.status ? 0 : 1,//状态
+      strategyCode: formData.value.strategyCode, //策略代码
+      name: formData.value.name, //名称
+      description: formData.value.description, //描述
+      priority: formData.value.priority, //优先级
+      status: formData.value.status ? 0 : 1, //状态
       //规则条件集合
       condition: JSON.stringify(formData.value.condition),
       configuration: JSON.stringify(formData.value.configuration)
@@ -474,45 +793,53 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: '',
-    strategyCode: formStrategyCode.value,//策略代码id
-    name: '',//名称
-    description: '',//描述
-    priority: '',//优先级
-    status: true,//状态
+    strategyCode: formStrategyCode.value, //策略代码id
+    name: '', //名称
+    description: '', //描述
+    priority: '', //优先级
+    status: true, //状态
     //规则条件集合
     condition: [
       // 供应商
-      { ParamCode: 'SupplierCode', Operator: "IN", Value: "" },
+      { ParamCode: 'SupplierCode', Operator: 'IN', Value: '' },
       // 物品类型/物品分组/物品/abc类/项目/
-      { ParamCode: 'ItemType', Operator: "IN", Value: "" },
+      { ParamCode: 'ItemType', Operator: 'IN', Value: '' },
       // /重量/体积/面积
-      { ParamCode: 'Weight', Operator: ">", Value: [] },
+      { ParamCode: 'Weight', Operator: '>', Value: [] },
       // 库存状态
-      { ParamCode: 'InventoryStatus', Operator: "IN", Value: [] },
+      { ParamCode: 'InventoryStatus', Operator: 'IN', Value: [] },
       // 存储类型
-      { ParamCode: 'StorageType', Operator: "IN", Value: [] },
+      { ParamCode: 'StorageType', Operator: 'IN', Value: [] },
       // 库存事务
-      { ParamCode: 'TransactionType', Operator: "IN", Value: [] }
+      { ParamCode: 'TransactionType', Operator: 'IN', Value: [] }
     ],
     configuration: {
       // 仓库代码
-      WarehouseCode:"",
+      WarehouseCode: '',
       // 库区代码
-      AreaCode:"",
+      AreaCode: '',
       // 库位组代码
-      LocationGroupCode:"",
+      LocationGroupCode: '',
       // 库位代码
-      LocationCode:"",
+      LocationCode: '',
       // 优先空库位
-      EmptyLocationFirst:'FALSE',
+      EmptyLocationFirst: 'FALSE',
       // 优先非空库位
-      NotEmptyLocationFirst:'FALSE',
+      NotEmptyLocationFirst: 'FALSE',
       // 可以混物品
-      EnableMixItem:'TRUE',
+      EnableMixItem: 'TRUE',
       // 可以混批次
-      EnableMixLot:'TRUE',
+      EnableMixLot: 'TRUE',
       // 可以混状态
-      EnableMixStatus:'TRUE',
+      EnableMixStatus: 'TRUE',
+      // 巷道排序方向
+      AisleOrder: 'ASC',
+      // 货架排序方向
+      ShelfOrder: 'ASC',
+      // 行排序方向
+      RowOrder: 'ASC',
+      // 列排序方向
+      ColumOrder: 'ASC'
     }
   }
 }
@@ -520,9 +847,9 @@ const resetForm = () => {
 // 弹窗按钮
 const Butttondata = [
   defaultButtons.formSaveBtn(null), // 保存
-  defaultButtons.formCloseBtn(null), // 关闭
+  defaultButtons.formCloseBtn(null) // 关闭
 ]
-// 按钮事件 
+// 按钮事件
 const buttonBaseClick = (val, item) => {
   // 保存
   if (val == 'save') {
@@ -533,7 +860,6 @@ const buttonBaseClick = (val, item) => {
     dialogVisible.value = false
   }
 }
-
 </script>
 <style scoped lang="scss">
 .item {
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
index 5af25be42..d6ff45ff7 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptJobMain/index.vue
@@ -174,9 +174,9 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
   return [
-    defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
-    defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
-    defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
+    // defaultButtons.mainListJobAccBtn({hide:isShowMainButton(row,['1'])}), // 承接
+    // defaultButtons.mainListJobCloBtn({hide:isShowMainButton(row,['1'])}), // 关闭
+    // defaultButtons.mainListJobAbaBtn({hide:isShowMainButton(row,['2'])}), // 放弃
     // defaultButtons.mainListJobExeBtn({hide:isShowMainButton(row,['2'])}), // 执行
   ]
 }
diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
index f92b205b4..a470839db 100644
--- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue
@@ -198,30 +198,37 @@ const isShowMainButton = (row,val) => {
 // 列表-操作按钮
 const butttondata = (row) => {
     return [
-        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6'])}), // 关闭
-        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5'])}), // 重新添加
-        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1'])}), // 提交审批
-        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2'])}), // 驳回
-        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2'])}), // 审批通过
-        defaultButtons.mainListEditBtn({hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑
-        defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
+        defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4']),hasPermi:'wms:unplannedreceipt-request-main:close'}), // 关闭
+        defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['5']),hasPermi:'wms:unplannedreceipt-request-main:reAdd'}), // 重新添加
+        defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:submit'}), // 提交审批
+        defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:refused'}), // 驳回
+        defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:unplannedreceipt-request-main:agree'}), // 审批通过
+        defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:unplannedreceipt-request-main:handle'}), // 处理
+        defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:unplannedreceipt-request-main:update'}), // 编辑
+        // defaultButtons.mainListDeleteBtn({hasPermi:'wms:unplannedreceipt-request-main:delete'}), // 删除
     ]
 }
 
-
-
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     console.log('列表-操作按钮事件-关闭')
+    handleClose(row.id)
   } else if (val == 'mainReAdd') { // 重新添加
     console.log('列表-操作按钮事件-重新添加')
+    handleReAdd(row.id)
   } else if (val == 'mainSubmit') { // 提交审批
     console.log('列表-操作按钮事件-提交审批')
+    handleSubmit(row.id)
   } else if (val == 'mainTurnDown') { // 驳回
     console.log('列表-操作按钮事件-驳回')
+    handleRefused(row.id)
   } else if (val == 'mainApprove') { // 审批通过
     console.log('列表-操作按钮事件-审批通过')
+    handleAgree(row.id)
+  } else if (val == 'mainHandle') { // 处理
+    console.log('列表-操作按钮事件-处理')
+    handleHandle(row.id)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
@@ -229,6 +236,66 @@ const buttonTableClick = async (val, row) => {
   }
 }
 
+/** 关闭按钮操作 */
+const handleClose = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmColse'))
+    await UnplannedreceiptRequestMainApi.closeUnplannedreceiptRequestMain(id)
+    message.success(t('common.closeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 重新添加按钮操作 */
+const handleReAdd = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmReAdd'))
+    await UnplannedreceiptRequestMainApi.reAddUnplannedreceiptRequestMain(id)
+    message.success(t('common.reAddSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 提交按钮操作 */
+const handleSubmit = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmSubmit'))
+    await UnplannedreceiptRequestMainApi.submitUnplannedreceiptRequestMain(id)
+    message.success(t('common.submitSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批驳回按钮操作 */
+const handleRefused = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmRefused'))
+    await UnplannedreceiptRequestMainApi.refusedUnplannedreceiptRequestMain(id)
+    message.success(t('common.refusedSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 审批通过按钮操作 */
+const handleAgree = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmAgree'))
+    await UnplannedreceiptRequestMainApi.agreeUnplannedreceiptRequestMain(id)
+    message.success(t('common.agreeSuccess'))
+    await getList()
+  } catch {}
+}
+
+/** 处理按钮操作 */
+const handleHandle = async (id: number) => {
+  try {
+    await message.confirm(t('common.confirmHandle'))
+    await UnplannedreceiptRequestMainApi.handleUnplannedreceiptRequestMain(id)
+    message.success(t('common.handleSuccess'))
+    await getList()
+  } catch {}
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm =async (type: string, row?: number) => {