Просмотр исходного кода

Merge branch 'dev' of http://git.xayunmei.com/SH-Arbitrate/Mediation-Frontend into hcb

hanchaobo 2 лет назад
Родитель
Сommit
0d62eda5a8

+ 7
- 4
src/views/caseManagement/components/addCase.vue Просмотреть файл

601
       },
601
       },
602
     ]">
602
     ]">
603
                 <el-radio-group v-model="item.res.sex" disabled>
603
                 <el-radio-group v-model="item.res.sex" disabled>
604
-                  <el-radio :label="'0'">男</el-radio>
605
-                  <el-radio :label="'1'">女</el-radio>
604
+                  <el-radio label="0">男</el-radio>
605
+                  <el-radio label="1">女</el-radio>
606
                 </el-radio-group>
606
                 </el-radio-group>
607
               </el-form-item>
607
               </el-form-item>
608
             </el-col>
608
             </el-col>
1334
     clearValidateRes(val, index) {
1334
     clearValidateRes(val, index) {
1335
       if (index == 0) {
1335
       if (index == 0) {
1336
         if (val == 0) {
1336
         if (val == 0) {
1337
+        console.log(this.formData.affiliate.res[0].res.sex)
1338
+         this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex); 
1337
           if (this.formZipData.affiliate) {
1339
           if (this.formZipData.affiliate) {
1338
             // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
1340
             // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 0);
1339
             this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1341
             this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1340
             this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1342
             this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1341
             this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1343
             this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1342
-            this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
1344
+            this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex);
1343
             this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1345
             this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1344
             this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1346
             this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1345
             this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1347
             this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1346
           }
1348
           }
1347
         } else if (val == 1) {
1349
         } else if (val == 1) {
1350
+        console.log(this.formData.affiliate.res[0].res.sex)
1348
           if (this.formZipData.affiliate) {
1351
           if (this.formZipData.affiliate) {
1349
             // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
1352
             // this.$set(this.formData.affiliate.res[0].res, 'organizeFlag', 1);
1350
             this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1353
             this.$set(this.formData.affiliate.res[0].res, 'name', this.formZipData.affiliate.res[0].res.name);
1351
             this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1354
             this.$set(this.formData.affiliate.res[0].res, 'phone', this.formZipData.affiliate.res[0].res.phone);
1352
             this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1355
             this.$set(this.formData.affiliate.res[0].res, 'idCard', this.formZipData.affiliate.res[0].res.idCard);
1353
-            this.$set(this.formData.affiliate.res[0].res, 'sex', Number(this.formZipData.affiliate.res[0].res.sex));
1356
+            this.$set(this.formData.affiliate.res[0].res, 'sex', this.formZipData.affiliate.res[0].res.sex);
1354
             this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1357
             this.$set(this.formData.affiliate.res[0].res, 'birth', this.formZipData.affiliate.res[0].res.birth);
1355
             this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1358
             this.$set(this.formData.affiliate.res[0].res, 'home', this.formZipData.affiliate.res[0].res.home);
1356
             this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);
1359
             this.$set(this.formData.affiliate.res[0].res, 'email', this.formZipData.affiliate.res[0].res.email);

+ 6
- 1
src/views/caseManagement/components/mediation.vue Просмотреть файл

170
       filedata: {
170
       filedata: {
171
         annexType: 7,
171
         annexType: 7,
172
         isMediaBook: 1,
172
         isMediaBook: 1,
173
+        caseId:null
173
       },
174
       },
174
       fileList: [],
175
       fileList: [],
175
       attachList: [],
176
       attachList: [],
228
       this.attachList = updatedArray;
229
       this.attachList = updatedArray;
229
     },
230
     },
230
     beforeUpload(flie, fileList) {
231
     beforeUpload(flie, fileList) {
232
+      this.filedata.caseId =  this.mediationData.id
233
+  
231
       this.fileList = fileList;
234
       this.fileList = fileList;
232
     },
235
     },
233
     handlSuccess(res, file) {
236
     handlSuccess(res, file) {
237
+      const fileSuccess = [{ annexId: res.annexId, annexType: res.annexType,annexName:res.newFileName,annexPath:res.fileName,onlyOfficeFileId:res.onlyOfficeFileId}]
234
       this.codes = res.code
238
       this.codes = res.code
235
-      console.log(res)
236
       this.attachList.push({ annexId: res.annexId, annexType: res.annexType });
239
       this.attachList.push({ annexId: res.annexId, annexType: res.annexType });
240
+      this.recordArrMediate = fileSuccess;
237
       // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
241
       // this.$set(this.mediationData, "attachList", {annexId:res.annexId});
238
     },
242
     },
239
     /** 获取案件详情信息 */
243
     /** 获取案件详情信息 */
259
             this.recordArrMediate.push(item);
263
             this.recordArrMediate.push(item);
260
           }
264
           }
261
         });
265
         });
266
+        
262
       });
267
       });
263
     },
268
     },
264
     /** 获取用户信息 */
269
     /** 获取用户信息 */