Merge branch 'hjw-mobaihe' into 'hjw-mobaihe'

Hjw mobaihe

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

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:""
     };
   },
@@ -225,6 +226,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

@@ -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,7 +69,7 @@ export default {
               "Content-Type": "application/json",
           },
           data: {
-              taskId: this.taskId,
+              taskId: this.taskIdnew,
               woNo: this.woNo
           },
       }).then((res) => {
@@ -74,6 +79,8 @@ export default {
   },
   mounted(){
     this.rovaData()
+    console.log('itemDig---taskidnew')
+    console.log(this.taskIdnew)
   }
 }
 </script>