新增库区2

src/api/DeliveryWarehouse/DeliveryWarehouseSelect/index.ts

@@ -27,4 +27,8 @@ export const DeliveryWarehouseSelectApi = {
   exportExcel: async (params: any) => {
     return await request.download({ url: `/coding/delivery/exportExcel`, params })
   }
+,
+  getDwAndKq: async (params: any) => {
+    return await request.get({ url: `/coding/dwxx/getDwAndKq`, params })
+  }
 }

src/api/DeliveryWarehouse/DeliveryWarehouseSelect/interface/CwxxRespVO.ts

@@ -2,6 +2,7 @@
  * 管理后台 - 财务信息 Response VO
  */
 export interface CwxxRespVO {
+  index?: number;
   /**
    * 雪花id
    */

src/api/DeliveryWarehouse/DeliveryWarehouseSelect/interface/DeliverySaveVO.ts

@@ -11,6 +11,8 @@ import {
 export interface DeliverySaveVO {
   dwxxReqVO?: DwxxSaveReqVO; // 单位信息
   kqxxReqVO?: KqxxSaveReqVO; // 库区信息
+  kqxxReqVOList?: KqxxSaveReqVO[]; // 库区信息
   caxxReqVOList?: CaxxSaveReqVO[]; // 仓房信息列表
   cwxxReqVO?: CwxxRespVO; // 财务信息
+  cwxxReqVOList?: CwxxRespVO[]; // 财务信息
 }

src/api/DeliveryWarehouse/DeliveryWarehouseSelect/interface/KqxxSaveReqVO.ts

@@ -2,6 +2,8 @@
  * 管理后台 - 库区信息; 新增/修改 Request VO
  */
 export interface KqxxSaveReqVO {
+  index?: number;
+  kqId?: number;
   /**
    * 主键
    */
@@ -11,7 +13,7 @@ export interface KqxxSaveReqVO {
    * 单位id
    */
   dwid?: number; // Java 的 Long 对应 TypeScript 的 number
-
+  areaCode:string;
   /**
    * 库区名称
    */

src/components/Dialog/src/Dialog.vue

@@ -84,6 +84,7 @@ const myDialogClass2 = ref()
           >
             <Icon
               v-if="fullscreen"
+              :size="haveHeader ? 12 : 20"
               class="is-hover  mr-10px cursor-pointer"
               :icon="isFullscreen ? 'radix-icons:exit-full-screen' : 'radix-icons:enter-full-screen'"
               :color=" haveHeader ? 'color-[#fff]' : 'var(--el-color-info)'"
@@ -91,6 +92,7 @@ const myDialogClass2 = ref()
               @click="toggleFull"
             />
             <Icon
+              :size="haveHeader ? 12 : 20"
               class="is-hover color-[#fff] cursor-pointer"
               icon="ep:close"
               hover-color="var(--el-color-primary)"

src/components/MyRadio/MyRadioItem.vue

@@ -5,6 +5,7 @@
       :name="groupName"
       :value="props.name"
       v-model="localValue"
+      :disabled="props.disabled"
       @change="handleChange" />
     <span class="name">
       <slot name="name">{{ props.name }}</slot>
@@ -21,10 +22,12 @@ import { inject, computed } from 'vue';
 
 interface RadioItemProps {
   name: string;
+  disabled:boolean
 }
 
 const props = withDefaults(defineProps<RadioItemProps>(), {
-  name: '' // 确保提供默认值或验证此为必填项
+  name: '' ,// 确保提供默认值或验证此为必填项,
+  disabled: false
 });
 
 const radioGroup = inject<{ currentValue: Ref<string | number> }>('radioGroup');

src/components/Title/index.vue

@@ -0,0 +1,21 @@
+<script setup lang="ts">
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: ''
+  }
+})
+
+
+</script>
+
+<template>
+   <div class="relative flex lh-50px  justify-start">
+       <div style="background: var(--el-color-primary)" class="w-5px  mt-13px mr-10px ml-0px h-26px"></div> <h2>{{ props.title}}</h2>
+   </div>
+</template>
+
+<style scoped lang="scss">
+
+</style>

src/components/UploadFile/src/UploadImgs.vue

@@ -138,19 +138,27 @@ const uploadSuccess: UploadProps['onSuccess'] = (res: any): void => {
 // 监听模型绑定值变动
 watch(
   () => props.modelValue,
-  (val: string | string[]) => {
+  (val) => {
     if (!val) {
-      fileList.value = [] // fix：处理掉缓存，表单重置后上传组件的内容并没有重置
-      return
+      fileList.value = [] // 处理掉缓存，表单重置后上传组件的内容并没有重置
+      return;
     }
 
-    fileList.value = [] // 保障数据为空
-    fileList.value.push(
-      ...(val as string[]).map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url }))
-    )
+    fileList.value = []; // 确保数据为空
+
+    // 检查 val 是否是数组，如果是，则处理；如果不是，进行适当的错误处理或跳过。
+    if (Array.isArray(val)) {
+      fileList.value.push(
+        ...val.map((url) => ({ name: url.substring(url.lastIndexOf('/') + 1), url }))
+      );
+    } else if (typeof val === 'string') { // 如果 val 是字符串，直接处理它。
+      fileList.value.push({ name: val.substring(val.lastIndexOf('/') + 1), url: val });
+    } else {
+      console.error('Expected an array of strings or a single string, but got:', typeof val);
+    }
   },
   { immediate: true, deep: true }
-)
+);
 
 watch(()=>fileList.value,()=>{
   console.log(fileList.value,'ss')

src/components/index.ts

@@ -3,10 +3,12 @@ import { Icon } from './Icon'
 import NumberPairInput from './NumberPairInput/index.vue'
 import MyRadio from './MyRadio/index.vue'
 import MyRadioItem from './MyRadio/MyRadioItem.vue'
+import Title from './Title/index.vue'
 
 export const setupGlobCom = (app: App<Element>): void => {
   app.component('Icon', Icon)
   app.component('NumberPairInput', NumberPairInput)
   app.component('MyRadio', MyRadio)
   app.component('MyRadioItem', MyRadioItem)
+  app.component('Title', Title)
 }

src/views/DeliveryWarehouse/compontents/Form.vue

@@ -56,7 +56,6 @@
 </template>
 <script lang="ts" setup>
 import {ref} from 'vue'
-import {useI18n} from 'vue-i18n'
 import {DeliveryWarehouseSelectApi} from '@/api/DeliveryWarehouse/DeliveryWarehouseSelect'
 import {DICT_TYPE} from '@/utils/dict'
 import {TableColumnData, TableRowSelection} from "@arco-design/web-vue";
@@ -98,8 +97,7 @@ interface TableRow {
 // 组件配置
 defineOptions({name: 'DeliveryWarehouseSelectForm'})
 
-// 国际化
-const {t} = useI18n()
+
 // 组件状态
 const dialogVisible = ref(false)
 const dialogTitle = ref('仓房列表')
@@ -196,7 +194,7 @@ const rowSelection = reactive<TableRowSelection>({
   showCheckedAll: true,
   onlyCurrent: false,
 });
-const selectedKeys = ref<(string | number)[] | undefined>([])
+const selectedKeys = ref<(string | number)[]>([])
 
 
 /**
@@ -311,6 +309,8 @@ const submitForm = async () => {
       ...queryParams.value
     }
     if (formType.value === 'select') {
+       //存储id的list，找到对应id的数据
+      submitData.storeRespVOList = list.value.filter((item) => selectedKeys.value.includes(item.id))
       await DeliveryWarehouseSelectApi.submitSelectList(submitData)
       Message.success("数据已提交到备选交收库")
     } else if (formType.value == 'back') {