Sfoglia il codice sorgente

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

chenrui 1 anno fa
parent
commit
e96b87fa1e

+ 1 - 4
src/views/salesReturnManagement/billOfLading/detail.vue

@@ -121,7 +121,7 @@
               <a-form-model-item style="margin-bottom:10px" label="附件" :label-col="{span:2}" :wrapper-col="{span:22}">
                 <div style="line-height:26px;">
                   <div v-for="item in form.attachmentList" :key="item.id">
-                    <a href="javascript:;" @click="openLink(item.filePath)">{{ item.fileName }}</a>
+                    <a :href="item.filePath" download="true">{{ item.fileName }}</a>
                   </div>
                 </div>
               </a-form-model-item>
@@ -242,9 +242,6 @@ export default {
     }
   },
   methods: {
-    openLink (url) {
-      window.open(url)
-    },
     // 打印预览/快捷打印
     handlePrint (type) {
       const _this = this

+ 5 - 2
src/views/salesReturnManagement/billOfLading/list.vue

@@ -334,6 +334,9 @@ export default {
       this.queryParam.warehouseSn = undefined
       this.queryParam.bizUserSn = undefined
       this.$refs.table.refresh(true)
+      if (!flag) {
+        this.$route.query.billNo = ''
+      }
     },
     pageInit () {
       const _this = this
@@ -368,8 +371,8 @@ export default {
     if (this.$store.state.app.isNewTab) {
       this.resetSearchForm(!!this.$route.query.billNo)
       this.pageInit()
-    } else {
-      this.setTableH()
+    }
+    if (this.$route.query.billNo) {
       this.resetSearchForm(!!this.$route.query.billNo)
     }
     // 仅刷新列表,不重置页面