点位类型状态显示

lms/nladmin-ui/src/api/wms/sch/region.js

@@ -32,4 +32,20 @@ export function changeActive(data) {
   })
 }
 
-export default { add, edit, del, changeActive }
+export function getPointStatusSelectById(id) {
+  return request({
+    url: 'api/region/getPointStatusSelectById',
+    method: 'post',
+    data: id
+  })
+}
+
+export function getPointTypeSelectById(id) {
+  return request({
+    url: 'api/region/getPointTypeSelectById',
+    method: 'post',
+    data: id
+  })
+}
+
+export default { add, edit, del, changeActive, getPointStatusSelectById, getPointTypeSelectById }

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -123,6 +123,20 @@
           <el-form-item v-if="false" label="点位标识" prop="point_id">
             <el-input v-model="form.point_id" style="width: 370px;" />
           </el-form-item>
+          <el-form-item label="所属区域" prop="region_id">
+            <el-select
+              v-model="form.region_id"
+              placeholder="请选择"
+              style="width: 370px;"
+              @change="getPointStatusAndTypeList"
+            >
+              <el-option
+                v-for="item in reginoList"
+                :label="item.region_name"
+                :value="item.region_id"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="点位编码" prop="point_code">
             <el-input v-model="form.point_code" style="width: 370px;" :disabled="this.form.point_type==='01'" />
           </el-form-item>
@@ -136,9 +150,10 @@
               placeholder="点位状态"
               class="filter-item"
               style="width: 370px;"
+              clearable
             >
               <el-option
-                v-for="item in dict.sch_point_status"
+                v-for="item in pointStatusList"
                 :label="item.label"
                 :value="item.value"
               />
@@ -159,16 +174,16 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="设备点位类型" prop="device_point_type">
+          <el-form-item label="点位类型" prop="device_point_type">
             <el-select
-              v-model="form.device_point_type"
+              v-model="form.point_type"
               size="mini"
               placeholder="设备点位类型"
               class="filter-item"
               style="width: 370px;"
             >
               <el-option
-                v-for="item in dict.device_point_type"
+                v-for="item in pointTypesList"
                 :label="item.label"
                 :value="item.value"
               />
@@ -177,37 +192,6 @@
           <el-form-item label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>
-          <el-form-item label="是否专机" prop="is_host">
-            <el-radio-group v-model="form.is_host">
-              <el-radio
-                v-for="item in dict.IS_HOST"
-                :label="item.value"
-              >{{ item.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="点位类型" prop="point_type">
-            <el-radio-group v-model="form.point_type">
-              <el-radio
-                v-for="item in dict.sch_point_type"
-                :label="item.value"
-              >{{ item.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="所属区域" prop="region_id">
-            <el-select
-              v-model="form.region_id"
-              placeholder="请选择"
-              style="width: 370px;"
-            >
-              <el-option
-                v-for="item in reginoList"
-                :label="item.region_name"
-                :value="item.region_id"
-              />
-            </el-select>
-          </el-form-item>
 
           <el-form-item label="备注">
             <el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
@@ -230,33 +214,17 @@
         <el-table-column type="selection" width="55" />
         <el-table-column prop="point_code" label="点位编码" sortable width="100" />
         <el-table-column prop="point_name" label="点位名称" width="120" sortable show-overflow-tooltip />
+        <el-table-column prop="region_name" label="区域名称" />
         <el-table-column prop="point_type_name" label="点位类型" />
         <el-table-column prop="point_status_name" label="点位状态" />
         <el-table-column prop="lock_type_name" label="锁定类型" />
-        <el-table-column prop="region_name" label="所属区域" width="110" />
+        <el-table-column prop="vehicle_type" label="载具类型" />
         <el-table-column prop="vehicle_code" label="载具编码" />
-        <el-table-column label="是否启用" align="center" prop="is_used">
-          <template slot-scope="scope">
-            <el-switch
-              :value="format_is_used(scope.row.is_used)"
-              active-color="#409EFF"
-              inactive-color="#F56C6C"
-              @change="changeEnabled(scope.row, scope.row.is_used)"
-            />
-          </template>
-        </el-table-column>
-        <el-table-column prop="vehicle_type" label="托盘类型">
-          <template slot-scope="scope">
-            {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="vehicle_qty" label="载具数量" />
-        <el-table-column prop="vehicle_type" label="是否专机">
-          <template slot-scope="scope">
-            {{ dict.label.IS_HOST[scope.row.is_host] }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="update_optname" label="修改者" />
+        <el-table-column prop="remark" label="备注" />
+        <el-table-column prop="is_used" label="是否启用" />
+        <el-table-column prop="is_delete" label="是否删除" />
+        <el-table-column prop="update_optname" label="修改人" />
         <el-table-column prop="update_time" label="修改时间" width="150" />
         <el-table-column
           v-permission="[]"
@@ -280,6 +248,7 @@
 </template>
 
 <script>
+import crudRegion from '@/api/wms/sch/region'
 import crudPoint, { changeActive } from '@/api/wms/sch/point'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -288,7 +257,7 @@ import udOperation from '@crud/UD.operation'
 import pagination from '@crud/Pagination'
 /* import checkoutbill from '@/api/wms/st/core/outbill/checkoutbill'*/
 
-const defaultForm = { device_point_type: null, point_id: null, is_host: null, point_code: null, point_name: null, area_type: null, point_type: '00', point_status: '00', lock_type: '00', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
+const defaultForm = { point_id: null, is_host: null, point_code: null, point_name: null, area_type: null, point_type: null, point_status: null, lock_type: '00', vehicle_code: null, source_id: null, remark: null, is_used: null, is_delete: null, create_id: null, create_name: null, create_time: null, update_optid: null, update_optname: null, update_time: null }
 export default {
   name: 'Point',
   dicts: ['sch_point_type', 'sch_area_type', 'sch_point_status', 'is_used', 'd_lock_type', 'SCH_TASK_TYPE_DTL', 'vehicle_type', 'IS_HOST', 'device_point_type'],
@@ -315,6 +284,8 @@ export default {
     return {
       syncLoading: false,
       invtypelist: [],
+      pointStatusList: [],
+      pointTypesList: [],
       options: [],
       reginoList: [],
       permission: {},
@@ -331,14 +302,8 @@ export default {
         region_id: [
           { required: true, message: '区域类型不能为空', trigger: 'blur' }
         ],
-        point_status: [
-          { required: true, message: '点位状态不能为空', trigger: 'blur' }
-        ],
         lock_type: [
           { required: true, message: '锁定类型不能为空', trigger: 'blur' }
-        ],
-        is_host: [
-          { required: true, message: '是否专机不能为空', trigger: 'blur' }
         ]
 
       }
@@ -388,6 +353,20 @@ export default {
         })
       }).catch(() => {
       })
+    },
+    getPointStatusAndTypeList(id) {
+      this.getPointStatusList(id)
+      this.getPointTypeList(id)
+    },
+    getPointStatusList(id) {
+      crudRegion.getPointStatusSelectById(id).then(res => {
+        this.pointStatusList = res
+      })
+    },
+    getPointTypeList(id) {
+      crudRegion.getPointTypeSelectById(id).then(res => {
+        this.pointTypesList = res
+      })
     }
 
   }