Browse Source

增加错误修改提示

duy 1 year ago
parent
commit
756d449c31

+ 20 - 8
src/views/project/debit/contract/check-list.vue

@@ -571,7 +571,7 @@ const removeContractTreeNode = async () => {
         text: '删除节点中,请耐心等待...',
         background: 'rgba(0, 0, 0, 0.7)',
     })
-    const { error, code } = await deleteNode({
+    const { error, code, msg } = await deleteNode({
         id: treeItem.value.id || '',
         contractId:contractId.value,
     })
@@ -579,7 +579,9 @@ const removeContractTreeNode = async () => {
     if (!error && code === 200) {
         window?.$message?.success('删除成功')
         window?.location?.reload() //刷新页面
-    }
+    } else {
+       window.$message.error(msg)
+     }
 }
 //锁定节点
 const handleLockNode = async ()=>{
@@ -591,7 +593,9 @@ const handleLockNode = async ()=>{
     if (!error && code === 200) {
         window?.$message?.success(msg)
         window?.location?.reload() //刷新页面
-    }
+    } else {
+        window.$message.error(msg)
+     }
 }
 //表格数据
 const tableLoading = ref(false)
@@ -653,7 +657,7 @@ const treeModalSave = async () => {
     const res = await formValidate(formRef.value)
     if (res) {
         if (menuType.value === 'add') {
-            const { error, code } = await addNode({
+            const { error, code, msg } = await addNode({
                 ...formModel.value,
                 isSupplement:0,
             })
@@ -663,9 +667,11 @@ const treeModalSave = async () => {
                 window?.$message?.success('新增成功')
                 treeModalShow.value = false
                 window?.location?.reload() //刷新页面
+            } else {
+                window.$message.error(msg)
             }
         } else if (menuType.value === 'edit') {
-            const { error, code } = await updateForm({
+            const { error, code, msg } = await updateForm({
                 ...formModel.value,
                 isSupplement:0,
             })
@@ -675,6 +681,8 @@ const treeModalSave = async () => {
                 window?.$message?.success('修改成功')
                 treeModalShow.value = false
                 window?.location?.reload() //刷新页面
+            } else {
+                window.$message.error(msg)
             }
         }
     }
@@ -761,7 +769,7 @@ const supplementsModalSave = async () => {
     const res = await formValidate(supplementsFormRef.value)
     if (res) {
 
-        const { error, code } = await addNode({
+        const { error, code, msg } = await addNode({
             ...supplementsFormModel.value,
             isSupplement:1,
             parentId:treeItem.value?.id || '',
@@ -774,7 +782,9 @@ const supplementsModalSave = async () => {
             window?.$message?.success('新增成功')
             supplementsModalShow.value = false
             window?.location?.reload() //刷新页面
-        }
+        } else {
+                window.$message.error(msg)
+         }
     }
 
 }
@@ -823,13 +833,15 @@ const sortModalSave = async () => {
     const ids = arrToId(sortTableData.value)
   //发起请求
   sortNodeLoading.value = true
-    const { error, code } = await sortForm({ ids })
+    const { error, code, msg } = await sortForm({ ids })
     sortNodeLoading.value = false
     //判断状态
     if (!error && code === 200) {
         window?.$message?.success('保存成功')
         sortModalShow.value = false
         window?.location?.reload() //刷新页面
+    } else {
+                window.$message.error(msg)
     }
 
 }

+ 3 - 2
src/views/project/debit/contract/components/pay/row-data.vue

@@ -138,8 +138,9 @@ const modalSave = async () => {
         emit('finish')
         if (!error && code === 200) {
             window?.$message?.success(msg)
-         
-        }
+        } else {
+               window.$message.error(msg)
+         }
 }
 
 //公式

+ 15 - 13
src/views/project/debit/contract/components/pay/system-pay.vue

@@ -16,11 +16,11 @@
 </template>
 
 <script setup>
-import {ref, watch} from 'vue'
+import { ref, watch } from 'vue'
 import payApiPr from '~api/project/debit/project/pay.js'
 import payApiCo from '~api/project/debit/contract/pay.js'
-import {arrToId, getArrValue} from 'js-fast-way'
-import {useAppStore} from '~src/store'
+import { arrToId, getArrValue } from 'js-fast-way'
+import { useAppStore } from '~src/store'
 
 const props = defineProps({
     ids: {
@@ -44,7 +44,7 @@ watch(() => [
     props.ids,
 ], ([ids]) => {
     console.log('ids', ids)
-}, {immediate: true})
+}, { immediate: true })
 
 //监听
 watch(isShow, (val) => {
@@ -56,19 +56,19 @@ watch(isShow, (val) => {
 //表格数据
 const tableLoading = ref(false)
 const tableColumn = [
-    {key: 'payNumber', name: '支付项编号'},
-    {key: 'payName', name: '支付项名称'},
-    {key: 'payType', name: '支付项类型'},
-    {key: 'isDeduct', name: '是否为扣款项'},
-    {key: 'isTotalTerms', name: '是否合计项'},
-    {key: 'payApplicableType', name: '适用类型'},
+    { key: 'payNumber', name: '支付项编号' },
+    { key: 'payName', name: '支付项名称' },
+    { key: 'payType', name: '支付项类型' },
+    { key: 'isDeduct', name: '是否为扣款项' },
+    { key: 'isTotalTerms', name: '是否合计项' },
+    { key: 'payApplicableType', name: '适用类型' },
 ]
 const tableData = ref([])
 //获取数据
 
 const getTableData = async () => {
     tableLoading.value = true
-    const {error, code, data} = await payApiPr.getProPayList({
+    const { error, code, data } = await payApiPr.getProPayList({
         contractId: contractId.value,
         projectId: projectId.value,
     })
@@ -91,7 +91,7 @@ const saveLoading = ref(false)
 const modalSave = async () => {
 
     saveLoading.value = true
-    const {error, code, msg} = await payApiCo.referenced({
+    const { error, code, msg } = await payApiCo.referenced({
         projectId: projectId.value,
         ids: arrToId(selectList.value),
         contractId: contractId.value,
@@ -101,7 +101,9 @@ const modalSave = async () => {
     if (!error && code === 200) {
         window?.$message?.success(msg)
 
-    }
+    } else {
+        window.$message.error(msg)
+     }
     emit('finish')
 }
 </script>

+ 2 - 0
src/views/project/debit/contract/components/unit/row-data.vue

@@ -341,6 +341,8 @@ const modalSave = async () => {
     addNodeLoading.value = false
     if (!error && code === 200) {
         window?.$message?.success(msg)
+    } else {
+        window.$message.error(msg)
     }
     emit('finish')
 }

+ 3 - 1
src/views/project/debit/contract/components/unit/tree-form.vue

@@ -173,7 +173,9 @@ const modalSave = async () => {
             window?.$message?.success(msg)
             tableData.value = []
      
-        }
+        } else {
+             window.$message.error(msg)
+         }
         emit('finish')
     
 }

+ 7 - 5
src/views/project/debit/contract/pay.vue

@@ -256,9 +256,9 @@ const collectModalSave = async () => {
     collectSaveLoading.value = false
     if (!error && code === 200) {
         window?.$message?.success(msg)
-
-
-    }
+    } else {
+            window.$message.error(msg)
+     }
     getDetail(rowViewId.value)
     isCollectShow.value = false
 }
@@ -281,14 +281,16 @@ const delCollectRow = (row) => {
     })
 }
 const removeCollectPay = async (id) => {
-    const { error, code } = await payApi.removeCollect({
+    const { error, code, msg } = await payApi.removeCollect({
         id: rowViewId.value,
         bindId: id,
     })
     if (!error && code === 200) {
         window?.$message?.success('删除成功')
         getDetail(rowViewId.value)
-    }
+    } else {
+         window.$message.error(msg)
+     }
 }
 //添加汇总项
 const tableCollectColumn = ref([

+ 9 - 5
src/views/project/debit/contract/unit.vue

@@ -199,7 +199,7 @@ const setTree = async () => {
             ishowTree.value = true
         }, 100)
     } else {
-        // newlistdata.value = []
+       window.$message.error(msg)
     }
 }
 //懒加载的数据
@@ -373,14 +373,16 @@ const removeContractTreeNode = async () => {
         text: '删除节点中,请耐心等待...',
         background: 'rgba(0, 0, 0, 0.7)',
     })
-    const { error, code } = await unitApi.deleteNode({
+    const { error, code, msg } = await unitApi.deleteNode({
         id: curTreeData.value.id || '',
     })
     loadingInstance.close()
     if (!error && code === 200) {
         window?.$message?.success('删除成功')
         window?.location?.reload() //刷新页面
-    }
+    } else {
+        window.$message.error(msg)
+     }
 }
 //表格数据
 const tableLoading = ref(false)
@@ -476,14 +478,16 @@ const sortModalSave = async () => {
     const ids = arrToId(sortTableData.value)
     //发起请求
     sortNodeLoading.value = true
-    const { error, code } = await unitApi.sortForm({ ids })
+    const { error, code, msg } = await unitApi.sortForm({ ids })
     sortNodeLoading.value = false
     //判断状态
     if (!error && code === 200) {
         window?.$message?.success('保存成功')
         sortModalShow.value = false
         window?.location?.reload() //刷新页面
-    }
+    } else {
+         window.$message.error(msg)
+     }
 }
 //合同计量单元导入
 const leadModalShow = ref(false)

+ 2 - 0
src/views/project/debit/project/components/pay/row-data.vue

@@ -162,6 +162,8 @@ const modalSave = async () => {
         if (!error && code === 200) {
             window?.$message?.success(msg)
          
+        } else {
+            window.$message.error(msg)
         }
 }
 

+ 2 - 0
src/views/project/debit/project/components/pay/system-pay.vue

@@ -96,6 +96,8 @@ const modalSave = async () => {
         if (!error && code === 200) {
             window?.$message?.success(msg)
 
+        } else {
+            window.$message.error(msg)
         }
         emit('finish')
 }

+ 5 - 3
src/views/project/debit/project/pay.vue

@@ -281,8 +281,8 @@ const collectModalSave = async () => {
     collectSaveLoading.value = false
     if (!error && code === 200) {
         window?.$message?.success(msg)
-
-
+    } else {
+        window.$message.error(msg)
     }
     getDetail(rowViewId.value)
     isCollectShow.value = false
@@ -306,13 +306,15 @@ const delCollectRow = (row) => {
     })
 }
 const removeCollectPay = async (id) => {
-    const { error, code } = await payApi.removeCollect({
+    const { error, code, msg } = await payApi.removeCollect({
         id: rowViewId.value,
         bindId: id,
     })
     if (!error && code === 200) {
         window?.$message?.success('删除成功')
         getDetail(rowViewId.value)
+    } else {
+        window.$message.error(msg)
     }
 }
 //添加汇总项

+ 13 - 4
src/views/project/debit/project/unit.vue

@@ -179,6 +179,7 @@ const setTree = async ()=>{
             ishowTree.value = true
         }, 100)
         } else {
+            window.$message.error(msg)
             // newlistdata.value = []
         }
 }
@@ -290,7 +291,7 @@ const treeModalSave = async () => {
     if (menuType.value === 'edit') {
         const isValidate = await formValidate(formRef.value)
         if (!isValidate) return false
-        const { error, code } = await unitApi.updateForm({
+        const { error, code, msg } = await unitApi.updateForm({
             ...formModel.value,
 
         })
@@ -300,12 +301,14 @@ const treeModalSave = async () => {
             window?.$message?.success('修改成功')
             treeModalShow.value = false
             window?.location?.reload() //刷新页面
+        } else {
+            window.$message.error(msg)
         }
     }
     if (menuType.value === 'add') {
         const isValidate = await formValidate(formRef.value)
         if (!isValidate) return false
-        const { error, code } = await unitApi.addNode({
+        const { error, code, msg } = await unitApi.addNode({
             ...formModel.value,
 
         })
@@ -315,6 +318,8 @@ const treeModalSave = async () => {
             window?.$message?.success('新增成功')
             treeModalShow.value = false
             window?.location?.reload() //刷新页面
+        } else {
+            window.$message.error(msg)
         }
     }
 }
@@ -367,13 +372,15 @@ const removeContractTreeNode = async () => {
         text: '删除节点中,请耐心等待...',
         background: 'rgba(0, 0, 0, 0.7)',
     })
-    const { error, code } = await unitApi.deleteNode({
+    const { error, code, msg } = await unitApi.deleteNode({
         id: curTreeData.value.id || '',
     })
     loadingInstance.close()
     if (!error && code === 200) {
         window?.$message?.success('删除成功')
         window?.location?.reload() //刷新页面
+    } else {
+        window.$message.error(msg)
     }
 }
 
@@ -421,13 +428,15 @@ const sortModalSave = async () => {
     const ids = arrToId(sortTableData.value)
   //发起请求
   sortNodeLoading.value = true
-    const { error, code } = await unitApi.sortForm({ ids })
+    const { error, code, msg } = await unitApi.sortForm({ ids })
     sortNodeLoading.value = false
     //判断状态
     if (!error && code === 200) {
         window?.$message?.success('保存成功')
         sortModalShow.value = false
         window?.location?.reload() //刷新页面
+    } else {
+        window.$message.error(msg)
     }
 
 }