diff --git a/ant-design-vue-jeecg/src/api/api.js b/ant-design-vue-jeecg/src/api/api.js
index 44cef72..9b520ab 100644
--- a/ant-design-vue-jeecg/src/api/api.js
+++ b/ant-design-vue-jeecg/src/api/api.js
@@ -113,8 +113,9 @@ export const searchTimePeriod = (params)=>postAction("/reservationsubmission/res
export const Platform = (params)=>postAction("/platformmanagement/platformManagement/Platform");
//释放月台
-export const Release = (params)=>postAction("/platformmanagement/platformManagement/releasePlatform?id="+params);
-
+export const releasePlatform = (params)=>postAction("/platformmanagement/platformManagement/releasePlatform?id="+params);
+//锁定月台
+export const bindPlatform = (params)=>postAction("/platformmanagement/platformManagement/bindPlatform?id="+params);
// 中转HTTP请求
export const transitRESTful = {
diff --git a/ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformDetailsList.vue b/ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformDetailsList.vue
index 03af2ce..d3773b4 100644
--- a/ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformDetailsList.vue
+++ b/ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformDetailsList.vue
@@ -73,15 +73,21 @@
</template>
<span slot="action" slot-scope="text, record">
- <a @click="release(record.id)">释放</a>
- <a-divider type="vertical" />
+ <div>
+ <a-popconfirm title="确定释放该月台吗?" @confirm="() => releaseClick(record.id)" v-if="record.state=='lock' || record.state=='reserve'">
+ <a>释放</a>
+ </a-popconfirm>
+ <a-popconfirm title="确定绑定该月台吗?" @confirm="() => bindClcik(record.id)" v-if="record.state=='empty' ">
+ <a>绑定</a>
+ </a-popconfirm>
+ <a-divider type="vertical" />
+ <a @click="handleEdit(record)">编辑</a>
+ <a-divider type="vertical" />
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+ <a>删除</a>
+ </a-popconfirm>
+ </div>
- <a @click="handleEdit(record)">编辑</a>
- <a-divider type="vertical" />
-
- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
- <a>删除</a>
- </a-popconfirm>
</span>
</a-table>
@@ -95,7 +101,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import PlatformDetailsModal from './modules/PlatformDetailsModal'
- import {Release} from "../../../api/api";
+ import { releasePlatform, bindPlatform } from '../../../api/api'
function routeReload() {
@@ -146,11 +152,11 @@
return parseInt(index)+1;
}
},
- // {
- // title:'编码',
- // align:"center",
- // dataIndex: 'code'
- // },
+ {
+ title:'编码',
+ align:"center",
+ dataIndex: 'code'
+ },
{
title:'名称',
align:"center",
@@ -216,22 +222,31 @@
this.selectedRowKeys=[]
this.ipagination.current = 1
},
- release(id) {
- Release(id).then((res) => {
+ releaseClick(id) {
+ releasePlatform(id).then((res) => {
if (res.success) {
- alert("释放成功");
- this.loadData(1);
-
+ this.$message.success(res.message);
+ this.searchReset();
} else {
- alert("释放失败");
- this.loadData(1);
+ this.$message.error(res.message);
+ this.searchReset();
+ }
+ })
+ },
+ bindClcik(id){
+ bindPlatform(id).then((res) => {
+ if (res.success) {
+ this.$message.success(res.message);
+ this.searchReset();
+ } else {
+ this.$message.error(res.message);
}
})
-
},
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'name',text:'名称',dictCode:''})
+ fieldList.push({type:'string',value:'code',text:'编码',dictCode:''})
fieldList.push({type:'string',value:'boxtYpe',text:'箱型',dictCode:''})
fieldList.push({type:'string',value:'high',text:'高',dictCode:''})
fieldList.push({type:'string',value:'state',text:'状态',dictCode:'platformstatus'})
diff --git a/ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformManagementList.vue b/ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformManagementList.vue
index 280ff64..ded6210 100644
--- a/ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformManagementList.vue
+++ b/ant-design-vue-jeecg/src/views/basics/platformmanagement/PlatformManagementList.vue
@@ -74,16 +74,10 @@
<a @click="handleEdit(record)">编辑</a>
<a-divider type="vertical" />
- <a-dropdown>
- <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
- <a-menu slot="overlay">
- <a-menu-item>
- <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+ <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
- </a-menu-item>
- </a-menu>
- </a-dropdown>
+
</span>
</a-table>
diff --git a/ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformDetailsModal.vue b/ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformDetailsModal.vue
index b423f3a..b55a360 100644
--- a/ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformDetailsModal.vue
+++ b/ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformDetailsModal.vue
@@ -12,6 +12,11 @@
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-row>
<a-col :span="24">
+ <a-form-model-item v-if="model.code==null" label="编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
+ <a-input v-model="model.code"placeholder="请输入编码"></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
<a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-input v-model="model.name"placeholder="请输入名称" ></a-input>
</a-form-model-item>
@@ -27,7 +32,7 @@
</a-form-model-item>
</a-col>
<a-col :span="24">
- <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
+ <a-form-model-item v-if="model.state== null" label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="state">
<j-dict-select-tag type="list" v-model="model.state" dictCode="platformstatus" placeholder="请选择状态" />
</a-form-model-item>
</a-col>
@@ -71,6 +76,9 @@
confirmLoading: false,
validatorRules: {
+ code: [
+ { required: true, message: '请输入编码!'},
+ ],
name: [
{ required: true, message: '请输入名称!'},
],
diff --git a/ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformManagementModal.vue b/ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformManagementModal.vue
index 9a7c710..990e665 100644
--- a/ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformManagementModal.vue
+++ b/ant-design-vue-jeecg/src/views/basics/platformmanagement/modules/PlatformManagementModal.vue
@@ -12,6 +12,11 @@
<a-form-model ref="form" :model="model" :rules="validatorRules">
<a-row>
<a-col :span="24">
+ <a-form-model-item label="编码" v-if="model.code == null" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="code">
+ <a-input v-model="model.code" placeholder="请输入编码" ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span="24">
<a-form-model-item label="名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
<a-input v-model="model.name" placeholder="请输入名称" ></a-input>
</a-form-model-item>
@@ -74,6 +79,9 @@
confirmLoading: false,
validatorRules: {
+ code: [
+ { required: true, message: '请输入编码!'},
+ ],
name: [
{ required: true, message: '请输入名称!'},
],