锁定站台页面优化

曾湘平
1 parent 365393f7
Showing 3 changed files with 39 additions and 13 deletions
ant-design-vue-jeecg/src/views/system/lockStation/LockStationList.vue
ant-design-vue-jeecg/src/views/system/lockStation/modules/LockStationForm.vue
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/lockStation/entity/LockStation.java
@@ -162,7 +162,7 @@
           {
             title:'状态',
             align:"center",
-            dataIndex: 'status'
+            dataIndex: 'status_dictText'
           },
           {
             title:'库区',
@@ -10,22 +10,32 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item 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="任务ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="taskId">
-              <a-input v-model="model.taskId" placeholder="请输入任务ID"  ></a-input>
+              <j-search-select-tag
+                placeholder="请选择入库口"
+                v-model="model.fromPort"
+                dict="port,name,code,type !='2'"
+                :pageSize="5"
+                :async="true">
+              </j-search-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="状态" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="status">
-              <a-input-number v-model="model.status" placeholder="请输入状态" style="width: 100%" />
+              <j-dict-select-tag v-model="model.status" title="状态" dictCode="port_lock_status" placeholder="请选择状态"/>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="库区" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="zoneCode">
-              <a-input v-model="model.zoneCode" placeholder="请输入库区"  ></a-input>
+              <a-select
+                show-search
+                placeholder="请选择库区"
+                option-filter-prop="children"
+                v-model="model.zoneCode">
+                <a-select-option v-for="item in zoneList" :key="item.name" :value="item.code">{{
+                    item.name
+                  }}
+                </a-select-option>
+              </a-select>
             </a-form-model-item>
           </a-col>
         </a-row>
@@ -38,6 +48,7 @@
  
   import { httpAction, getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
+  import {getZoneList} from '@/api/api'
  
   export default {
     name: 'LockStationForm',
@@ -64,13 +75,20 @@
           sm: { span: 16 },
         },
         confirmLoading: false,
-validatorRules: {
-},
+        validatorRules: {
+          code: [
+            {required: true, message: '请选择站台!'},
+          ],
+          status: [
+            {required: true, message: '请选择状态!'},
+          ],
+        },
         url: {
           add: "/lock/lockStation/add",
           edit: "/lock/lockStation/edit",
           queryById: "/lock/lockStation/queryById"
-        }
+        },
+        zoneList: []
       }
     },
     computed: {
@@ -81,6 +99,7 @@ validatorRules: {
     created () {
        //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      this.loadFrom();
     },
     methods: {
       add () {
@@ -90,6 +109,13 @@ validatorRules: {
         this.model = Object.assign({}, record);
         this.visible = true;
       },
+      loadFrom() {
+        getZoneList().then((res) => {
+          if (res.success) {
+            this.zoneList = res.result
+          }
+        });
+      },
       submitForm () {
         const that = this;
         // 触发表单验证
@@ -44,7 +44,7 @@ public class LockStation implements Serializable {
     @ApiModelProperty(value = "任务ID")
     private String taskId;
 	/**状态*/
-	@Excel(name = "状态", width = 15)
+	@Excel(name = "状态", width = 15, dicCode = "port_lock_status")
     @Dict(dicCode = "port_lock_status")
     @ApiModelProperty(value = "状态")
     private Integer status;