Merge branch 'hjw-mobaihe' into 'master'

Hjw mobaihe

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

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

@@ -189,9 +189,7 @@
                         res.data.attachList[i].id = res.data.attachList[i].attchFileId;
                     }
                     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.infolist = Object.assign({}, res.data);
                     this.infoApply = JSON.parse(this.infolist.params.terminalRes);
                     this.uploadstatus = true;
                 });

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

@@ -145,8 +145,6 @@ export default {
                 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

@@ -118,7 +118,7 @@
         </div>
     </el-dialog>
 
-    <itemDlg v-if="selWoNo" :dialogVisible="dialogVisible" :woNo="selWoNo" :taskName="selTaskName" @closeWin="closeWin"></itemDlg>
+    <itemDlg v-if="selWoNo" :dialogVisible="dialogVisible" :woNo="selWoNo" :taskIdnew="seltaskId" :taskName="selTaskName" @closeWin="closeWin"></itemDlg>
   </div>
 </template>
 <script>
@@ -180,6 +180,7 @@ export default {
       //
       dialogVisible:false,
       selWoNo:"",
+      seltaskId:"",
       selTaskName:""
     };
   },
@@ -211,8 +212,6 @@ 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}
@@ -225,6 +224,7 @@ export default {
     },
     viewItem(n, v){
         this.selWoNo = n.woNo;
+        this.seltaskId = n.taskId;
         this.selTaskName = n.taskName;
         this.dialogVisible = true;
     },

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

@@ -9,7 +9,7 @@
       :before-close="handleClose">
       <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>
       <div class="el-line"></div>
@@ -42,6 +42,7 @@ import baseTable from  "./base.vue"
 export default {
   props: {
       woNo:   { required: false, type: String},
+      taskIdnew:   { required: false, type: String},
       itemId: { required: false, type: String},
       taskName: { required: false, type: String},
       dialogVisible: {required: true,type: Boolean, default() {return false;}},
@@ -49,7 +50,11 @@ export default {
   components:{ baseTable },
   data(){
     return{
-      rovaList:[]
+      rovaList:[],
+      datalist: {
+        url: '/bpm/api/download',
+        type: 1
+      },
     }
   },
   methods:{
@@ -64,11 +69,12 @@ export default {
               "Content-Type": "application/json",
           },
           data: {
-              taskId: this.taskId,
+              taskId: this.taskIdnew,
               woNo: this.woNo
           },
       }).then((res) => {
           this.rovaList = res.data.taskList;
+          this.datalist.attList = res.data.attachList;
       });
     }
   },