Browse Source

bug 修复

lilei 3 years ago
parent
commit
d861c34a40

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1657617233098
+  "version": 1657783805407
 }

+ 10 - 4
src/views/bulkManagement/bulkWarehousingOrder/chooseImportModal.vue

@@ -174,11 +174,17 @@ export default {
       if (this.loadData.length == 0) {
         this.$message.warning('无可导入的产品!')
       } else {
-        if (this.importDisabled != undefined && this.disableProduct.length > 0) {
-          this.$emit('ok', this.importDisabled == 1 ? this.rightData : this.enableProduct)
-          this.isShow = false
+        // 有禁用产品
+        if (this.disableProduct.length > 0) {
+          if (this.importDisabled == undefined) {
+            this.$message.warning('请先确认已禁用的产品是否导入?')
+          } else {
+            this.$emit('ok', this.importDisabled == 1 ? this.rightData : this.enableProduct)
+            this.isShow = false
+          }
         } else {
-          this.$message.warning('请先确认已禁用的产品是否导入!')
+          this.$emit('ok', this.rightData)
+          this.isShow = false
         }
       }
     },

+ 1 - 1
src/views/bulkManagement/bulkWarehousingOrder/importGuideModal.vue

@@ -129,7 +129,7 @@ export default {
     handleExport () {
       const link = document.createElement('a')
       link.style.display = 'none'
-      link.href = 'https://jianguan-images.oss-cn-beijing.aliyuncs.com/template/SanJianRuKuMingXi.xlsx'
+      link.href = 'https://jianguan-images.oss-cn-beijing.aliyuncs.com/template/散件入库产品导入模板.xlsx'
       link.setAttribute('download', '散件入库产品导入模板' + '.xlsx')
       document.body.appendChild(link)
       link.click()