Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

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

@@ -768,6 +768,8 @@ export default {
       getGoodsAreaoptionList().then(res=>{
         const data = res.data.data;
         this.areaoption = data
+        console.log("this.areaoption>>>>>>>>>>>>>",this.areaoption
+        );
       })
       getTemplateData("9").then(res=>{
         console.log(res.data.data);
@@ -925,16 +927,16 @@ export default {
             if (!this.form.id) {
               console.log("this.form>>>>>>>", this.form);
               console.log("this.optioner>>>>>>>", this.optioner);
-              if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){
+              // if (!!this.form.goodsAreaId && this.form.goodsAreaId.length > 1){
-                    //这里需要截取最后一个ID
+              //       //这里需要截取最后一个ID
-                    let a = this.form.goodsAreaId;
+              //       let a = this.form.goodsAreaId;
-                this.form.goodsAreaId = a[a.length - 1];
+              //   this.form.goodsAreaId = a[a.length - 1];
-              }
+              // }
-              this.optioner.map(item => {
+              // this.optioner.map(item => {
-                if (item.id == this.form.goodsAreaId) {
+              //   if (item.id == this.form.goodsAreaId) {
-                  this.form.goodsAreaName = item.headline
+              //     this.form.goodsAreaName = item.headline
-                }
+              //   }
-              })
+              // })
               add(this.form).then(() => {
                 this.box = false;
                 this.onLoad(this.page);

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

@@ -524,6 +524,7 @@ function initpage() {
 }
 function handleExportArea() {
   let id=details.arrlist[details.checkselect]?.id||0
+   let name=details.arrlist[details.checkselect]?.name||''
   if (id ===0){
     proxy.$message({
       type: "success",
@@ -543,7 +544,7 @@ function handleExportArea() {
   }).then(() => {
     NProgress.start();
     exportBlob(downloadUrl, values).then(res => {
-      downloadXls(res.data, `仓库${dateNow()}.xlsx`);
+      downloadXls(res.data, name+`${dateNow()}.xlsx`);
       NProgress.done();
     })
   });

src/views/distribution/inventory/distrilbutionBillLading.vue

@@ -1856,18 +1856,26 @@ export default {
         return ;
       }
       let isa = false;
-      console.log('执行了');
+      // console.log('执行了');
       this.selectionListStock.some(i => {
-        console.log('asdgfasdv', i);
+        // console.log('提交的值《》《》', i);
         if (parseInt(i.inventoryQuantity) > parseInt(i.quantityStock)) {
           // this.$message.warning("添加数量大于可以数量");
           isa = true;
           return;
         }
         let a = this.data.filter(ele => ele.id == i.id).length >= 1;
-        // console.log("asdgfasdv",a);
+        // console.log("相同的值",a);
         if (!a) {
+          // console.log("相同了");
           this.data.push(i);
+        }else if(a){
+          this.data.forEach( ii =>{
+            // console.log("里面的值",ii);
+            if(ii.id == i.id && parseInt(ii.inventoryQuantity)+parseInt(i.inventoryQuantity) < ii.quantityStock){
+              ii.inventoryQuantity = parseInt(ii.inventoryQuantity)+parseInt(i.inventoryQuantity);
+            }
+          });
         }
       });
 
@@ -1877,7 +1885,7 @@ export default {
     },
     //数量校验
     handleNumberRange(e, row) {
-      console.log('执行了2222', e, e.target.value, row);
+      // console.log('执行了2222', e, e.target.value, row);
       if (e.target.value) {
         e.target.value = e.target.value.replace(/[^\.\d]/g, ''); //替换掉与数字无关的字符（中英文与符号都会被替换掉，只留下数字，此时值类型为字符串）
         if (e.target.value) {

src/views/distribution/stockup/distributionStockupDetails.vue

@@ -976,6 +976,7 @@ export default {
         };
         getPrintDetail(qr).then( res =>{
           console.log(",./");
+          this.dialogVisible = true;
           this.html=''
           this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
         })
@@ -995,6 +996,7 @@ export default {
         //库存品订单批量
         getPrintDetail(qr).then( res =>{
           // console.log(",./");
+          this.dialogVisible = true;
           this.html=''
           this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
         })
@@ -1008,6 +1010,7 @@ export default {
       row.type = "1";
       getPrintDetail(row).then( res =>{
         console.log(",./");
+        this.dialogVisible = true;
         this.html=''
         this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
       })
@@ -1029,11 +1032,14 @@ export default {
           if(!!i){
             let a = {};
             a.sku = i.sku;
+            a.id = i.id;
             a.orderCode = i.orderCode;
             a.descriptionGoods = i.descriptionGoods;
             a.cargoUnit = i.cargoUnit;
             a.stockPackageCode = i.stockPackageCode;
             a.brandName = i.brandName;
+            a.stockListId = i.stockListId;
+            a.reservationId = i.reservationId;
             s.push(a);
           }
         });

src/views/distribution/stockup/distributionStockupDetailsSelf.vue

@@ -249,7 +249,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="库存品" name="enter">
-            <el-button type="primary" text icon="el-icon-view" >批量打印</el-button>
+            <el-text type="primary" text icon="el-icon-view"  @click="handleBatchDetail('2')">批量打印</el-text>
             <el-table
               ref="table"
               v-loading="loading"
@@ -259,6 +259,12 @@
               style="width: 100%"
               :border="option.border"
             >
+              <el-table-column
+                type="selection"
+                v-if="option.selection"
+                width="55"
+                align="center"
+              ></el-table-column>
               <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
               <el-table-column
                 v-if="option.index"
@@ -342,12 +348,41 @@
         </span>
       </el-dialog>
       <el-dialog title="包条码" :visible.sync="dialogPack" width="780px" v-model="dialogPack">
-        <div >
+        <el-text type="primary" icon="el-icon-view"  @click="handleBatchDetail('1')">批量打印</el-text>
-          <span>lmy 666</span>
+
+        <tablecmt
+          :columnList="columnInventoryBatch"
+          :tableData="packageCodeList"
+          :loading="loading"
+          @inputTxt="inputsc"
+          @timeCheck="timesc"
+          @btnCheck="btnsc"
+          @selectCheck="selectsc"
+          @selection="selectionChange"
+        >
+          <template #default="slotProps">
+
+            <el-text type="primary" text icon="el-icon-view"  @click="handlePrintDetail(slotProps.scope.row)">打印</el-text>
+
+          </template>
+        </tablecmt>
+
+        <div class="avue-crud__pagination" style="width:100%">
+          <!-- 分页模块 -->
+          <el-pagination align="right"
+                         background
+                         @size-change="sizeChange"
+                         @current-change="currentChange"
+                         :current-page="page2.currentPage"
+                         :page-sizes="[30, 50,80, 120]"
+                         :page-size="page2.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="page2.total">
+          </el-pagination>
         </div>
         <span slot="footer" class="dialog-footer">
           <!--    <el-button type="primary" @click="ddd">导 出</el-button>-->
-          <el-button type="primary" @click="printTemplate">打 印</el-button>
+<!--          <el-button type="primary" @click="printTemplate">打 印</el-button>-->
           <el-button type="primary" @click="dialogPack = false">确 定</el-button>
           <el-button @click="dialogPack = false">取 消</el-button>
         </span>
@@ -419,20 +454,110 @@ import option from '@/option/distribution/distributionStockup';
 import { mapGetters } from 'vuex';
 import { getDictionaryBiz } from '@/api/system/dict';
 import { getParcelListOwn, getParcelListOwnSelf } from '@/api/distribution/distributionParcelList';
-import { getDisStockList } from '@/api/distribution/disStockListDetail'
+import { getDisStockList, getPrintDetail } from '@/api/distribution/disStockListDetail';
 import { stockUp } from '@/api/basicdata/basicdataGoodsArea';
 import { getStockDetail } from '@/api/distribution/distributionStock';
 import { getStockTemplate, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
 import { getLodop } from '@/utils/LodopFuncs';
+import dayjs from 'dayjs';
 
 export default {
   data() {
     return {
-      html: null, // 页面包条码内容
+      html: '', // 页面包条码内容
       dialogVisible: false, //二维码控制
       dialogPack: false, //包件控制
       height: 0,
       activeName: 'reservation',
+      packageCodeList: [],
+      columnInventoryBatch:[
+        {
+          prop: '',
+          label: '序号',
+          type: 0,
+          values: '',
+          width: 55,
+          checkarr: [],
+          fixed: true,
+        },
+        {
+          prop: 'sku',
+          label: 'SKU',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: true,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'orderCode',
+          label: '订单编号',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'cargoUnit',
+          label: '单位',
+          type: 1,
+          values: '',
+          width: '100',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'stockPackageCode',
+          label: '包条码',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'brandName',
+          label: '品牌',
+          type: 1,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: '',
+          label: '操作',
+          type: 6,
+          values: '',
+          width: '230',
+          checkarr: [],
+          fixed: 'right',
+          hide: true,
+        },
+
+      ],
       // 弹框标题
       title: '',
       // 是否展示弹框
@@ -535,20 +660,169 @@ export default {
     },
   },
   methods: {
-    //查询库存包件明细
+    showdrawer(value){
+      this.drawerShow=value
+    },
+    /**
+     * 弹窗的勾选回调，用于更改头部数组
+     * 固定搭配，只需要更换   columnList
+     */
+    setnewcolum(newarr, headarr,type) {
+      // console.log(newarr,'+++++++++++')
+      if(type==1){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'checkList', headarr);
+      }else if(type==2){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'flexList', headarr);
+      }else if(type==3){
+        this.columnList = newarr;
+        this.$functions.setStorage(window.location.pathname+'sortlist', headarr);
+      }
+
+    },
+    selectionsc(value) {
+      console.log(value);
+    },
+    delectsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    editsolt(scope) {
+      const { row } = scope;
+      console.log(row);
+    },
+    btnsc(index, row) {
+      console.log(index, row);
+    },
+    selectsc(index, row) {
+      console.log(index, row);
+      // if(row.prop =='typeServiceName'){
+      //   this.query['typeService'] = index;
+      // }else if(row.prop =='stockupStatusName'){
+      //   this.query["stockupStatus"] = index;
+      // }else if(row.prop =='assignStatusName'){
+      //   this.query["assignStatus"] = index;
+      // }else{
+      //   this.query[row.prop] = index;
+      // }
+      // // this.query[row.prop] = index;
+      // this.onLoad(this.page);
+    },
+    timesc(index, row) {
+      console.log(index, row);
+      if (!!index){
+        index = dayjs(index).format('YYYY-MM-DD');
+      }
+      this.query[row.prop] =  index
+      if (!index){
+        delete this.query[row.prop]
+      }
+      this.onLoad(this.page);
+    },
+    inputsc(index, row) {
+      console.log(index, row);
+      /*      if(row.prop =='typeServiceName'){
+              this.query['typeService'] = index;
+            }else if(row.prop =='stockupStatusName'){
+              this.query["stockupStatus"] = index;
+            }else if(row.prop =='assignStatusName'){
+              this.query["assignStatus"] = index;
+            }else{
+             this.query[row.prop] = index;
+             }*/
+      this.query[row.prop] = index;
+
+      this.onLoad(this.page);
+    },
+    //批量打印
+    handleBatchDetail(type){
+      console.log("selectionList",this.selectionList);
+      if(this.selectionList.length == 0){
+        this.$message.warning("至少选择一条数据！！")
+        return ;
+      }
+      if(type== '1'){
+        //包条码批量
+        let checkcode=[]
+        this.selectionList.map(item=>{
+          console.log("item>>>",item);
+          checkcode.push(item.id)
+        })
+        let qr = {
+          ids: checkcode.join(','),
+          type: "2"
+        };
+        getPrintDetail(qr).then( res =>{
+          console.log(",./");
+          this.dialogVisible = true;
+          this.html=''
+          this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+        })
+      }else if(type== '2'){
+//包条码批量
+        let myMap = [];
+        this.selectionList.map(item=>{
+          if(!!item.stocklist){
+            myMap.push(item.stocklist);
+          }
+        })
+        let qr = {
+          ids: myMap.join(","),
+          type: "3"
+        };
+        console.log("><><>>",qr);
+        //库存品订单批量
+        getPrintDetail(qr).then( res =>{
+          // console.log(",./");
+          this.dialogVisible = true;
+          this.html=''
+          this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+        })
+
+      }
+    },
+    //单独打印
+    handlePrintDetail(row){
+      console.log("单个答应》》》",row);
+      row.type = "1";
+      getPrintDetail(row).then( res =>{
+        console.log(",./");
+        this.dialogVisible = true;
+        this.html=''
+        this.html=this.getHtmls(res.data.data.dataList,res.data.data.templateHtml)
+      })
+
+    },
     onDetail(row){
-      //
+      this.selectionList = [];
+      console.log("row>><><><",row);
       this.dialogPack = true;
-      console.log("row>>>",row);
       //查询信息
       let po = {
         stockListId: row.stockListId,
-        reservationId: row.billLadingId,
+        reservationId: row.reservationId,
       }
+      let s =[];
       getDisStockList(po).then( res =>{
         console.log("res>>>>库存包件码",res.data.data);
+        res.data.data.forEach(i => {
+          if(!!i){
+            let a = {};
+            a.sku = i.sku;
+            a.id = i.id;
+            a.orderCode = i.orderCode;
+            a.descriptionGoods = i.descriptionGoods;
+            a.cargoUnit = i.cargoUnit;
+            a.stockPackageCode = i.stockPackageCode;
+            a.brandName = i.brandName;
+            a.stockListId = i.stockListId;
+            a.reservationId = i.reservationId;
+            s.push(a);
+          }
+        });
+        this.packageCodeList = s;
       })
-
     },
       //打印
     printTemplate() {