ysy 1 year ago
parent
commit
9b377f8533

+ 1 - 1
src/utils/request.js

@@ -3,7 +3,7 @@
  */
  */
 import axios from 'axios';
 import axios from 'axios';
 import router from '@/router';
 import router from '@/router';
-import store from '@/store';
+
 import { MessageBox, Message } from 'element-ui';
 import { MessageBox, Message } from 'element-ui';
 import { API_BASE_URL, TOKEN_HEADER_NAME, LAYOUT_PATH } from '@/config/setting';
 import { API_BASE_URL, TOKEN_HEADER_NAME, LAYOUT_PATH } from '@/config/setting';
 import { getToken, setToken } from './token-util';
 import { getToken, setToken } from './token-util';

+ 1 - 1
src/views/material/BOMmanage/components/detailedList.vue

@@ -256,7 +256,7 @@
         ],
         ],
         statusOpt: {
         statusOpt: {
           '': '全部',
           '': '全部',
-          0: '已停用',
+          0: '草稿',
           1: '已发布'
           1: '已发布'
         },
         },
 
 

+ 1 - 1
src/views/material/BOMmanage/detailsPop.vue

@@ -636,7 +636,7 @@
           })
           })
             .then(() => {
             .then(() => {
               bomSubmit({ businessId: this.currentNodeData.id }).then((res) => {
               bomSubmit({ businessId: this.currentNodeData.id }).then((res) => {
-                if (res.code == 0) {
+                if (res?.code == 0) {
                   this.$message.success('发布成功');
                   this.$message.success('发布成功');
                   this.getTreeData();
                   this.getTreeData();
                 }
                 }

+ 2 - 2
src/views/material/product/components/index-data.vue

@@ -134,14 +134,14 @@
           结构BOM
           结构BOM
         </el-link>
         </el-link>
 
 
-        <el-link
+        <!-- <el-link
           type="primary"
           type="primary"
           v-if="row.isProduct == 1"
           v-if="row.isProduct == 1"
           :underline="false"
           :underline="false"
           @click="openMaterial(row)"
           @click="openMaterial(row)"
         >
         >
           物料BOM
           物料BOM
-        </el-link>
+        </el-link> -->
 
 
         <!-- <el-link
         <!-- <el-link
           type="primary"
           type="primary"

+ 1 - 0
vue.config.js

@@ -35,6 +35,7 @@ module.exports = {
         // target: 'http://192.168.1.147:18086',
         // target: 'http://192.168.1.147:18086',
         // target: 'http://192.168.1.176:18086',
         // target: 'http://192.168.1.176:18086',
         target: 'http://192.168.1.125:18086',
         target: 'http://192.168.1.125:18086',
+
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
         pathRewrite: {
           '^/api': ''
           '^/api': ''