Merge remote-tracking branch 'origin/dev' into dev

src/api/basicdata/basicdataGoodsAllocation.js

@@ -33,7 +33,7 @@ export const remove = (ids) => {
 }
 export const shelf = (ids) => {
   return request({
-    url: '/api/logpm-basicdata/goodsAllocation/downAllocation',
+    url: '/api/logpm-warehouse/warehouseGoodsAllocation/downAllocation',
     method: 'post',
     params: {
       ids,

src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue

@@ -8,10 +8,10 @@
           <el-form-item>
             <el-row>
               <el-col >
-                <el-form-item label="货区:" prop="info" >
+<!--                <el-form-item label="货区:" prop="info" >-->
-                  <el-cascader :options="optioner" style="width: 80%" v-model="query.goodsAreaInfo" placeholder="请选择货区"  clearable :show-all-levels="false">
+<!--                  <el-cascader :options="optioner" style="width: 80%" v-model="query.goodsAreaInfo" placeholder="请选择货区"  clearable :show-all-levels="false">-->
-                  </el-cascader>
+<!--                  </el-cascader>-->
-                </el-form-item>
+<!--                </el-form-item>-->
                 <el-form-item label="货架状态:" prop="areaStatus">
                   <!--            <el-input v-model="form.areaStatus" placeholder="请输入货区状态；1-启用，2-禁用"/>-->
                   <el-select v-model="query.goodsShelfStatus" clearable  placeholder="请选择货架状态" style="width: 80%;">

src/views/basicdata/warehouse/tray/basicdataTray.vue

@@ -102,6 +102,7 @@
   import {dateNow} from "@/utils/date";
   import NProgress from 'nprogress';
   import 'nprogress/nprogress.css';
+  import { getLodop } from '@/utils/LodopFuncs';
 
   export default {
     data() {
@@ -286,6 +287,7 @@
           });
       },
       //批量打印数据处理代码
+      //批量打印数据处理代码
       printTemplate() {
         let that=this;
         this.selectionList.map(item=>{
@@ -300,6 +302,24 @@
           // checkcode.push(item.orderPackageCode)
         })
 
+      },
+      //批量打印打印代码
+      w_print(templateData){
+        let LODOP = getLodop();
+        // let templateData = "res.data.data";
+        // console.log(templateData);
+        LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
+        LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+        LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
+        // // 设置打印整宽且不变形
+        LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
+        // // 设置打印后自动关闭
+        LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1);
+        // // data就是一段html文本
+        LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', templateData);
+        // LODOP.PREVIEW(); //预览(预览打印无脚标)
+        LODOP.PRINT(); //直接打印
+
       },
       handleqr(){
         if (this.selectionList.length === 0) {