单挑退回

src/components/NumberPairInput/index.vue

@@ -7,7 +7,7 @@
       type="number"
       min="0"
     />
-    <div class="w-30px" style="text-align: center">-</div>
+    <div class="w-30px mr-5px ml-5px" style="text-align: center">至</div>
     <el-input
       :model-value="localValue[1]"
       @input="handleInput(1, $event)"

src/views/DeliveryWarehouse/DeliveryWarehouseList/index.vue

@@ -169,7 +169,19 @@ const handleBack = async () => {
 
   console.log()
 }
-
+const rowBack = async (row: any) => {
+  try {
+    await ElMessageBox.confirm('确认要退回的所选的库区？', '提示', {
+      confirmButtonText: '确 认',
+      cancelButtonText: '取 消',
+      type: 'warning'
+    })
+    await DeliveryWarehouseListApi.revertKqxx({kqIds: [row.kqId]})
+    await handleQuery()
+  }catch (err){
+    throw err
+  }
+}
 
 /**
  * 打开表单
@@ -473,6 +485,12 @@ onUnmounted(() => {
           </div>
         </template>
       </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" min-width="80" prop="edit">
+        <template #default="scope">
+           <el-button size="small" type="danger" @click="rowBack(scope)">退回</el-button>
+        </template>
+      </el-table-column>
+
     </el-table>
     <Pagination
       v-model:limit="queryParams.pageSize"

src/views/DeliveryWarehouse/DeliveryWarehouseSelect/index.vue

@@ -387,15 +387,6 @@ const roleType = ref('gjj')
               重置
             </el-button>
             <el-button
-              v-hasPermi="['coding:kqxx:creat']"
-              plain
-              type="primary"
-              @click="openCreateForm('create')"
-            >
-              <Icon class="mr-5px" icon="ep:plus"/>
-              新增库区
-            </el-button>
-            <el-button
               plain
               type="success"
               @click="handleExport"
@@ -403,15 +394,15 @@ const roleType = ref('gjj')
               <Icon class="mr-5px" icon="ep:download"/>
               导出
             </el-button>
-            <!--            <el-button-->
-            <!--              v-hasPermi="['coding:dwxx:create']"-->
-            <!--              plain-->
-            <!--              type="primary"-->
-            <!--              @click="openCreateForm('create')"-->
-            <!--            >-->
-            <!--              <Icon class="mr-5px" icon="ep:plus"/>-->
-            <!--              新增库区-->
-            <!--            </el-button>-->
+            <el-button
+              v-hasPermi="['coding:kqxx:creat']"
+              plain
+              type="primary"
+              @click="openCreateForm('create')"
+            >
+              <Icon class="mr-5px" :size="14" icon="ep:plus"/>
+              新增库区
+            </el-button>
           </el-form-item>
         </el-form>
 
@@ -430,13 +421,13 @@ const roleType = ref('gjj')
           tooltip-effect="dark"
         >
           <el-table-column align="center" fixed="left" label="序号" min-width="60" type="index"/>
-          <el-table-column align="center" label="所属省份" min-width="100" prop="sheng"/>
-          <el-table-column align="center" label="所属市区" min-width="100" prop="shi"/>
-          <el-table-column align="center" label="所属县区" min-width="100" prop="xian"/>
-          <el-table-column align="center" label="企业名称" min-width="180" prop="dwmc"/>
-          <el-table-column align="center" label="库区名称" min-width="180" prop="kqmc"/>
-          <el-table-column align="center" label="库区仓容总量(吨)" min-width="150" prop="sjcrNum"/>
-          <el-table-column align="center" label="仓房数量(个)" min-width="120" prop="cfnum">
+          <el-table-column align="center" label="所属省份" min-width="120" prop="sheng"/>
+          <el-table-column align="center" label="所属市区" min-width="120" prop="shi"/>
+          <el-table-column align="center" label="所属县区" min-width="120" prop="xian"/>
+          <el-table-column align="center" label="企业名称" min-width="280" prop="dwmc"/>
+          <el-table-column align="center" label="库区名称" min-width="280" prop="kqmc"/>
+          <el-table-column align="center" label="库区仓容总量(吨)" min-width="170" prop="sjcrNum"/>
+          <el-table-column align="center" label="仓房数量(个)" min-width="140" prop="cfnum">
             <template #default="scope">
               <div
                 class="w-full color-[var(--el-color-primary)] cursor-pointer"
@@ -445,7 +436,7 @@ const roleType = ref('gjj')
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="已选仓房" min-width="120" prop="yxcfnum">
+          <el-table-column align="center" label="已选仓房" min-width="140" prop="yxcfnum">
             <template #default="scope">
               <div
                 class="w-full color-[var(--el-color-primary)] cursor-pointer"

src/views/DeliveryWarehouse/compontents/Form.vue

@@ -4,9 +4,9 @@
       <a-table
         v-loading="formLoading"
         v-model:selectedKeys="selectedKeys"
+        :bordered="{wrapper: true, cell: true}"
         :columns="tableColumns"
         :data="list"
-        :bordered="{wrapper: true, cell: true}"
         :row-selection="rowSelection"
         row-key="id"
       >
@@ -16,6 +16,11 @@
         <template #cazt="{record }">
           <dict-tag :type="DICT_TYPE.SYSTEM_CAZT" :value="record.cazt"/>
         </template>
+        <template #edit="{record }">
+          <el-button size="small" type="danger" @click="backRow(record)">
+            退回
+          </el-button>
+        </template>
       </a-table>
     </div>
     <template #footer>
@@ -114,11 +119,12 @@ const tableColumns = ref<TableColumnData[]>([
     align: 'center'
   }
 ])
-const tableColumnsTemp: TableColumnData[] = [{
-  title: '库区名称',
-  dataIndex: 'kqmc',
-  align: 'center'
-},
+const tableColumnsTemp: TableColumnData[] = [
+  {
+    title: '库区名称',
+    dataIndex: 'kqmc',
+    align: 'center'
+  },
   {
     title: '仓房名称',
     dataIndex: 'cfmc',
@@ -169,7 +175,7 @@ const open = async (type: string, row?: any) => {
         slotName: 'rdyhName',
         align: 'center'
       }
-      ]
+    ]
   } else if (row.yxcf == YxcfEnum.XdjskCfxx) {
     tableColumns.value = [...tableColumnsTemp,
       {
@@ -200,6 +206,18 @@ const open = async (type: string, row?: any) => {
   } else {
     tableColumns.value = [...tableColumnsTemp]
   }
+  if (formType.value == 'back') {
+    tableColumns.value.push({
+      title: '操作',
+      dataIndex: 'edit',
+      slotName: 'edit',
+      align: 'center'
+    })
+  } else {
+    tableColumns.value.filter((item) => {
+      return item.dataIndex !== 'edit'
+    })
+  }
   resetForm()
   try {
     formLoading.value = true
@@ -264,7 +282,20 @@ const submitForm = async () => {
     formLoading.value = false
   }
 }
-
+const backRow = async (row) => {
+  try {
+    await ElMessageBox.confirm('确认要退回的所选的库区？', '提示', {type:'warning'});
+    const submitData: any = {
+      ids: [row.id],
+      ...queryParams.value
+    }
+    await DeliveryWarehouseSelectApi.returnToWarehouse(submitData)
+    await handleQuery()
+    Message.success("数据已退回到交收仓选择")
+  } catch (err) {
+    throw err
+  }
+}
 // 监听
 // const stopWatches: (() => void)[] = [];
 // stopWatches.push(
@@ -286,6 +317,7 @@ const emit = defineEmits(['success'])
 .mb-50px {
   margin-bottom: 50px;
 }
+
 :deep(.arco-table-element thead .arco-table-tr .arco-table-th) {
   background: var(--table-header-bg-color);
   font-weight: 700;