1、更新

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

@@ -238,8 +238,6 @@
                       <div class="info">
                         <div class="prod-image">
                           <prod-pic
-                            height="60"
-                            width="60"
                             :pic="order.pic"
                           ></prod-pic>
                         </div>
@@ -447,17 +445,10 @@
         <el-form-item label="订单数" label-width="100px">
           <span autocomplete="off">{{dataListSelections.size}}</span>
         </el-form-item>
-        <el-form-item label="色数" label-width="100px">
-          <el-select v-model="wave.colorPrint">
-            <el-option key="YX" label="影像级" value="8"></el-option>
-            <el-option key="LS" label="六色" value="6"></el-option>
-            <el-option key="SS" label="四色" value="4"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="克数" label-width="100px">
           <el-select v-model="wave.gram">
-            <el-option key="1" label="400g" value="400g"></el-option>
-            <el-option key="2" label="350g" value="350g"></el-option>
+            <el-option key="500g" label="500g" value="500g"></el-option>
+            <el-option key="1000g" label="1000g" value="1000g"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -818,7 +809,7 @@
         })
       },
       createWave(){
-        let dataBody = {colorPrint: this.wave.colorPrint, gram: this.wave.gram, waveName: this.wave.waveName, "orderNumberList": [...this.dataListSelections], "printChannel": this.printChannel};
+        let dataBody = {shopId: this.shopPrintChannel.shopList[0].shopId, colorPrint: this.wave.colorPrint, gram: this.wave.gram, waveName: this.wave.waveName, "orderNumberList": [...this.dataListSelections], "printChannel": this.wave.printChannel};
         this.$http({
           url: this.$http.adornUrl(`/platform/wave/create`),
           method: 'POST',

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

@@ -54,19 +54,14 @@
               <span style="margin-left: 30px" v-if="wave.updateTime">{{wave.updateTime}}</span>
             </div>
             <el-button size="small" @click="generatePdfCombinationBatch" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">批量生成PDF</el-button>
-            <el-button size="small" v-if="wave.printChannel === 'WoNiu'" @click="downloadPdfBatch" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">批量下载ZIP</el-button>
-            <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" @click="openPsdConfirmDialog" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">生成PSD</el-button>
+            <el-button size="small" v-if="wave.printChannel === 'ChengDu'" @click="downloadPdfBatch" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">批量下载ZIP</el-button>
 <!--            <el-button size="small" @click="downloadPrintOrderPdfZip" :disabled="wave.productionStatus == 0" :loading="wavePrintOrderPdfDownloadLoading">批量下载PDF</el-button>-->
-            <el-button size="small" v-if="wave.printChannel === 'KuaiYin'" :loading="wavePrintOrderInfoDownloadLoading" @click="downloadWavePrintOrderInfo" :disabled="wave.productionStatus == 0">下载订单信息</el-button>
+            <el-button size="small" v-if="wave.printChannel === 'ChengDu'" :loading="wavePrintOrderInfoDownloadLoading" @click="downloadWavePrintOrderInfo" :disabled="wave.productionStatus == 0">下载订单信息</el-button>
             <el-button size="small" @click="openScanDialog" :disabled="wave.productionStatus == 0">扫描发货</el-button>
-            <el-button size="small" @click="onKeyDelivery" v-if="wave.printChannel === 'KuaiYin' && wave.productionStatus === 1" :loading="onKeyDeliveryLoading">一键发货</el-button>
             <el-divider direction="vertical" content-position="center"/>
             <el-button size="small" @click="productionLockConfirm" v-if="wave.productionStatus === 0">生产锁定</el-button>
             <el-button size="small" @click="productionLockCancel" v-if="wave.productionStatus === 1">取消锁定</el-button>
-            <el-button size="small" v-if="wave.printChannel === 'KuaiYin'" @click.stop="getUpload()" :disabled="wave.expressBillStatus === 1 || wave.productionStatus === 0">导入运单号</el-button>
             <el-divider direction="vertical" content-position="center"/>
             <el-button type="text" @click="deleteWave" :disabled="wave.expressBillStatus == 1 || wave.productionStatus == 1 || wave.scanStatus == 1">删除波次</el-button>
             <el-button type="text" icon="el-icon-refresh-left" @click="getDataList(page, null, false)" >刷新</el-button>
@@ -364,6 +359,42 @@
       </div>
     </el-dialog>
     <wave-stat ref="waveStatRef"></wave-stat>
+    <el-dialog
+      :append-to-body="true"
+      title="PSD生成确认"
+      :visible.sync="psdConfirmVisibale"
+      v-if="psdConfirmVisibale"
+      width="30%"
+      left
+      :close-on-click-modal="false"
+      :close-on-press-escape="false">
+      <el-form :model="wave" label-position="right">
+        <el-form-item label="闪卡类型" label-width="100px">
+          <el-select v-model="wave.skType">
+            <el-option key="SK" label="闪卡" value="SK"></el-option>
+            <el-option key="MXP" label="明信片" value="MXP"></el-option>
+            <el-option key="FK" label="方卡" value="FK"></el-option>
+            <el-option key="LSP" label="镭射票" value="LSP"></el-option>
+            <el-option key="DLSP" label="大镭射票" value="DLSP"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="材质" label-width="100px">
+          <el-select v-model="wave.materialList" multiple>
+            <el-option key="G" label="逆向UV" value="G"></el-option>
+            <el-option key="V" label="UV光油" value="V"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="单双面" label-width="100px">
+          <el-select v-model="wave.side">
+            <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>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="generateSKWavePSD()">确认</el-button>
+      </div>
+    </el-dialog>
   </el-dialog>
 
 </template>
@@ -465,7 +496,7 @@
         newWaveNo: null,
         visible: false,
         wave:{},
-        printChannel: "WoNiu",
+        printChannel: "ChengDu",
         addToWaveDialogVisible: false,
         wavePrintOrderInfoDownloadLoading:false,
         onKeyDeliveryLoading: false,
@@ -475,7 +506,8 @@
         modifyExpressBillVisible: false,
         waveStatVisible: false,
         printOrder:{},
-        expandRowDetail:{}
+        expandRowDetail:{},
+        psdConfirmVisibale: false,
       }
     },
     components: {
@@ -505,6 +537,28 @@
 
     },
     methods: {
+      openPsdConfirmDialog(){
+        this.psdConfirmVisibale = true;
+      },
+      generateSKWavePSD(){
+        this.$http({
+          url: this.$http.adornUrl('/platform/wave/generateSKWavePSD'),
+          method: 'post',
+          data: this.$http.adornData(this.wave),
+        }).then(({ data }) => {
+          if(data){
+            this.$message({
+              message: "生成开始请刷新等待",
+              type: 'success'
+            })
+          }else{
+            this.$message({
+              message: "生成失败",
+              type: 'error'
+            })
+          }
+        })
+      },
       handleDeliveryChange(delivery){
         if(delivery === 'ZTO'){
           this.printOrder.deliveryName = '中通快递';
@@ -774,10 +828,6 @@
         })
       },
       generatePdfCombinationBatch(){
-        // if(this.dataListSelections.size == 0){
-        //   this.$message.error("请至少选择一个订单");
-        //   return ;
-        // }
         this.$confirm('确定要批量生成PDF吗？', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',