perf(axios):拦截器提取，避免重复拦截

src/apis/axios.js

@@ -56,18 +56,18 @@ export default async(
   //     return res;
   //   });
   // 请求拦截器
-  axios.interceptors.request.use(
-    config => {
-      if (!config.data.token) {
-        config.data.token = getToken()
-      }
-      return config
-    },
-    error => {
-      // 错误抛到业务代码
-      return Promise.reject(new Error('服务器异常，请联系管理员！'))
-    }
-  )
+  // axios.interceptors.request.use(
+  // config => {
+  // if (!config.data.token) {
+  // config.data.token = getToken()
+  // }
+  // return config
+  // },
+  // error => {
+  // 错误抛到业务代码
+  //     return Promise.reject(new Error('服务器异常，请联系管理员！'))
+  //   }
+  // )
   // 添加响应拦截器
   axios.interceptors.response.use(
     async response => {

src/apis/user/axios.js

@@ -47,40 +47,7 @@ export default async(
   if (onUploadProgress && typeof onUploadProgress === 'function') {
     obj.onUploadProgress = onUploadProgress
   }
-  // 请求拦截器
-  axios.interceptors.request.use(
-    config => {
-      if (!config.data.token) {
-        config.data.token = getToken()
-      }
 
-      const { noRelation, needRela, relaComNo } = config.data
-      // const deleteKeys = ['needRela', 'noRealtion']
-      // deleteKeys.forEach(key => key in config.data && delete config.data[key])
-      const innerRelaComNo = store.state.user.currentCompany
-      // 决定传递关联公司:非超管用户且单独的请求中data中没有设置noRelation
-      // needRela: 超管需要传递关联公司(默认超管不传递)
-      // noRelation: 普通用户不传递关联公司(默认普通用户传递)
-      const isAllowRelaComNo = !store.state.user.isSupertube && !noRelation
-      config.data.relaComNo = isAllowRelaComNo ? innerRelaComNo : ''
-      if (needRela) config.data.relaComNo = relaComNo || innerRelaComNo
-
-      return config
-    },
-    () => {
-      // 错误抛到业务代码
-      return Promise.reject(new Error('服务器异常，请联系管理员！'))
-    }
-  )
-  // 添加响应拦截器
-  axios.interceptors.response.use(
-    async response => {
-      return response
-    },
-    error => {
-      return Promise.reject(error.response.data)
-    }
-  )
   return new Promise((resolve, reject) => {
     axios(obj)
       .then(response => {
@@ -91,3 +58,37 @@ export default async(
       })
   })
 }
+
+// 请求拦截器
+axios.interceptors.request.use(
+  config => {
+    if (!config.data.token) {
+      config.data.token = getToken()
+    }
+    const { noRelation, needRela, relaComNo } = config.data
+    const innerRelaComNo = store.state.user.currentCompany
+    // 决定传递关联公司:非超管用户且单独的请求中data中没有设置noRelation
+    // needRela: 超管需要传递关联公司(默认超管不传递)
+    // noRelation: 普通用户不传递关联公司(默认普通用户传递)
+    const isAllowRelaComNo = !store.state.user.isSupertube && !noRelation
+    config.data.relaComNo = isAllowRelaComNo ? innerRelaComNo : ''
+    if (needRela) config.data.relaComNo = relaComNo || innerRelaComNo
+    const deleteKeys = ['needRela', 'noRelation']
+    deleteKeys.forEach(key => key in config.data && delete config.data[key])
+    return config
+  },
+  () => {
+    // 错误抛到业务代码
+    return Promise.reject(new Error('服务器异常，请联系管理员！'))
+  }
+)
+
+// 添加响应拦截器
+axios.interceptors.response.use(
+  async response => {
+    return response
+  },
+  error => {
+    return Promise.reject(error.response.data)
+  }
+)

src/views/sellOut/hawbWorkbench/index.vue

@@ -54,7 +54,7 @@
           </show-data-table>
         </el-collapse-item>
 
-        <el-collapse-item title="待分单" name="2">
+        <el-collapse-item title="待分仓" name="2">
           <div style="width:100%">
             <el-table size="mini">
               <el-table-column prop="ckbm" label="仓库号码" min-width="120" />
@@ -70,7 +70,7 @@
               </el-table-column>
             </el-table>
 
-            <div style="width:100;display: flex;justify-content: flex-end;padding-right: 30px;margin-top: 20px;">
+            <div style="width:100;display: flex;justify-content: flex-end;padding-right: 30px;margin: 20px 0px;">
               <el-button type="primary" size="mini">保存</el-button>
               <el-button size="mini">取消</el-button>
             </div>

src/views/sellOut/zixunOrder/components/addEditBargain.vue

@@ -50,8 +50,8 @@
             <el-form-item label="单位" label-width="50px">
               <el-input
                 v-if="show_sitem"
-                maxlength="10"
                 v-model="show_sitem.unit"
+                maxlength="10"
                 disabled
               />
             </el-form-item>
@@ -150,22 +150,25 @@
           <el-col :span="16">
             <el-form-item label="议价备注:" prop="bargain_remark" label-width="88px">
               <el-input
+                v-model="ruleForm.bargain_remark"
                 type="textarea"
                 :rows="2"
                 maxlength="250"
                 show-word-limit
                 placeholder="议价备注"
-                v-model="ruleForm.bargain_remark"
-              >
-              </el-input>
+              />
             </el-form-item>
           </el-col>
           <el-col :span="24" style="text-align: right">
-            <el-button @click="showModelThis = false" :size="'mini'">{{
+            <el-button :size="'mini'" @click="showModelThis = false">{{
               isDetail ? "关 闭" : "取 消"
             }}</el-button>
-            <el-button v-if="!isDetail" type="primary" :size="'mini'" @click="submitForm"
-              >保 存
+            <el-button
+              v-if="!isDetail"
+              type="primary"
+              :size="'mini'"
+              @click="submitForm"
+            >保 存
             </el-button>
           </el-col>
         </el-row>
@@ -174,26 +177,26 @@
   </el-dialog>
 </template>
 <script>
-import asyncRequest from "@/apis/service/sellOut/bargainList";
-import resToken from "@/mixins/resToken";
-import { add_sum } from "@/utils/validate";
+import asyncRequest from '@/apis/service/sellOut/bargainList'
+import resToken from '@/mixins/resToken'
+import { add_sum } from '@/utils/validate'
 export default {
-  name: "Account",
-  props: ["showModel", "sitem"],
+  name: 'Account',
   mixins: [resToken],
+  props: ['showModel', 'sitem'],
   data() {
     return {
       roleList: [],
       loading: false,
-      title: "添加账号",
+      title: '添加账号',
       organizeList: [],
       showModelThis: this.showModel,
       ruleForm: {
-        result_info_id: "",
-        bargain_price: "0",
-        result_info_id_name: "",
-        bargain_remark: "",
-        cost_price: "0",
+        result_info_id: '',
+        bargain_price: '0',
+        result_info_id_name: '',
+        bargain_remark: '',
+        cost_price: '0'
       },
       show_sitem: null,
       rulesThis: this.rules,
@@ -201,161 +204,161 @@ export default {
         result_info_id: [
           {
             required: true,
-            message: "请选择议价原因！",
-            trigger: "change",
-          },
+            message: '请选择议价原因！',
+            trigger: 'change'
+          }
         ],
         bargain_price: [
           {
             required: true,
-            message: "期望售价不能为空！",
-            trigger: "blur",
-          },
+            message: '期望售价不能为空！',
+            trigger: 'blur'
+          }
         ],
         cost_price: [
           {
             required: true,
-            message: "期望工艺费不能为空！",
-            trigger: "blur",
-          },
+            message: '期望工艺费不能为空！',
+            trigger: 'blur'
+          }
         ],
         bargain_remark: [
           {
             required: true,
-            message: "议价备注不能为空！",
-            trigger: "blur",
-          },
-        ],
-      },
-    };
+            message: '议价备注不能为空！',
+            trigger: 'blur'
+          }
+        ]
+      }
+    }
   },
   watch: {
-    showModel: function (val) {
-      this.showModelThis = val;
+    showModel: function(val) {
+      this.showModelThis = val
       if (val) {
-        this.initForm();
+        this.initForm()
       }
     },
     showModelThis(val) {
       if (!val) {
-        this.$emit("cancel");
+        this.$emit('cancel')
       }
-    },
+    }
   },
   methods: {
     async initForm() {
-      this.loading = true;
-      this.rulesThis = this.rules;
-      await this.resetForm();
-      this.loading = false;
+      this.loading = true
+      this.rulesThis = this.rules
+      await this.resetForm()
+      this.loading = false
     },
 
     number_change(e, key) {
-      this.ruleForm[key] = e + "" || "0";
-      this.$refs.ruleForm.validateField(key);
+      this.ruleForm[key] = e + '' || '0'
+      this.$refs.ruleForm.validateField(key)
     },
 
     async resetForm() {
       // 重置
       await this.$nextTick(() => {
-        this.show_sitem = JSON.parse(JSON.stringify(this.sitem));
-        const { origin_price, specinfo, cost_fee, bidNo } = this.sitem;
+        this.show_sitem = JSON.parse(JSON.stringify(this.sitem))
+        const { origin_price, specinfo, cost_fee, bidNo } = this.sitem
         if (specinfo && specinfo.length > 0) {
           specinfo.forEach((a, ai) => {
-            this.show_sitem.good_name += `${ai === 0 ? "_" : "-"}${a.spec_name}[${
+            this.show_sitem.good_name += `${ai === 0 ? '_' : '-'}${a.spec_name}[${
               a.spec_value_name
-            }]`;
-          });
+            }]`
+          })
         }
         if (this.$refs.ruleForm) {
-          this.$refs.ruleForm.resetFields();
-          this.$refs.ruleForm.clearValidate();
+          this.$refs.ruleForm.resetFields()
+          this.$refs.ruleForm.clearValidate()
           this.ruleForm = {
-            bargain_price: origin_price || "0",
-            bidNo: bidNo || "",
-            bargain_remark: "",
-            cost_price: cost_fee || "0",
-            result_info_id: "",
-            result_info_id_name: "",
-          };
+            bargain_price: origin_price || '0',
+            bidNo: bidNo || '',
+            bargain_remark: '',
+            cost_price: cost_fee || '0',
+            result_info_id: '',
+            result_info_id_name: ''
+          }
         }
-      });
+      })
     },
     select_change(e) {
-      const { code, label } = e;
-      this.ruleForm.result_info_id = code || "";
-      this.ruleForm.result_info_id_name = label || "";
-      this.$refs.ruleForm.validateField("result_info_id");
+      const { code, label } = e
+      this.ruleForm.result_info_id = code || ''
+      this.ruleForm.result_info_id_name = label || ''
+      this.$refs.ruleForm.validateField('result_info_id')
     },
     async submitForm() {
-      await this.$refs.ruleForm.validate(async (valid) => {
+      await this.$refs.ruleForm.validate(async(valid) => {
         if (valid) {
           if (this.loading) {
-            return;
+            return
           }
-          this.loading = true;
-          const { bidNo, origin_price, is_gold_price, can, cost_fee } = this.sitem;
-          const { bargain_price, cost_price } = this.ruleForm;
-          let a = add_sum(origin_price + "", "0");
-          let b = add_sum(bargain_price + "", "0");
+          this.loading = true
+          const { bidNo, origin_price, is_gold_price, can, cost_fee } = this.sitem
+          const { bargain_price, cost_price } = this.ruleForm
+          const a = add_sum(origin_price + '', '0')
+          const b = add_sum(bargain_price + '', '0')
           if (b > a) {
-            this.$message.warning("期望售价不能高于当前售价");
-            this.loading = false;
-            return;
+            this.$message.warning('期望售价不能高于当前售价')
+            this.loading = false
+            return
           }
 
-          let c = add_sum(cost_fee + "", "0");
-          let d = add_sum(cost_price + "", "0");
+          const c = add_sum(cost_fee + '', '0')
+          const d = add_sum(cost_price + '', '0')
           if (d > c) {
-            this.$message.warning("期望工艺费不能高于当前工艺费");
-            this.loading = false;
-            return;
+            this.$message.warning('期望工艺费不能高于当前工艺费')
+            this.loading = false
+            return
           }
 
-          let model = JSON.parse(JSON.stringify(this.ruleForm));
-          console.log(model);
-          delete model["result_info_id_name"];
+          const model = JSON.parse(JSON.stringify(this.ruleForm))
+          console.log(model)
+          delete model['result_info_id_name']
 
-          //根据实时金价对接口进行不同传参
-          if (is_gold_price == "1" && can && can.length > 0 && can[0].id + "" == "6") {
+          // 根据实时金价对接口进行不同传参
+          if (is_gold_price == '1' && can && can.length > 0 && can[0].id + '' == '6') {
             if (c === d) {
-              this.$message.warning("期望工艺费不能等于当前工艺费!");
-              this.loading = false;
-              return;
+              this.$message.warning('期望工艺费不能等于当前工艺费!')
+              this.loading = false
+              return
             }
-            model.bargain_price = "0";
+            model.bargain_price = '0'
           } else {
             if (a === b) {
-              this.$message.warning("期望售价不能等于当前售价!");
-              this.loading = false;
-              return;
+              this.$message.warning('期望售价不能等于当前售价!')
+              this.loading = false
+              return
             }
-            model.cost_price = "0";
+            model.cost_price = '0'
           }
 
-          let res = await asyncRequest.bargain_add(model);
-          this.loading = false;
+          const res = await asyncRequest.bargain_add(model)
+          this.loading = false
           if (res && res.code === 0) {
             this.$notify.success({
-              title: "议价流程创建成功！",
-              message: "",
-            });
-            this.showModelThis = false;
+              title: '议价流程创建成功！',
+              message: ''
+            })
+            this.showModelThis = false
             // 刷新
-            this.$emit("refresh");
+            this.$emit('refresh')
           } else if (res && res.code >= 100 && res.code <= 104) {
-            await this.logout();
+            await this.logout()
           } else {
-            this.$message.warning(res.message);
+            this.$message.warning(res.message)
           }
         } else {
-          console.log("error submit!!");
-          return false;
+          console.log('error submit!!')
+          return false
         }
-      });
-    },
-  },
-};
+      })
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>