lilei 1 éve
szülő
commit
c84507bc55

+ 3 - 3
src/views/salesReturnManagement/receiveCheck/importGuideModal.vue

@@ -15,7 +15,7 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“申请退货数量”、“仓库实收数量”、“退货原因”的列,“产品编码”必填,其它列可自定义,不影响数据导入</li>
+            <li>1) 导入的Excel文件中必须包含名为“产品编码”、“申请退货数量”、“仓库实收数量”、“退货原因”、“备注”的列,“产品编码”必填,其它列可自定义,不影响数据导入</li>
             <li>
               <a :href="filePath" style="margin: 5px 0 0;display: block;">
                 <a-icon type="download" style="padding-right: 5px;" />下载导入模板
@@ -91,7 +91,7 @@ export default {
         savePathType: 'local',
         salesReturnBillSn: this.params.salesReturnBillSn
       },
-      filePath: location.protocol + '//' +location.host + '/templ/收货产品导入模板.xlsx'
+      filePath: location.protocol + '//' + location.host + '/templ/收货产品导入模板.xlsx'
     }
   },
   methods: {
@@ -128,7 +128,7 @@ export default {
     handleClose () {
       this.openImportModal = false
       this.isShow = false
-    },
+    }
   },
   watch: {
     //  父页面传过来的弹框状态

+ 8 - 8
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -196,7 +196,7 @@ export default {
     }
   },
   computed: {
-    goodFlag() {
+    goodFlag () {
       return this.ordeDetail && this.ordeDetail.goodFlag || ''
     },
     columns () {
@@ -355,18 +355,18 @@ export default {
         goodFlag: this.goodFlag
       }
       // 退货原因
-      if(type == 0){
+      if (type == 0) {
         const rows = this.returnReasonlist.find(item => item.code == val)
-        params.returnReasonCode = val||''
+        params.returnReasonCode = val || ''
         params.returnReason = rows ? rows.dispName : ''
-      }else{
+      } else {
         // 备注
         params.returnReasonRemarks = val.target.value
-        if(!params.returnReasonRemarks){
+        if (!params.returnReasonRemarks) {
           return
         }
       }
-      
+
       this.loading = true
       this.spinning = true
       salesReturnDetailUpdateReason(params).then(res => {
@@ -384,8 +384,8 @@ export default {
     getOrderDetail () {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
-        if(res.data){
-          this.returnReasonlist = [...this.$store.state.app.goodReturnReason,...this.$store.state.app.defectiveReturnReason]
+        if (res.data) {
+          this.returnReasonlist = [...this.$store.state.app.goodReturnReason, ...this.$store.state.app.defectiveReturnReason]
         }
       })
     },