预约详情增加查看包件二维码

src/views/distribution/reservation/reservationAddFrom.vue

@@ -1033,7 +1033,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'unpack',
+          prop: 'unpackName',
           label: '拆包状态',
           type: 1,
           values: '',
@@ -1595,7 +1595,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'unpack',
+          prop: 'unpackName',
           label: '拆包状态',
           type: 1,
           values: '',
@@ -2019,9 +2019,9 @@ export default {
             item.reservationNum = '0';
             item.applyNum = item.quantityStock - item.quantityOccupied;
             if (item.unpack){
-              item.unpack = '是'
+              item.unpackName = '是'
             }else {
-              item.unpack = '否'
+              item.unpackName = '否'
             }
           });
           this.page.total = inventoryList.total;
@@ -2331,9 +2331,9 @@ export default {
           inventoryList.records.forEach(item => {
             item.reservationNum = '0';
             if (item.unpack){
-              item.unpack = '是'
+              item.unpackName = '是'
             }else {
-              item.unpack = '否'
+              item.unpackName = '否'
             }
           });
           this.page.total = inventoryList.total;

src/views/distribution/reservation/reservationDetails.vue

@@ -177,8 +177,9 @@
                                 @selectCheck="selectsc"
                                 @selection="selectionsc"
                         >
-                          <el-button size="small" @click="editsolt(slotProps.scope)">--</el-button>
-                          <br/>
+                            <template #default="slotProps">
+                                <el-text size="small" @click="handleQRCode(slotProps.scope)">查看二维码</el-text>
+                            </template>
                         </tablecmt>
                     </el-tab-pane>
                     <el-tab-pane label="库存品信息">
@@ -245,7 +246,21 @@
               <el-button icon="el-icon-circle-close" @click="isaddvalue=false">关 闭</el-button>
             </el-form-item>
           </el-dialog>
-
+            <el-dialog
+                    title="二维码"
+                    :visible.sync="dialogVisibleF"
+                    width="780px"
+                    v-model="dialogVisibleF"
+            >
+                <div>
+                    <div v-html="html"></div>
+                </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 @click="dialogVisibleF = false">取 消</el-button>
+        </span>
+            </el-dialog>
 
             <el-dialog
                     v-model="dialogVisible"
@@ -320,7 +335,7 @@
     reservationInfoStockArticleExport,
     reservationInfoStockListExport
   } from '@/api/distribution/distributionReservation';
-  import { getStockAddValue } from '@/api/distribution/distributionStockArticle';
+  import { getStockAddValue, showOrderPackgeCode } from '@/api/distribution/distributionStockArticle';
   import option from '@/option/distribution/distributionReservationDetails';
 
   import { mapGetters } from 'vuex';
@@ -336,6 +351,7 @@
         // 是否展示弹框
         box: false,
         dataForm: {},
+        dialogVisibleF:false,
         // 是否显示查询
         search: true,
         // 是否显示新增
@@ -1101,6 +1117,25 @@
           .catch(_ => {
           });
       },
+      handleQRCode(scope){
+
+        const { row } = scope;
+        console.log('执行查看二维码');
+        this.materialQRCode = row;
+        console.log('---------------->',row);
+        let qr = {
+          ids: row.id,
+        };
+        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;
+
+      },
       checkPackage(scope) {
         const { row } = scope;
         console.log(row);

src/views/mail/order/add.vue

@@ -1069,7 +1069,7 @@
             sortable: true,
           },
           {
-            prop: 'unpack',
+            prop: 'unpackName',
             label: '拆包状态',
             type: 1,
             values: '',
@@ -2075,9 +2075,9 @@
                     item.reservationNum = '0';
                     item.applyNum = item.quantityStock - item.quantityOccupied;
                     if (item.unpack){
-                      item.unpack = '是'
+                      item.unpackName = '是'
                     }else {
-                      item.unpack = '否'
+                      item.unpackName = '否'
                     }
                   });
                   this.page.total = inventoryList.total;
@@ -2372,6 +2372,11 @@
                   const inventoryList = res.data.data;
                   inventoryList.records.forEach(item => {
                     item.reservationNum = '0';
+                    if (item.unpack){
+                      item.unpackName = '是'
+                    }else {
+                      item.unpackName = '否'
+                    }
                   });
                   this.page.total = inventoryList.total;
                   this.inventoryInfo = inventoryList.records;