Merge branch 'dev' of http://60.209.125.238:20010/lijingjia/ds-wms-client-web into dev

src/views/operation/CustomerReconciliation/index.vue

@@ -0,0 +1,3 @@
+<template> </template>
+<script lang="ts" setup></script>
+<style lang="less"></style>

src/views/operation/seaexport/detail/columns.tsx

@@ -69,14 +69,6 @@ if (FnblType.length) {
     ListData.blType.push({ label: e.name, value: e.value })
   })
 }
-//揽货人数据
-const FnsaleId: any = await GetSaleList()
-if (FnsaleId.succeeded) {
-  ListData.saleId = []
-  FnsaleId.data.forEach((e) => {
-    ListData.saleId.push({ ...e, label: e.userName, value: e.id })
-  })
-}
 
 const FnsaleDeptId: any = await GetDeptList()
 if (FnsaleDeptId.succeeded) {
@@ -121,13 +113,6 @@ if (FnshipAgencyId.succeeded) {
     ListData.shipAgencyId.push({ label: e.codeName, value: e.id })
   })
 }
-// const FnsaleId: any = await GetSaleUserList()
-// if (FnsaleId.succeeded) {
-//   ListData.saleId = []
-//   FnsaleId.data.forEach((e) => {
-//     ListData.saleId.push({ ...e, label: `${e.userName}/${e.userCode}`, value: e.id })
-//   })
-// }
 
 const FncustomerService: any = await GetCustomerServiceList()
 if (FncustomerService.succeeded) {
@@ -852,8 +837,15 @@ export const basicInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel, formActionType }) => {
       return {
         allowClear: true,
-        options: ListData.saleId,
         showSearch: true,
+        // options: ListData.saleId,
+        // const FnsaleId: any = await GetSaleList()
+        // if (FnsaleId.succeeded) {
+        //   ListData.saleId = []
+        //   FnsaleId.data.forEach((e) => {
+        //     ListData.saleId.push({ ...e, label: e.userName, value: e.id })
+        //   })
+        // }
         filterOption: (input: string, option: any) => {
           let RData = false
           if (option.userName.toLowerCase().indexOf(input.toLowerCase()) >= 0) {