Merge remote-tracking branch 'origin/linjinhong' into dev

components.d.ts

@@ -7,10 +7,10 @@ export {}
 
 
 declare module 'vue' {
 declare module 'vue' {
   export interface GlobalComponents {
   export interface GlobalComponents {
-    AmountInput: typeof import('./src/components/Form.vue/AmountInput.vue')['default']
+    AmountInput: typeof import('./src/components/Form/AmountInput.vue')['default']
     CommonCard: typeof import('./src/components/CommonCard.vue')['default']
     CommonCard: typeof import('./src/components/CommonCard.vue')['default']
-    DatePicker: typeof import('./src/components/Form.vue/DatePicker.vue')['default']
-    DateRangePicker: typeof import('./src/components/Form.vue/DateRangePicker.vue')['default']
+    DatePicker: typeof import('./src/components/Form/DatePicker.vue')['default']
+    DateRangePicker: typeof import('./src/components/Form/DateRangePicker.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
@@ -32,6 +32,7 @@ declare module 'vue' {
     ElImage: typeof import('element-plus/es')['ElImage']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElOption: typeof import('element-plus/es')['ElOption']
@@ -52,6 +53,7 @@ declare module 'vue' {
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTree: typeof import('element-plus/es')['ElTree']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     Icon: typeof import('./src/components/Icon.vue')['default']
     Icon: typeof import('./src/components/Icon.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     ImageView: typeof import('./src/components/ImageView.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']
     LogList: typeof import('./src/components/LogList.vue')['default']
@@ -60,10 +62,11 @@ declare module 'vue' {
     RightClickMenu: typeof import('./src/components/RightClickMenu.vue')['default']
     RightClickMenu: typeof import('./src/components/RightClickMenu.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     RouterView: typeof import('vue-router')['RouterView']
-    Select: typeof import('./src/components/Form.vue/Select.vue')['default']
+    Select: typeof import('./src/components/Form/Select.vue')['default']
     ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default']
     ShipmentOrderDetail: typeof import('./src/components/ShipmentOrderDetail.vue')['default']
     SplitDiv: typeof import('./src/components/splitDiv/splitDiv.vue')['default']
     SplitDiv: typeof import('./src/components/splitDiv/splitDiv.vue')['default']
-    'Switch ': typeof import('./src/components/Form.vue/Switch .vue')['default']
+    'Switch ': typeof import('./src/components/Form/Switch .vue')['default']
+    TableRightClickMenu: typeof import('./src/components/TableRightClickMenu.vue')['default']
     TableView: typeof import('./src/components/TableView.vue')['default']
     TableView: typeof import('./src/components/TableView.vue')['default']
     UploadExcel: typeof import('./src/components/UploadExcel.vue')['default']
     UploadExcel: typeof import('./src/components/UploadExcel.vue')['default']
     UploadImage: typeof import('./src/components/UploadImage.vue')['default']
     UploadImage: typeof import('./src/components/UploadImage.vue')['default']

src/components/CustomizeForm.tsx

@@ -2,12 +2,12 @@ import { defineComponent, PropType, ref, computed, h } from 'vue'
 import type { Component } from 'vue'
 import type { Component } from 'vue'
 import { ElInput, ElForm, ElFormItem } from 'element-plus'
 import { ElInput, ElForm, ElFormItem } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import type { FormInstance } from 'element-plus'
-import AmountInput from './Form.vue/AmountInput.vue' // 金额输入框
-import DateRangePicker from './Form.vue/DateRangePicker.vue' // 时间范围选择器
-import DatePicker from './Form.vue/DatePicker.vue' // 单个日期选择器
-import Select from './Form.vue/Select.vue' // 普通下拉选择框
-import Switch from './Form.vue/Switch .vue'
-import './Form.vue/form.scss'
+import AmountInput from './Form/AmountInput.vue' // 金额输入框
+import DateRangePicker from './Form/DateRangePicker.vue' // 时间范围选择器
+import DatePicker from './Form/DatePicker.vue' // 单个日期选择器
+import Select from './Form/Select.vue' // 普通下拉选择框
+import Switch from './Form/Switch .vue'
+import './Form/form.scss'
 
 
 import type { FormItemRule } from 'element-plus'
 import type { FormItemRule } from 'element-plus'
 
 

src/components/SearchForm.tsx

 import { defineComponent, PropType, ref, computed, watch, h } from 'vue'
 import { defineComponent, PropType, ref, computed, watch, h } from 'vue'
 import type { Component } from 'vue'
 import type { Component } from 'vue'
 
 
-import AmountInput from './Form.vue/AmountInput.vue' // 金额输入框
-import DateRangePicker from './Form.vue/DateRangePicker.vue' // 时间范围选择器
-import DatePicker from './Form.vue/DatePicker.vue' // 单个日期选择器
-import Select from './Form.vue/Select.vue' // 普通下拉选择框
+import AmountInput from './Form/AmountInput.vue' // 金额输入框
+import DateRangePicker from './Form/DateRangePicker.vue' // 时间范围选择器
+import DatePicker from './Form/DatePicker.vue' // 单个日期选择器
+import Select from './Form/Select.vue' // 普通下拉选择框
 import { ElInput, ElForm, ElFormItem, ElButton } from 'element-plus'
 import { ElInput, ElForm, ElFormItem, ElButton } from 'element-plus'
 import {
 import {
   ISearchForm,
   ISearchForm,

src/views/logistics/declarationRule.vue

@@ -101,6 +101,7 @@ const [editForm, resetEditForm] = useValue<AddDeclarationRuleObj>({
   currency: 'USD',
   currency: 'USD',
 })
 })
 const {
 const {
+  loading,
   currentPage,
   currentPage,
   pageSize,
   pageSize,
   total,
   total,
@@ -466,7 +467,7 @@ const tableConfig = ref<TableColumn[]>([
   },
   },
 ])
 ])
 
 
-const loading = ref(false)
+// const loading = ref(false)
 
 
 /**
 /**
  * @description: 取消按钮
  * @description: 取消按钮

src/views/logistics/logisticsQuotation.vue

@@ -436,7 +436,7 @@ onMounted(() => {
 })
 })
 
 
 async function search() {
 async function search() {
-  loading.value = true
+  // loading.value = true
   const isEqual =
   const isEqual =
     JSON.stringify(searchForm.value) === JSON.stringify({ logisticsIdList: [] })
     JSON.stringify(searchForm.value) === JSON.stringify({ logisticsIdList: [] })
   try {
   try {
@@ -448,7 +448,7 @@ async function search() {
   } catch (e) {
   } catch (e) {
     console.log(e)
     console.log(e)
   } finally {
   } finally {
-    loading.value = false
+    // loading.value = false
   }
   }
 }
 }
 
 
@@ -729,6 +729,7 @@ function handleSizeChange(val: number) {
 }
 }
 
 
 async function getList() {
 async function getList() {
+  loading.value = true
   try {
   try {
     const { data } = await getlogisticsQuotationPage({
     const { data } = await getlogisticsQuotationPage({
       ...searchForm.value,
       ...searchForm.value,
@@ -741,10 +742,13 @@ async function getList() {
     mergeCells.value = []
     mergeCells.value = []
   } catch (error) {
   } catch (error) {
     console.log(error)
     console.log(error)
+  } finally {
+    loading.value = false
   }
   }
 }
 }
 const templeData = ref<LogisticsQuotation[]>([])
 const templeData = ref<LogisticsQuotation[]>([])
 async function getSearchList() {
 async function getSearchList() {
+  loading.value = true
   try {
   try {
     const { data } = await getlogisticsQuotationList({
     const { data } = await getlogisticsQuotationList({
       ...searchForm.value,
       ...searchForm.value,
@@ -784,6 +788,8 @@ async function getSearchList() {
     mergeCells.value = newMergeCells
     mergeCells.value = newMergeCells
   } catch (error) {
   } catch (error) {
     console.log(error)
     console.log(error)
+  } finally {
+    loading.value = false
   }
   }
 }
 }
 
 

src/views/order/podUs/components/ResultInfo.vue

@@ -74,7 +74,7 @@ const checkAll = ref(false)
 const selectedList = ref<(string | number)[]>([])
 const selectedList = ref<(string | number)[]>([])
 
 
 // 显示弹窗
 // 显示弹窗
-const showDialog = (type: string) => {
+const showDialog = (type?: string) => {
   console.log(type)
   console.log(type)
 
 
   resultDialog.value = true
   resultDialog.value = true

src/views/order/podUs/index.vue

@@ -2189,7 +2189,7 @@ const getOrderByIdApi = async (type: string) => {
       const res = await operation.Fn(ids)
       const res = await operation.Fn(ids)
       if (res.code === 200) {
       if (res.code === 200) {
         if (isArray(res.data)) {
         if (isArray(res.data)) {
-          resultInfo.value = res.data
+          resultInfo.value = res.data || []
           resultRefs.value?.showDialog(type)
           resultRefs.value?.showDialog(type)
         } else if (isString(res.data)) {
         } else if (isString(res.data)) {
           window.open(filePath + res.data)
           window.open(filePath + res.data)
@@ -2199,6 +2199,7 @@ const getOrderByIdApi = async (type: string) => {
       }
       }
       loading.close()
       loading.close()
     } catch (e) {
     } catch (e) {
+      resultInfo.value = []
       console.error(e)
       console.error(e)
     }
     }
   } else {
   } else {
@@ -2401,10 +2402,13 @@ const logisticsToPicking = async () => {
       ids: selection.value.map((item) => item.id).join(','),
       ids: selection.value.map((item) => item.id).join(','),
     })
     })
     if (res.code !== 200) return
     if (res.code !== 200) return
+    resultInfo.value = res.data || []
+    resultRefs.value?.showDialog()
     ElMessage.success('操作成功')
     ElMessage.success('操作成功')
     search()
     search()
     loadTabData()
     loadTabData()
   } catch (e) {
   } catch (e) {
+    resultInfo.value = []
     console.error(e)
     console.error(e)
   } finally {
   } finally {
     loading.close()
     loading.close()