配送计划增加查看二维码功能

src/api/distribution/distributionStockList.js

@@ -36,12 +36,28 @@ export const getStockListOwn = (current, size, params) => {
   })
 }
 
+/**
+ * 查看库存品包件库存品码
+ * @param params
+ * @returns {AxiosPromise}
+ */
+export const showInventoryPackgeCode = (reservationId,stockListId) => {
+  return request({
+    url: '/api/logpm-distribution/distributionStockList/showOrderPackgeCode',
+    method: 'get',
+    params: {
+      reservationId,
+      stockListId
+    }
+  })
+}
+
 /**
  * 商场的库存品列表
- * @param {*} current 
- * @param {*} size 
- * @param {*} params 
- * @returns 
+ * @param {*} current
+ * @param {*} size
+ * @param {*} params
+ * @returns
  */
 export const getStockListClient = (current, size, params) => {
   return request({

src/views/distribution/deliverylist/distributionDeliveryListedt.vue

@@ -287,6 +287,9 @@
             <!--              >查看详情-->
             <!--              </el-text>-->
             <!--            </template>-->
+            <template #default="slotProps">
+              <el-text size="small" @click="handleInventoryQRCode(slotProps.scope.row)">查看二维码</el-text>
+            </template>
           </tablecmt>
         </el-tab-pane>
       </el-tabs>
@@ -618,6 +621,7 @@ import {
   getinventorydetail,
 } from '@/api/distribution/distributionDeliveryList';
 import { showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
+import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
 import { update as updatesign, getOneclickq } from '@/api/distribution/distributionSignfor';
 import option from '@/option/basic/basicPdarecords';
 import { mapGetters } from 'vuex';
@@ -629,6 +633,7 @@ import { getToken } from '@/utils/auth';
 export default {
   data() {
     return {
+      html:'',
       dialogImageUrl: '', //图片放大地址
       dialogVisible: false, //图片状态
       dialogImageUrlA: '',
@@ -1591,8 +1596,18 @@ export default {
       ],
       inventoryoptioncolumn: [
         {
-          prop: 'sku',
-          label: 'SKU',
+          prop: 'incomingBatch',
+          label: '入库批次号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },        {
+          prop: 'orderCode',
+          label: '订单自编码',
           type: 2,
           values: '',
           width: '150',
@@ -1602,8 +1617,30 @@ export default {
           head: false,
         },
         {
-          prop: 'descriptionGoods',
-          label: '物料名称',
+          prop: 'serviceNumber',
+          label: '服务号',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'marketName',
+          label: '商场名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
+        {
+          prop: 'brandName',
+          label: '品牌',
           type: 2,
           values: '',
           width: '150',
@@ -1623,6 +1660,17 @@ export default {
           sortable: true,
           head: false,
         },
+        {
+          prop: 'descriptionGoods',
+          label: '物料名称',
+          type: 2,
+          values: '',
+          width: '150',
+          checkarr: [],
+          fixed: false,
+          sortable: true,
+          head: false,
+        },
         {
           prop: 'cargoNorms',
           label: '物料规格',
@@ -2815,6 +2863,22 @@ export default {
     timesc() {},
     btnsc() {},
     selectsc() {},
+
+    handleInventoryQRCode(row){
+      this.materialQRCode = row;
+      console.log('row------------>',row);
+      // let qr = {
+      //   ids: row.id,
+      // };
+      this.html = '';
+      showInventoryPackgeCode(row.reservationId,row.id).then(res => {
+        // this.orderPackageCode = res.data
+        console.log(res.data);
+        this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+      });
+      this.dialogVisibleF = true;
+
+    },
     /**
      * 查看二维码
      * @param {*} row

src/views/distribution/reservation/reservationDetails.vue

@@ -200,7 +200,9 @@
                               @selectCheck="selectsc"
                               @selection="selectionsc"
                       >
-                        <el-button size="small" @click="costadd(slotProps.scope)">--</el-button>
+                          <template #default="slotProps">
+                              <el-text size="small" @click="handleInventoryQRCode(slotProps.scope)">查看二维码</el-text>
+                          </template>
                       </tablecmt>
                     </el-tab-pane>
                 </el-tabs>
@@ -336,6 +338,7 @@
     reservationInfoStockListExport
   } from '@/api/distribution/distributionReservation';
   import { getStockAddValue, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
+  import { showInventoryPackgeCode } from '@/api/distribution/distributionStockList';
   import option from '@/option/distribution/distributionReservationDetails';
 
   import { mapGetters } from 'vuex';
@@ -345,6 +348,7 @@
   export default {
     data() {
       return {
+        html: '',
         height: 300,
         // 弹框标题
         title: '',
@@ -742,6 +746,16 @@
             sortable: true,
             head: false
           },
+          {
+            prop: 'serviceNumber',
+            label: '服务号',
+            type: 2,
+            values: '',
+            width: '160',
+            checkarr: [],
+            fixed: false,
+            sortable: true
+          },
           {
             prop: 'sku',
             label: 'SKU码',
@@ -803,6 +817,7 @@
             fixed: false,
             sortable: true
           },
+
           {
             prop: 'reservationNum',
             label: '预约数量',
@@ -813,17 +828,6 @@
             fixed: false,
             sortable: true
           },
-
-          {
-            prop: 'orderCode',
-            label: '备货件数',
-            type: 2,
-            values: '',
-            width: '160',
-            checkarr: [],
-            fixed: false,
-            sortable: true
-          },
           {
             prop: 'stockupNum',
             label: '已备件数',
@@ -1126,10 +1130,31 @@
         let qr = {
           ids: row.id,
         };
+        this.html = '';
         showOrderPackgeCode(qr).then(res => {
           // this.orderPackageCode = res.data
           console.log(res.data);
-          this.html = '';
+          this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
+        });
+
+        this.dialogVisibleF = true;
+
+      },
+      printTemplate(){},
+      handleInventoryQRCode(scope){
+
+        const { row } = scope;
+        console.log('执行查看二维码------------>row:',row);
+
+        this.materialQRCode = row;
+        console.log('---------------->',row);
+        let qr = {
+          ids: row.id,
+        };
+        this.html = '';
+        showInventoryPackgeCode(row.reservationId,row.id).then(res => {
+          // this.orderPackageCode = res.data
+          console.log(res.data);
           this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml);
         });