src/components/order-card-item/index.vue

@@ -152,6 +152,9 @@
           }else if(prodName.indexOf("毛绒徽章") !== -1){
             width = 827;
             height = 827;
+          }else if(prodName.indexOf("手幅") !== -1){
+            width = 1252;
+            height = 3614;
           }
           let _URL = window.URL || window.webkitURL;
           let img = new Image();

src/views/modules/order/order.vue

@@ -57,6 +57,7 @@
               <el-option key="axm" label="爱心膜" value="爱心膜"></el-option>
               <el-option key="szxs" label="十字星闪" value="十字星闪"></el-option>
               <el-option key="wjx" label="五角旗星" value="五角旗星"></el-option>
+              <el-option key="yhm" label="烟花膜" value="烟花膜"></el-option>
             </el-select>
           </el-form-item>
           <!--<el-form-item :label="this.$i18n.t('order.orderType') + ':'" :label-width=" lang === 'en' ? '145px' : '85px'">
@@ -721,6 +722,12 @@
                       @click="markPromotion(order)"
                     >标记推广
                     </div>
+                    <!--<div
+                      class="default-btn text-btn operate-btn"
+                      v-if="order.status == 2"
+                      @click="scanDelivey(order)"
+                    >扫码发货
+                    </div>-->
                     <div
                       class="default-btn text-btn operate-btn"
                       v-if="isAuth('admin:station:orderItemsDelivery') && order.status === 2 && order.dvyType === 2"
@@ -1253,6 +1260,9 @@ export default {
 
   },
   methods: {
+    scanDelivey(order){
+
+    },
     openGeneratePrintPdfBatchDialog(){
       this.generatePrintPdfBatchVisible = true;
     },

src/views/modules/print/print-order-info.vue

@@ -233,6 +233,7 @@ export default {
   methods: {
     closeDialog(){
       this.visible = false;
+      this.$emit('printOrderClose');
     },
     init (params) {
       this.dataForm.orderNumber = params.orderNumber || 0

src/views/modules/print/print-order.vue

@@ -66,6 +66,7 @@
                 <el-option key="xx" label="星星" value="星星"></el-option>
                 <el-option key="szxs" label="十字星闪" value="十字星闪"></el-option>
                 <el-option key="wjx" label="五角旗星" value="五角旗星"></el-option>
+                <el-option key="yhm" label="烟花膜" value="烟花膜"></el-option>
               </el-select>
             </template>
           </el-form-item>
@@ -425,7 +426,7 @@
       </div>
     </el-dialog>
     <!-- 订单详情 -->
-    <print-order-info ref="printOrderInfo"></print-order-info>
+    <print-order-info ref="printOrderInfo" v-if="printOrderDialogVisible" @printOrderClose="printOrderClose"></print-order-info>
     <!-- 波次订单 -->
     <wave-print-order ref="wavePrintOrder"></wave-print-order>
 
@@ -576,6 +577,10 @@
 
     },
     methods: {
+      printOrderClose(){
+        this.printOrderDialogVisible = false;
+      },
+
       wavePrintOrderClose(){
         this.wavePrintOrderVisible = false;
       },
@@ -583,9 +588,12 @@
         this.$refs.wavePrintOrder.openAndQueryPrintOrder({orderNumber: orderNumber, waveId: waveId})
       },
       openPrintOrderDialog(orderNumber){
-        this.$refs.printOrderInfo.init({
-          orderNumber: orderNumber,
-        })
+        this.printOrderDialogVisible = true;
+        this.$nextTick(() => {
+          this.$refs.printOrderInfo.init({
+            orderNumber: orderNumber,
+          })
+        });
       },
       openGenerateWaveDialog(){
         if(this.dataListSelections.size === 0){