Browse Source

2025-1-14

cmy 10 months ago
parent
commit
ee318dfa29

+ 20 - 12
src/views/Authorization/Menu/Menu.vue

@@ -261,19 +261,27 @@ const save = async () => {
       is_show_path: formData.meta.hidden ? 1 : 0, //是否显示路由0显示1隐藏
       extend: formData
     }
-    if (actionType.value === 'edit') {
-      await setMenuApi(data)
-    } else if (actionType.value === '') {
-      await newMenuApi(data)
+    try {
+      let res: any = {}
+      if (actionType.value === 'edit') {
+        res = await setMenuApi(data)
+      } else if (actionType.value === '') {
+        res = await newMenuApi(data)
+      }
+      if (res.status == 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        dialogVisible.value = false
+        getList()
+      }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    ElMessage({
-      showClose: true,
-      message: '保存成功',
-      type: 'success'
-    })
-    getList()
-    saveLoading.value = false
-    dialogVisible.value = false
   }
 }
 </script>

+ 7 - 7
src/views/Authorization/Role/Role.vue

@@ -203,19 +203,19 @@ const save = async () => {
       } else {
         res = await addRoleApi(data)
       }
-      ElMessage({
-        message: '添加成功',
-        type: 'success'
-      })
-      if (res) {
-        currentPage.value = 1
+
+      if (res?.status === 200) {
+        ElMessage({
+          message: '添加成功',
+          type: 'success'
+        })
+        dialogVisible.value = false
         getList()
       }
     } catch (error) {
       console.log(error)
     } finally {
       saveLoading.value = false
-      dialogVisible.value = false
     }
   }
 }

+ 20 - 13
src/views/Authorization/User/User.vue

@@ -243,20 +243,27 @@ const save = async () => {
       roles: formData.roles, //角色数组
       status: formData.status ? 1 : 0 //是否启用
     }
-    // console.log(data, 'data')
-    if (actionType.value === 'edit') {
-      await putUserRole(data)
-    } else if (actionType.value === '') {
-      await addUserRole(data)
+    try {
+      let res: any = {}
+      if (actionType.value === 'edit') {
+        res = await putUserRole(data)
+      } else if (actionType.value === '') {
+        res = await addUserRole(data)
+      }
+      if (res?.status == 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
+      }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    ElMessage({
-      showClose: true,
-      message: '保存成功',
-      type: 'success'
-    })
-    getList()
-    saveLoading.value = false
-    dialogVisible.value = false
   }
 }
 </script>

+ 27 - 13
src/views/Goods/classify/index.vue

@@ -122,7 +122,7 @@ const action = async (type: string, row?: any) => {
       id: row.id,
       name: row.name,
       is_show: row.is_show == 1 ? true : false,
-      image: row.image || [], //一口价
+      image: row.image ? [row.image] : [], //一口价
       sort: row.sort
     }
   }
@@ -160,21 +160,32 @@ const save = async () => {
       image: formData.image[0] || '', //一口价
       sort: formData.sort
     }
-    if (actionType.value === 'edit') {
-      await putProductCategory(data)
-    } else if (actionType.value === 'add') {
-      await addProductCategory(data)
+    try {
+      let re: any = {}
+      if (actionType.value === 'edit') {
+        re = await putProductCategory(data)
+      } else if (actionType.value === 'add') {
+        re = await addProductCategory(data)
+      }
+      if (re.status == 200) {
+        ElMessage({
+          showClose: true,
+          message: '添加成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
+      }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    ElMessage({
-      showClose: true,
-      message: '添加成功',
-      type: 'success'
-    })
-    getList()
-    saveLoading.value = false
-    dialogVisible.value = false
   }
 }
+const load = async (row: any, treeNode: unknown, resolve: any) => {
+  console.log(row, resolve)
+}
 </script>
 
 <template>
@@ -188,6 +199,9 @@ const save = async () => {
       :columns="tableColumns"
       default-expand-all
       node-key="cate_name"
+      lazy
+      :load="load"
+      :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
       stripe
       :data="dataList"
       :loading="loading"

+ 19 - 20
src/views/Goods/list/index.vue

@@ -393,29 +393,28 @@ const save = async () => {
       level: formData.level,
       group_id: formData.group_id
     }
-    let status = 'success'
-    // console.log(formData, 'formData')
-    if (actionType.value === 'edit') {
-      const res = await putUserData(data)
-      if (!res) {
-        status = 'error'
+    try {
+      let res: any = {}
+      // console.log(formData, 'formData')
+      if (actionType.value === 'edit') {
+        res = await putUserData(data)
+      } else if (actionType.value === '') {
+        res = await addUserData(data)
       }
-    } else if (actionType.value === '') {
-      const res = await addUserData(data)
-      if (!res) {
-        status = 'error'
+      if (res?.status == 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
       }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    if (status == 'success') {
-      ElMessage({
-        showClose: true,
-        message: '保存成功',
-        type: 'success'
-      })
-      getList()
-      dialogVisible.value = false
-    }
-    saveLoading.value = false
   }
 }
 const drawerUser = ref(false)

+ 31 - 29
src/views/Login/components/LoginForm.vue

@@ -200,37 +200,39 @@ const loginForm = async (captcha?: any) => {
     redata.captchaVerification = captcha.captchaVerification
   }
   //登录
-  const res = await loginApi(redata)
+  try {
+    const res = await loginApi(redata)
 
-  if (res) {
-    // 是否记住我
-    if (unref(remember)) {
-      userStore.setLoginInfo({
-        username: formData.username,
-        password: formData.password
-      })
-    } else {
-      userStore.setLoginInfo(undefined)
-    }
-    userStore.setRoleName(res.data.unique_auth)
-    userStore.setRememberMe(unref(remember))
-    userStore.setUserInfo(res.data)
-    userStore.setToken(res.data.token)
-    // 是否使用动态路由
-    if (appStore.getDynamicRouter) {
-      loading.close()
-      getRole(res.data.menus)
-    } else {
-      await permissionStore.generateRoutes('static').catch(() => {})
-      permissionStore.getAddRouters.forEach((route) => {
-        addRoute(route as RouteRecordRaw) // 动态添加可访问路由表
-      })
-      permissionStore.setIsAddRouters(true)
-      // console.log(permissionStore)
-      push({ path: redirect.value || permissionStore.addRouters[0].path })
-      loading.close()
+    if (res) {
+      // 是否记住我
+      if (unref(remember)) {
+        userStore.setLoginInfo({
+          username: formData.username,
+          password: formData.password
+        })
+      } else {
+        userStore.setLoginInfo(undefined)
+      }
+      userStore.setRoleName(res.data.unique_auth)
+      userStore.setRememberMe(unref(remember))
+      userStore.setUserInfo(res.data)
+      userStore.setToken(res.data.token)
+      // 是否使用动态路由
+      if (appStore.getDynamicRouter) {
+        getRole(res.data.menus)
+      } else {
+        await permissionStore.generateRoutes('static').catch(() => {})
+        permissionStore.getAddRouters.forEach((route) => {
+          addRoute(route as RouteRecordRaw) // 动态添加可访问路由表
+        })
+        permissionStore.setIsAddRouters(true)
+        // console.log(permissionStore)
+        push({ path: redirect.value || permissionStore.addRouters[0].path })
+      }
     }
-  } else {
+  } catch (error) {
+    console.log(error)
+  } finally {
     loading.close()
   }
 }

+ 20 - 12
src/views/Staff/category/index.vue

@@ -169,19 +169,27 @@ const save = async () => {
       type: formData.type, //类型
       is_show: formData.is_show ? 1 : 0 //是否启用
     }
-    if (actionType.value === 'edit') {
-      await putStaffCategory(data)
-    } else if (actionType.value === 'add') {
-      await addStaffCategory(data)
+    try {
+      let res: any = {}
+      if (actionType.value === 'edit') {
+        res = await putStaffCategory(data)
+      } else if (actionType.value === 'add') {
+        res = await addStaffCategory(data)
+      }
+      if (res?.status == 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
+      }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    ElMessage({
-      showClose: true,
-      message: '保存成功',
-      type: 'success'
-    })
-    getList()
-    saveLoading.value = false
-    dialogVisible.value = false
   }
 }
 </script>

+ 20 - 21
src/views/Staff/designer/index.vue

@@ -101,7 +101,7 @@ const tableColumns = reactive<TableColumn[]>([
   {
     field: 'tag_list_chs',
     label: '标签',
-    minWidth: 120,
+    minWidth: 160,
     slots: {
       default: ({ row }: any) => {
         return (
@@ -260,29 +260,28 @@ const save = async () => {
       detail_address: formData.detail_address,
       start_job_year: formData.start_job_year
     }
-    let status = 'success'
-    if (actionType.value === 'edit') {
-      data.id = formData.id
-      const re = await putDesigner(data)
-      if (!re) {
-        status = 'error'
+    try {
+      let res: any = {}
+      if (actionType.value === 'edit') {
+        data.id = formData.id
+        res = await putDesigner(data)
+      } else if (actionType.value === '') {
+        res = await addDesigner(data)
       }
-    } else if (actionType.value === '') {
-      const re = await addDesigner(data)
-      if (!re) {
-        status = 'error'
+      if (res?.status === 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
       }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    if (status === 'success') {
-      ElMessage({
-        showClose: true,
-        message: '保存成功',
-        type: 'success'
-      })
-      getList()
-      dialogVisible.value = false
-    }
-    saveLoading.value = false
   }
 }
 

+ 20 - 12
src/views/Staff/jobs/index.vue

@@ -162,19 +162,27 @@ const save = async () => {
       is_show: formData.is_show ? 1 : 0, //是否启用
       default_price: formData.default_price //一口价
     }
-    if (actionType.value === 'edit') {
-      await putStaffJobs(data)
-    } else if (actionType.value === 'add') {
-      await addStaffJobs(data)
+    try {
+      let res: any = {}
+      if (actionType.value === 'edit') {
+        res = await putStaffJobs(data)
+      } else if (actionType.value === 'add') {
+        res = await addStaffJobs(data)
+      }
+      if (res?.status == 200) {
+        ElMessage({
+          showClose: true,
+          message: '添加成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
+      }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    ElMessage({
-      showClose: true,
-      message: '添加成功',
-      type: 'success'
-    })
-    getList()
-    saveLoading.value = false
-    dialogVisible.value = false
   }
 }
 </script>

+ 20 - 20
src/views/Staff/worker/index.vue

@@ -259,29 +259,29 @@ const save = async () => {
       detail_address: formData.detail_address,
       start_job_year: formData.start_job_year
     }
-    let status = 'success'
-    if (actionType.value === 'edit') {
-      data.id = formData.id
-      const re = await putWorker(data)
-      if (!re) {
-        status = 'error'
+    try {
+      let res: any = {}
+      if (actionType.value === 'edit') {
+        data.id = formData.id
+        res = await putWorker(data)
+      } else if (actionType.value === '') {
+        res = await addWorker(data)
       }
-    } else if (actionType.value === '') {
-      const re = await addWorker(data)
-      if (!re) {
-        status = 'error'
+      if (res?.status === 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
       }
+      saveLoading.value = false
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    if (status === 'success') {
-      ElMessage({
-        showClose: true,
-        message: '保存成功',
-        type: 'success'
-      })
-      getList()
-      dialogVisible.value = false
-    }
-    saveLoading.value = false
   }
 }
 

+ 20 - 13
src/views/System/class/index.vue

@@ -265,20 +265,27 @@ const save = async () => {
       eng_title: formData.eng_title, //英文名
       info: formData.info //描述
     }
-    console.log(data, 'data')
-    if (actionType.value === 'edit') {
-      await putClass(data)
-    } else if (actionType.value === '') {
-      await addClass(data)
+    try {
+      let res: any = {}
+      if (actionType.value === 'edit') {
+        res = await putClass(data)
+      } else if (actionType.value === '') {
+        res = await addClass(data)
+      }
+      if (res?.status == 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
+      }
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    ElMessage({
-      showClose: true,
-      message: '保存成功',
-      type: 'success'
-    })
-    getList()
-    saveLoading.value = false
-    dialogVisible.value = false
   }
 }
 </script>

+ 21 - 21
src/views/User/level/index.vue

@@ -258,30 +258,30 @@ const save = async () => {
       explain: formData.explain,
       task: formData.task
     }
-    let status = 'success'
-    if (actionType.value === 'edit') {
-      data.id = formData.id
-      // console.log(data)
-      const re = await putUserLevel(data)
-      if (!re) {
-        status = 'error'
+    try {
+      let res: any = {}
+      if (actionType.value === 'edit') {
+        data.id = formData.id
+        // console.log(data)
+        res = await putUserLevel(data)
+      } else if (actionType.value === '') {
+        res = await addUserLevel(data)
       }
-    } else if (actionType.value === '') {
-      const re = await addUserLevel(data)
-      if (!re) {
-        status = 'error'
+      if (res?.status === 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
       }
+      saveLoading.value = false
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    if (status === 'success') {
-      ElMessage({
-        showClose: true,
-        message: '保存成功',
-        type: 'success'
-      })
-      getList()
-      dialogVisible.value = false
-    }
-    saveLoading.value = false
   }
 }
 

+ 20 - 20
src/views/User/list/index.vue

@@ -393,29 +393,29 @@ const save = async () => {
       level: formData.level,
       group_id: formData.group_id
     }
-    let status = 'success'
-    // console.log(formData, 'formData')
-    if (actionType.value === 'edit') {
-      const res = await putUserData(data)
-      if (!res) {
-        status = 'error'
+    let res: any = {}
+    try {
+      // console.log(formData, 'formData')
+      if (actionType.value === 'edit') {
+        res = await putUserData(data)
+      } else if (actionType.value === '') {
+        res = await addUserData(data)
       }
-    } else if (actionType.value === '') {
-      const res = await addUserData(data)
-      if (!res) {
-        status = 'error'
+      if (res?.status == 200) {
+        ElMessage({
+          showClose: true,
+          message: '保存成功',
+          type: 'success'
+        })
+        getList()
+        dialogVisible.value = false
       }
+      saveLoading.value = false
+    } catch (error) {
+      console.log(error)
+    } finally {
+      saveLoading.value = false
     }
-    if (status == 'success') {
-      ElMessage({
-        showClose: true,
-        message: '保存成功',
-        type: 'success'
-      })
-      getList()
-      dialogVisible.value = false
-    }
-    saveLoading.value = false
   }
 }
 const drawerUser = ref(false)