rev：1.出库分配逻辑修改，组盘页面批次下拉框修改

wms/nladmin-ui/src/views/wms/basedata/group/group.js

@@ -80,4 +80,12 @@ export function excelImport(data) {
   })
 }
 
-export default { add, edit, del, queryMater, queryMaterList, checkVehicle, querySupp, copySave, printDelete, excelImport }
+export function getPcsn(data) {
+  return request({
+    url: 'api/group/getPcsn',
+    method: 'post',
+    data
+  })
+}
+
+export default { add, edit, del, queryMater, queryMaterList, checkVehicle, querySupp, copySave, printDelete, excelImport, getPcsn }

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

@@ -145,7 +145,22 @@
 
             <el-col :span="8">
               <el-form-item label="焊材批号" prop="pcsn">
-                <el-input v-model="form.pcsn" style="width: 200px;" />
+                <el-select
+                  v-model="form.pcsn"
+                  size="mini"
+                  placeholder="全部"
+                  style="width: 200px"
+                  class="filter-item"
+                  filterable
+                  allow-create
+                >
+                  <el-option
+                    v-for="item in pcsnList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
 
@@ -410,6 +425,7 @@ export default {
       suppList: [],
       deviceList: [],
       materList: [],
+      pcsnList: [],
       formPrint: {
         print_num: 1
       },
@@ -445,6 +461,9 @@ export default {
     crudDeviceinfo.getDevice({}).then(res => {
       this.deviceList = res
     })
+    crudGroup.getPcsn({}).then(res => {
+      this.pcsnList = res.data
+    })
   },
   methods: {
     // 钩子：在获取表格数据之前执行，false 则代表不获取数据

wms/nladmin-ui/src/views/wms/statement/structivt/index.vue

@@ -108,8 +108,9 @@
         <el-table-column prop="produce_time" label="生产日期" :min-width="flexWidth('produce_time',crud.data,'生产日期')" />
         <el-table-column prop="quality_time" label="有效日期" :min-width="flexWidth('quality_time',crud.data,'有效日期')" />
         <el-table-column prop="bake_num" label="烘干次数" :min-width="flexWidth('bake_num',crud.data,'烘干次数')" />
-        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
         <el-table-column prop="insert_time" label="入库时间" :min-width="flexWidth('insert_time',crud.data,'入库时间')" />
+        <el-table-column prop="is_return" label="是否退料" :min-width="flexWidth('is_return',crud.data,'是否退料')" :formatter="isReturn" />
+        <el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
       </el-table>
       <!--分页组件-->
       <pagination />
@@ -133,6 +134,7 @@ export default {
   name: 'Structivt',
   components: { pagination, crudOperation, rrOperation, imageModal },
   mixins: [presenter(), header(), crud()],
+  dicts: ['IS_OR_NOT'],
   cruds() {
     return CRUD({
       title: '库存管理', url: 'api/structivt', idField: 'stockrecord_id', sort: 'stockrecord_id,desc',
@@ -173,8 +175,8 @@ export default {
       crudStructivt.imageLoad(vehicle).then(response => {
         const blob = new Blob([response]) // 尽可能根据响应头确定类型
         this.imageUrl = URL.createObjectURL(blob)
-          this.showModal = true
-        }
+        this.showModal = true
+      }
       )
     },
     sectQueryChange(val) {
@@ -195,6 +197,9 @@ export default {
     querytable() {
       this.crud.toQuery()
     },
+    isReturn(row, column) {
+      return this.dict.label.IS_OR_NOT[row.is_return]
+    },
     downdtl() {
       if (this.currentRow !== null) {
         this.showDtlLoading = true