Merge remote-tracking branch 'origin/master'

src/views/hlguser/modules/HlgUserSubcontractor.vue

@@ -164,6 +164,7 @@
           this.ipagination.current = 1;
         }
         var params = this.getQueryParams()//查询条件
+        params.id= this.userId
         this.loading = true
         getAction(this.url.list, params).then((res) => {
           if (res.success) {
@@ -192,10 +193,9 @@
       //上传合同
       uploadContract(record){
         let recordNew = {};
-        recordNew.isImport = record.isImport;
         recordNew.id = record.userContractId;
         recordNew.userId = this.userId;
-        recordNew.subcontractorId = record.subcontractorId;
+        recordNew.subcontractorId = record.id;
         recordNew.subcontract = record.subcontract;
         this.$refs.contractModal.edit(recordNew)
         this.$refs.contractModal.title = '用户合同'