fix: 修复

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

@@ -25,6 +25,19 @@
               />
             </el-select>
           </el-form-item>
+          <el-form-item label="所属区域" prop="region_code">
+            <el-select
+              v-model="query.region_code"
+              placeholder="请选择"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in regionList"
+                :label="item.region_name"
+                :value="item.region_code"
+              />
+            </el-select>
+          </el-form-item>
           <el-form-item label="载具编码">
             <el-input
               v-model="query.vehicle_code"
@@ -34,6 +47,22 @@
               @keyup.enter.native="crud.toQuery"
             />
           </el-form-item>
+          <el-form-item label="绑定状态">
+            <el-select
+              v-model="query.group_bind_material_status"
+              clearable
+              size="mini"
+              placeholder="绑定状态"
+              class="filter-item"
+              @change="hand"
+            >
+              <el-option
+                v-for="item in dict.group_bind_material_status"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
           <rrOperation />
         </el-form>
       </div>
@@ -202,6 +231,11 @@
         <el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
         <el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
         <el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
+        <el-table-column prop="group_bind_material_status" label="绑定状态" :min-width="flexWidth('group_bind_material_status',crud.data,'入库时间')">
+          <template slot-scope="scope">
+            {{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
+          </template>
+        </el-table-column>
         <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
         <el-table-column prop="material_name" label="物料名称" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
         <el-table-column prop="material_code" label="物料编码" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
@@ -254,6 +288,7 @@ import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
 import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue'
 import WorkOrderDialog from '@/views/wms/sch/group/WorkOrderDialog.vue'
 import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
+import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
 
 const defaultForm = {
   group_id: null,
@@ -289,14 +324,14 @@ const defaultForm = {
 }
 export default {
   name: 'VehicleMaterialGroup',
-  dicts: ['group_status'],
+  dicts: ['group_status', 'group_bind_material_status'],
   components: { WorkOrderDialog, MaterialDialog, pagination, crudOperation, rrOperation, udOperation },
   mixins: [presenter(), header(), form(defaultForm), crud()],
   cruds() {
     return CRUD({
       title: '组盘信息管理',
       url: 'api/schBaseVehiclematerialgroup',
-      idField: 'vehicle_code',
+      idField: 'group_id',
       sort: 'vehicle_code,desc',
       optShow: {
         add: true,
@@ -305,12 +340,16 @@ export default {
         download: false,
         reset: true
       },
+      query: {
+        group_bind_material_status: '2'
+      },
       crudMethod: { ...crudSchBaseVehiclematerialgroup }
     })
   },
   created() {
     this.getWorkShopList()
     this.getPointList()
+    this.getRegionList()
   },
   data() {
     return {
@@ -320,6 +359,7 @@ export default {
       },
       workShopList: [],
       pointList: [],
+      regionList: [],
       choose: '物料',
       materialDialog: false,
       workOrderDialog: false
@@ -335,6 +375,11 @@ export default {
         this.workShopList = res
       })
     },
+    getRegionList() {
+      crudSchBaseRegion.getRegionList().then(res => {
+        this.regionList = res
+      })
+    },
     getMaterial() {
       if (this.choose === '物料') {
         this.materialDialog = true
@@ -365,7 +410,10 @@ export default {
     setPointName(data) {
       var point = this.pointList.find(item => item.point_code === data)
       this.form.point_name = point.point_name
-    }
+    },
+    hand(value) {
+      this.crud.toQuery()
+    },
   }
 }
 </script>

nladmin-ui/src/views/wms/sch/group/schBaseVehiclematerialgroup.js

@@ -24,4 +24,12 @@ export function edit(data) {
   })
 }
 
-export default { add, edit, del }
+export function getGroup(data) {
+  return request({
+    url: 'api/schBaseVehiclematerialgroup/getGroup',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, getGroup }