mes-ocea-before.git

			@@ -11,7 +11,10 @@
			:ajaxFun="ajaxFun"
			ref="locationTable"
			>
			<template #toolbar></template>
			<template #toolbar>
			<el-button type="primary" @click="addOrUpdateHandle"
			v-if="permissions.basic_location_add">新增</el-button>
			</template>
			</ttable>
			<!-- 弹窗, 新增 / 修改 -->
			<table-form
			@@ -44,7 +47,7 @@
			mulLocation: [],
			uploadInfo: {
			// 是否展示上传EXCEL以及对应的url
			isShow: true,
			isShow: false,
			url: '/mes/location/upload'
			},
			prelang: 'operation',
			@@ -59,6 +62,7 @@
			seqNo: true,
			isShowHide: true, // 是否显示显影按钮
			isSearch: true, // 高级查询按钮
			isRefresh: true, // 是否显示刷新按钮
			defaultOrderBy: { column: 'createTime', direction: 'desc' }
			},
			table: {
			@@ -193,25 +197,19 @@
			optList: () => {
			return this.getWarehouseLocGroupList()
			}
			},
			}/* ,
			// ERP库位
			{
			minWidth: '200',
			prop: 'ifsLocation',
			label: 'ERP库位',
			label: 'IFS库位',
			sort: true,
			isTrue: false,
			isSearch: true,
			searchInfoType: 'text'
			}
			} */
			],
			toolbar: [
			{
			text: '新增',
			type: 'primary',
			fun: this.addOrUpdateHandle
			}
			],
			toolbar: [],
			operator: [
			{
			text: '删除',
			@@ -350,6 +348,10 @@
			},
			// 新增 / 修改
			addOrUpdateHandle(row) {
			if(!this.permissions.basic_location_edit && row.id!=null){
			this.$message.error("该角色没有操作权限")
			return
			}
			this.addOrUpdateVisible = true
			this.$nextTick(() => {
			this.$refs.addOrUpdate.init(row == null ? null : row.id)
			@@ -357,6 +359,10 @@
			},
			// 删除
			deleteHandle(row) {
			if(!this.permissions.basic_location_del){
			this.$message.error("该角色没有操作权限")
			return
			}
			this.$confirm('是否确认删除库位号为' + row.locNo, '提示', {
			confirmButtonText: '确定',
			cancelButtonText: '取消',