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

src/views/caseManagement/caseList.vue

@@ -22,8 +22,8 @@
                     style="width: 240px" @keyup.enter.native="handleQuery" />
             </el-form-item>
             <el-form-item label="创建时间" prop="caseTime">
-                <el-date-picker v-model="caseTime" type="daterange" align="right" unlink-panels range-separator="至"
-                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px"
+                <el-date-picker v-model="caseTime" type="datetimerange" align="right" unlink-panels range-separator="至"
+                    start-placeholder="开始日期" end-placeholder="结束日期" clearable style="width: 240px" :default-time="['00:00:00', '23:59:59']"
                     @change="caseTimeChange">
                 </el-date-picker>
             </el-form-item>
@@ -76,8 +76,8 @@
                     <el-button size="mini" type="text" icon="el-icon-edit" @click="evidenceUpload(scope.row)"
                         v-hasPermi="['caseManagement:list:evidenceEdit']"
                         v-if="scope.row.caseFlowId <= 9">上传证据</el-button>
-                        <el-button size="mini" v-if="scope.row.mediationFileFlag==1" @click="mediationApplication(scope.row)" type="text"
-                        icon="el-icon-edit-outline">调解书</el-button>
+                    <el-button size="mini" v-if="scope.row.mediationFileFlag == 1"
+                        @click="mediationApplication(scope.row)" type="text" icon="el-icon-edit-outline">调解书</el-button>
                     <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.caseFlowId == 15 ||
             scope.row.caseFlowId == 16 ||
             scope.row.caseFlowId == 17
@@ -143,7 +143,8 @@
             :timeConfirmData="timeConfirmData" @getList="getList" :queryParams="queryParams"></timeConfirm>
         <!-- 待调解     -->
         <mediation @cancelMediation="cancelMediation" :mediationVisable="mediationVisable"
-            :mediationData="mediationData" @getList="getList" :queryParams="queryParams" :applicant="applicant"></mediation>
+            :mediationData="mediationData" @getList="getList" :queryParams="queryParams" :applicant="applicant">
+        </mediation>
         <confirmMediation @cancelConfirmTion="cancelConfirmTion" :confirmTionVisable="confirmTionVisable"
             :confirmTionData="confirmTionData" @getList="getList" :queryParams="queryParams"></confirmMediation>
         <!-- 归档详情 -->
@@ -151,7 +152,8 @@
             @cancelDetail="cancelDetail" :detailsAwardNum="detailsAwardNum" :flagLoadingS="flagLoadingS">
         </caseFilingDetailsPage>
         <!-- 调解申请书 -->
-        <mediationApplications :mediationAppVisable="mediationAppVisable" @cancelmediationApp="cancelmediationApp" :mediationLise="mediationLise"></mediationApplications>
+        <mediationApplications :mediationAppVisable="mediationAppVisable" @cancelmediationApp="cancelmediationApp"
+            :mediationLise="mediationLise"></mediationApplications>
     </div>
 </template>
 
@@ -243,8 +245,8 @@ export default {
             detailform: {}, //缴费详情数据
             evidenceVisable: false, //证据修改弹窗
             mediationVisable: false, //待调解弹窗
-            mediationAppVisable:false,//调解申请书
-            mediationLise:{},
+            mediationAppVisable: false,//调解申请书
+            mediationLise: {},
             mediationData: {},
             payTitle: "", //缴费标题
             resPayTitle: "", //被申请人缴费标题
@@ -283,12 +285,12 @@ export default {
             caseStausArr: [], //案件状态
             isapplicant: true, //判断角色申请人或非申请人
             caseFilingData: {},
-            applicant:""
+            applicant: ""
         };
     },
     created() {
         // this.queryParams.caseNum = this.$route.query.caseNum;
-        this.$set(this.queryParams,"caseNum",this.$route.query.caseNum);
+        this.$set(this.queryParams, "caseNum", this.$route.query.caseNum);
         console.log(this.$route.query)
         if (this.$route.query.token) {
             this.queryDisable = true;
@@ -805,11 +807,11 @@ export default {
             this.showarchiveDetails = false;
         },
         // 调解书
-        mediationApplication(row){
+        mediationApplication(row) {
             this.mediationLise = row
             this.mediationAppVisable = true
         },
-        cancelmediationApp(){
+        cancelmediationApp() {
             this.mediationAppVisable = false
         }
     },

src/views/caseManagement/components/addCase.vue

@@ -1272,6 +1272,8 @@ export default {
           this.$set(this.formData.affiliate.applicant[0].applicant, "phone", this.getUserInfoList.phonenumber);
           this.$set(this.formData.affiliate.applicant[0].applicant, "idType", this.getUserInfoList.idType);
           this.$set(this.formData.affiliate.applicant[0].applicant, "nationality", this.getUserInfoList.nationality);
+          this.$set(this.formData.affiliate.applicant[0].applicant, 'home', this.getUserInfoList.home);
+            this.$set(this.formData.affiliate.applicant[0].applicant, 'address', this.getUserInfoList.address);
           if (this.formZipData.affiliate) {
             // this.$set(this.formData.affiliate.applicant[0].applicant, 'organizeFlag', 0);
             this.$set(this.formData, 'arbitratClaims', this.formZipData.arbitratClaims);
@@ -1321,6 +1323,8 @@ export default {
             this.$set(this.formData.affiliate.applicant[0].applicant, 'idCard', null);
             this.$set(this.formData.affiliate.applicant[0].applicant, 'email', null);
             this.$set(this.formData.affiliate.applicant[0].applicant, 'phone', null);
+            this.$set(this.formData.affiliate.applicant[0].applicant, 'home', null);
+            this.$set(this.formData.affiliate.applicant[0].applicant, 'address', null);
           }
         }
       }