chencc před 1 rokem
rodič
revize
7c8e28dba0

+ 19 - 8
src/api/material/BOM.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request';
-
+import { MessageBox, Message } from 'element-ui';
 // 分页
 export async function getPage(params) {
   const res = await request.get(`/main/bom/page`, { params });
@@ -159,17 +159,25 @@ export async function deleteBomTreeList(data) {
 // 保存BOM树节点
 export async function updateBatchBOM(data) {
   const res = await request.post(`/main/bomCategory/updateBatchBOM`, data);
-  if (res.data.code == 0) {
+  console.log(res, "res111111111111111");
+  if (res&&res.data.code == 0) {
     return res.data;
+  }else{
+     Message.error({
+      message:res.data.message
+    });
+    return false;
   }
-  return Promise.reject(new Error(res.data.message));
+ 
 }
 
 // 获取产品BOM列表
 export async function getBomPageList(params) {
   const res = await request.get(`/main/bomCategory/page`, { params });
-  if (res.data.code == 0) {
-    return res.data.data;
+  if (res) {
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
   }
   return Promise.reject(new Error(res.data.message));
 }
@@ -179,9 +187,12 @@ export async function getBomPageCategoryId(params) {
   const res = await request.get(`/main/bomCategory/pageByCategoryId`, {
     params
   });
-  if (res.data.code == 0) {
-    return res.data.data;
+  if (res) {
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
   }
+
   return Promise.reject(new Error(res.data.message));
 }
 
@@ -382,4 +393,4 @@ export async function sourceBomVersion(data) {
     return res.data;
   }
   return Promise.reject(new Error(res.data.message));
-}
+}

+ 10 - 7
src/utils/request.js

@@ -48,19 +48,22 @@ service.interceptors.request.use(
 service.interceptors.response.use(
   (res) => {
     // token 自动续期
-    if (Number(res.data.code) == -1 && res.config?.showErrorToast !== false) {
-      Message.error({
-        dangerouslyUseHTMLString: true,
-        message:res.data.message}
-      );
-      return false;
+
+console.log(res);
+// && res.config?.showErrorToast !== false
+    if (Number(res.data.code) == -1) {
+      // Message.error({
+      //   dangerouslyUseHTMLString: true,
+      //   message:res.data.message}
+      // );
+      return res;
     }
     if (Number(res.data.code) == 500 ) {
       Message.error({
         dangerouslyUseHTMLString: true,
         message:res.data.message}
       );
-      return false;
+      return res;
     }
 
 

+ 27 - 20
src/views/material/BOMmanage/components/detailedList.vue

@@ -4,7 +4,7 @@
     <BOMSearch @search="reload" :statusOpt="statusOpt" />
     <ele-pro-table ref="table" :columns="columns" :datasource="datasource" class="dict-table"
       tool-class="ele-toolbar-actions">
-   
+
       <template v-slot:toolbar>
         <div class="toolbar_box">
           <div v-if="attributeData.status != 1">
@@ -56,7 +56,7 @@
         </div>
 
         <div v-else v-if="row.resourceBomVersion">
-          {{'V' +  row.resourceBomVersion + '.0' }}
+          {{ 'V' + row.resourceBomVersion + '.0' }}
         </div>
 
       </template>
@@ -479,22 +479,22 @@ export default {
               if (element.categoryId == item2.id) {
                 item2.resourceBomVersionList.push(element);
               }
-    
-                item2.resourceBomVersion = item2.resourceBomVersionList[0].versions;
-              item2.resourceBomId = item2.resourceBomVersionList[0].resourceBomId; 
+
+              item2.resourceBomVersion = item2.resourceBomVersionList[0].versions;
+              item2.resourceBomId = item2.resourceBomVersionList[0].resourceBomId;
 
               setTimeout(() => {
                 item2.id = "";
               }, 100);
 
-              
+
             })
           })
         }
 
 
         this.$nextTick(() => {
-          data.map(v=>{
+          data.map(v => {
             v.id = "";
           })
           console.log(data, '++++++++++++++');
@@ -561,17 +561,21 @@ export default {
         type: 'warning'
       })
         .then(() => {
-          // deleteBomTreeList([row.id]).then((msg) => {
-          //   this.$message.success('删除' + msg);
-          //   this.$refs.table.reload({
-          //     pageNum: 1
-          //   });
-          // });
 
-          let _list = this.$refs.table.getData() ?? [];
+          if (row.id) {
+            deleteBomTreeList([row.id]).then((msg) => {
+              this.$message.success('删除' + msg);
+              this.$refs.table.reload({
+                pageNum: 1
+              });
+            });
+          } else {
+            let _list = this.$refs.table.getData() ?? [];
+
+            _list = _list.filter((item) => item.id !== row.id);
+            this.$refs.table.setData(_list);
+          }
 
-          _list = _list.filter((item) => item.id !== row.id);
-          this.$refs.table.setData(_list);
         })
         .finally(() => { });
     },
@@ -592,10 +596,13 @@ export default {
         return this.$message.info('用量不能为空')
       }
       updateBatchBOM(list).then((res) => {
-        this.$message.success('保存成功');
-        this.$refs.table.reload({
-          pageNum: 1
-        });
+        if(res){
+          this.$message.success('保存成功');
+          this.$refs.table.reload({
+            pageNum: 1
+          });
+        }
+        
       });
     }
   }

+ 2 - 2
vue.config.js

@@ -35,10 +35,10 @@ module.exports = {
     proxy: {
       // 当我们的本地的请求 有/api的时候,就会代理我们的请求地址向另外一个服务器发出请求
       '/api': {
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {