lilei 1 year ago
parent
commit
d223882735

+ 0 - 0
public/templ/收货产品(不良品)模板 - 副本.xlsx → public/templ/收货产品(不良品)模板.xlsx


+ 0 - 0
public/templ/收货产品(良品)模板 - 副本.xlsx → public/templ/收货产品(良品)模板.xlsx


+ 1 - 1
src/views/common/returnReason.js

@@ -56,7 +56,7 @@ const ReturnReason = {
     }
     }
     // 全部
     // 全部
     if(!this.goodFlag){
     if(!this.goodFlag){
-      this.list = [...this.$store.state.app.goodReturnReason,...this.$store.state.app.defectiveReturnReason]
+      this.list = [...this.$store.state.app.defectiveReturnReason, ...this.$store.state.app.goodReturnReason]
     }
     }
   },
   },
   watch: {
   watch: {

+ 5 - 1
src/views/salesReturnManagement/custConfirm/list.vue

@@ -27,7 +27,7 @@
           <a-button style="margin-left:5px;" :loading="loading" @click="openPlSetReason">批量设置退货原因</a-button>
           <a-button style="margin-left:5px;" :loading="loading" @click="openPlSetReason">批量设置退货原因</a-button>
           <span style="margin-left:10px;" v-if="selNums">已选{{ selNums }}项</span>
           <span style="margin-left:10px;" v-if="selNums">已选{{ selNums }}项</span>
           <a-button type="primary" :loading="loading" class="button-info" @click="setNewSalesRetrunOrder">生成新销退单</a-button>
           <a-button type="primary" :loading="loading" class="button-info" @click="setNewSalesRetrunOrder">生成新销退单</a-button>
-          <div style="float:right;color:#999;margin-top:8px;">说明:红色行表示收货时新增的产品;黄色表示客服确认时新增的产品;退货原因文字显示红色表示有修改</div>
+          <div style="float:right;color:#999;margin-top:8px;">说明:红色行表示收货时新增的产品;黄色表示客服确认时新增的产品;退货原因文字显示红色表示退货原因和退货类别不一致;</div>
         </div>
         </div>
         <!-- 已选配件列表 -->
         <!-- 已选配件列表 -->
         <s-table
         <s-table
@@ -315,6 +315,10 @@ export default {
   methods: {
   methods: {
     // 生成新销退单
     // 生成新销退单
     setNewSalesRetrunOrder () {
     setNewSalesRetrunOrder () {
+      if (!this.selNums) {
+        this.$message.warning('请先选择产品!')
+        return
+      }
       const _this = this
       const _this = this
       this.$confirm({
       this.$confirm({
         title: '提示',
         title: '提示',

+ 1 - 1
src/views/salesReturnManagement/custConfirm/setPriceModal.vue

@@ -64,7 +64,7 @@
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="setPrice-reset">重置</a-button>
               <a-button style="margin-left: 5px" @click="resetSearchForm" :disabled="disabled" id="setPrice-reset">重置</a-button>
             </a-form-item>
             </a-form-item>
           </a-form>
           </a-form>
-          <div style="float:right;color:#999;margin-top:10px;">说明:红色行表示收货时新增的产品;黄色表示客服确认时新增的产品</div>
+          <div style="float:right;color:#999;margin-top:10px;">说明:红色行表示收货时新增的产品;黄色表示客服确认时新增的产品;退货原因文字显示红色表示退货原因和退货类别不一致;</div>
         </div>
         </div>
         <!-- 表格数据 -->
         <!-- 表格数据 -->
         <s-table
         <s-table

+ 1 - 1
src/views/salesReturnManagement/salesReturn/list.vue

@@ -101,7 +101,7 @@
                 </a-form-model-item>
                 </a-form-model-item>
               </a-col>
               </a-col>
             </template>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
               <span class="table-page-search-submitButtons">
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button type="primary" :disabled="disabled" @click="$refs.table.refresh(true)">查询</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>
                 <a-button style="margin-left: 8px" :disabled="disabled" @click="resetSearchForm()">重置</a-button>