1、售后登记优化

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

@@ -44,9 +44,18 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="产品名称" prop="prodName" :disabled="true">
-        <span key="prodName">{{dataForm.prodName}}</span>
-      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="产品名称" prop="prodName" :disabled="true">
+            <span key="prodName">{{dataForm.prodName}}</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="波次号" prop="waveNo" :disabled="true">
+            <span key="waveNo">{{dataForm.waveNo}}</span>
+          </el-form-item>
+        </el-col>
+      </el-row>
       <el-row>
         <el-col :span="12">
           <el-form-item label="售后类型" prop="type">
@@ -210,7 +219,8 @@ export default {
         prodName: null,
         settleStatus: 0,
         shopId: this.$store.state.user.shopId,
-        shopName: this.$store.state.user.shopName
+        shopName: this.$store.state.user.shopName,
+        waveNo: null
       },
       dialogImageUrl: null,
       imgDialogVisible: false,
@@ -283,18 +293,22 @@ export default {
     searchOrder(orderNumber){
       if(orderNumber){
         this.$http({
-          url: this.$http.adornUrl('/order/thirdPrintOrder/info/' + orderNumber),
+          url: this.$http.adornUrl('/printOrder/printOrder/searchByOrderNumber'),
           method: 'get',
-          params: this.$http.adornParams()
+          params: this.$http.adornParams({orderNumber: orderNumber})
         }).then(({data}) => {
           this.dataForm.orderTime = data.order.createTime;
-          this.dataForm.deliveryNo = data.deliveryCode;
+          this.dataForm.deliveryNo = data.deliveryNo;
           this.dataForm.orderAmount = data.order.actualTotal;
           this.dataForm.prodName = data.order.prodName;
+          this.dataForm.waveNo = data.waveNo;
+          this.dataForm.printChannel = data.printChannel;
         })
       }else{
         this.dataForm.orderTime = null;
         this.dataForm.deliveryNo = null;
+        this.dataForm.waveNo = null;
+        this.dataForm.printChannel = null;
       }
     },
     openOrderInfo(orderNumber){
@@ -344,6 +358,7 @@ export default {
       this.dataForm.status = 0;
       this.dataForm.refundAmount = 0;
       this.dataForm.costAmount = 0;
+      this.dataForm.waveNo = null;
       this.visible = false;
       this.$emit("refreshDataList", null);
     }

src/views/modules/afterSales/thirdAfterSales.vue

@@ -6,12 +6,16 @@
         <div class="input-row">
           <el-form-item label="售后渠道" class="search-form-item" v-if="employeeType === 0">
             <el-select v-model="searchForm.printChannel" clearable>
-              <el-option label="广森" value="GSART" v-if="shopId === 1"></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="Lightning" v-if="shopId === 1"></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="波次号" class="search-form-item">
+            <el-input type="text" clearable v-model="searchForm.waveNo" placeholder="请输入波次号"></el-input>
+          </el-form-item>
+          <el-form-item label="产品名称" class="search-form-item">
+            <el-input type="text" clearable v-model="searchForm.prodName" placeholder="请输入产品名称"></el-input>
+          </el-form-item>
           <el-form-item label="订单编号" class="search-form-item">
             <el-input type="text" clearable v-model="searchForm.orderNumber" placeholder="请输入订单编号"></el-input>
           </el-form-item>
@@ -103,11 +107,17 @@
           row-class-name="table-row"
           style="width: 100%">
           <!-- 售后渠道 -->
-          <el-table-column label="售后渠道" prop="printChannel" align="center">
+          <el-table-column label="售后渠道" prop="printChannel" align="center" width="110px">
             <template slot-scope="scope">
               <span>{{scope.row.printChannel}}</span>
             </template>
           </el-table-column>
+          <!-- 波次号 -->
+          <el-table-column label="波次号" prop="waveNo" align="center" width="130px">
+            <template slot-scope="scope">
+              <span>{{ scope.row.waveNo}}</span>
+            </template>
+          </el-table-column>
           <!-- 订单编号 -->
           <el-table-column label="订单编号" prop="orderNumber" align="center" width="100px">
             <template slot-scope="scope">
@@ -115,7 +125,7 @@
             </template>
           </el-table-column>
           <!-- 快递单号 -->
-          <el-table-column label="快递单号" prop="deliveryNo" align="center" width="80px">
+          <el-table-column label="快递单号" prop="deliveryNo" align="center" width="140px">
             <template slot-scope="scope">
               <span>{{ scope.row.deliveryNo}}</span>
             </template>
@@ -273,9 +283,11 @@ export default {
         type: null,
         orderTime: null,
         orderNumber: null,
+        prodName: null,
         deliveryNo: null,
         settleStatus: null,
-        registrant: null
+        registrant: null,
+        waveNo: null
       }, // 搜索
       dataListLoading: false,
       addOrUpdateVisible: false,
@@ -352,6 +364,8 @@ export default {
             'status': this.searchForm.status,
             'deliveryNo': this.searchForm.deliveryNo,
             'registrant': this.searchForm.registrant,
+            'prodName': this.searchForm.prodName,
+            'waveNo': this.searchForm.waveNo
           },
           )
         )

src/views/modules/shop/feature/create/edit/components/goods/index.vue

@@ -303,7 +303,7 @@ export default {
       formData: {
         size: 2, // 一行多少个
         showContent: [1, 2, 3, 4],//1.商品名称2.商品描述3.商品价格4.按钮
-        button_type: '1',
+        button_type: '2',
         goods: [],
         button_img_width: 54,
         button_img_height: 24,