Merge remote-tracking branch 'origin/master'

src/views/modules/purchaseorder/procurementReview.vue

@@ -795,7 +795,7 @@
 
        // window.open(   this.baseUrl+'/file/'+row.newFileName)
         this.pdfVisible = true
-        this.pdfUrl= 'http://192.168.1.2:9002/file/'+row.newFileName
+        this.pdfUrl= 'http://192.168.1.83:9002/file/'+row.newFileName
         // axios.get('/proxyApi/ftp/file/downFtpFile/' + row.id, {
         //   responseType: 'blob',
         //   headers: {

src/views/modules/sys/menu.vue

@@ -142,7 +142,7 @@
       },
       // 删除
       deleteHandle (id) {
-        this.$confirm(`确定对[id=${id}]进行[删除]操作?`, '提示', {
+        this.$confirm(`确定对进行[删除]操作?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'