1、更新啊打印模

2、图库优化

src/views/modules/print/print-scan-delivery.vue

@@ -85,6 +85,7 @@
 import {autoConnect, disAutoConnect, hiprint, defaultElementTypeProvider} from 'vue-plugin-hiprint'
 import yundaTemplate from './yunda-template-data'
 import ztoTemplate from './zto-template-data'
+import ztoWoNiuTemplate from './zto-woniu-template-data'
 import printData from './yunda-print-data'
 autoConnect();
 hiprint.init();
@@ -92,6 +93,7 @@ export default {
   data () {
     return {
       ztoHiprintTemplate : null,
+      ztoWoNiuHiprintTemplate : null,
       yundaHiprintTemplate : null,
       dataList: [],
       page: {
@@ -125,6 +127,7 @@ export default {
   mounted () {
     this.buildYundaDesigner();
     this.buildZtoDesigner();
+    this.buildZtoWoNiuDesigner();
   },
   methods: {
     getLogisticsList(){
@@ -160,6 +163,16 @@ export default {
       // 构建 并填充到 容器中
       this.ztoHiprintTemplate.design("#zto-hiprint-printTemplate");
     },
+    buildZtoWoNiuDesigner(){
+      $("#zto-hiprint-printTemplate").empty(); // 先清空, 避免重复构建
+      this.ztoWoNiuHiprintTemplate = new hiprint.PrintTemplate({
+        // 如果使用 vue ref 创建的模板json, 需要使用 .value 获取 (确保内部能够使用 object.key 拿到对应数据就行)
+        template: ztoWoNiuTemplate, // 模板json(object)
+        settingContainer: "#PrintElementOptionSetting", // 元素参数容器
+      });
+      // 构建 并填充到 容器中
+      this.ztoWoNiuHiprintTemplate.design("#zto-woniu-hiprint-printTemplate");
+    },
     getDeviceList(){
       this.$http({
         url: this.$http.adornUrl('/print/printDevice/getDeviceList'),
@@ -245,7 +258,11 @@ export default {
 
     printWallbill(logistics){
       if(logistics.logistics === 'ZTO'){
-        this.ztoHiprintTemplate.print2(printData.value(logistics));
+        if(logistics.printChannel === 'WoNiu'){
+          this.ztoWoNiuHiprintTemplate.print2(printData.value(logistics));
+        }else{
+          this.ztoHiprintTemplate.print2(printData.value(logistics));
+        }
       }else if(logistics.logistics === 'YUNDA'){
         this.yundaHiprintTemplate.print2(printData.value(logistics));
       }

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

@@ -58,7 +58,7 @@
             <el-button size="small" v-if="wave.printChannel === 'Lightning'" @click="downloadPdfBatch" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">批量下载ZIP</el-button>
             <el-button size="small" v-if="wave.printChannel === 'KuaiYin' && wave.shopId === 1"@click="mergeAndDownloadPDF" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">合并PDF并下载</el-button>
             <el-button size="small" v-if="wave.printChannel === 'KuaiYin' && wave.shopId === 2"@click="downloadPdfBatch" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">压缩包下载</el-button>
-            <el-button size="small" v-if="wave.printChannel === 'KuaiYin' && wave.shopId === 2"@click="mergeAndDownloadPDF" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">大PDF下载</el-button>
+            <el-button size="small" v-if="wave.printChannel === 'KuaiYin' && (wave.shopId === 2 || wave.shopId === 6)"@click="mergeAndDownloadPDF" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">大PDF下载</el-button>
 <!--            <el-button size="small" @click="downloadPrintOrderPdfZip" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">批量下载PDF</el-button>-->
             <el-button size="small" :loading="wavePrintOrderInfoDownloadLoading" @click="downloadWavePrintOrderInfo" :disabled="wave.productionStatus == 0">下载订单信息</el-button>
             <el-button size="small" @click="openScanDialog" :disabled="wave.productionStatus == 0">扫描发货</el-button>

src/views/modules/print/wave.vue

@@ -41,6 +41,17 @@
               <el-option key="1" label="已获取" value="1"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="色数">
+            <el-select
+              v-model="searchForm.colorPrint"
+              clearable
+              placeholder="请选择打印色数"
+              size="small">
+              <el-option key="8" label="影像级" value="8"></el-option>
+              <el-option key="4" label="四色" value="4"></el-option>
+              <el-option key="6" label="六色" value="6"></el-option>
+            </el-select>
+          </el-form-item>
           <!--<el-form-item label="发货状态"  :label-width=" lang === 'en' ? '145px' : '85px'">
             <el-select
               v-model="searchForm.scanStatus"

src/views/modules/prod/post-product/posting-edit-product.vue

@@ -584,6 +584,10 @@ export default {
           colorPrintName:'六色',
           colorPrintId: '6'
         },
+        {
+          colorPrintName:'七色',
+          colorPrintId: '7'
+        },
         {
           colorPrintName:'四色',
           colorPrintId: '4'

src/views/modules/prod/printPicLib-add-or-update.vue

@@ -143,6 +143,9 @@ export default {
       }else if(prodName.indexOf("二宫格") !== -1){
         width = 1252;
         height = 732;
+      }else if(prodName.indexOf("直拍") !== -1){
+        width = 732;
+        height = 1252;
       }
       return {width, height};
     },
@@ -153,7 +156,6 @@ export default {
       return new Promise((resolve, reject) => {
         let image = new Image();
         image.onload = function() {
-          debugger
           let imageFormat = imageStr.split('.').pop();
           if(imageFormat !== 'jpg'){
             reject(index);