Przeglądaj źródła

Merge branch 'develop_yh22' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh22

chenrui 1 rok temu
rodzic
commit
57f82cd9be

+ 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){
-      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: {

+ 9 - 2
src/views/salesReturnManagement/custConfirm/list.vue

@@ -6,6 +6,9 @@
         <template slot="subTitle">
           <a id="custConfirm-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">
+            退货类别:{{ordeDetail&&ordeDetail.goodFlagDictValue}}
+          </span>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="custConfirm-cont">
@@ -27,7 +30,7 @@
           <a-button style="margin-left:5px;" :loading="loading" @click="openPlSetReason">批量设置退货原因</a-button>
           <span style="margin-left:10px;" v-if="selNums">已选{{ selNums }}项</span>
           <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>
         <!-- 已选配件列表 -->
         <s-table
@@ -315,10 +318,14 @@ export default {
   methods: {
     // 生成新销退单
     setNewSalesRetrunOrder () {
+      if (!this.selNums) {
+        this.$message.warning('请先选择产品!')
+        return
+      }
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '选择的产品将生成新的销退单?',
+        content: '选择的产品将生成新的销退单,并且从当前列表中删除!是否确认生成?',
         centered: true,
         closable: true,
         onOk () {

+ 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-form-item>
           </a-form>
-          <div style="float:right;color:#999;margin-top:10px;">说明:红色行表示收货时新增的产品;黄色表示客服确认时新增的产品</div>
+          <div style="float:right;color:#999;margin-top:10px;">说明:红色行表示收货时新增的产品;黄色表示客服确认时新增的产品;退货原因文字显示红色表示退货原因和退货类别不一致;</div>
         </div>
         <!-- 表格数据 -->
         <s-table

+ 3 - 0
src/views/salesReturnManagement/receiveCheck/checking.vue

@@ -6,6 +6,9 @@
         <template slot="subTitle">
           <a id="salesReturnCheck-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">
+            退货类别:{{ordeDetail&&ordeDetail.goodFlagDictValue}}
+          </span>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="salesReturnCheck-cont">

+ 3 - 0
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -6,6 +6,9 @@
         <template slot="subTitle">
           <a id="salesReturnReceive-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
+          <span style="margin: 0 10px;color: #666;">
+            退货类别:{{ordeDetail&&ordeDetail.goodFlagDictValue}}
+          </span>
         </template>
       </a-page-header>
       <a-card size="small" :bordered="false" class="salesReturnReceive-cont">

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

@@ -15,7 +15,7 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“数量”、“退货原因”的列,且名称必须相同</li>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“数量”、“退货原因”、“备注”的列,且名称必须相同</li>
             <li>2) 除了“产品编码”、“数量”、“退货原因”、“备注”四列,其他列可自定义,不影响数据导入</li>
             <li>3) 如果导入的产品已经存在,则不会导入该行</li>
             <li>

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

@@ -101,7 +101,7 @@
                 </a-form-model-item>
               </a-col>
             </template>
-            <a-col :md="24" :sm="24" style="text-align:center;">
+            <a-col :md="6" :sm="24">
               <span class="table-page-search-submitButtons">
                 <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>