1

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

@@ -200,6 +200,9 @@
           }else if(prodName.indexOf("撕拉") !== -1){
             width = 768;
             height = 768;
+          }else if(prodName.indexOf("5寸直角卡") !== -1){
+            width = 1087;
+            height = 1347;
           }
           let _URL = window.URL || window.webkitURL;
           let img = new Image();
@@ -343,6 +346,8 @@
           this.prodType = '二宫格';
         }else if(prodName.indexOf('撕拉') != -1){
           this.prodType = '撕拉';
+        }else if(prodName.indexOf('5寸直角卡') != -1){
+          this.prodType = '5寸直角卡';
         }
         this.$nextTick(() =>{
           this.$refs.canvasPreviewRef.init(cardItem, this.resourcesUrl + picUrl, this.prodType, side)

src/views/modules/print/wave.vue

@@ -20,6 +20,17 @@
               <el-option key="1" label="已生产" value="1"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="发货状态"  :label-width=" lang === 'en' ? '145px' : '85px'">
+            <el-select
+              v-model="searchForm.scanStatus"
+              clearable
+              placeholder="请选择发货状态"
+              size="small">
+              <el-option key="0" label="未发货" value="0"></el-option>
+              <el-option key="1" label="部分发货" value="1"></el-option>
+              <el-option key="2" label="全部发货" value="2"></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="运单号状态"  :label-width=" lang === 'en' ? '145px' : '85px'">
             <el-select
               v-model="searchForm.expressBillStatus"