lilei пре 1 година
родитељ
комит
2646cb28d4

+ 4 - 1
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">
@@ -322,7 +325,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '选择的产品将生成新的销退单?',
+        content: '选择的产品将生成新的销退单,并且从当前列表中删除!是否确认生成?',
         centered: true,
         closable: true,
         onOk () {

+ 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>