no message
							parent
							
								
									7397164c39
								
							
						
					
					
						commit
						be7f275792
					
				| 
						 | 
					@ -21,6 +21,8 @@ const getters = {
 | 
				
			||||||
  sqlApi: state => state.api.sqlApi,
 | 
					  sqlApi: state => state.api.sqlApi,
 | 
				
			||||||
  swaggerApi: state => state.api.swaggerApi,
 | 
					  swaggerApi: state => state.api.swaggerApi,
 | 
				
			||||||
  reportApi: state => state.api.reportApi,
 | 
					  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
 | 
					export default getters
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -23,7 +23,11 @@ const api = {
 | 
				
			||||||
    // report
 | 
					    // report
 | 
				
			||||||
    reportApi: baseUrl + '/jmreport/list',
 | 
					    reportApi: baseUrl + '/jmreport/list',
 | 
				
			||||||
    // baseUrl,
 | 
					    // baseUrl,
 | 
				
			||||||
    baseApi: baseUrl
 | 
					    baseApi: baseUrl,
 | 
				
			||||||
 | 
					    //点位上传
 | 
				
			||||||
 | 
					    pointApi:baseUrl + '/api/point/import_point',
 | 
				
			||||||
 | 
					    //容器上传
 | 
				
			||||||
 | 
					    stockApi:baseUrl + '/api/stock/import_stock',
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -65,7 +65,7 @@
 | 
				
			||||||
          slot='right'
 | 
					          slot='right'
 | 
				
			||||||
          style="float: right;padding-left: 5px"
 | 
					          style="float: right;padding-left: 5px"
 | 
				
			||||||
          :headers="headers"
 | 
					          :headers="headers"
 | 
				
			||||||
          action="/api/point/import_point"
 | 
					          :action="pointApi"
 | 
				
			||||||
          :file-list="fileList"
 | 
					          :file-list="fileList"
 | 
				
			||||||
          :on-error="handleErr"
 | 
					          :on-error="handleErr"
 | 
				
			||||||
          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
 | 
					          :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 viewFullStockOut from '@/views/base-data/point/fullStockOut.vue';
 | 
				
			||||||
import pointUrl from '@/api/point'
 | 
					import pointUrl from '@/api/point'
 | 
				
			||||||
import multiAdjust from "@/views/base-data/point/multiAdjust.vue";
 | 
					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}
 | 
					const defaultForm = {id: null, status: 'FREE', enabled: 1, code: null, name: null, description: null, area: null}
 | 
				
			||||||
export default {
 | 
					export default {
 | 
				
			||||||
| 
						 | 
					@ -334,6 +335,9 @@ export default {
 | 
				
			||||||
      //表单数据
 | 
					      //表单数据
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					  computed: {
 | 
				
			||||||
 | 
					    ...mapGetters(['pointApi'])
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  mounted() {
 | 
					  mounted() {
 | 
				
			||||||
    this.getArea()
 | 
					    this.getArea()
 | 
				
			||||||
    //获取点位表的数据
 | 
					    //获取点位表的数据
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -59,7 +59,7 @@
 | 
				
			||||||
          slot='right'
 | 
					          slot='right'
 | 
				
			||||||
          style="float: right;padding-left: 5px"
 | 
					          style="float: right;padding-left: 5px"
 | 
				
			||||||
          :headers="headers"
 | 
					          :headers="headers"
 | 
				
			||||||
          action="/api/stock/import_stock"
 | 
					          :action="stockApi"
 | 
				
			||||||
          :file-list="fileList"
 | 
					          :file-list="fileList"
 | 
				
			||||||
          :on-error="handleErr"
 | 
					          :on-error="handleErr"
 | 
				
			||||||
          :on-success=" (response, file, fileList) => { return handleSuccess(response, file, fileList,crud);}"
 | 
					          :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 DonMessage from "@/utils/message";
 | 
				
			||||||
import {getToken} from "@/utils/auth";
 | 
					import {getToken} from "@/utils/auth";
 | 
				
			||||||
import {getAres} from "@/api/area";
 | 
					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}
 | 
					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 {
 | 
					export default {
 | 
				
			||||||
| 
						 | 
					@ -218,6 +219,9 @@ export default {
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					  computed: {
 | 
				
			||||||
 | 
					    ...mapGetters(['stockApi'])
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  mounted() {
 | 
					  mounted() {
 | 
				
			||||||
    this.getArea();
 | 
					    this.getArea();
 | 
				
			||||||
    this.getStockType();
 | 
					    this.getStockType();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue