695593266@qq.com 11 месяцев назад
Родитель
Сommit
85283ed641

+ 83 - 79
src/utils/request.js

@@ -1,85 +1,89 @@
 /**
  * axios 实例
  */
- import axios from 'axios';
- import router from '@/router';
- import store from '@/store';
- import { MessageBox, Message } from 'element-ui';
- import { API_BASE_URL, TOKEN_HEADER_NAME, LAYOUT_PATH } from '@/config/setting';
- import { getToken, setToken } from './token-util';
- import { logout } from './page-tab-util';
- import JSONBIG from 'json-bigint';
- const service = axios.create({
-   baseURL: API_BASE_URL,
-   transformResponse: [
-     function (data) {
-       if (data instanceof Blob) {
-         return data;
-       }
-       const json = JSONBIG({
-         storeAsString: true
-       });
-       const res = json.parse(data);
-       return res;
-     }
-   ]
- });
- /**
-  * 添加请求拦截器
-  */
- service.interceptors.request.use(
-   (config) => {
-     // 添加 token 到 header
-     const token = getToken();
-     if (token && config.headers) {
-       config.headers.common[TOKEN_HEADER_NAME] = token;
-     }
+import axios from 'axios';
+import router from '@/router';
+import store from '@/store';
+import { MessageBox, Message } from 'element-ui';
+import { API_BASE_URL, TOKEN_HEADER_NAME, LAYOUT_PATH } from '@/config/setting';
+import { getToken, setToken } from './token-util';
+import { logout } from './page-tab-util';
+import JSONBIG from 'json-bigint';
+const service = axios.create({
+  baseURL: API_BASE_URL,
+  transformResponse: [
+    function (data) {
+      if (data instanceof Blob) {
+        return data;
+      }
+      const json = JSONBIG({
+        storeAsString: true
+      });
+      const res = json.parse(data);
+      return res;
+    }
+  ]
+});
+/**
+ * 添加请求拦截器
+ */
+service.interceptors.request.use(
+  (config) => {
+    // 添加 token 到 header
+    const token = getToken();
+    if (token && config.headers) {
+      config.headers.common[TOKEN_HEADER_NAME] = token;
+    }
 
-     return config;
-   },
-   (error) => {
-     return Promise.reject(error);
-   }
- );
+    return config;
+  },
+  (error) => {
+    return Promise.reject(error);
+  }
+);
 
- /**
-  * 添加响应拦截器
-  */
- service.interceptors.response.use(
-   (res) => {
-     // token 自动续期
-     if (res.data.code == '-1' && res.config?.showErrorToast !== false&&res.data.message) {
-       Message.error(res.data.message);
-     }
-     const token = res.headers[TOKEN_HEADER_NAME.toLowerCase()];
-     if (token) {
-       setToken(token);
-     }
-     return res;
-   },
-   (error) => {
-     // 登录过期处理
-     if (error?.response?.status === 401) {
-       const currentPath = router.currentRoute.path;
-       if (currentPath === LAYOUT_PATH) {
-         logout(true);
-       } else {
-         MessageBox.alert('登录状态已过期, 请退出重新登录!', '系统提示', {
-           confirmButtonText: '重新登录',
-           callback: (action) => {
-             if (action === 'confirm') {
-               logout(false, currentPath);
-             }
-           },
-           beforeClose: () => {
-             MessageBox.close();
-           }
-         });
-       }
-       return Promise.reject(new Error(error.response.data?.message));
-     }
-     return Promise.reject(error);
-   }
- );
+/**
+ * 添加响应拦截器
+ */
+service.interceptors.response.use(
+  (res) => {
+    // token 自动续期
+    if (
+      res.data.code == '-1' &&
+      res.config?.showErrorToast !== false &&
+      res.data.message
+    ) {
+      Message.error(res.data.message);
+    }
+    const token = res.headers[TOKEN_HEADER_NAME.toLowerCase()];
+    if (token) {
+      setToken(token);
+    }
+    return res;
+  },
+  (error) => {
+    // 登录过期处理
+    if (error?.response?.status === 401) {
+      const currentPath = router.currentRoute.path;
+      if (currentPath === LAYOUT_PATH) {
+        logout(true);
+      } else {
+        MessageBox.alert('登录状态已过期, 请退出重新登录!', '系统提示', {
+          confirmButtonText: '重新登录',
+          callback: (action) => {
+            if (action === 'confirm') {
+              logout(false, currentPath);
+            }
+          },
+          beforeClose: () => {
+            MessageBox.close();
+          }
+        });
+      }
+      return Promise.reject(new Error(error.response.data?.message));
+    }
+    return Promise.reject(error);
+  }
+);
 
- export default service;
+export default service;

+ 13 - 43
src/views/materialPlan/components/plan-edit-dialog.vue

@@ -90,7 +90,6 @@
 
         <template v-slot:bomId="{ row }">
           <el-select
-            v-if="row.bomType == '1'"
             v-model="row.bomId"
             placeholder="请选择"
             style="width: 100%"
@@ -108,33 +107,7 @@
             >
             </el-option> -->
             <el-option
-              v-for="item in getPBOMData(row)"
-              :key="item.id"
-              :label="'V' + item.versions + '.0'"
-              :value="item.id"
-            >
-            </el-option>
-          </el-select>
-          <el-select
-            v-if="row.bomType == '2'"
-            v-model="row.bomId"
-            placeholder="请选择"
-            style="width: 100%"
-            :disabled="type == 'detail'"
-            @change="changeVersions(row)"
-          >
-            <!-- <el-option
-              v-for="item in row.bomCategoryList"
-              :key="item.bomType == row.bomType ? item.id : ''"
-              :label="
-                item.bomType == row.bomType ? 'V' + item.versions + '.0' : ''
-              "
-              :value="item.bomType == row.bomType ? item.id : ''"
-              v-if="item.id !== ''"
-            >
-            </el-option> -->
-            <el-option
-              v-for="item in getMBOMData(row)"
+              v-for="item in getBOMData(row)"
               :key="item.id"
               :label="'V' + item.versions + '.0'"
               :value="item.id"
@@ -987,26 +960,23 @@
       },
       changeType(row, value) {
         // console.log(1121313123);
-        if (value == '1') {
-          this.getPBOMData(row);
-          // this.changeVersions(row)
-        } else if (value == '2') {
-          this.getMBOMData(row);
-          // this.changeVersions(row)
+        const data = row.bomCategoryList.filter(
+          (item) => item.bomType == row.bomType
+        );
+        if (data.length > 0) {
+          row.bomId = data[0].bomId;
+          this.changeVersions(row);
+        } else {
+          row.bomId = '';
         }
       },
-      getPBOMData(row) {
-        const data = row.bomCategoryList.filter((item) => item.bomType == '1');
 
-        return data;
-        // console.log('PBOM', row);
+      getBOMData(row) {
+        return row.bomCategoryList.filter(
+          (item) => item.bomType == row.bomType
+        );
       },
 
-      getMBOMData(row) {
-        const data = row.bomCategoryList.filter((item) => item.bomType == '2');
-
-        return data;
-      },
       //选择工艺路线
       openVersion(row) {
         this.xsId = row.id;

+ 22 - 27
src/views/materialPlan/components/producePlan.vue

@@ -90,7 +90,6 @@
 
         <template v-slot:bomId="{ row }">
           <el-select
-            v-if="row.bomType == '1'"
             v-model="row.bomId"
             placeholder="请选择"
             style="width: 100%"
@@ -108,22 +107,22 @@
             >
             </el-option> -->
             <el-option
-              v-for="item in getPBOMData(row)"
+              v-for="item in getBOMData(row)"
               :key="item.id"
               :label="'V' + item.versions + '.0'"
               :value="item.id"
             >
             </el-option>
           </el-select>
-          <el-select
+          <!-- <el-select
             v-if="row.bomType == '2'"
             v-model="row.bomId"
             placeholder="请选择"
             style="width: 100%"
             :disabled="type == 'detail'"
             @change="changeVersions(row)"
-          >
-            <!-- <el-option
+          > -->
+          <!-- <el-option
               v-for="item in row.bomCategoryList"
               :key="item.bomType == row.bomType ? item.id : ''"
               :label="
@@ -133,14 +132,14 @@
               v-if="item.id !== ''"
             >
             </el-option> -->
-            <el-option
-              v-for="item in getMBOMData(row)"
+          <!-- <el-option
+              v-for="item in getMBOMData(row, $index)"
               :key="item.id"
               :label="'V' + item.versions + '.0'"
               :value="item.id"
             >
             </el-option>
-          </el-select>
+          </el-select> -->
         </template>
 
         <!-- <template v-slot:bomId="{ row }">
@@ -161,13 +160,13 @@
           </el-select>
         </template> -->
 
-        <template v-slot:bomType="{ row }">
+        <template v-slot:bomType="{ row, $index }">
           <el-select
             v-model="row.bomType"
             placeholder="请选择"
             style="width: 100%"
             :disabled="type == 'detail'"
-            @change="changeType(row, row.bomType)"
+            @change="changeType(row, row.bomType, $index)"
           >
             <el-option
               v-for="item in bomTypeList"
@@ -951,28 +950,24 @@
         this.$forceUpdate();
       },
 
-      changeType(row, value) {
-        // console.log(1121313123);
-        if (value == '1') {
-          this.getPBOMData(row);
-          // this.changeVersions(row)
-        } else if (value == '2') {
-          this.getMBOMData(row);
-          // this.changeVersions(row)
+      changeType(row) {
+        const data = row.bomCategoryList.filter(
+          (item) => item.bomType == row.bomType
+        );
+        if (data.length > 0) {
+          row.bomId = data[0].bomId;
+          this.changeVersions(row);
+        } else {
+          row.bomId = '';
         }
       },
-      getPBOMData(row) {
-        const data = row.bomCategoryList.filter((item) => item.bomType == '1');
 
-        return data;
-        // console.log('PBOM', row);
+      getBOMData(row) {
+        return row.bomCategoryList.filter(
+          (item) => item.bomType == row.bomType
+        );
       },
 
-      getMBOMData(row) {
-        const data = row.bomCategoryList.filter((item) => item.bomType == '2');
-
-        return data;
-      },
       remove2(row) {
         const data = this.$refs.table.getData() ?? [];
         this.formData.materialRemoveIds.push(row.categoryId);

+ 2 - 1
vue.config.js

@@ -35,9 +35,10 @@ module.exports = {
         // target: 'http://192.168.1.103:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.158:18086',
-        target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.251:18086',
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.251:18186',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {