diff --git a/src/api/system/location.js b/src/api/system/location.js
index 4216d3f..165b53f 100644
--- a/src/api/system/location.js
+++ b/src/api/system/location.js
@@ -42,3 +42,11 @@ export function delLocation(locationId) {
     method: 'delete'
   })
 }
+
+// 启用禁用
+export function enableLocation(locationId) {
+  return request({
+    url: '/app/location/changeIsEnableStatus/' + locationId,
+    method: 'post'
+  })
+}
diff --git a/src/views/system/location/index.vue b/src/views/system/location/index.vue
index 3418b26..1ce2b4b 100644
--- a/src/views/system/location/index.vue
+++ b/src/views/system/location/index.vue
@@ -49,14 +49,6 @@
                 <!--@keyup.enter.native="handleQuery"-->
               <!--/>-->
             <!--</el-form-item>-->
-            <el-form-item label="状态" prop="locationStatus">
-              <el-input
-                v-model="queryParams.locationStatus"
-                placeholder="请输入状态"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
             <!--<el-form-item label="外部库位号" prop="outerId">-->
               <!--<el-input-->
                 <!--v-model="queryParams.outerId"-->
@@ -137,14 +129,18 @@
                 <!--@keyup.enter.native="handleQuery"-->
               <!--/>-->
             <!--</el-form-item>-->
-            <!--<el-form-item label="是否正在工作" prop="isWorking">-->
-              <!--<el-input-->
-                <!--v-model="queryParams.isWorking"-->
-                <!--placeholder="请输入是否正在工作"-->
-                <!--clearable-->
-                <!--@keyup.enter.native="handleQuery"-->
-              <!--/>-->
-            <!--</el-form-item>-->
+            <el-form-item label="货位状态" prop="locationStatus">
+              <el-select v-model="queryParams.locationStatus" placeholder="请选择启用状态" clearable :style="{width: '100%'}">
+                <el-option v-for="(item, index) in locationStatusOptions" :key="index" :label="item.label"
+                           :value="item.value" :disabled="item.disabled"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="启用状态" prop="isWorking">
+              <el-select v-model="queryParams.isEnable" placeholder="请选择启用状态" clearable :style="{width: '100%'}">
+                <el-option v-for="(item, index) in isEnableOptions" :key="index" :label="item.label"
+                           :value="item.value" :disabled="item.disabled"></el-option>
+              </el-select>
+            </el-form-item>
           </template>
         </div>
         <div class="search-form-footer">
@@ -195,12 +191,21 @@
           <el-button
             type="danger"
             plain
-            icon="el-icon-delete"
+            icon="el-icon-edit"
             size="mini"
             :disabled="multiple"
             @click="handleDelete"
             v-hasPermi="['app:location:remove']"
           >删除</el-button>
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="multiple"
+            @click="handleEnable"
+            v-hasPermi="['app:location:edit']"
+          >修改启用状态</el-button>
         </el-button-group>
       </div>
       <div class="right">
@@ -297,27 +302,24 @@
     <!-- 弹窗 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body destroy-on-close>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="库位号" prop="locationId">
-          <el-input v-model="form.locationId" placeholder="请输入库位号" />
-        </el-form-item>
-        <el-form-item label="库位类型" prop="locationType">
-        <el-input v-model="form.locationType" placeholder="请输入库位类型" />
-        </el-form-item>
-        <el-form-item label="库位状态" prop="locationStatus">
-        <el-input v-model="form.locationStatus" placeholder="请输入库位状态" />
-        </el-form-item>
-        <el-form-item label="外部库位号" prop="outerId">
-          <el-input v-model="form.outerId" placeholder="请输入外部库位号" />
-        </el-form-item>
-        <el-form-item label="库区号" prop="areaId">
-          <el-input v-model="form.areaId" placeholder="请输入库区号" />
-        </el-form-item>
-        <el-form-item label="巷道号" prop="tunnelId">
-          <el-input v-model="form.tunnelId" placeholder="请输入巷道号" />
-        </el-form-item>
-        <el-form-item label="设备号" prop="equipmentId">
-          <el-input v-model="form.equipmentId" placeholder="请输入设备号" />
-        </el-form-item>
+        <!--<el-form-item label="库位类型" prop="locationType">-->
+        <!--<el-input v-model="form.locationType" placeholder="请输入库位类型" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="库位状态" prop="locationStatus">-->
+        <!--<el-input v-model="form.locationStatus" placeholder="请输入库位状态" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="外部库位号" prop="outerId">-->
+          <!--<el-input v-model="form.outerId" placeholder="请输入外部库位号" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="库区号" prop="areaId">-->
+          <!--<el-input v-model="form.areaId" placeholder="请输入库区号" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="巷道号" prop="tunnelId">-->
+          <!--<el-input v-model="form.tunnelId" placeholder="请输入巷道号" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="设备号" prop="equipmentId">-->
+          <!--<el-input v-model="form.equipmentId" placeholder="请输入设备号" />-->
+        <!--</el-form-item>-->
         <el-form-item label="排" prop="wRow">
           <el-input v-model="form.wRow" placeholder="请输入排" />
         </el-form-item>
@@ -327,21 +329,37 @@
         <el-form-item label="层" prop="wLayer">
           <el-input v-model="form.wLayer" placeholder="请输入层" />
         </el-form-item>
-        <el-form-item label="深度" prop="wDepth">
-          <el-input v-model="form.wDepth" placeholder="请输入深度" />
-        </el-form-item>
-        <el-form-item label="是否锁定" prop="isLock">
-          <el-input v-model="form.isLock" placeholder="请输入是否锁定" />
-        </el-form-item>
-        <el-form-item label="载具号" prop="vehicleId">
-          <el-input v-model="form.vehicleId" placeholder="请输入载具号" />
+        <el-form-item label="库位编码" prop="locationId">
+          <el-input v-model="form.locationId" placeholder="请输入库位号" />
         </el-form-item>
+        <!--<el-form-item label="深度" prop="wDepth">-->
+          <!--<el-input v-model="form.wDepth" placeholder="请输入深度" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="是否锁定" prop="isLock">-->
+          <!--<el-input v-model="form.isLock" placeholder="请输入是否锁定" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="载具号" prop="vehicleId">-->
+          <!--<el-input v-model="form.vehicleId" placeholder="请输入载具号" />-->
+        <!--</el-form-item>-->
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
-        <el-form-item label="是否正在工作" prop="isWorking">
-          <el-input v-model="form.isWorking" placeholder="请输入是否正在工作" />
+        <el-form-item label="货位状态" prop="locationStatus">
+          <el-select v-model="form.locationStatus" placeholder="请选择货位状态" clearable :style="{width: '100%'}">
+            <el-option v-for="(item, index) in locationStatusOptions" :key="index" :label="item.label"
+                       :value="item.value" :disabled="item.disabled"></el-option>
+          </el-select>
         </el-form-item>
+          <el-form-item label="启用状态" prop="isEnable" required>
+            <el-switch v-model="form.isEnable" :active-value='0' :inactive-value='1'></el-switch>
+          </el-form-item>
+        <!--<el-form-item label="启用状态" prop="isWorking">-->
+          <!--<el-radio-group v-model="form.isEnable" size="medium">-->
+            <!--<el-radio v-for="(item, index) in isEnableOptions" :key="index" :label="item.value"-->
+                      <!--:disabled="item.disabled">{{item.label}}</el-radio>-->
+          <!--</el-radio-group>-->
+        <!--</el-form-item>-->
+        <!--<el-input v-model="form.isWorking" placeholder="请输入是否正在工作" />-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -370,7 +388,7 @@
 </template>
 
 <script>
-import {listLocation, getLocation, addLocation, updateLocation, delLocation} from "@/api/system/location";
+import {listLocation, getLocation, addLocation, updateLocation, delLocation, enableLocation} from "@/api/system/location";
 // import {addMessage, updateMessage} from "@/api/system/message";
 import {getToken} from "@/utils/auth";
 
@@ -436,8 +454,23 @@ export default {
         wDepth: null,
         isLock: null,
         vehicleId: null,
-        isWorking: null
+        isWorking: null,
+        isEnable: null
       },
+      isEnableOptions: [{
+        "label": "启用",
+        "value": 0
+      }, {
+        "label": "禁用",
+        "value": 1
+      }],
+      locationStatusOptions: [{
+        "label": "空闲",
+        "value": 0
+      }, {
+        "label": "占用",
+        "value": 1
+      }],
       // 表单参数
       form: {},
       // 表单校验
@@ -475,8 +508,8 @@ export default {
         isLock: [
           { required: true, message: "是否锁定不能为空", trigger: "blur" }
         ],
-        isWorking: [
-          { required: true, message: "是否正在工作不能为空", trigger: "blur" }
+        isEnable: [
+          { required: true, message: "启用状态不能为空", trigger: "blur" }
         ]
 
       }
@@ -555,7 +588,8 @@ export default {
         isLock: null,
         vehicleId: null,
         remark: null,
-        isWorking: null
+        isWorking: null,
+        isEnable: null
       };
       this.resetForm("form");
     },
@@ -596,7 +630,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.materialCode != null) {
+          if (this.form.locationId != null) {
             updateLocation(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
@@ -623,6 +657,19 @@ export default {
       }).catch(() => {
       });
     },
+
+    /** 启用禁用按钮操作 */
+    handleEnable(row) {
+      const materialCodes = row.locationId || this.ids;
+      this.$modal.confirm('是否确认启用禁用库位号为"' + materialCodes + '"的数据项？').then(function () {
+        return enableLocation(materialCodes);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+
     /** 导出按钮操作 */
     handleExport() {
       this.download('app/location/export', {
diff --git a/src/views/system/stand/index.vue b/src/views/system/stand/index.vue
index 4b418e8..de420c3 100644
--- a/src/views/system/stand/index.vue
+++ b/src/views/system/stand/index.vue
@@ -33,34 +33,34 @@
       <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="84px" :size="formSize">
         <div class="search-form-content" :class="{ 'is-advanced': isAdvanced }">
           <template v-if="isAdvanced">
-            <el-form-item label="站台名称" prop="standName">
+            <el-form-item label="站点编码" prop="standCode">
+              <el-input
+                v-model="queryParams.standCode"
+                placeholder="请输入站点编码"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="站点名称" prop="standName">
               <el-input
                 v-model="queryParams.standName"
-                placeholder="请输入站台名称"
+                placeholder="请输入站点名称"
                 clearable
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="站台区域" prop="standArea">
+            <el-form-item label="站点类型" prop="standType">
+              <el-input
+                v-model="queryParams.standType"
+                placeholder="请输入站点类型"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="所在区域" prop="standArea">
               <el-input
                 v-model="queryParams.standArea"
-                placeholder="请输入站台区域"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="站台属性" prop="standProperty">
-              <el-input
-                v-model="queryParams.standProperty"
-                placeholder="请输入站台属性"
-                clearable
-                @keyup.enter.native="handleQuery"
-              />
-            </el-form-item>
-            <el-form-item label="是否锁定" prop="isLock">
-              <el-input
-                v-model="queryParams.isLock"
-                placeholder="请输入是否锁定"
+                placeholder="请输入所在区域"
                 clearable
                 @keyup.enter.native="handleQuery"
               />
@@ -217,39 +217,40 @@
     <!-- 弹窗 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body destroy-on-close>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
-        <el-form-item label="站台名称" prop="standName">
-          <el-input v-model="form.standName" placeholder="请输入站台名称" />
+        <el-form-item label="站点编码" prop="standCode">
+          <el-input v-model="form.standCode" placeholder="请输入站点编码" />
         </el-form-item>
-        <el-form-item label="站台区域" prop="standArea">
-          <el-input v-model="form.standArea" placeholder="请输入站台区域" />
+        <el-form-item label="站点名称" prop="standName">
+          <el-input v-model="form.standName" placeholder="请输入站点名称" />
         </el-form-item>
-        <el-form-item label="站台类型" prop="standType">
-          <el-select v-model="form.standType" placeholder="请选择站台类型">
-            <el-option
-              v-for="dict in dict.type.site_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
+        <el-form-item label="站点类型" prop="standType">
+          <el-input v-model="form.standType" placeholder="请输入站点名称" />
+        </el-form-item>
+        <!--<el-form-item label="站点类型" prop="standType">-->
+          <!--<el-select v-model="form.standType" placeholder="请选择站点类型">-->
+            <!--<el-option-->
+              <!--v-for="dict in dict.type.site_type"-->
+              <!--:key="dict.value"-->
+              <!--:label="dict.label"-->
+              <!--:value="dict.value"-->
+            <!--&gt;</el-option>-->
+          <!--</el-select>-->
+        <!--</el-form-item>-->
+        <el-form-item label="所在区域" prop="standArea">
+          <el-input v-model="form.standArea" placeholder="请输入站点区域" />
+        </el-form-item>
+        <el-form-item label="站点属性" prop="standProperty">
+          <el-input v-model="form.standProperty" placeholder="请输入站点属性" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+        <el-form-item label="状态" prop="standStatus">
+          <el-select v-model="form.standStatus" placeholder="请选择站点状态" clearable :style="{width: '100%'}">
+            <el-option v-for="(item, index) in standStatusOptions" :key="index" :label="item.label"
+                       :value="item.value" :disabled="item.disabled"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="站台状态" prop="standStatus">
-          <el-select v-model="form.standStatus" placeholder="请选择站台状态">
-            <el-option
-              v-for="dict in dict.type.site_status"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="站台属性" prop="standProperty">
-          <el-input v-model="form.standProperty" placeholder="请输入站台属性" />
-        </el-form-item>
-        <el-form-item label="是否锁定" prop="isLock">
-          <el-input v-model="form.isLock" placeholder="请输入是否锁定" />
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -331,31 +332,41 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        standId: null,
+        standCode: null,
         standName: null,
         standType: null,
         standArea: null,
         standProperty: null,
         standStatus: null,
+        remark: null,
         isLock: null,
       },
+      standStatusOptions: [{
+        "label": "空闲",
+        "value": 0
+      }, {
+        "label": "占用",
+        "value": 1
+      }],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         standName: [
-          { required: true, message: "站台名称,不能为空不能为空", trigger: "blur" }
+          { required: true, message: "站点名称,不能为空不能为空", trigger: "blur" }
         ],
         standArea: [
-          { required: true, message: "站台区域，不可为空不能为空", trigger: "blur" }
+          { required: true, message: "站点区域，不可为空不能为空", trigger: "blur" }
         ],
         standType: [
-          { required: true, message: "站台类型，不能为空不能为空", trigger: "change" }
+          { required: true, message: "站点类型，不能为空不能为空", trigger: "change" }
         ],
         standStatus: [
-          { required: true, message: "站台状态，不能为空不能为空", trigger: "change" }
+          { required: true, message: "站点状态，不能为空不能为空", trigger: "change" }
         ],
         standProperty: [
-          { required: true, message: "站台属性，不能为空不能为空", trigger: "change" }
+          { required: true, message: "站点属性，不能为空不能为空", trigger: "change" }
         ],
         isLock: [
           { required: true, message: "是否锁定，不能为空不能为空", trigger: "change" }
@@ -445,7 +456,7 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
+      this.ids = selection.map(item => item.standId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -469,7 +480,7 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
-          if (this.form.materialCode != null) {
+          if (this.form.standId != null) {
             updateStand(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
diff --git a/src/views/system/storage/index.vue b/src/views/system/storage/index.vue
index a52f06f..9f28e71 100644
--- a/src/views/system/storage/index.vue
+++ b/src/views/system/storage/index.vue
@@ -136,9 +136,21 @@
       <!-- <el-table-column label="仓库地址" align="center" prop="storageAddress" />
       <el-table-column label="仓库联系人名称" align="center" prop="storageConcatsName" />
       <el-table-column label="仓库联系人方式" align="center" prop="storageConcatsMobile" /> -->
-      <el-table-column label="立体库" align="center" prop="autoStatus" />
-      <el-table-column label="AGV库" align="center" prop="isAgv" />
-      <el-table-column label="是否可用" align="center" prop="status" />
+      <el-table-column label="立体库" align="center" prop="autoStatus" >
+        <template slot-scope="scope">
+          {{scope.row.autoStatus=='1'?'立体库':'平库'}}
+        </template>
+      </el-table-column>
+      <el-table-column label="是否AGV库" align="center" prop="isAgv" >
+        <template slot-scope="scope">
+          {{scope.row.isAgv=='1'?'是':'否'}}
+        </template>
+      </el-table-column>
+      <el-table-column label="是否可用" align="center" prop="status" >
+        <template slot-scope="scope">
+          {{scope.row.status=='1'?'是':'否'}}
+        </template>
+      </el-table-column>
       <!-- <el-table-column label="仓储类型 1AGV 2堆垛机 3穿梭4 人工库 5 其他" align="center" prop="type" /> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -196,7 +208,10 @@
           <el-input v-model="form.storageConcatsMobile" placeholder="请输入仓库联系人方式" />
         </el-form-item> -->
         <el-form-item label="是否是AGV库" prop="isAgv">
-          <el-input v-model="form.isAgv" placeholder="请输入是否是AGV库 0：否 1：是" />
+          <el-radio-group v-model="form.isAgv" size="medium">
+            <el-radio v-for="(item, index) in isAgvOptions" :key="index" :label="item.value"
+                      :disabled="item.disabled">{{item.label}}</el-radio>
+          </el-radio-group>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -249,6 +264,13 @@ export default {
         status: null,
         type: null
       },
+      isAgvOptions: [{
+        "label": "是",
+        "value": "1"
+      }, {
+        "label": "否",
+        "value": "0"
+      }],
       // 表单参数
       form: {},
       // 表单校验
diff --git a/src/views/system/vehicle/index.vue b/src/views/system/vehicle/index.vue
index fe314aa..bd7b8c8 100644
--- a/src/views/system/vehicle/index.vue
+++ b/src/views/system/vehicle/index.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="载具编码" prop="vehicleId">
+      <el-form-item label="容器编码" prop="vehicleCode">
         <el-input
-          v-model="queryParams.vehicleId"
-          placeholder="请输入载具编码"
+          v-model="queryParams.vehicleCode"
+          placeholder="请输入容器编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="载具类型" prop="vehicleType">
+      <el-form-item label="容器类型" prop="vehicleType">
         <el-input
           v-model="queryParams.vehicleType"
-          placeholder="请输入载具类型"
+          placeholder="请输入容器类型"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -95,12 +95,16 @@
 
     <el-table v-loading="loading" :data="vehicleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="载具编码" align="center" prop="vehicleId" />
-      <el-table-column label="载具类型" align="center" prop="vehicleType" />
+      <el-table-column label="容器编码" align="center" prop="vehicleCode" />
+      <el-table-column label="容器类型" align="center" prop="vehicleType" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="载具状态" align="center" prop="vehicleStatus" />
+      <el-table-column label="容器状态" align="center" prop="vehicleStatus" >
+        <template slot-scope="scope">
+          {{scope.row.vehicleStatus=='1'?'占用':'空闲'}}
+        </template>
+      </el-table-column>
       <!--<el-table-column label="库位号" align="center" prop="locationId" />-->
-      <!--<el-table-column label="是否空载具" align="center" prop="isEmpty" />-->
+      <!--<el-table-column label="是否空容器" align="center" prop="isEmpty" />-->
       <!--<el-table-column label="是否锁定" align="center" prop="isLock" />-->
       <!--<el-table-column label="上次入库时间" align="center" prop="lastInTime" width="180">-->
         <!--<template slot-scope="scope">-->
@@ -139,29 +143,50 @@
     <!-- 添加或修改【请填写功能名称】对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="库位号" prop="locationId">
-          <el-input v-model="form.locationId" placeholder="请输入库位号" />
+        <!--<el-form-item label="库位号" prop="locationId">-->
+          <!--<el-input v-model="form.locationId" placeholder="请输入库位号" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="是否空容器" prop="isEmpty">-->
+          <!--<el-input v-model="form.isEmpty" placeholder="请输入是否空容器" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="是否锁定" prop="isLock">-->
+          <!--<el-input v-model="form.isLock" placeholder="请输入是否锁定" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="上次入库时间" prop="lastInTime">-->
+          <!--<el-date-picker clearable-->
+            <!--v-model="form.lastInTime"-->
+            <!--type="date"-->
+            <!--value-format="yyyy-MM-dd"-->
+            <!--placeholder="请选择上次入库时间">-->
+          <!--</el-date-picker>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="上次入库用户" prop="lastInUser">-->
+          <!--<el-input v-model="form.lastInUser" placeholder="请输入上次入库用户" />-->
+        <!--</el-form-item>-->
+        <el-form-item label="容器编码" prop="vehicleCode">
+          <el-input v-model="form.vehicleCode" placeholder="请输入容器编码号" />
         </el-form-item>
-        <el-form-item label="是否空载具" prop="isEmpty">
-          <el-input v-model="form.isEmpty" placeholder="请输入是否空载具" />
-        </el-form-item>
-        <el-form-item label="是否锁定" prop="isLock">
-          <el-input v-model="form.isLock" placeholder="请输入是否锁定" />
-        </el-form-item>
-        <el-form-item label="上次入库时间" prop="lastInTime">
-          <el-date-picker clearable
-            v-model="form.lastInTime"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择上次入库时间">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="上次入库用户" prop="lastInUser">
-          <el-input v-model="form.lastInUser" placeholder="请输入上次入库用户" />
+        <el-form-item label="容器类型" prop="vehicleType">
+          <el-input v-model="form.vehicleType" placeholder="请输入容器类型号" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
+        <el-form-item label="容器状态" prop="vehicleStatus">
+          <el-select v-model="form.vehicleStatus" placeholder="请选择容器状态" clearable :style="{width: '100%'}">
+            <el-option v-for="(item, index) in vehicleStatusOptions" :key="index" :label="item.label"
+                       :value="item.value" :disabled="item.disabled"></el-option>
+          </el-select>
+        </el-form-item>
+        <!--<el-form-item label="容器状态" prop="vehicleStatus" required>-->
+          <!--<el-switch v-model="form.vehicleStatus" :active-value='0' :inactive-value='1'></el-switch>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="容器状态" prop="vehicleStatus">-->
+          <!--<el-radio-group v-model="form.vehicleStatus" size="medium">-->
+            <!--<el-radio v-for="(item, index) in vehicleStatusOptions" :key="index" :label="item.value"-->
+                      <!--:disabled="item.disabled">{{item.label}}</el-radio>-->
+          <!--</el-radio-group>-->
+        <!--</el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -208,18 +233,25 @@ export default {
         lastInTime: null,
         lastInUser: null,
       },
+      vehicleStatusOptions: [{
+        "label": "空闲",
+        "value": 0
+      }, {
+        "label": "占用",
+        "value": 1
+      }],
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         vehicleType: [
-          { required: true, message: "载具类型不能为空", trigger: "change" }
+          { required: true, message: "容器类型不能为空", trigger: "change" }
         ],
         vehicleStatus: [
-          { required: true, message: "载具状态不能为空", trigger: "change" }
+          { required: true, message: "容器状态不能为空", trigger: "change" }
         ],
         isEmpty: [
-          { required: true, message: "是否空载具不能为空", trigger: "blur" }
+          { required: true, message: "是否空容器不能为空", trigger: "blur" }
         ],
         isLock: [
           { required: true, message: "是否锁定不能为空", trigger: "blur" }
@@ -252,6 +284,7 @@ export default {
     reset() {
       this.form = {
         vehicleId: null,
+        vehicleCode: null,
         vehicleType: null,
         vehicleStatus: null,
         locationId: null,