Merge branch 'dev' of http://www.aishuhong.com:16356/liujiale/finance into dev

src/utils/download.js

@@ -2,7 +2,8 @@
  * @param {string} url
  * @param {string} fileName
  */
-import axios from 'axios'
+  import { getFileUrl } from "@/api/companyFile";
+  import axios from 'axios'
 export const downloadPDFFile = function (url, fileName) {
     axios({
       method: 'get',
@@ -26,9 +27,11 @@ export const downloadPDFFile = function (url, fileName) {
     })
   }
 
-export const previewPDF = (url) => {
+export const previewPDF = async (filename) => {
     const a = document.createElement("a"); //创建一个<a></a>标签
-    a.href = url; // 给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
+    // a.href = url; // 给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
+    a.href=(await getFileUrl(filename)).data 
+    debugger
     a.target = "_blank";
     a.style.display = "none"; // 障眼法藏起来a标签
     document.body.appendChild(a); // 将a标签追加到文档对象中

src/views/contract/components/addContract.vue

@@ -34,7 +34,7 @@
                             </el-input>
                         </el-form-item>
                     </el-descriptions-item>
-                    <el-descriptions-item label="合同编号" labelClassName="required">
+                    <el-descriptions-item label="合同编号" labelClassName="required" :disabled="isEdit">
                         <el-form-item prop="contractNumber">
                             <el-input placeholder="请输入合同编号" v-model="formData.contractNumber"></el-input>
                         </el-form-item>
@@ -418,8 +418,8 @@ export default {
         },
         handleDownload(file) {
             let { filePath } = file
-            let url = process.env.VUE_APP_BASE_API + filePath;
-            previewPDF(url)
+            // let url = process.env.VUE_APP_BASE_API + filePath;
+            previewPDF(filePath)
         },
         
         handleRemove(file) {

src/views/pettyMoney/addPettyMoneyRecord.vue

@@ -168,8 +168,7 @@ export default {
         },
         handleDownload() {
             let { pettyEnclosure: filePath } = this.formData
-            let url = process.env.VUE_APP_BASE_API + filePath;
-            previewPDF(url)
+            previewPDF(filePath)
         },
 
         handleRemove(file) {

src/views/pettyMoney/components/applicateDetail.vue

@@ -104,8 +104,8 @@ export default {
     methods: {
         handleDownload() {
             let { pettyEnclosure: filePath } = this.checkedRow
-            let url = process.env.VUE_APP_BASE_API + filePath;
-            previewPDF(url)
+            // let url = process.env.VUE_APP_BASE_API + filePath;
+            previewPDF(filePath)
         },
     }
 }