1 优化

src/components/order-pdf-generate/index.vue

@@ -14,7 +14,7 @@
       <el-form-item label="打印渠道" prop="printChannel">
         <el-select v-model="dataForm.printChannel" clearable filterable @change="handlePrintChannelChange">
           <el-option key="GSART" label="广森数码" value="GSART"></el-option>
-          <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>
+<!--          <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>-->
           <el-option key="KuaiYin" label="快印数码" value="KuaiYin"></el-option>
         </el-select>
       </el-form-item>

src/components/order-print-create/index.vue

@@ -15,7 +15,7 @@
         <el-select v-model="dataForm.printChannel" clearable filterable @change="handlePrintChannelChange">
           <el-option key="GSART" label="广森数码" value="GSART"></el-option>
           <el-option key="Lightning" label="闪电打印" value="Lightning"></el-option>
-          <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>
+<!--          <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>-->
           <el-option key="KuaiYin" label="快印数码" value="KuaiYin"></el-option>
         </el-select>
       </el-form-item>

src/views/modules/afterSales/returnDelivery.vue

@@ -4,6 +4,13 @@
     <div class="search-bar">
       <el-form :inline="true" class="search-form" ref="searchForm" :model="searchForm" label-width="auto" size="small">
         <div class="input-row">
+          <el-form-column label="打印渠道" class="search-form-item">
+            <el-select v-model="searchForm.status" clearable>
+              <el-option key="KuaiYin" label="快印" value="KuaiYin"></el-option>
+              <el-option key="GSART" label="广森" value="GSART"></el-option>
+              <el-option key="WoNiu" label="蜗牛" value="WoNiu"></el-option>
+            </el-select>
+          </el-form-column>
           <el-form-item label="订单号" class="search-form-item">
             <el-input type="text" clearable v-model="searchForm.orderNumber" placeholder="订单号"></el-input>
           </el-form-item>
@@ -48,6 +55,12 @@
           row-class-name="table-row"
           style="width: 100%">
           <!-- 订单号 -->
+          <el-table-column label="打印渠道" prop="printChannel" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.printChannel === 'KuaiYin'">快印</span>
+              <span v-if="scope.row.printChannel === 'GSART'">广森</span>
+            </template>
+          </el-table-column>
           <el-table-column label="订单号" prop="orderNumber" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.orderNumber}}</span>
@@ -189,7 +202,8 @@ export default {
             deliveryNo: this.searchForm.deliveryNo,
             receiverInfo: this.searchForm.receiverInfo,
             status: this.searchForm.status,
-            isPayed: this.searchForm.isPayed
+            isPayed: this.searchForm.isPayed,
+            printChannel: this.searchForm.printChannel
             },
             this.searchForm
           )

src/views/modules/afterSales/thirdAfterSales-add-or-update.vue

@@ -13,7 +13,7 @@
             <el-select key="printChannel" v-model="dataForm.printChannel" :disabled="isView">
               <el-option label="广森" value="GSART"></el-option>
               <el-option label="快印" value="KuaiYin"></el-option>
-              <el-option label="蜗牛" value="WoNiu"></el-option>
+<!--              <el-option label="蜗牛" value="WoNiu"></el-option>-->
             </el-select>
           </el-form-item>
         </el-col>

src/views/modules/afterSales/thirdAfterSales.vue

@@ -8,7 +8,7 @@
             <el-select v-model="searchForm.printChannel" clearable>
               <el-option label="广森" value="GSART"></el-option>
               <el-option label="快印" value="KuaiYin" v-if="shopId === 1"></el-option>
-              <el-option label="蜗牛" value="WoNiu" v-if="shopId === 1"></el-option>
+<!--              <el-option label="蜗牛" value="WoNiu" v-if="shopId === 1"></el-option>-->
             </el-select>
           </el-form-item>
           <el-form-item label="订单编号" class="search-form-item">

src/views/modules/order/order.vue

@@ -976,7 +976,7 @@
       <el-form-item label="打印渠道" prop="printChannel">
         <el-select v-model="printChannel" clearable filterable>
           <el-option key="GSART" label="广森数码" value="GSART"></el-option>
-          <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>
+<!--          <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>-->
           <el-option key="KuaiYin" label="快印数码" value="KuaiYin"></el-option>
         </el-select>
       </el-form-item>
@@ -1000,7 +1000,7 @@
         <el-form-item label="打印渠道" prop="printChannel">
           <el-select v-model="printChannel" clearable filterable>
             <el-option key="GSART" label="广森数码" value="GSART"></el-option>
-            <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>
+<!--            <el-option key="WoNiu" label="蜗牛数码" value="WoNiu"></el-option>-->
             <el-option key="KuaiYin" label="快印数码" value="KuaiYin"></el-option>
           </el-select>
         </el-form-item>

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

@@ -50,7 +50,7 @@
             <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 === 'KuaiYin'"@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" :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.productionStatus === 1" :loading="onKeyDeliveryLoading">一键发货</el-button>
             <el-divider direction="vertical" content-position="center"/>