Merge branch 'release' into 'dev'

ts修复

See merge request !156

src/views/order/podCN/index.vue

@@ -3633,7 +3633,7 @@ const rejectOrder = async (type: string) => {
   if (!targets.length) return ElMessage.warning('请选择数据')
   if (!targets.length) return ElMessage.warning('请选择数据')
   let reason = ''
   let reason = ''
   try {
   try {
-    const { value } = await ElMessageBox.prompt<string>('驳回确认', {
+    const { value } = await ElMessageBox.prompt('驳回确认', {
       confirmButtonText: '确认',
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       cancelButtonText: '取消',
       inputType: 'textarea',
       inputType: 'textarea',
@@ -3659,7 +3659,8 @@ const rejectOrder = async (type: string) => {
     })
     })
 
 
     if (res.code !== 200) return
     if (res.code !== 200) return
-    resultInfo.value = (res.data || []).filter((item) => !item.status)
+    resultInfo.value = res.data
+    resultInfo.value = resultInfo.value.filter((item) => !item.status)
     if (!resultInfo.value.length) {
     if (!resultInfo.value.length) {
       ElMessage.success('操作成功')
       ElMessage.success('操作成功')
       search()
       search()

src/views/order/podUs/index.vue

@@ -5600,7 +5600,7 @@ const rejectOrder = async (type: string) => {
   if (!targets.length) return ElMessage.warning('请选择数据')
   if (!targets.length) return ElMessage.warning('请选择数据')
   let reason = ''
   let reason = ''
   try {
   try {
-    const { value } = await ElMessageBox.prompt<string>('驳回确认', {
+    const { value } = await ElMessageBox.prompt('驳回确认', {
       confirmButtonText: '确认',
       confirmButtonText: '确认',
       cancelButtonText: '取消',
       cancelButtonText: '取消',
       inputType: 'textarea',
       inputType: 'textarea',
@@ -5625,7 +5625,8 @@ const rejectOrder = async (type: string) => {
       reasonStr: reason,
       reasonStr: reason,
     })
     })
     if (res.code !== 200) return
     if (res.code !== 200) return
-    resultInfo.value = (res.data || []).filter((item) => !item.status)
+    resultInfo.value = res.data
+    resultInfo.value = resultInfo.value.filter((item) => !item.status)
     if (!resultInfo.value.length) {
     if (!resultInfo.value.length) {
       ElMessage.success('操作成功')
       ElMessage.success('操作成功')
       search()
       search()