diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index dae6bbc..05fa0d5 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -88,9 +88,9 @@
           //角色ID
           roleId: "",
           //用户名
-          username: "admin",
+          username: "",
           //密码
-          password: "admin",
+          password: "",
           //账号类型
           type: "account",
           //验证码的值
diff --git a/src/styles/login.scss b/src/styles/login.scss
index 528b00e..f2f429e 100644
--- a/src/styles/login.scss
+++ b/src/styles/login.scss
@@ -76,10 +76,6 @@
   box-sizing: border-box;
 }
 
-.el-button--primary{
-
-}
-
 .login-main {
   margin: 0 auto;
   width: 65%;
@@ -148,7 +144,6 @@
 
   .el-input {
     input {
-      padding-bottom: 10px;
       text-indent: 5px;
       background: transparent;
       border: none;
diff --git a/src/views/register/add.vue b/src/views/register/add.vue
index 7dd21ad..05361ed 100644
--- a/src/views/register/add.vue
+++ b/src/views/register/add.vue
@@ -82,15 +82,19 @@
         </template> </el-table-column
       ><el-table-column align="center" prop="cardno" label="身份证号码">
         <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.cardno"
-            clearable
-            onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
-            maxlength="18"
-            placeholder="身份证号码"
-            size="medium"
-            style="width: 90%; margin-left: 5%"
-          />
+            <!-- onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" -->
+          <el-form :model="scope.row" :rules="rules">
+            <el-form-item prop="cardno">
+              <el-input
+                v-model="scope.row.cardno"
+                clearable
+                placeholder="身份证号码"
+                size="medium"
+                style="width: 90%; margin-left: 5%"
+              />
+            </el-form-item>
+          </el-form>
+          
         </template>
       </el-table-column>
       <el-table-column align="center" prop="address" label="住址">
@@ -115,15 +119,17 @@
         </template> </el-table-column
       ><el-table-column align="center" prop="phone" label="联系人电话">
         <template slot-scope="scope">
-          <el-input
-            v-model="scope.row.phone"
-            clearable
-            onkeyup="this.value=this.value.replace(/[^\d.]/g,'')"
-            maxlength="11"
-            placeholder="联系人电话"
-            size="medium"
-            style="width: 90%; margin-left: 5%"
-          />
+          <el-form :model="scope.row" :rules="rules">
+            <el-form-item prop="phone">
+              <el-input
+                v-model="scope.row.phone"
+                clearable
+                placeholder="联系人电话"
+                size="medium"
+                style="width: 90%; margin-left: 5%"
+              />
+            </el-form-item>
+          </el-form>
         </template>
       </el-table-column>
     </el-table>
@@ -162,7 +168,7 @@
               <figcaption>
                 <el-select
                   v-model="form.streetId"
-                  :disabled="isappend"
+                  :disabled="pageType == 'edit'"
                   :filter-method="dataFilter"
                   clearable
                   filterable
@@ -186,10 +192,10 @@
           <el-form-item prop="disputeId" style="width: 100%">
             <figure>
               <i></i>诉求类型
-              <figcaption>
+              <figcaption v-show="form.disputeId != -1">
                 <el-select
                   v-model="form.disputeId"
-                  :disabled="isappend"
+                  :disabled="pageType == 'edit'"
                   :filter-method="dataFilter"
                   clearable
                   filterable
@@ -207,6 +213,12 @@
                   />
                 </el-select>
               </figcaption>
+              <figcaption v-show="form.disputeId == -1">
+                <el-input
+                  v-model="form.disputeName"
+                  :disabled="pageType == 'edit'">
+                </el-input>
+              </figcaption>
             </figure>
           </el-form-item>
         </el-col>
@@ -370,6 +382,31 @@ import {addRegister,getStreetList,againResolve} from "@/api/register/register"
 import {getBaseList,getTypeList} from "@/api/base"
 export default {
   data() {
+    var checkNumber = (rule, value, callback) => { // 手机号验证
+        if (!value) {
+          return callback(new Error('身份证号不能为空'));
+        } else {
+          const reg = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+          if (reg.test(value)) {
+            callback();
+          } else {
+            return callback(new Error('请输入正确的身份证号'));
+          }
+        }
+      };
+      var checkPhone = (rule,value,callback) =>{ 
+        if(!value){
+          return callback(new Error('联系方式不能为空'));
+        }else{
+          const moblie=/^1(3|4|5|6|7|8|9)\d{9}$/;
+          const tel=/^(0[0-9]{2,3}\-)([2-9][0-9]{4,7})+(\-[0-9]{1,4})?$/
+          if(moblie.test(value) || tel.test(value)){
+            callback()
+          }else{
+            return callback(new Error('请输入正确的联系方式'));
+          }
+        } 
+      }
     return {
       form: {
         personNum: "",
@@ -385,6 +422,14 @@ export default {
         ],
         problemDesc:[
           { required: true, message: "请填写反应主要问题", trigger: "change" },
+        ],
+        cardno:[
+          {required:true,message:'请填写身份证号',trigger:'blur'},
+          {validator: checkNumber, trigger: 'blur'}
+        ],
+        phone:[
+          {required:true,message:'请填写联系方式',trigger:'blur'},
+          {validator: checkPhone, trigger: 'blur'}
         ]
       },
       formData: [
@@ -414,59 +459,7 @@ export default {
     } else if (this.$route.query.type == "edit") {
       this.title = "再次调解登记";
       this.pageType = "edit";
-      this.getAgainDetail()
-      // this.formData = [
-      //   {
-      //     username: "张三",
-      //     gender: "1",
-      //     age: 20,
-      //     cardno: "3708821548488178",
-      //     address: "洋河镇",
-      //     addressNow: "洋河镇",
-      //     phone: "13564854126",
-      //   },
-      //   {
-      //     username: "李四",
-      //     gender: "1",
-      //     age: 20,
-      //     cardno: "3708821548488178",
-      //     address: "洋河镇",
-      //     addressNow: "洋河镇",
-      //     phone: "13564854126",
-      //   },
-      //   {
-      //     username: "王二狗",
-      //     gender: "1",
-      //     age: 20,
-      //     cardno: "3708821548488178",
-      //     address: "洋河镇",
-      //     addressNow: "洋河镇",
-      //     phone: "13564854126",
-      //   },
-      //   {
-      //     username: "王五",
-      //     gender: "1",
-      //     age: 20,
-      //     cardno: "3708821548488178",
-      //     address: "洋河镇",
-      //     addressNow: "洋河镇",
-      //     phone: "13564854126",
-      //   },
-      // ];
-      // // this.form.number = this.formData.length
-      // this.form = {
-      //   number: this.formData.length,
-      //   id: "122555646684684",
-      //   streetId: "胶州市",
-      //   disputeId: "土地纠纷",
-      //   disposeDept: "市住建局",
-      //   hasProtocol: "无协议书",
-      //   hasOpinion: "无处理意见",
-      //   hasReviewOpinion: "无复查意见",
-      //   legalPaper: "无法律文书",
-      //   regTime: "2012-05-15 12:30",
-      //   problemDesc: "矛盾描述...........",
-      // };
+      this.getAgainDetail();
     }
   },
   computed: {
@@ -556,43 +549,74 @@ export default {
           let params = {}
             if(this.formData.length !== 0){
                 let tmp = this.formData.filter(item => item.username !== '')
-                if(this.pageType == 'add'){
-                  params={
-                    visitors:tmp,
-                    ...this.form
-                  }
-                  // console.log(params)
-                  addRegister(params).then(res =>{
-                    if(res.data.code == 200){
-                      this.$message.success('提交成功！')
-                      let { tag, key } = this.findTag(this.$route.fullPath);
-                      this.$store.commit("DEL_TAG", tag);
-                      if (tag.value === this.tag.value) {
-                        tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
-                        this.$router.push({
-                          path: "/register/index",
-                        });
+                console.log(tmp)
+                if(tmp.length !== 0){
+                  if(this.pageType == 'add'){
+                    let tmp1 = this.typeData.find(item => item.id == this.form.disputeId)
+                    if(!tmp1){
+                      params = {
+                        ...this.form,
+                        visitors:tmp,
+                        disputeName:this.form.disputeId,
+                        disputeId:''
+                      }
+                    }else{
+                      params={
+                        visitors:tmp,
+                        ...this.form,
+                        disputeId:this.form.disputeId
                       }
                     }
-                  })
-                }else if(this.pageType == 'edit'){
-                  params={
-                    ...this.form,
-                    visitors:tmp,
-                  }
-                  addRegister(params).then(res =>{
-                    if(res.data.code == 200){
-                      this.$message.success('提交成功！')
-                      let { tag, key } = this.findTag(this.$route.fullPath);
-                      this.$store.commit("DEL_TAG", tag);
-                      if (tag.value === this.tag.value) {
-                        tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
-                        this.$router.push({
-                          path: "/register/index",
-                        });
+                    console.log(params)
+                    addRegister(params).then(res =>{
+                      if(res.data.code == 200){
+                        this.$message.success('提交成功！')
+                        let { tag, key } = this.findTag(this.$route.fullPath);
+                        this.$store.commit("DEL_TAG", tag);
+                        if (tag.value === this.tag.value) {
+                          tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
+                          this.$router.push({
+                            path: "/register/index",
+                          });
+                        }
+                      }
+                    })
+                  }else if(this.pageType == 'edit'){
+                    params={
+                      ...this.form,
+                      visitors:tmp,
+                    }
+                    let tmp1 = this.typeData.find(item => item.id == this.form.disputeId)
+                    if(!tmp1){
+                      params = {
+                        ...this.form,
+                        visitors:tmp,
+                        disputeName:this.form.disputeId,
+                        disputeId:''
+                      }
+                    }else{
+                      params={
+                        visitors:tmp,
+                        ...this.form,
+                        disputeId:this.form.disputeId
                       }
                     }
-                  })
+                    addRegister(params).then(res =>{
+                      if(res.data.code == 200){
+                        this.$message.success('提交成功！')
+                        let { tag, key } = this.findTag(this.$route.fullPath);
+                        this.$store.commit("DEL_TAG", tag);
+                        if (tag.value === this.tag.value) {
+                          tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个
+                          this.$router.push({
+                            path: "/register/index",
+                          });
+                        }
+                      }
+                    })
+                  }
+                }else{
+                  this.$message.error('登记人员列表不可为空')
                 }
             }else{
                 this.$message.error('登记人员列表不可为空')
@@ -636,6 +660,14 @@ export default {
 }
 .el-table{
   width: 96% !important;
+
+  /deep/ .is-required{
+    margin-top:20px
+  }
+
+  /deep/ .el-form-item__error{
+    left:15px
+  }
 }
 /deep/ .btn_box {
   display: flex;
diff --git a/src/views/register/index.vue b/src/views/register/index.vue
index 44ba16c..ed075ec 100644
--- a/src/views/register/index.vue
+++ b/src/views/register/index.vue
@@ -15,7 +15,6 @@
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
-      @on-load="onLoad"
     >
       <template slot-scope="scope" slot="reStatusSearch">
         <el-select v-model="form.getRegList" placeholder="请选择诉求状态">
@@ -48,7 +47,7 @@
         </el-select>
       </template>
       <template slot-scope="scope" slot="windowsSearch">
-        <el-select v-model="form.windows" placeholder="请选择处理窗口">
+        <el-select v-model="form.windows" placeholder="请选择处理窗口" :disabled="isWinDis">
           <el-option
             v-for="item in winData"
             :key="item.id"
@@ -58,7 +57,7 @@
         </el-select>
       </template>
       <template slot-scope="scope" slot="nameSearch">
-        <el-input v-model="form.name" placeholder="请输入代表姓名"></el-input>
+        <el-input v-model="form.name" placeholder="请输入来访人姓名"></el-input>
       </template>
       <template slot-scope="{ row }" slot="menu">
         <el-button
@@ -222,12 +221,13 @@ export default {
             // searchSpan: 4,
           },
           {
-            label: "代表姓名",
+            label: "来访人姓名",
             prop: "name",
             search: true,
             searchslot: true,
             hide: true,
-            // searchSpan: 4,
+            searchSpan: 5,
+            searchLabelWidth:100
           },
           {
             label: "登记时间",
@@ -237,11 +237,11 @@ export default {
             hide: true,
           },
           {
-            label: "代表姓名",
+            label: "来访人姓名",
             prop: "username",
             align: "center",
             overHidden:true,
-            width:70,
+            width:80,
           },
           {
             label: "身份证号码",
@@ -285,22 +285,28 @@ export default {
       data: [],
       time:'',
       date:'',
+      isWinDis:false
     };
   },
    computed: {
-    ...mapGetters(["permission"]),
+    ...mapGetters(["permission","userInfo"]),
   },
   created() {
     this.headers["Blade-Auth"] = "bearer " + getToken();
     this.getTime();
     this.getWinData();
     this.getTypeData()
-    console.log(this.permission)
   },
   methods: {
     getWinData(){
       getBaseList().then(res =>{
-        this.winData = res.data.data
+        this.winData = res.data.data;
+        let tmp = this.winData.find(item => item.id == this.userInfo.user_id);
+        if(tmp){
+          this.form.windows = tmp.id;
+          this.isWinDis = true
+        }
+        this.onLoad()
       })
     },
     getTypeData(){
@@ -330,6 +336,11 @@ export default {
     searchReset() {
       this.query = {};
       this.form = {};
+      let tmp = this.winData.find(item => item.id == this.userInfo.user_id);
+        if(tmp){
+          this.form.windows = tmp.id;
+          this.isWinDis = true
+        }
       this.onLoad(this.page);
     },
     searchChange(params, done) {
diff --git a/src/views/register/recon.vue b/src/views/register/recon.vue
index 930efe1..ba4ffbb 100644
--- a/src/views/register/recon.vue
+++ b/src/views/register/recon.vue
@@ -129,7 +129,7 @@
                   <el-input
                     v-model="form.personNum"
                     size="medium"
-                    placeholder="请输入来访人数"
+                    :placeholder="pageType == 'recon' ? 请输入来访人数 : pageType == 'edit' ? '无' : '无'"
                     clearable
                     style="width: 90%"
                     :readonly="true"
@@ -171,7 +171,7 @@
           <el-form-item style="width: 100%">
             <figure>
               &emsp;诉求类型
-              <figcaption>
+              <figcaption v-show="form.disputeId != -1">
                 <el-select
                   v-model="form.disputeId"
                   :disabled="isappend || pageType == 'edit' || pageType == 'recon'"
@@ -192,6 +192,14 @@
                   />
                 </el-select>
               </figcaption>
+              <figcaption v-show="form.disputeId == -1">
+                <el-input
+                  v-model="form.disputeName"
+                  :disabled="isappend || pageType == 'edit' || pageType == 'recon'"
+                  size="medium"
+                  style="width: 90%"
+                ></el-input>
+              </figcaption>
             </figure>
           </el-form-item>
         </el-col>
@@ -211,7 +219,7 @@
                     filterable
                     allow-create
                     ref="searchSelect"
-                    placeholder="请选择单位"
+                    :placeholder="pageType == 'recon' ? '请选择单位' : pageType == 'edit' ? '无' : '无'"
                     size="medium"
                     style="width: 90%"
                   >
@@ -236,7 +244,7 @@
                   v-model="form.protocol"
                   :disabled="pageType == 'edit' || pageType == 'recon'"
                   size="medium"
-                  placeholder="请输入基层有无协议书"
+                  :placeholder="pageType == 'recon' ? '请输入基层有无协议书' : pageType == 'edit' ? '无' : '无'"
                   clearable
                   style="width: 90%"
                 />
@@ -253,7 +261,7 @@
                   v-model="form.opinion"
                   :disabled="pageType == 'edit' || pageType == 'recon'"
                   size="medium"
-                  placeholder="请输入基层有无处理意见"
+                  :placeholder="pageType == 'recon' ? '请输入基层有无处理意见' : pageType == 'edit' ? '无' : '无'"
                   clearable
                   style="width: 90%"
                 />
@@ -273,7 +281,7 @@
                   :disabled="pageType == 'edit' || pageType == 'recon'"
                     v-model="form.reviewOpinion"
                     size="medium"
-                    placeholder="请输入部门有无复查意见"
+                    :placeholder="pageType == 'recon' ? '请输入部门有无复查意见' : pageType == 'edit' ? '无' : '无'"
                     clearable
                     style="width: 90%"
                   />
@@ -291,7 +299,7 @@
                 :disabled="pageType == 'edit' || pageType == 'recon'"
                   v-model="form.legalPaper"
                   size="medium"
-                  placeholder="请输入法律文书"
+                  :placeholder="pageType == 'recon' ? '请输入法律文书' : pageType == 'edit' ? '无' : '无'"
                   clearable
                   style="width: 90%"
                 />
@@ -311,7 +319,7 @@
                 <el-input
                   v-model="form.legalPaper"
                   size="medium"
-                  placeholder="请输入诉求初登时间"
+                  :placeholder="pageType == 'recon' ? '请输入诉求初登时间' : pageType == 'edit' ? '无' : '无'"
                   clearable
                   style="width: 90%"
                   :readonly="true"
@@ -331,7 +339,7 @@
                 <figcaption>
                   <el-select
                     v-model="form.skipGrant"
-                    :disabled="pageType == 'edit' || pageType == 'recon'"
+                    :disabled="pageType == 'edit' || isSkip"
                     :filter-method="dataFilter"
                     clearable
                     filterable
@@ -353,6 +361,36 @@
             </el-form-item>
           </div>
         </el-col>
+        <el-col :span="6" style="width: 31%; margin-left: -2.1%" v-show="form.skipGrant == 1">
+          <div class="grid-content bg-purple">
+            <el-form-item  style="width: 100%">
+              <figure>
+                &emsp;越级上报级别
+                <figcaption>
+                  <el-select
+                    v-model="form.skipGrantLevel"
+                    :disabled="pageType == 'edit' || isSkip"
+                    :filter-method="dataFilter"
+                    clearable
+                    filterable
+                    allow-create
+                    ref="searchSelect"
+                    placeholder="请选择单位"
+                    size="medium"
+                    style="width: 90%"
+                  >
+                    <el-option
+                      v-for="item in grantLevelData"
+                      :key="item.value"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </figcaption>
+              </figure>
+            </el-form-item>
+          </div>
+        </el-col>
       </el-row>
       <el-row :model="form" :rules="rules" :gutter="20">
         <el-col style="width: 100%; margin-left: 1%">
@@ -367,7 +405,7 @@
                     :disabled="pageType == 'edit'"
                     v-model="form.problemDesc"
                     size="medium"
-                    placeholder="请输入反应主要问题"
+                    :placeholder="pageType == 'recon' ? '请输入反应主要问题' : pageType == 'edit' ? '无' : '无'"
                     clearable
                     style="width: 90%"
                   />
@@ -419,13 +457,14 @@
         </el-table-column>
         <el-table-column align="center" prop="talkingHis" label="接谈记录详情">
           <template slot-scope="scope">
+            <i></i>
             <el-input
               type="textarea"
               :autosize="{ minRows: 2 }"
               v-model="scope.row.talkingHis"
               size="medium"
               :disabled="pageType == 'edit'"
-              placeholder="请输入接谈记录详情"
+              :placeholder="pageType == 'recon' ? '请输入接谈记录详情' : pageType == 'edit' ? '无' : '无'"
               clearable
               style="width: 90%"
             >
@@ -446,7 +485,7 @@
                     v-model="form.attitude"
                     :disabled="pageType == 'edit'"
                     size="medium"
-                    placeholder="请输入上访人意见和态度"
+                    :placeholder="pageType == 'recon' ? '请输入上访人意见和态度' : pageType == 'edit' ? '无' : '无'"
                     clearable
                     style="width: 90%"
                   />
@@ -469,7 +508,7 @@
                     :autosize="{ minRows: 2 }"
                     v-model="form.talkingAdvice"
                     size="medium"
-                    placeholder="请输入接谈意见"
+                    :placeholder="pageType == 'recon' ? '请输入接谈意见' : pageType == 'edit' ? '无' : '无'"
                     clearable
                     style="width: 90%"
                   />
@@ -494,7 +533,7 @@
                     filterable
                     allow-create
                     ref="searchSelect"
-                    placeholder="请选择单位"
+                    :placeholder="pageType == 'recon' ? '请选择单位' : pageType == 'edit' ? '无' : '无'"
                     size="medium"
                     style="width: 90%"
                     multiple
@@ -524,7 +563,7 @@
                   filterable
                   allow-create
                   ref="searchSelect"
-                  placeholder="请选择单位"
+                  :placeholder="pageType == 'recon' ? '请选择单位' : pageType == 'edit' ? '无' : '无'"
                   size="medium"
                   style="width: 90%"
                 >
@@ -552,7 +591,7 @@
                   filterable
                   allow-create
                   ref="searchSelect"
-                  placeholder="请选择事件等级"
+                  :placeholder="pageType == 'recon' ? '请选择事件等级' : pageType == 'edit' ? '无' : '无'"
                   size="medium"
                   style="width: 90%"
                 >
@@ -583,7 +622,7 @@
                     filterable
                     allow-create
                     ref="searchSelect"
-                    placeholder="请选择办理状态"
+                    :placeholder="pageType == 'recon' ? '请选择办理状态' : pageType == 'edit' ? '无' : '无'"
                     size="medium"
                     style="width: 90%"
                   >
@@ -609,7 +648,7 @@
                   v-model="form.feedbackDeadline"
                   type="datetime"
                   style="width: 90%"
-                  placeholder="选择日期时间"
+                  :placeholder="pageType == 'recon' ? '选择日期时间' : pageType == 'edit' ? '无' : '无'"
                   format="yyyy-MM-dd HH:mm:ss"
                   value-format="yyyy-MM-dd HH:mm:ss"
                 >
@@ -630,7 +669,7 @@
                   format="yyyy-MM-dd HH:mm:ss"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   style="width: 90%"
-                  placeholder="选择日期时间"
+                  :placeholder="pageType == 'recon' ? '选择日期时间' : pageType == 'edit' ? '无' : '无'"
                 >
                 </el-date-picker>
               </figcaption>
@@ -651,7 +690,7 @@
                     :autosize="{ minRows: 2 }"
                     v-model="form.remark"
                     size="medium"
-                    placeholder="请输入备注"
+                    :placeholder="pageType == 'recon' ? '请输入备注' : pageType == 'edit' ? '无' : '无'"
                     clearable
                     style="width: 90%"
                   />
@@ -674,14 +713,14 @@
                   style="width: 90%"
                   format="yyyy-MM-dd HH:mm:ss"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择来访时间"
+                  :placeholder="pageType == 'recon' ? '选择来访时间' : pageType == 'edit' ? '无' : '无'"
                 >
                 </el-date-picker>
               </figcaption>
             </figure>
           </el-form-item>
         </el-col>
-        <el-col :span="6" style="width: 31%; margin-left: 2.1%">
+        <el-col :span="6" style="width: 31%; margin-left: -2.1%">
           <el-form-item style="width: 100%">
             <figure>
               &emsp; 提交时间
@@ -693,16 +732,33 @@
                   style="width: 90%"
                   format="yyyy-MM-dd HH:mm:ss"
                   value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="选择提交时间"
+                  :placeholder="pageType == 'recon' ? '选择提交时间' : pageType == 'edit' ? '无' : '无'"
                 >
                 </el-date-picker>
               </figcaption>
             </figure>
           </el-form-item>
         </el-col>
+        <el-col :span="6" style="width: 31%; margin-left: -1.58%">
+          <el-form-item style="width: 100%" prop="mediatorName">
+            <figure>
+              <i></i> 调解员姓名
+              <figcaption>
+               <el-input
+                    :disabled="pageType == 'edit'"
+                    v-model="form.mediatorName"
+                    size="medium"
+                    :placeholder="pageType == 'recon' ? '请输入调解员姓名' : pageType == 'edit' ? '无' : '无'"
+                    clearable
+                    style="width: 90%"
+                  />
+              </figcaption>
+            </figure>
+          </el-form-item>
+        </el-col>
       </el-row>
-      <el-row :model="form" :rules="rules" :gutter="20">
-        <el-col style="width: 100%; margin-left: 1%" v-show="imgList.length == 0 && pageType !== 'edit'">
+      <el-row :model="form" :rules="rules" :gutter="20" v-show="isShowImg">
+        <el-col style="width: 100%; margin-left: 1%" >
           <el-form-item>
             <figure>
               &emsp; 上传附件
@@ -710,7 +766,7 @@
                 <el-upload
                   v-model="imgList"
                   class="upload_box"
-                  :class="imgList.length >= 5 ? 'hide' : ''"
+                  :class="(imgList.length >= 5 ||pageType == 'edit') ? 'hide' : ''"
                   :headers="headers"
                   action="/api/blade-resource/oss/endpoint/put-file"
                   list-type="picture-card"
@@ -721,7 +777,7 @@
                   limit="5"
                   accept=".jpg,.png"
                 >
-                  <div class="up_box" v-show="imgList.length < 5 && pageType !== 'edit'">
+                  <div class="up_box">
                     <div class="upload_item">
                       <div class="img">
                         <img src="~@/assets/image/upload.png" alt="" />
@@ -741,7 +797,7 @@
       <el-form-item class="btn_box" v-show="pageType == 'recon'">
         <el-button class="can_btn" @click="handleCancel">取消</el-button>
         <el-button class="sub_btn" type="primary" @click="submitForm"
-          >发布</el-button
+          >提交</el-button
         >
       </el-form-item>
     </el-form>
@@ -765,8 +821,10 @@ export default {
         number: "",
         fileList: [],
       },
+      isSkip:false,
       imgList: [],
       fileList: [],
+      isUpload:false,
       enentLevel: [
         { value: 0, label: "简单" },
         { value: 1, label: "一般" },
@@ -778,10 +836,17 @@ export default {
         { value: 2, label: "达成协议" },
         { value: 3, label: "调解成功" },
       ],
+      isShowImg:true,
       yuejiData:[
         {value:1,label:'是'},
         {value:0,label:'否'},
       ],
+      grantLevelData:[
+        {value:0,label:'中央'},
+        {value:1,label:'省级'},
+        {value:2,label:'市级'},
+        {value:3,label:'区县'},
+      ],
       headers: {
         "Blade-Auth": "",
       }, //认证
@@ -811,6 +876,9 @@ export default {
         appealStatus: [
           { required: true, message: "请选择办理状态", trigger: "change" },
         ],
+        mediatorName:[
+          { required: true, message: "请输入调解员姓名", trigger: "change" },
+        ]
       },
       formData: [
         {
@@ -871,6 +939,11 @@ export default {
         this.form.dutyDeptIds = this.form.dutyDeptIds !== '' ? this.form.dutyDeptIds.split(',') : ''
         this.recordData = this.form.talkingHisList;
         this.form.personNum = this.formData.length;
+        if(res.data.data.mediationId !== '' && res.data.data.fileList.length !== 0){
+          this.isShowImg = true
+        }else{
+          this.isShowImg = false
+        }
         if(this.form.fileList.length !== 0){
           this.form.fileList.map((item) => {
             this.imgList.push({ fileAddr: item.fileAddr });
@@ -891,6 +964,7 @@ export default {
           personNum:res.data.data.visitors.length,
           streetId: res.data.data.streetId,
           disputeId: res.data.data.disputeId,
+          disputeName:res.data.data.disputeName,
           disposeDept: res.data.data.disposeDept,
           protocol: res.data.data.protocol,
           opinion: res.data.data.opinion,
@@ -900,8 +974,16 @@ export default {
           visitTime:res.data.data.regTime,
           skipGrant:res.data.data.skipGrant
         };
+        this.isShowImg = res.data.data.mediationId == '' ? true : false
+        
+        console.log(this.isShowImg)
         this.formData = res.data.data.visitors;
         this.recordData = res.data.data.talkingHisList;
+        if(res.data.data.talkingHisList.length == 0){
+          this.isSkip = false
+        }else{
+          this.isSkip = true
+        }
         // this.form.personNum = this.form
         this.recordData.push({
           talkingTime: this.$route.query.time,
@@ -1076,6 +1158,10 @@ export default {
 .record_tab {
   width: 98% !important;
 }
+/deep/ .el-table td.el-table__cell .cell{
+  display: flex;
+  justify-content: center;
+}
 /deep/ .btn_box {
   display: flex;
   align-items: center;
@@ -1170,7 +1256,14 @@ export default {
       }
     }
   }
+
+  
 }
+.hide{
+        /deep/ .el-upload--picture-card {
+            display: none;
+        }
+    }
 /deep/ .el-upload-list {
   .el-upload-list__item {
     width: 394px;
diff --git a/vue.config.js b/vue.config.js
index c986d13..797e9f0 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,6 +1,6 @@
 module.exports = {
   //路径前缀
-  publicPath: "/",
+  publicPath: "./",
   lintOnSave: false,
   productionSourceMap: false,
   transpileDependencies: ["/@yabby-business/"],
@@ -31,6 +31,7 @@ module.exports = {
         // target: "http://192.168.1.106:80",
         // target: "http://192.168.1.3:8083",
         target: "http://192.168.1.106:80",
+        // target: "http://127.0.0.1:10000",
         //远程演示服务地址,可用于直接启动项目
         //target: 'https://saber.bladex.vip/api',
         ws: true,