【修改】bug

src/views/merchant/merchant_list.vue

@@ -284,7 +284,7 @@ export default {
     exParams() {
       return {
         userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
+        nickName: this.screenForm.nickname,
         linkPhone: this.screenForm.phone,
         email: this.screenForm.email,
         status: this.screenForm.status,
@@ -400,7 +400,7 @@ export default {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
         userName: this.screenForm.account,
-        nickName: this.screenForm.nickName,
+        nickName: this.screenForm.nickname,
         linkPhone: this.screenForm.phone,
         email: this.screenForm.email,
         status: this.screenForm.status,

src/views/supply/apply/apply_list.vue

@@ -73,7 +73,7 @@
             <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'invoice/listExport'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/apply/engin_list.vue

@@ -73,7 +73,7 @@
             <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'invoice/listProjectExport'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/engin/engin_list.vue

@@ -83,7 +83,7 @@
             <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'engin-info-order/export'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">

src/views/supply/engin/home_list.vue

@@ -328,6 +328,9 @@ export default {
 
     // 进入退订
     toReturn(item) {
+      if(item.refundableQty <= 0) {
+        return this.$errorMsg('可退数量为0');
+      }
       this.queryItem = item;
       this.isShowReturn = true;
     },