rev：修改

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

@@ -175,20 +175,20 @@
           type="primary"
           icon="el-icon-circle-close"
           :disabled="crud.selections.length !== 1"
-          @click="cleanVehicle"
+          @click="getConfirm"
         >
-          清载具
+          放货完成
         </el-button>
         <el-button
           slot="right"
           class="filter-item"
           size="mini"
-          type="danger"
+          type="primary"
           icon="el-icon-circle-close"
           :disabled="crud.selections.length !== 1"
-          @click="cleanMaterial"
+          @click="putConfirm"
         >
-          清物料
+          取货完成
         </el-button>
       </crudOperation>
       <!--表单组件-->
@@ -601,16 +601,16 @@ export default {
         this.crud.toQuery()
       })
     },
-    cleanVehicle() {
+    getConfirm() {
       const data = this.$refs.table.selection[0]
-      crudSchBasePoint.cleanVehicle(data).then(res => {
+      crudSchBasePoint.getConfirm(data).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
     },
-    cleanMaterial() {
+    putConfirm() {
       const data = this.$refs.table.selection[0]
-      crudSchBasePoint.cleanMaterial(data).then(res => {
+      crudSchBasePoint.putConfirm(data).then(res => {
         this.crud.notify('操作成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
         this.crud.toQuery()
       })
@@ -688,8 +688,8 @@ export default {
       // 表格渲染
       LODOP.ADD_PRINT_TABLE('15mm', '5mm', '95%', '95%', tableHtml)
 
-      LODOP.PREVIEW()// 预览
-      // LODOP.PRINT()// 打印
+      // LODOP.PREVIEW()// 预览
+      LODOP.PRINT()// 打印
       // LODOP.PRINT_DESIGN()// 编辑
       this.crud.notify('打印成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
       this.crud.toQuery()

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

@@ -90,6 +90,7 @@
         <el-table-column prop="canuse_qty" label="可用数" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="frozen_qty" label="冻结数" :formatter="crud.formatNum3" :min-width="100" />
         <el-table-column prop="qty_unit_name" label="计量单位" :min-width="flexWidth('qty_unit_name',crud.data,'计量单位')" />
+        <el-table-column prop="block_num" label="所属区块" :min-width="flexWidth('block_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>