1、售后登记

src/views/modules/afterSales/thirdAfterSales.vue

@@ -34,6 +34,7 @@
               <el-option label="退件" value="退件"></el-option>
               <el-option label="补发" value="补发"></el-option>
               <el-option label="物流" value="物流"></el-option>
+              <el-option label="丢件" value="丢件"></el-option>
               <el-option label="改地址" value="改地址"></el-option>
               <el-option label="改快递" value="改快递"></el-option>
               <el-option label="其他" value="其他"></el-option>

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

@@ -15,14 +15,14 @@
               size="small"
             ></el-input>
           </el-form-item>
-          <el-form-item label="三方单号" :label-width=" lang === 'en' ? '145px' : '85px'">
+          <!--<el-form-item label="三方单号" :label-width=" lang === 'en' ? '145px' : '85px'">
             <el-input
               v-model="dataForm.orderNo"
               placeholder="请输入三方单号"
               clearable
               size="small"
             ></el-input>
-          </el-form-item>
+          </el-form-item>-->
           <el-form-item label="订单状态"  :label-width=" lang === 'en' ? '145px' : '85px'">
             <el-select
               v-model="dataForm.status"

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

@@ -118,7 +118,7 @@
                   <span>{{scope.row.orderNumber }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
+              <!--<el-table-column
                 label="第三方单号"
                 width="100"
                 align="center"
@@ -126,7 +126,7 @@
                 <template slot-scope="scope">
                   <span>{{scope.row.orderNo }}</span>
                 </template>
-              </el-table-column>
+              </el-table-column>-->
               <el-table-column
                 label="下单时间"
                 align="center"
@@ -160,7 +160,7 @@
               </el-table-column>
               <el-table-column
                 label="产品名"
-                width="300"
+                width="240"
                 align="center"
                 prop="prodName">
                 <template slot-scope="scope">
@@ -187,16 +187,6 @@
                   <span>{{scope.row.prodNums }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                align="center"
-                prop="isMerge"
-                width="65"
-                label="合单">
-                <template slot-scope="scope">
-                  <el-tag type="info" effect="dark" v-if="scope.row.isMerge == 1">否</el-tag>
-                  <el-tag type="danger" effect="dark" v-if="scope.row.isMerge == 2">是</el-tag>
-                </template>
-              </el-table-column>
               <el-table-column
                 align="center"
                 prop="deliveryName"
@@ -274,6 +264,13 @@
                   <span style="color:red;overflow: hidden; width: 100px; text-overflow:ellipsis">{{scope.row.remark}}</span>
                 </template>
               </el-table-column>
+              <el-table-column
+                align="center"
+                label="PDF文件">
+                <template slot-scope="scope">
+                  <el-button size="mini" :loading="downPdfBtnLoading" v-if="scope.row.workStatus === 2" @click="downPdf(scope.row.orderNumber)">下载PDF</el-button>
+                </template>
+              </el-table-column>
               <el-table-column
                 align="center"
                 :label="$t('crud.menu')"
@@ -464,6 +461,7 @@
         newWaveNo: null,
         visible: false,
         wave:{},
+        resourcesUrl: process.env.VUE_APP_RESOURCES_URL,
         printChannel: "WoNiu",
         addToWaveDialogVisible: false,
         wavePrintOrderInfoDownloadLoading:false,
@@ -474,7 +472,8 @@
         modifyExpressBillVisible: false,
         waveStatVisible: false,
         printOrder:{},
-        expandRowDetail:{}
+        expandRowDetail:{},
+        downPdfBtnLoading: false
       }
     },
     components: {
@@ -504,6 +503,31 @@
 
     },
     methods: {
+      downPdf(orderNumber){
+        this.downPdfBtnLoading = true;
+        let pdf = null;
+        this.$http({
+          url: this.$http.adornUrl(`/printOrderPdf/printOrderPdf/info/${orderNumber}`),
+          method: 'GET',
+          params: this.$http.adornParams()
+        }).then(({ data }) => {
+          pdf = data
+          if(pdf){
+            let randomStr = Math.floor(Math.random() * 100000).toString();
+            this.getPdfFile(this.resourcesUrl + pdf.pdfUrl + "?a=" + randomStr).then(data => {
+              saveAs(data, pdf.pdfName)
+              this.downPdfBtnLoading = false
+            }).catch((e) => {
+              this.downPdfBtnLoading = false
+            })
+          }else{
+            pdf = null;
+            this.downPdfBtnLoading = false
+          }
+        }).catch((e) => {
+          this.downPdfBtnLoading = false
+        })
+      },
       handleDeliveryChange(delivery){
         if(delivery === 'ZTO'){
           this.printOrder.deliveryName = '中通快递';