add:1.增加点位一键解锁功能；

2.增加组盘解绑、重新绑定功能；

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

@@ -173,11 +173,26 @@
           <!--<el-form-item label="车间编码">
             <el-input v-model="form.workshop_code" style="width: 240px;" />
           </el-form-item>-->
+          <el-form-item label="绑定状态">
+            <el-select
+              v-model="form.group_bind_material_status"
+              size="mini"
+              placeholder="绑定状态"
+              class="filter-item"
+              style="width: 240px;"
+              clearable
+            ><el-option
+              v-for="item in dict.group_bind_material_status"
+              :label="item.label"
+              :value="item.value"
+            />
+            </el-select>
+          </el-form-item>
           <el-form-item label="组盘状态">
             <el-select
               v-model="form.group_status"
               size="mini"
-              placeholder="点位状态"
+              placeholder="组盘状态"
               class="filter-item"
               style="width: 240px;"
               clearable

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

@@ -134,6 +134,18 @@
         >
           禁用
         </el-button>
+        <el-button
+          v-if="crud.query.is_used == 'true'"
+          slot="right"
+          class="filter-item"
+          size="mini"
+          type="warning"
+          icon="el-icon-unlock"
+          :disabled="crud.selections.length === 0"
+          @click="unlockPoint(crud.selections, false)"
+        >
+          一键解锁
+        </el-button>
       </crudOperation>
       <!--表单组件-->
       <el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="540px">
@@ -252,14 +264,14 @@
         <el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
         <el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
         <el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
-<!--                <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
+        <!--                <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
         <!--        <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
         <!-- <el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
           <template slot-scope="scope">
             {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
           </template>
         </el-table-column> -->
-<!--        <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />-->
+        <!--        <el-table-column prop="vehicle_type" label="物料类型" :min-width="flexWidth('vehicle_type',crud.data,'物料类型')" />-->
         <el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
         <el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
         <el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
@@ -317,7 +329,7 @@
 </template>
 
 <script>
-import crudSchBasePoint from './schBasePoint'
+import crudSchBasePoint, { unlockPoint } from './schBasePoint'
 import crudSchBaseRegion from '../region/schBaseRegion'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
@@ -477,6 +489,15 @@ export default {
         this.crud.toQuery()
       })
     },
+    unlockPoint(data, flag) { // 更改启用状态
+      const param = {}
+      param.data = data
+      param.used = flag
+      crudSchBasePoint.unlockPoint(param).then(res => {
+        this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
+        this.crud.toQuery()
+      })
+    },
     showButton(point_status) {
       if (point_status && point_status === '2') {
         return true

lms/nladmin-ui/src/views/wms/sch/point/schBasePoint.js

@@ -32,6 +32,14 @@ export function changeUsed(data) {
   })
 }
 
+export function unlockPoint(data) {
+  return request({
+    url: 'api/schBasePoint/unlockPoint',
+    method: 'post',
+    data: data
+  })
+}
+
 export function getPointList(data) {
   return request({
     url: 'api/schBasePoint/getPointList',
@@ -40,4 +48,4 @@ export function getPointList(data) {
   })
 }
 
-export default { add, edit, del, changeUsed, getPointList }
+export default { add, edit, del, changeUsed, unlockPoint, getPointList }