11/7 打印功能

src/api/basic/workPlace/SysWorkplaceFreight.js

@@ -41,3 +41,22 @@ export function updateWorkplaceFreight(query) {
     data: query
   });
 }
+
+
+
+export function printAllFreight(query) {
+  return axios({
+    url: "/udiwms/WorkplaceFreight/printAllFreight",
+    method: "post",
+    data: query,
+    headers: {'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8'},
+    responseType: 'arraybuffer',   //一定要设置响应类型，否则页面会是空白pdf
+  });
+}
+// export function printAllFreight(query) {
+//   return axios({
+//     url: "/udiwms/WorkplaceFreight/printAllFreight",
+//     method: "post",
+//     data: query
+//   });
+// }

src/views/basic/workplace/addWorkplaceFreightDialog.vue

@@ -114,15 +114,15 @@
       <!--<el-table-column label="创建时间" prop="createTime" ></el-table-column>-->
       <!--<el-table-column label="备注" prop="remark"></el-table-column>-->
     </el-table>
-    <!--<div slot="footer" class="dialog-footer" style="margin-top: 50px">-->
-    <!--  <el-button @click.native="hideForm">取消</el-button>-->
-    <!--  <el-button-->
-    <!--    type="primary"-->
-    <!--    @click.native="formSubmit()"-->
-    <!--  >提交-->
-    <!--  </el-button-->
-    <!--  >-->
-    <!--</div>-->
+    <div slot="footer" class="dialog-footer" style="margin-top: 50px">
+      <el-button @click.native="hideForm">取消</el-button>
+      <el-button
+        type="primary"
+        @click.native="formSubmit()"
+      >提交
+      </el-button
+      >
+    </div>
   </div>
 </template>
 
@@ -225,14 +225,7 @@ export default {
               }
             })
           } else {
-            addWorkplaceFreight(this.formData).then(res => {
-              if (res.code == 20000) {
-                this.$message.success('新增成功')
-                this.closeDialog()
-              } else {
-                this.$message.error(res.message)
-              }
-            })
+            this.closeDialog()
           }
 
         }

src/views/basic/workplace/freightManage.vue

@@ -8,8 +8,12 @@
         <el-card style="width: 100%;height: 100%">
           <div slot="header" class="clearfix" style="margin-bottom: 10px;">
             <span style="font-weight: 700;">取货架列表
-              <el-button style="float: right;margin-bottom: -5px " @click="onAddFreight" type="primary">新增取货架
+              <el-button-group style="float: right">
+              <el-button style="margin-bottom: -5px " @click="printFreight(1,null)" type="primary">打印全部
               </el-button>
+              <el-button style="margin-bottom: -5px " @click="onAddFreight" type="primary">新增取货架
+              </el-button>
+              </el-button-group>
             </span>
 
           </div>
@@ -71,7 +75,8 @@
             :current-page.sync="query.page"
             :page-size="query.limit"
             layout="total,prev, pager, next"
-            :total="total">
+            :total="total"
+          >
           </el-pagination>
         </el-card>
       </div>
@@ -103,7 +108,7 @@
                 <el-button
                   type="text"
                   size="small"
-                  @click.native.stop="handleEdit(scope.row)"
+                  @click.native.stop="printFreight(2,scope.row)"
                 >打印
                 </el-button>
               </template>
@@ -116,7 +121,8 @@
             :current-page.sync="LayerQuery.page"
             :page-size="LayerQuery.limit"
             layout="prev, pager, next"
-            :total="LayerTotal">
+            :total="LayerTotal"
+          >
           </el-pagination>
           <!--<pagination-->
           <!--  :total="LayerTotal"-->
@@ -144,6 +150,16 @@
               label="出货槽编号"
             >
             </el-table-column>
+            <el-table-column label="操作" width="60">
+              <template slot-scope="scope">
+                <el-button
+                  type="text"
+                  size="small"
+                  @click.native.stop="printFreight(3,scope.row)"
+                >打印
+                </el-button>
+              </template>
+            </el-table-column>
           </el-table>
           <el-pagination
             small
@@ -151,7 +167,8 @@
             :current-page.sync="queueQuery.page"
             :page-size="queueQuery.limit"
             layout="prev, pager, next"
-            :total="queueTotal">
+            :total="queueTotal"
+          >
           </el-pagination>
           <!--<el-pagination-->
           <!--  layout="prev, pager, next"-->
@@ -184,17 +201,18 @@
 </template>
 
 <script>
-import { getWorkplaceFreightList } from '@/api/basic/workPlace/SysWorkplaceFreight'
+import { deleteFreight, getWorkplaceFreightList, printAllFreight } from '@/api/basic/workPlace/SysWorkplaceFreight'
 import addWorkplaceFreightDialog from './addWorkplaceFreightDialog'
 import { getLayerList } from '@/api/basic/workPlace/SysWorkplaceLayer'
 import { getQueueListPage } from '@/api/basic/workPlace/SysWorkplaceQueue'
+import { isBlank } from '@/utils/strUtil'
 
 export default {
   props: {
     workplaceId: {
       type: Object,
       required: true
-    },
+    }
   },
   components: { addWorkplaceFreightDialog },
   data() {
@@ -213,13 +231,15 @@ export default {
       LayerQuery: {
         page: 1,
         limit: 5,
-        freightCode: ''
+        freightCode: '',
+        freightCodes: []
       },
       LayerTotal: 0,
       queueQuery: {
         page: 1,
         limit: 5,
-        layerCode: ''
+        layerCode: '',
+        layerCodes: []
       },
       rowData: null,
       freightList: [],
@@ -234,6 +254,14 @@ export default {
       getWorkplaceFreightList(this.query).then(res => {
         if (res.code == 20000) {
           this.freightList = res.data.list || []
+          if (this.freightList.length == 0) {
+            this.queueList = []
+            this.layerList = []
+          } else {
+            this.LayerQuery.freightCode = ''
+            this.LayerQuery.freightCodes = this.freightList.map(item => item.code)
+            this.getLayers()
+          }
           this.total = res.data.total || 0
         } else {
           this.total = 0
@@ -247,6 +275,10 @@ export default {
           this.layerList = res.data.list || []
           if (this.layerList.length == 0) {
             this.queueList = []
+          } else {
+            this.queueQuery.layerCode = ''
+            this.queueQuery.layerCodes = this.layerList.map(item => item.code)
+            this.getQueues()
           }
         } else {
           this.layerList = []
@@ -264,22 +296,21 @@ export default {
         }
       })
     },
-    handleFreightCurrentChange(newPage){
+    handleFreightCurrentChange(newPage) {
       this.query.page = newPage
       this.getList()
     },
-    handleQueueCurrentChange(newPage){
+    handleQueueCurrentChange(newPage) {
       this.queueQuery.page = newPage
       this.getQueues()
     },
-    handleLayerCurrentChange(newPage){
+    handleLayerCurrentChange(newPage) {
       this.LayerQuery.page = newPage
       this.getLayers()
     },
     handChangeFreight(row) {
       this.LayerQuery.freightCode = row.code
       this.getLayers()
-      // this.getQueues()
     },
     handChangeLayer(row) {
       this.queueQuery.layerCode = row.code
@@ -289,13 +320,55 @@ export default {
       this.rowData = row
       this.WorkplaceFreightDialogVisible = true
     },
+    handleDel(row) {
+      this.$confirm('此操作将永久删除该取货架, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteFreight(row).then(res => {
+          if (res.code == 20000) {
+            this.getAllList(this.workplaceId)
+            this.$message.success('删除成功')
+          } else {
+            this.$message.error(res.message)
+          }
+        })
+      }).catch(() => {
+
+      })
+
+    },
     onAddFreight() {
-      if (this.workplaceId == null){
-        return this.$message.error("请选择工位")
+      if (this.workplaceId == null) {
+        return this.$message.error('请选择工位')
       }
       this.rowData = null
       this.WorkplaceFreightDialogVisible = true
     },
+    printFreight(val, row) {
+      //打印全部
+      let query = {
+        labelId: 8
+      }
+      if (val == 1) {
+
+      } else if (val == 2) {
+        query.layerCode = row.code
+      }else {
+        query.queueCode = row.code
+      }
+
+      printAllFreight(query).then(res => {
+        const binaryData = []
+        binaryData.push(res)
+        let url = window.URL.createObjectURL(
+          new Blob(binaryData, { type: 'application/pdf' })
+        )
+        // this.loading = false
+        window.open(url)
+      })
+    },
     closeDialog() {
       this.getList()
       this.getLayers()
@@ -303,10 +376,12 @@ export default {
       this.WorkplaceFreightDialogVisible = false
     },
     getAllList(workPlaceIdFk) {
-      this.query.workPlaceIdFk = workPlaceIdFk
-      this.LayerQuery.freightCode = ""
+      if (!isBlank(workPlaceIdFk)) {
+        this.query.workPlaceIdFk = workPlaceIdFk
+      }
+      // this.LayerQuery.freightCode = ""
       this.getList()
-      this.getLayers()
+      // this.getLayers()
       this.getQueues()
     }
   },