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

src/views/caseManagement/components/addCase.vue

@@ -138,6 +138,13 @@
                 <el-radio :label="1">机构</el-radio>
               </el-radio-group>
             </el-form-item>
+          </el-col>
+           <el-col :span="24">
+            <div style="display: inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">申请人</div>
+            </div>
+            <el-divider></el-divider>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
             <el-form-item label="申请机构名称" prop="affiliate.applicationName" :rules="[
@@ -151,7 +158,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
-            <el-form-item label="申请人" prop="affiliate.applicationName" :rules="[
+            <el-form-item  label="申请人" prop="affiliate.applicationName" :rules="[
       {
         required: true,
         message: '申请人名称不能为空',
@@ -162,7 +169,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
-            <el-form-item label="统一社会信用代码" prop="affiliate.code" :rules="[
+            <el-form-item label-width="140px" label="统一社会信用代码" prop="affiliate.code" :rules="[
       {
         required: true,
         message: '统一社会信用代码不能为空',
@@ -173,7 +180,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 0">
-            <el-form-item label="申请人身份证号码" prop="affiliate.code" :rules="[
+            <el-form-item  label="申请人身份证号码" prop="affiliate.code" :rules="[
       {
         required: true,
         message: '申请人身份证号不能为空',
@@ -270,6 +277,13 @@
     ]">
               <el-input v-model="formData.affiliate.applicantAddress" placeholder="请输入申请人联系地址" />
             </el-form-item>
+          </el-col>
+           <el-col :span="24">
+            <div style="display: inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">代理人</div>
+            </div>
+            <el-divider></el-divider>
           </el-col>
           <el-col :span="12" v-if="formData.affiliate.organizeFlag == 1">
             <el-form-item label="代理人联系电话" prop="affiliate.contactTelphoneAgent" :rules="[
@@ -336,6 +350,13 @@
     ]">
               <el-input v-model="formData.affiliate.agentEmail" placeholder="请输入代理人邮箱" />
             </el-form-item>
+          </el-col>
+           <el-col :span="24">
+            <div style="display: inline-flex">
+              <div class="infoIcon"></div>
+              <div class="caseInfo">被申请人</div>
+            </div>
+            <el-divider></el-divider>
           </el-col>
           <el-col :span="12">
             <el-form-item label="被申请人姓名" prop="affiliate.respondentName" :rules="[
@@ -349,7 +370,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="被申请人联系电话" prop="affiliate.respondentPhone" :rules="[
+            <el-form-item label-width="140px" label="被申请人联系电话" prop="affiliate.respondentPhone" :rules="[
       {
         required: true,
         message: '被申请人联系电话不能为空',
@@ -365,7 +386,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
+            <el-form-item label-width="140px" label="被申请人身份证号" prop="affiliate.respondentIdentityNum" :rules="[
       {
         required: true,
         message: '被申请人身份证号不能为空',
@@ -382,7 +403,7 @@
                 placeholder="请输入被申请人身份证号" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="10">
             <el-form-item label="被申请人性别：" prop="affiliate.respondentSex" :rules="[
       {
         required: true,
@@ -396,13 +417,13 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="被申请人出生年月日：" prop="affiliate.respondentBirth">
+            <el-form-item label-width="140px" label="被申请人出生年月：" prop="affiliate.respondentBirth">
               <el-date-picker disabled v-model="formData.affiliate.respondentBirth" type="date" placeholder="被申请人出生年月日">
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
+            <el-form-item label-width="150px" label="被申请人申请人住所" prop="affiliate.respondentHome" :rules="[
       {
         required: true,
         message: '被申请人申请人住所不能为空',
@@ -799,4 +820,7 @@ export default {
   height: 700px !important;
   overflow: auto !important;
 }
+::v-deep .el-form-item--medium .el-form-item__content {
+    line-height: 37px;
+}
 </style>

src/views/caseManagement/components/selectMediator.vue

@@ -47,8 +47,15 @@ export default {
     watch: {
         mediatorVisable(val) {
             if (val) {
-                listMediator().then(res=>{
+                listMediator({caseAppliId: this.mediatorData.id}).then(res=>{
                     this.tableData = res.data;
+                    this.tableData.forEach((item)=> {
+                        if (item.echoFlag) {
+                            this.$nextTick(()=>{
+                                this.$refs.multipleTable.toggleRowSelection(item, true);
+                            })
+                        }
+                    })
                 })
             }
         }
@@ -88,7 +95,6 @@ export default {
         },
         handleSelectionChange(val) {
             this.multipleSelection = val;
-            // console.log(this.multipleSelection,"LLLLLLLLLLLLLLLLL");
         }
     },
 };

src/views/caseprocessManagement/components/addNodeprocess.vue

@@ -97,11 +97,13 @@ export default {
         addvisiable(val) {
             if (val) {
                 this.ruleForm = this.editData;
+                this.fileName = '',
                 this.getRoles();
                 this.getbackflowArr();
                 if (this.ruleForm && this.ruleForm.fileName) {
                     this.imgSvgUrl = process.env.VUE_APP_BASE_API + this.ruleForm.fileName;
-                    this.imageUrl = process.env.VUE_APP_BASE_API + this.ruleForm.fileName
+                    this.imageUrl = process.env.VUE_APP_BASE_API + this.ruleForm.fileName;
+                    this.fileName = this.ruleForm.fileName
                 } else {
                     this.imgSvgUrl = ''
                     this.imageUrl = ''

src/views/index.vue

@@ -35,6 +35,13 @@ export default {
       iconHead: process.env.VUE_APP_BASE_API
     };
   },
+  watch: {
+    $route(val) {
+    if (val) {
+      this.gettodoCount();
+    }
+    }
+  },
   created() {
     this.gettodoCount();
   },