上报错误提醒修改

src/views/tentative/detect/outside.vue

@@ -570,7 +570,7 @@ const addEditFormClick = async () => {
 //新增、编辑 提交保存
 const submitFormApi = async () => {
     addEditFormLoading.value = true
-    const { error, code } = await dataApi.submitForm({
+    const { error, code, msg } = await dataApi.submitForm({
         ...addEditFormModel.value,
         projectId: projectId.value,
         contractId: contractId.value,
@@ -586,6 +586,8 @@ const submitFormApi = async () => {
        }, 100)
         await getTableData()
         // window?.location?.reload() //刷新页面
+    } else {
+        window?.$message?.error(msg)
     }
 
 }
@@ -606,7 +608,7 @@ const copyTableModalClick = () => {
 //复制提交保存
 const copyFormApi = async () => {
     addEditFormLoading.value = true
-    const { error, code } = await dataApi.copyData({
+    const { error, code, msg } = await dataApi.copyData({
         ...addEditFormModel.value,
         projectId: projectId.value,
         contractId: contractId.value,
@@ -617,6 +619,8 @@ const copyFormApi = async () => {
         window?.$message?.success('操作成功')
         addEditFormModal.value = false
         await getTableData()
+    } else {
+        window?.$message?.error(msg)
     }
 
 }
@@ -625,7 +629,7 @@ const copyFormApi = async () => {
 const copyLoading = ref(false)
 const batchCopyFormApi = async (ids) => {
     copyLoading.value = true
-    const { error, code } = await dataApi.copyData({
+    const { error, code, msg } = await dataApi.copyData({
         projectId: projectId.value,
         contractId: contractId.value,
         ids: ids,
@@ -635,6 +639,8 @@ const batchCopyFormApi = async (ids) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         await getTableData()
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -650,7 +656,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             ids: ids,
@@ -664,6 +670,8 @@ const tableRemoveData = async () => {
                     isShowTree.value = true
             }, 100)
 
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/tentative/detect/test-form.vue

@@ -1169,7 +1169,7 @@ const tableFormSaveClick = async () => {
                     return
 
                 }
-                const { error, code, data } = await dataApi.saveExcelBussData({
+                const { error, code, data, msg } = await dataApi.saveExcelBussData({
                     ...listItemBaseData.value,
                     isBatchSave: 1,
                     dataInfo: { orderList: FormData },
@@ -1231,6 +1231,8 @@ const tableFormSaveClick = async () => {
                    }
 
 
+                } else {
+                    window?.$message?.error(msg)
                 }
             }
         }

src/views/tentative/detect/third.vue

@@ -571,7 +571,7 @@ const addEditFormClick = async () => {
 const submitFormApi = async () => {
     addEditFormLoading.value = true
     console.log(addEditFormModel.value, 'addEditFormModel.value')
-    const { error, code } = await dataApi.submitForm({
+    const { error, code, msg } = await dataApi.submitForm({
         ...addEditFormModel.value,
         projectId: projectId.value,
         contractId: contractId.value,
@@ -587,6 +587,8 @@ const submitFormApi = async () => {
         }, 100)
         await getTableData()
 
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -608,7 +610,7 @@ const changepdf = (pdf)=>{
 //复制提交保存
 const copyFormApi = async () => {
     addEditFormLoading.value = true
-    const { error, code } = await dataApi.copyData({
+    const { error, code, msg } = await dataApi.copyData({
         ...addEditFormModel.value,
         projectId: projectId.value,
         contractId: contractId.value,
@@ -622,6 +624,8 @@ const copyFormApi = async () => {
             addEditFormLoading.value = false
         }, 1000)
         await getTableData()
+    } else {
+        window?.$message?.error(msg)
     }
     addEditFormLoading.value = false
 }
@@ -630,7 +634,7 @@ const copyFormApi = async () => {
 const copyLoading = ref(false)
 const batchCopyFormApi = async (ids) => {
     copyLoading.value = true
-    const { error, code } = await dataApi.copyData({
+    const { error, code, msg } = await dataApi.copyData({
         projectId: projectId.value,
         contractId: contractId.value,
         ids: ids,
@@ -640,6 +644,8 @@ const batchCopyFormApi = async (ids) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         await getTableData()
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -655,21 +661,23 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             ids: ids,
         })
         //处理数据
         if (!error && code === 200) {
-            window?.$message?.success('操作成功')
-            // searchClick()
-            isShowTree.value = false
-            setTimeout(() => {
-                isShowTree.value = true
-            }, 100)
-            await getTableData()
-            }
+                window?.$message?.success('操作成功')
+                // searchClick()
+                isShowTree.value = false
+                setTimeout(() => {
+                    isShowTree.value = true
+                }, 100)
+                await getTableData()
+         } else {
+                window?.$message?.error(msg)
+         }
     }
 }
 

src/views/tentative/device/approach.vue

@@ -263,7 +263,7 @@ import { useAppStore } from '~src/store'
 import { HcIsButton } from '~src/plugins/IsButtons'
 import HcDragUpload from './components/HcDragUpload.vue'
 import approachApi from '~api/tentative/device/approach'
-import { formValidate, getArrValue } from 'js-fast-way'
+import { arrToId, formValidate, getArrValue } from 'js-fast-way'
 import { getContractUserList } from '~api/other'
 import { deviceClassListInit, getClassList } from '~api/tentative'
 import { HcDelMsg } from 'hc-vue3-ui'
@@ -477,7 +477,7 @@ const addEditNodeFormModalSave = async () => {
     const validate = await formValidate(addEditNodeFormRef.value)
     if (validate) {
         addEditNodeFormLoading.value = true
-        const { error, code } = await approachApi.getClassSubmit({
+        const { error, code, msg } = await approachApi.getClassSubmit({
             ...addEditNodeFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -489,6 +489,8 @@ const addEditNodeFormModalSave = async () => {
             addEditNodeFormModal.value = false
             addEditNodeFormLoading.value = false
             await getClassListData()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -511,7 +513,7 @@ const delNodeModalClick = (id) => {
 
 //删除分类
 const setClassRemove = async (id) => {
-    const { error, code } = await approachApi.setClassRemove({
+    const { error, code, msg } = await approachApi.setClassRemove({
         projectId: projectId.value,
         contractId: contractId.value,
         id: id,
@@ -520,6 +522,8 @@ const setClassRemove = async (id) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         await getClassListData()
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -535,7 +539,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await approachApi.removeData({
+        const { error, code, msg } = await approachApi.removeData({
             contractId: contractId.value,
             ids: ids,
         })
@@ -543,6 +547,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -692,7 +698,7 @@ const addEditFormClick = async () => {
     const validate = await formValidate(addEditFormRef.value)
     if (validate) {
         addEditFormLoading.value = true
-        const { error, code } = await approachApi.submitForm({
+        const { error, code, msg } = await approachApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -704,6 +710,8 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
             addEditFormLoading.value = false
             await getTableData()
+        } else {
+            window?.$message?.error(msg)
         }
         addEditFormLoading.value = false
     }

src/views/tentative/device/employ.vue

@@ -376,7 +376,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             contractId: contractId.value,
             ids: ids,
         })
@@ -384,6 +384,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -619,7 +621,7 @@ const addEditFormClick = async () => {
 
     if (validate) {
         addEditFormLoading.value = true
-        const { error, code } = await dataApi.submitForm({
+        const { error, code, msg } = await dataApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -631,8 +633,10 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
             addEditFormLoading.value = false
             await getTableData()
+        } else {
+                window?.$message?.error(msg)
+            }
         }
-    }
 }
 
 

src/views/tentative/device/overhaul.vue

@@ -335,7 +335,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             contractId: contractId.value,
             ids: ids,
         })
@@ -343,6 +343,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -515,7 +517,7 @@ const addEditFormClick = async () => {
     const validate = await formValidate(addEditFormRef.value)
     if (validate) {
         addEditFormLoading.value = true
-        const { error, code } = await dataApi.submitForm({
+        const { error, code, msg } = await dataApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -527,6 +529,8 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
             addEditFormLoading.value = false
             await getTableData()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/tentative/laboratory/user.vue

@@ -404,7 +404,7 @@ const addEditFormClick = async () => {
     if (validate) {
         addEditFormLoading.value = true
         addEditFormModel.value.workingTime = Number(addEditFormModel.value.workingTime)
-        const { error, code } = await dataApi.submitForm({
+        const { error, code, msg } = await dataApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -416,6 +416,8 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
             addEditFormLoading.value = false
             await getTableData()
+        } else {
+            window?.$message?.error(msg)
         }
         addEditFormModal.value = false
         addEditFormLoading.value = false
@@ -434,7 +436,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             ids: ids,
@@ -443,6 +445,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/tentative/material/approach.vue

@@ -532,7 +532,7 @@ const addEditFormClick = async () => {
     if (validate) {
         addEditFormLoading.value = true
         addEditFormModel.value.materialCount = Number(addEditFormModel.value.materialCount)
-        const { error, code } = await approachApi.submitForm({
+        const { error, code, msg } = await approachApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -545,6 +545,7 @@ const addEditFormClick = async () => {
             addEditFormLoading.value = false
             await getTableData()
         } else {
+            window?.$message?.error(msg)
             addEditFormLoading.value = false
         }
     }
@@ -616,13 +617,15 @@ const copyTableClick = () => {
 //复制数据请求
 const tableCopyData = async (rows) => {
     copyTableLoading.value = true
-    const { error, code } = await approachApi.copyData(rows)
+    const { error, code, msg } = await approachApi.copyData(rows)
     //处理数据
     copyTableLoading.value = false
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         copyTableModal.value = false
         await getTableData()
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -638,7 +641,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await approachApi.removeData({
+        const { error, code, msg } = await approachApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             ids: ids,
@@ -647,6 +650,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/tentative/material/sampling.vue

@@ -533,7 +533,7 @@ const addEditFormClick = async () => {
     const validate = await formValidate(addEditFormRef.value)
     if (validate) {
         addEditFormLoading.value = true
-        const { error, code } = await samplingApi.submitForm({
+        const { error, code, msg } = await samplingApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -547,6 +547,8 @@ const addEditFormClick = async () => {
                 addEditFormLoading.value = false
             }, 1000)
             await getTableData()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -599,13 +601,15 @@ const copyTableClick = () => {
 //复制数据请求
 const tableCopyData = async (rows) => {
     copyTableLoading.value = true
-    const { error, code } = await samplingApi.copyData(rows)
+    const { error, code, msg } = await samplingApi.copyData(rows)
     //处理数据
     copyTableLoading.value = false
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         copyTableModal.value = false
         await getTableData()
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -621,7 +625,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await samplingApi.removeData({
+        const { error, code, msg } = await samplingApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             ids: ids,
@@ -630,6 +634,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/tentative/parameter/compactness.vue

@@ -189,7 +189,7 @@ const addEditFormClick = async () => {
     if (validate) {
         //发起请求
         addEditFormLoading.value = true
-        const { error, code } = await dataApi.submitForm({
+        const { error, code, msg } = await dataApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -201,6 +201,8 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
             addEditFormLoading.value = false
             await getTableData()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -217,7 +219,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             ids: ids,
@@ -226,6 +228,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/tentative/parameter/container.vue

@@ -419,13 +419,15 @@ const addEditNodeFormModalSave = () => {
 //提交保存分类
 const submitClassification = async (form) => {
     addEditNodeFormLoading.value = true
-    const { error, code } = await dataApi.submitClassification(form)
+    const { error, code, msg } = await dataApi.submitClassification(form)
     //处理数据
     addEditNodeFormLoading.value = false
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         addEditNodeFormModal.value = false
         await getMenusData()
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -448,7 +450,7 @@ const delNodeModalClick = (id) => {
 //删除容器
 const removeClassification = async (id) => {
     //删除请求
-    const { error, code } = await dataApi.removeClassification({
+    const { error, code, msg } = await dataApi.removeClassification({
         projectId: projectId.value,
         contractId: contractId.value,
         id: id,
@@ -457,6 +459,8 @@ const removeClassification = async (id) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         getMenusData()
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -569,7 +573,7 @@ const addEditFormClick = async () => {
             }
         })
         //发起请求
-        const { error, code } = await dataApi.submitForm({
+        const { error, code, msg } = await dataApi.submitForm({
             projectId: projectId.value,
             contractId: contractId.value,
             beanList,
@@ -587,6 +591,8 @@ const addEditFormClick = async () => {
 
             await getTableData()
             console.log(addEditFormLoading.value, 'addEditFormLoading.value')
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -604,7 +610,7 @@ const tableRemoveData = async () => {
         const ids = arrToId(rows)
         const { containerInitTabName } = menuItem.value
         //删除请求
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             containerInitTabName: containerInitTabName,
@@ -614,6 +620,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/tentative/parameter/density.vue

@@ -171,7 +171,7 @@ const addEditFormClick = async () => {
     if (validate) {
         addEditFormLoading.value = true
         //发起请求
-        const { error, code } = await dataApi.submitForm({
+        const { error, code, msg } = await dataApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -183,6 +183,8 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
             addEditFormLoading.value = false
             await getTableData()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -199,7 +201,7 @@ const tableRemoveData = async () => {
     if (rows.length > 0) {
         const ids = arrToId(rows)
         //删除请求
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             ids: ids,
@@ -208,6 +210,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/tentative/parameter/sieve.vue

@@ -304,7 +304,7 @@ const addEditNodeFormModalSave = async () => {
     if (validate) {
         addEditNodeFormLoading.value = true
         //发起请求
-        const { error, code } = await dataApi.submitClassification({
+        const { error, code, msg } = await dataApi.submitClassification({
             ...addEditNodeFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -316,6 +316,8 @@ const addEditNodeFormModalSave = async () => {
             addEditNodeFormModal.value = false
             addEditNodeFormLoading.value = false
             await queryClassification()
+        } else {
+            window?.$message?.error(msg)
         }
 
         addEditFormLoading.value = false
@@ -331,7 +333,7 @@ const addEditNodeFormModalClose = () => {
 //删除分类
 const delClassification = async (item) => {
     //删除请求
-    const { error, code } = await dataApi.removeField({
+    const { error, code, msg } = await dataApi.removeField({
         projectId: projectId.value,
         contractId: contractId.value,
         id: item.id,
@@ -340,6 +342,8 @@ const delClassification = async (item) => {
     if (!error && code === 200) {
         window?.$message?.success('操作成功')
         await queryClassification()
+    } else {
+        window?.$message?.error(msg)
     }
 }
 
@@ -418,7 +422,7 @@ const addEditFormClick = async () => {
     if (validate) {
         addEditFormLoading.value = true
         //发起请求
-        const { error, code } = await dataApi.submitForm({
+        const { error, code, msg } = await dataApi.submitForm({
             ...addEditFormModel.value,
             projectId: projectId.value,
             contractId: contractId.value,
@@ -430,6 +434,8 @@ const addEditFormClick = async () => {
             addEditFormModal.value = false
             addEditFormLoading.value = false
             await getTableData()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }
@@ -446,7 +452,7 @@ const tableRemoveData = async () => {
     const rows = tableCheckedKeys.value
     if (rows.length > 0) {
         const ids = arrToId(rows)
-        const { error, code } = await dataApi.removeData({
+        const { error, code, msg } = await dataApi.removeData({
             projectId: projectId.value,
             contractId: contractId.value,
             ids: ids,
@@ -455,6 +461,8 @@ const tableRemoveData = async () => {
         if (!error && code === 200) {
             window?.$message?.success('操作成功')
             searchClick()
+        } else {
+            window?.$message?.error(msg)
         }
     }
 }

src/views/user/index.vue

@@ -296,13 +296,14 @@ const uploadFinish = async (res) => {
     const link = res?.data?.link ?? ''
     const user_id = userInfo.value?.user_id ?? ''
     if (link) {
-        const { error, code } = await userApi.updateUserInfo({ avatar: link, id: user_id })
+        const { error, code, msg } = await userApi.updateUserInfo({ avatar: link, id: user_id })
         if (!error && code === 200) {
             avatarLoading.value = false
             userInfo.value.avatar = link
             window?.$message?.success('更换头像成功')
             useAppState.setUserInfo(userInfo.value)
         } else {
+            window?.$message?.error(msg)
             avatarLoading.value = false
         }
     } else {
@@ -449,7 +450,7 @@ const saveUserInfoData = async () => {
     const { phone, user_id } = formUserModel.value
     if (phone && isPhone(phone)) {
         saveUserLoading.value = true
-        const { error, code } = await userApi.updateUserInfo({
+        const { error, code, msg } = await userApi.updateUserInfo({
             phone: phone,
             id: user_id,
         })
@@ -459,6 +460,7 @@ const saveUserInfoData = async () => {
             userInfo.value.phone = phone
             useAppState.setUserInfo(userInfo.value)
         } else {
+            window?.$message?.error(msg)
             saveUserLoading.value = false
         }
     }