修改查看pdf

applications/dee-mes/src/views/taskExecution/components/TechnicalRequirements/components/Table2.vue

@@ -41,8 +41,7 @@
 </template>
 
 <script>
-// import { downloadPdfHandle } from '@/api/inventory.js'
-import axios from 'axios'
+import { downloadFile } from '@/utils/http'
 export default {
   components: {},
 
@@ -132,37 +131,16 @@ export default {
           type: 'error'
         })
       }
-      // eslint-disable-next-line no-undef
-      const baseURl = `${VUE_APP_BASE_API || process.env.VUE_APP_BASE_API}`
       const user = 'wcadmin'
-      console.log(row.docsUrl + user)
-      axios({
-        method: 'get',
-        url: '/gace/mbom/downloadGACEAppData',
-        params: {
-          gaceUrl: row.docsUrl + user,
-          docName: row.docName
-        },
-        baseURL: baseURl,
-        headers: { token: `${localStorage.getItem('token')}`, 'equipment_id': `${localStorage.getItem('uid')}` },
-        responseType: 'arraybuffer'
-      }).then((res) => {
+      downloadFile(`/gace/mbom/downloadGACEAppData?gaceUrl=${row.docsUrl + user}&docName==${row.docName}`, 'get').then((res) => {
         const blob = new Blob([res.data], {
           type: 'application/pdf'
         })
         if (window.navigator.msSaveOrOpenBlob) {
           navigator.msSaveBlob(blob)
         } else {
-          // const elink = document.createElement('a')
-          // elink.download = 'pdf.pdf'
-          // elink.style.display = 'none'
-          // elink.href = URL.createObjectURL(blob)
           var openUrl = URL.createObjectURL(blob)
           window.open(openUrl)
-          // obj.document.title = '驱蚊器为切为'
-          // document.body.appendChild(elink)
-          // elink.click()
-          // document.body.removeChild(elink)
         }
       })
     }

applications/dee-mes/src/views/taskExecution/index.vue

@@ -868,8 +868,11 @@ export default {
             if (curRow) {
               that.selectOptions(curRow.id)
             } else {
-              !that.procedureId &&
+              if (that.procedureId) {
+                that.selectOptions(that.procedureId)
+              } else {
                 that.selectOptions(that.workingProcedure[0].id)
+              }
             }
           }
         })