Merge branch 'master' of http://121.196.213.68:3000/xiaozhiyong/refinery-customer-admin into lixuan

Reviewed-on: #3

src/utils/request.js

@@ -22,6 +22,7 @@ service.interceptors.request.use(
     const JSESSIONID = utils.uuid();
     config.headers["JSESSIONID"] = JSESSIONID;
     config.headers["token"] = utils.bcrypt(JSESSIONID);
+    config.headers['dataSources'] = 'WEB'
 
     if (env === "development") {
       return config;

src/views/order/index.vue

@@ -253,7 +253,9 @@ export default {
         currentPage: 1,
         pageSize: 10,
         total: 0,
-        params: {},
+        params: {
+          
+        },
       },
       oilCompanyMatch: {},
       billData:[],
@@ -335,6 +337,7 @@ export default {
     },
     //table list
     getByPage() {
+      this.parameter.params.customerId=this.$store.state.user.companyId
       order.getByPage(this.parameter).then((res) => {
         this.tableData = res.data.list;
         this.total = res.data.totalCount;

src/views/product/components/create.vue

@@ -107,14 +107,14 @@ export default {
     "form.salePrice": {
       handler(n, o) {
         if(n){
-          this.form.preAmount = this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)
+          this.form.preAmount = (this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)).toFixed(2)
         }
       },
     },
     "form.preQuantity": {
       handler(n, o) {
         if(n){
-          this.form.preAmount = this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)
+          this.form.preAmount = (this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)).toFixed(2)
         }
       },
     }