Finish Hotfix-zh-168

src/views/sales_rebate/rebate_list.vue

@@ -31,8 +31,8 @@
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :ms="18" :lg="18">
-            <el-form-item>
+          <el-col :xs="24" :ms="18" :lg="18" >
+
               <el-button type="primary" size="mini" icon="el-icon-plus" v-if="$checkBtnRole('add', $route.meta.roles)" @click="(dialogVisible = true), (type = 1), getDictList()">新增</el-button>
 
               <!-- <el-button type="primary" size="mini" @click="delfn"
@@ -42,8 +42,10 @@
                 <el-button :disabled="ids.length < 1" slot="reference" type="danger" icon="el-icon-minus" size="mini">批量删除</el-button>
               </el-popconfirm>
               <el-button icon="el-icon-search" type="primary" size="mini" @click="submitScreenForm">查询</el-button>
-              <el-button type="primary" size="mini" @click="resetScreenForm">重置</el-button>
-            </el-form-item>
+              <el-button type="primary" size="mini" @click="resetScreenForm" >重置</el-button>
+
+               <ExportButton style="display: inline-block;margin-left: 10px;" :exUrl="'/wallet/rebate_saletype/export'"  :exParams="exParams" />
+
           </el-col>
         </el-row>
       </el-form>
@@ -242,6 +244,18 @@ export default {
       },
     };
   },
+  computed:{
+     exParams() {
+      return {
+       pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        // mainName: this.screenForm.mainName,
+        saleTypeCode: this.screenForm.saleTypeCode,
+        saleTypeName: this.screenForm.saleTypeName,
+        status: this.screenForm.status,
+      }
+    },
+  },
   methods: {
     //
     selectionhangeFn(value) {
@@ -449,4 +463,5 @@ export default {
 .delClass {
   margin: 0 10px;
 }
+
 </style>

src/views/supply/sales/components/sales_detail.vue

@@ -81,7 +81,7 @@
             </template>
 
           </el-table-column>
-          <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+          <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.price | numToFixed }}
             </template>
@@ -90,7 +90,7 @@
             <template slot-scope="scope">
               {{ scope.row.payAmount | numToFixed }}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
           <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>

src/views/supply/sales/components/sales_examine.vue

@@ -59,7 +59,7 @@
         <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+        <!-- <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.price | numToFixed }}
           </template>
@@ -68,7 +68,7 @@
           <template slot-scope="scope">
             {{ scope.row.payAmount | numToFixed }}
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
     </div>