Browse Source

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

lilei 1 year ago
parent
commit
f0a2340988

BIN
public/templ/收货产品(其它)模板.xlsx


BIN
public/templ/收货产品(良品)模板.xlsx


BIN
public/templ/销售退货(其它)产品明细模板.xlsx


BIN
public/templ/销售退货(良品)产品明细模板.xlsx


+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.40",
+    "version": "2.2.41",
     "message": "发现有新版本发布,确定更新系统?"
 }

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

@@ -145,7 +145,7 @@ export default {
         this.$emit('close')
         this.resetSearchForm()
       } else {
-        this.filePath = location.protocol + '//' + location.host + (this.goodFlag == 1 ? '/templ/收货产品(良品)模板.xlsx' : '/templ/收货产品(不良品)模板.xlsx')
+        this.filePath = location.protocol + '//' + location.host + (this.goodFlag == 1 ? '/templ/收货产品(其它)模板.xlsx' : '/templ/收货产品(不良品)模板.xlsx')
       }
     }
   }

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

@@ -146,7 +146,7 @@ export default {
         this.paramsData = null
         this.$refs.importUpload.setFileList('')
       }else{
-        this.filePath = location.protocol + '//' +location.host + (this.goodFlag==1 ? '/templ/销售退货(良品)产品明细模板.xlsx' : '/templ/销售退货(不良品)产品明细模板.xlsx')
+        this.filePath = location.protocol + '//' +location.host + (this.goodFlag==1 ? '/templ/销售退货(其它)产品明细模板.xlsx' : '/templ/销售退货(不良品)产品明细模板.xlsx')
       }
     }
   }