Merge branch 'hjw-mobaihe' into 'master'

Hjw mobaihe

See merge request spfm/spfm-market-front!291

src/pages/main/homeMarket/magicboxAudit/audit.vue

@@ -190,6 +190,7 @@
                     }
                     this.datalist.attList = res.data.attachList;
                     console.log(this.datalist.attList)
+                    console.log("taskInit-attachList-----taskInit-attachListtaskInit-attachList-----taskInit-attachList")
                     this.infolist = Object.assign({}, res.data);
                     this.infoApply = JSON.parse(this.infolist.params.terminalRes);
                     this.uploadstatus = true;

src/pages/main/homeMarket/magicboxAudit/base.vue

@@ -73,7 +73,8 @@ export default {
     props: {
         woNo:   { required: false,type: String},
         itemId: { required: false,type: String},
-        taskName:{ required: false, type: String}
+        taskName:{ required: false, type: String},
+        datalist:{ required: false, type:Object}
     },
     data(){
         return{
@@ -140,6 +141,7 @@ export default {
                     let xFile = JSON.parse(this.infoApply.attrList);
                     for(var i = 0 ;i<xFile.length ;i++){
                         xFile[i].fileName = xFile[i].name;
+                        xFile[i].id = xFile[i].attchFileId;
                     }
                     this.datalist.attList = xFile;
                     this.uploadstatus =true

src/pages/main/homeMarket/magicboxAudit/dealAudit.vue

@@ -4,7 +4,7 @@
             <div class="container-box">
                 <div class="el-label"><i class="el-icon-collection-tag"></i>基本信息</div>
                 <div class="el-line"></div>
-                <baseTable v-if="woNo" :itemId="itemId" :woNo="woNo" :taskName="taskName"/>
+                <baseTable v-if="woNo" :itemId="itemId" :woNo="woNo" :taskName="taskName" :datalist="datalist"/>
 
                 <div class="el-line"></div>
                 <div class="el-label"><i class="el-icon-collection-tag"></i>审批轨迹</div>
@@ -98,6 +98,11 @@ export default {
     components:{ baseTable ,userDlg},
     data(){
         return{
+            datalist: {
+                    url: '/bpm/api/download',
+                    //url: '/market/compatt/downfile',
+                    type: 1
+                },
             itemId : "",
             taskId:"",
             woNo :"",
@@ -139,6 +144,9 @@ export default {
             }).then((res) => {
                 this.rovaList = res.data.taskList;
                 this.uploadstatus = true;
+                this.datalist.attList = res.data.attachList;
+                console.log(this.datalist.attList)
+                console.log('taskInit-attachList-----taskInit-attachList')
             });
         },
         submitInfo(u, v) {

src/pages/main/homeMarket/magicboxAudit/homeTask.vue

@@ -211,6 +211,8 @@ export default {
     },
     //处理申请
     dialogCheck(n, v) {
+      console.log(n)
+      console.log('rowrowrowrowrowrowrowrowrowrow')
         if (v == 1) {
             this.changeinfo = false;
             let params = { woNo: n.woNo, taskId: n.taskId,taskName:n.taskName}