Merge commit 'be7f275792dc3ffc0e7fe352c9d5f538e76b0875'

src/store/getters.js

@@ -21,6 +21,8 @@ const getters = {
   sqlApi: state => state.api.sqlApi,
   swaggerApi: state => state.api.swaggerApi,
   reportApi: state => state.api.reportApi,
-  sidebarRouters: state => state.permission.sidebarRouters
+  sidebarRouters: state => state.permission.sidebarRouters,
+  pointApi: state => state.api.pointApi,
+  stockApi: state => state.api.stockApi,
 }
 export default getters

src/store/modules/api.js

@@ -23,7 +23,11 @@ const api = {
     // report
     reportApi: baseUrl + '/jmreport/list',
     // baseUrl，
-    baseApi: baseUrl
+    baseApi: baseUrl,
+    //点位上传
+    pointApi:baseUrl + '/api/point/import_point',
+    //容器上传
+    stockApi:baseUrl + '/api/stock/import_stock',
   }
 }
 

src/views/base-data/point/index.vue

@@ -65,7 +65,7 @@
           slot='right'
           style="float: right;padding-left: 5px"
           :headers="headers"
-          action="/api/point/import_point"
+          :action="pointApi"
           :file-list="fileList"
           :on-error="handleErr"
           :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
@@ -264,6 +264,7 @@ import viewFullStockIn from '@/views/base-data/point/fullStockIn.vue';
 import viewFullStockOut from '@/views/base-data/point/fullStockOut.vue';
 import pointUrl from '@/api/point'
 import multiAdjust from "@/views/base-data/point/multiAdjust.vue";
+import {mapGetters} from "vuex";
 
 const defaultForm = {id: null, status: 'FREE', enabled: 1, code: null, name: null, description: null, area: null}
 export default {
@@ -334,6 +335,9 @@ export default {
       //表单数据
     }
   },
+  computed: {
+    ...mapGetters(['pointApi'])
+  },
   mounted() {
     this.getArea()
     //获取点位表的数据

src/views/base-data/stock/index.vue

@@ -59,7 +59,7 @@
           slot='right'
           style="float: right;padding-left: 5px"
           :headers="headers"
-          action="/api/stock/import_stock"
+          :action="stockApi"
           :file-list="fileList"
           :on-error="handleErr"
           :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
@@ -173,6 +173,7 @@ import { getStockTypes } from '@/api/stockType'
 import DonMessage from "@/utils/message";
 import {getToken} from "@/utils/auth";
 import {getAres} from "@/api/area";
+import {mapGetters} from "vuex";
 
 const defaultForm = { id: null, status: 'FREE',stockType: null,code: null, pid: null, pointId: null, subCount: null, name: null, typeId: null, length: null, width: null, height: null, weight: null, size: null, useWeight: null, useSize: null, usageWeight: null, usageSize: null, enabled: 1, createBy: null, updateBy: null, createTime: null, updateTime: null, topId: null}
 export default {
@@ -218,6 +219,9 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapGetters(['stockApi'])
+  },
   mounted() {
     this.getArea();
     this.getStockType();

src/views/business-data/inventoryLog/index.vue

@@ -37,7 +37,7 @@
           @change="crud.toQuery"
         />
       </el-select>
-      <el-input v-model="query.propC1" clearable placeholder="请输入批次号" style="width: 140px;" class="filter-item"
+      <el-input v-model="query.propC1" clearable placeholder="请输入Mo票" style="width: 140px;" class="filter-item"
                 @keyup.enter.native="crud.toQuery"/>
       <date-range-picker v-model="query.createTime" class="date-item" style="width: 100px"/>
       <rrOperation :crud="crud"/>
@@ -65,7 +65,7 @@
             <div>{{ scope.row.itemKey.item.name }}</div>
           </template>
         </el-table-column>
-        <el-table-column :show-overflow-tooltip="true" prop="propC1" label="批次号">
+        <el-table-column :show-overflow-tooltip="true" prop="propC1" label="Mo票">
           <template slot-scope="scope">
             <div>{{ scope.row.itemKey.propC1 }}</div>
           </template>