diff --git a/project/xiushan/apps/AppAdministrativeLicense/AppAdministrativeLicense.vue b/project/xiushan/apps/AppAdministrativeLicense/AppAdministrativeLicense.vue
index 440f39dd..c78d73ec 100644
--- a/project/xiushan/apps/AppAdministrativeLicense/AppAdministrativeLicense.vue
+++ b/project/xiushan/apps/AppAdministrativeLicense/AppAdministrativeLicense.vue
@@ -9,7 +9,6 @@
 <script>
 import List from "./components/List.vue";
 import Add from "./components/Add.vue";
-import Detail from "./components/Detail.vue";
 
 export default {
   name: "AppAdministrativeLicense",
@@ -18,7 +17,7 @@ export default {
     instance: Function,
     dict: Object,
   },
-  components: {Add, List,Detail},
+  components: {Add, List},
   data() {
     return {
       component: "List",
@@ -33,11 +32,6 @@ export default {
         this.params = data.params;
       }
 
-      if (data.type === "Detail") {
-        this.component = "Detail";
-        this.params = data.params;
-      }
-
       if (data.type === "List") {
         this.component = "List";
         this.params = data.params;
diff --git a/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue b/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
index 7dc9484c..e8f4432e 100644
--- a/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativeLicense/components/Add.vue
@@ -1,12 +1,17 @@
 <template>
   <section class="Add">
-    <ai-detail class="add">
+    <ai-detail class="add" v-if="isEdit == true || !id">
       <template #title>
-        <ai-title :title="params.id ? '编辑' : '新增行政许可信息'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
+        <ai-title :title="params.id ? '编辑行政许可信息' : '新增行政许可信息'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
+      </template>
+      <template #right>
+        <!-- <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="forms=data,isEdit=true">修改</span> -->
+        <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="isEdit==false">取消</span>
+        <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm(id)">保存</span>
       </template>
       <template #content>
         <div class="add-form">
-          <ai-bar title="新增许可信息"></ai-bar>
+          <ai-bar :title="params.id ? '编辑行政许可信息' : '新增行政许可信息'"></ai-bar>
           <el-form ref="forms" :model="forms" :rules="formRules" size="small"  label-width="150px">
             <el-form-item label="许可文书名称" prop="licenseName">
               <el-input v-model="forms.licenseName" placeholder="请输入"></el-input>
@@ -61,7 +66,35 @@
       </template>
       <template slot="footer" class="footer">
         <el-button class="delete-btn footer-btn" @click="cancel(false)">取消</el-button>
-        <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
+      <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
+    </template>
+    </ai-detail>
+    <ai-detail class="add" v-if="id && !isEdit">
+      <template slot="title">
+        <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+      </template>
+      <template slot="content">
+        <ai-card title="基本信息">
+          <template #right>
+            <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="forms=data,isEdit=true">修改</span>
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="isEdit==false">取消</span>
+            <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm(id)">保存</span>
+          </template>
+          <template #content v-if="isEdit == false">
+            <ai-wrapper>
+              <!-- dict.getLabel('fpRiskType', info.riskType) -->
+              <ai-info-item label="许可文书名称" :value="data.licenseName"></ai-info-item>
+              <ai-info-item label="许可文书号" :value="data.licenseName"></ai-info-item>
+              <ai-info-item label="许可决定日期" :value="data.decisionDate"></ai-info-item>
+              <ai-info-item label="许可有效期自" :value="data.startDate"></ai-info-item>
+              <ai-info-item label="许可有效期至" :value="data.endDate"></ai-info-item>
+              <ai-info-item label="许可机关" isLine :value="data.licenseOrganization"></ai-info-item>
+              <ai-info-item label="经营主体" isLine :value="data.enterpriseName"></ai-info-item>
+              <ai-info-item label="统一信用代码" isLine :value="data.unifiedCode"></ai-info-item>
+              <ai-info-item label="许可内容" isLine :value="data.licenseContent"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
       </template>
     </ai-detail>
   </section>
@@ -103,10 +136,18 @@ export default {
         enterpriseName: '',
         unifiedCode: '',
         licenseContent: '',
-      }
+      },
+      isEdit: false,
+      data: {},
+      id: '',
+    }
+  },
+  created() {
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.getDetail(this.params.id)
     }
   },
-  created() {},
   methods: {
     cancel(isRefresh) {
       this.$emit('change', {
@@ -114,13 +155,19 @@ export default {
         isRefresh: !!isRefresh,
       })
     },
-    confirm () {
+    getDetail(id) {
+      this.instance.post(`/appcreditadminstrativelicense/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.data = res.data
+        }
+      })
+    },
+    confirm (id) {
       this.$refs.forms.validate((valid) => {
         if (valid) {
           this.instance.post(`/appcreditadminstrativelicense/addOrUpdate`, {
             ...this.forms,
             id: this.params.id || '',
-            // picture: this.form.picture.length ? this.form.picture[0].url : ''
           }).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功')
diff --git a/project/xiushan/apps/AppAdministrativeLicense/components/Detail.vue b/project/xiushan/apps/AppAdministrativeLicense/components/Detail.vue
deleted file mode 100644
index 3cb38b7b..00000000
--- a/project/xiushan/apps/AppAdministrativeLicense/components/Detail.vue
+++ /dev/null
@@ -1,172 +0,0 @@
-<template>
-  <div class="Detail">
-    <ai-detail class="add">
-      <template #title>
-        <ai-title :title="params.id ? '详情' : '新增行政许可信息'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
-      </template>
-      <template #content>
-        <div class="add-form">
-          <div class="info">
-            <ai-bar title="基本信息"></ai-bar>
-            <el-form ref="forms" :model="forms" size="small"  label-width="150px">
-            <el-form-item label="许可文书名称" prop="num">
-              {{ forms.licenseName }}
-            </el-form-item>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="许可文书号" prop="num">
-                  {{ forms.licenseCode }}
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="许可决定日期" prop="num">
-                  {{ forms.decisionDate }}
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="许可有效期自" prop="num">
-                  {{ forms.startDate }}
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="许可有效期至" prop="num">
-                  {{ forms.endDate }}
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="许可机关" prop="num">
-              {{ forms.licenseOrganization }}
-            </el-form-item>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="经营主体" prop="num">
-                  {{ forms.enterpriseName }}
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="统一信用代码" prop="num">
-                  {{ forms.unifiedCode }}
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="许可内容" prop="num">
-              {{ forms.licenseContent }}
-            </el-form-item>
-            </el-form>
-          </div>
-        </div>
-      </template>
-    </ai-detail>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "Detail",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    params: Object,
-  },
-  data() {
-    return {
-      id: '',
-      forms: {},
-    }
-  },
-  created() {
-    if (this.params && this.params.id) {
-      this.id = this.params.id
-      this.getDetail(this.params.id)
-    }
-  },
-  methods: {
-    getDetail(id) {
-      this.instance.post(`/appcreditadminstrativelicense/queryDetailById?id=${id}`).then(res => {
-        if (res.code === 0) {
-          this.forms = res.data
-          // this.forms.codeUrl = [{
-          //   url: res.data.codeUrl
-          // }]
-        }
-      })
-    },
-    cancel (isRefresh) {
-      this.$emit('change', {
-        type: 'List',
-        isRefresh: !!isRefresh
-      })
-    }
-  },
-}
-</script>
-
-<style lang="scss" scoped>
-.Detail {
-  height: 100%;
-  overflow: hidden;
-  background: #f2f4f6 ;
-
-  .add-form__item {
-    display: flex;
-    align-items: center;
-  }
-
-  ::v-deep .el-form-item__label {
-    padding-right: 40px;
-  }
-
-  ::v-deep .ai-detail__content--active {
-    padding: 0 400px;
-    background: #FFF;
-
-    .ai-detail__content--wrapper {
-      width: 100%;
-    }
-
-    .aibar {
-      padding: 0 16px;
-    }
-
-    .el-form {
-      padding: 0 96px 20px 50px;
-    }
-
-    .add-form {
-      background: #fff;
-      .info {
-        box-sizing: border-box;
-        padding: 0 100px 0 0;
-        background: #FFF;
-      }
-    }
-  }
-
-  ::v-deep .ai-wrapper {
-    align-items: inherit !important;
-  }
-
-  .user-wrapper {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .avatar {
-    width: 100px;
-    height: 100px;
-    object-fit: contain;
-    border-radius: 10px;
-  }
-
-  .footer-btn {
-    width: 130px;
-  }
-
-  .el-form {
-    padding-bottom: 80px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppAdministrativeLicense/components/List.vue b/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
index 26114e53..10bd6bc9 100644
--- a/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
+++ b/project/xiushan/apps/AppAdministrativeLicense/components/List.vue
@@ -8,15 +8,22 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="经营主体/统一信用代码" v-model="search.name" clearable @change="search" v-throttle="() => {(page.current = 1), getTableData();}"/>
+            <el-input size="small" placeholder="经营主体/统一信用代码" v-model="search.name" clearable  
+            @clear="page.current = 1, search.name = '', getTableData()" suffix-icon="iconfont iconSearch"
+            v-throttle="() => {(page.current = 1), getTableData();}"/>
+          <ai-import :instance="instance" :dict="dict" importUrl="" url="appcreditadministrativesanction/downloadTemplate" type="appjob" name="行政许可信息" @success="getTableData(), $message.success('导入成功!')">
             <el-button size="small">导入</el-button>
+          </ai-import>
+          <!-- <ai-download :instance="instance" url="/app/appconvenientaddressbook/export" :params="search" fileName="行政许可信息"
+                       :disabled="tableData.length == 0"> -->
             <el-button size="small">导出</el-button>
+          <!-- </ai-download> -->
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size" @getList="getTableData" :col-configs="colConfigs" :dict="dict" @selection-change="   (v) => (ids = v.filter((e) => e.sysUserId).map((e) => e.sysUserId)) ">          
           <el-table-column slot="options" label="操作" fixed="right" align="center">
             <template slot-scope="{ row }">
-              <el-button type="text" @click.native="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click.native="toAdd(row.id)">详情</el-button>
               <el-button type="text" @click.native="handleDelete(row.id)">删除</el-button>
             </template>
           </el-table-column>
@@ -41,6 +48,7 @@ export default {
       page: { current: 1, size: 10, total: 0 },
       dialog: false,
       form: { name: "" },
+      data: {},
     };
   },
   computed: {
@@ -61,8 +69,10 @@ export default {
     this.getTableData()
   },
   methods: {
-    import() {},
-    export() {},
+    // search() {
+    //   this.forms.licenseCode = this.search.name
+    //   this.getTableData()
+    // },
     getTableData() {
       this.instance.post("/appcreditadminstrativelicense/list", null, {
         params: {...this.page, ...this.search, ...this.select}
@@ -73,11 +83,13 @@ export default {
         }
       })
     },
+    
     toAdd(id) {
       this.$emit('change', {
         type: 'Add',
         params: {
-          id: id || ''
+          id: id || '',
+          isEdit: true
         }
       })
     },
@@ -91,14 +103,6 @@ export default {
           })
       })
     },
-    toDetail(id) {
-      this.$emit('change', {
-        type: 'Detail',
-        params: {
-          id: id || ''
-        }
-      })
-    },
   },
 };
 </script>
diff --git a/project/xiushan/apps/AppAdministrativePenalty/AppAdministrativePenalty.vue b/project/xiushan/apps/AppAdministrativePenalty/AppAdministrativePenalty.vue
index 29808b53..b28270b3 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/AppAdministrativePenalty.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/AppAdministrativePenalty.vue
@@ -9,7 +9,6 @@
 <script>
 import List from "./components/List.vue";
 import Add from "./components/Add.vue";
-import Detail from "./components/Detail.vue";
 
 export default {
   name: "AppAdministrativePenalty",
@@ -18,7 +17,7 @@ export default {
     instance: Function,
     dict: Object,
   },
-  components: {Add, List,Detail},
+  components: {Add, List},
   data() {
     return {
       component: "List",
@@ -33,11 +32,6 @@ export default {
         this.params = data.params;
       }
 
-      if (data.type === "Detail") {
-        this.component = "Detail";
-        this.params = data.params;
-      }
-
       if (data.type === "List") {
         this.component = "List";
         this.params = data.params;
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
index 4ddb36d9..0c89878f 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/Add.vue
@@ -1,8 +1,13 @@
 <template>
   <section class="Add">
-    <ai-detail class="add">
+    <ai-detail class="add" v-if="isEdit == true || !id">
       <template #title>
-        <ai-title :title="params.id ? '编辑' : '新增行政处罚'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
+        <ai-title :title="params.id ? '编辑行政处罚' : '新增行政处罚'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
+        <!-- <template #right  v-if="title=='网格员详情'"> -->
+          <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="forms=data,isEdit=true">修改</span>
+          <!-- <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="searchDetail(),editOne=false">取消</span> -->
+          <!-- <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="save()">保存</span> -->
+        <!-- </template> -->
       </template>
       <template #content>
         <div class="add-form">
@@ -68,6 +73,36 @@
         <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
       </template>
     </ai-detail>
+
+    <ai-detail class="add" v-if="id && !isEdit">
+      <template slot="title">
+        <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+
+      </template>
+      <template slot="content">
+        <ai-card title="基本信息">
+          <template #right>
+              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data,id=params.id">修改</span>
+              <!-- <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="searchDetail(),editOne=false">取消</span> -->
+              <!-- <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="save()">保存</span> -->
+            </template>
+          <template #content>
+            <ai-wrapper>
+              <!-- dict.getLabel('fpRiskType', info.riskType) -->
+              <ai-info-item label="处罚文书号" :value="data.sanctionCode"></ai-info-item>
+              <ai-info-item label="处罚机关" :value="data.sanctionOrganization"></ai-info-item>
+              <ai-info-item label="处罚决定日期" :value="data.sanctionDate"></ai-info-item>
+              <ai-info-item label="处罚类型" :value="data.sanctionType"></ai-info-item>
+              <ai-info-item label="处罚内容" :value="data.sanctionContent"></ai-info-item>
+              <ai-info-item label="处罚依据" isLine :value="data.sanctionBasis"></ai-info-item>
+              <ai-info-item label="受罚主体" isLine :value="data.enterpriseName"></ai-info-item>
+              <ai-info-item label="统一信用代码" isLine :value="data.unifiedCode"></ai-info-item>
+              <ai-info-item label="违法事实" isLine :value="data.lllegalFact"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </template>
+    </ai-detail>
   </section>
 </template>
 
@@ -107,11 +142,18 @@ export default {
         enterpriseName: '',
         unifiedCode: '',
         lllegalFact: '',
-      }
+      },
+      isEdit: false,
+      id: '',
+      data: {},
     }
   },
   created() {
     this.$dict.load('administrativeSanctionType')
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.getDetail(this.params.id)
+    }
   },
   methods: {
     cancel(isRefresh) {
@@ -120,13 +162,19 @@ export default {
         isRefresh: !!isRefresh,
       })
     },
+    getDetail(id) {
+      this.instance.post(`/appcreditadministrativesanction/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.data = res.data
+        }
+      })
+    },
     confirm( ) {
       this.$refs.forms.validate((valid) => {
         if (valid) {
           this.instance.post(`/appcreditadministrativesanction/addOrUpdate`, {
             ...this.forms,
             id: this.params.id || '',
-            // picture: this.form.picture.length ? this.form.picture[0].url : ''
           }).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功')
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/Detail.vue b/project/xiushan/apps/AppAdministrativePenalty/components/Detail.vue
deleted file mode 100644
index 277b5a0f..00000000
--- a/project/xiushan/apps/AppAdministrativePenalty/components/Detail.vue
+++ /dev/null
@@ -1,151 +0,0 @@
-<template>
-  <section class="Detail">
-    <ai-detail class="Detail">
-      <template #title>
-        <ai-title :title="params.id ? '行政处罚详情' : '新增行政处罚'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
-      </template>
-      <template #content>
-        <div class="add-form">
-          <ai-bar title="行政处罚信息"></ai-bar>
-          <el-form ref="rules" :model="forms" :rules="formRules" size="small"  label-width="150px">
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="处罚文书号" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="处罚机关" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="处罚决定日期" prop="num">
-                  <el-date-picker v-model="value1" type="date" placeholder="选择日期" style="width:375px">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="处罚类型" prop="num">
-                  <ai-select v-model="readType" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('readType')"></ai-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="处罚内容" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="处罚依据" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="受罚主体" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="统一信用代码" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="违法事实" prop="num">
-              <el-input v-model="input" placeholder="请输入违法事实" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </template>
-    </ai-detail>
-  </section>
-</template>
-
-<script>
-export default {
-  name: "Detail",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    params: Object,
-  },
-  computed: {
-    formRules() {
-      return {
-        num: [{required: true,message:"请输入执行编号",trigger: "blur"}]
-      }
-    }
-  },
-  data() {
-    return {
-      forms
-    }
-  },
-  created() {},
-  methods: {
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'List',
-        isRefresh: !!isRefresh,
-      })
-    },
-  },
-
-}
-</script>
-
-<style lang="scss" scoped>
-.Detail {
-  height: 100%;
-  overflow: hidden;
-  background: #f2f4f6 !important;
-
-  .add-form__item {
-    display: flex;
-    align-items: center;
-  }
-
-  ::v-deep .el-form-item__label {
-    padding-right: 40px;
-  }
-
-  ::v-deep .ai-detail__footer {
-    background: #fff !important;
-  }
-
-  ::v-deep .ai-list.ai-list__single .ai-list__content--right-wrapper {
-    margin: 0 400px;
-  }
-
-  // ::v-deep .ai-wrapper {
-  //   align-items: inherit !important;
-  // }
-
-  .user-wrapper {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .avatar {
-    width: 100px;
-    height: 100px;
-    object-fit: contain;
-    border-radius: 10px;
-  }
-
-  .footer-btn {
-    width: 130px;
-  }
-
-  .el-form {
-    padding-bottom: 80px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppAdministrativePenalty/components/List.vue b/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
index e7b6aba2..a6d644ef 100644
--- a/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
+++ b/project/xiushan/apps/AppAdministrativePenalty/components/List.vue
@@ -8,10 +8,16 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.name" clearable suffix-icon="iconfont iconSearch"
-             @clear="page.current = 1, searchObj.con = '', getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/>
-            <el-button size="small">导入</el-button>
-            <el-button size="small">导出</el-button>
+            <el-input size="small" placeholder="许可文书号/许可对象" v-model="search.sanctionCode" clearable suffix-icon="iconfont iconSearch" @change="getTableData()"
+             @clear="page.current = 1, search.sanctionCode = '', getTableData()" v-throttle="() => {(page.current = 1), getTableData();}"/>
+            <ai-import :instance="instance" :dict="dict" type="" name="行政许可信息" @success="getTableData(), $message.success('导入成功!')">
+              <el-button size="small">导入</el-button>
+            </ai-import> 
+            <ai-download :instance="instance" url="appcreditadministrativesanction/export" :params="search" fileName="行政处罚信息"
+                       :disabled="tableData.length == 0">
+              <el-button size="small">导出</el-button>
+            </ai-download>
+            
           </template>
         </ai-search-bar>
         <ai-table :tableData="tableData" :total="page.total" :current.sync="page.current" :size.sync="page.size"
@@ -38,7 +44,7 @@ export default {
   },
   data() {
     return {
-      search: {name: ""},
+      search: {sanctionCode: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
     }
@@ -61,6 +67,10 @@ export default {
     this.getTableData()
   },
   methods: {
+    search() {
+      this.forms.sanctionCode = this.search.name
+      this.getTableData()
+    },
     getTableData() {
       this.instance.post("/appcreditadministrativesanction/list", null, {
         params: {...this.page, ...this.search, ...this.select}
@@ -81,7 +91,7 @@ export default {
     },
     toDetail(id) {
       this.$emit('change', {
-        type: 'Detail',
+        type: 'Add',
         params: {
           id: id || ''
         }
diff --git a/project/xiushan/apps/AppDishonestExecutee/AppDishonestExecutee.vue b/project/xiushan/apps/AppDishonestExecutee/AppDishonestExecutee.vue
index bd20de24..5b407d10 100644
--- a/project/xiushan/apps/AppDishonestExecutee/AppDishonestExecutee.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/AppDishonestExecutee.vue
@@ -9,7 +9,6 @@
 <script>
 import List from "./components/List.vue";
 import Add from "./components/Add.vue";
-import Detail from "./components/Detail.vue";
 
 export default {
   name: "AppDishonestExecutee",
@@ -18,7 +17,7 @@ export default {
     instance: Function,
     dict: Object,
   },
-  components: {Add, List,Detail},
+  components: {Add, List},
   data() {
     return {
       component: "List",
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
index c723d8a1..ac91b799 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/Add.vue
@@ -1,8 +1,8 @@
 <template>
   <section class="Add">
-    <ai-detail class="add">
+    <ai-detail class="add" v-if="isEdit == true || !id">
       <template #title>
-        <ai-title :title="params.id ? '编辑' : '新增失信被执行人'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
+        <ai-title :title="params.id ? '编辑失信被执行人' : '新增失信被执行人'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
       </template>
       <template #content>
         <div class="add-form">
@@ -56,6 +56,35 @@
         <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
       </template>
     </ai-detail>
+
+    <ai-detail class="add" v-if="id && !isEdit">
+      <template slot="title">
+        <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+
+      </template>
+      <template slot="content">
+        <ai-card title="基本信息">
+          <template #right>
+              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data">修改</span>
+              <!-- <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="searchDetail(),editOne=false">取消</span> -->
+              <!-- <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="save()">保存</span> -->
+            </template>
+          <template #content>
+            <ai-wrapper>
+              <!-- dict.getLabel('fpRiskType', info.riskType) -->
+              <!-- {{  dict.getLabel('dishonestPersonSituation',data.executionSituation) }} -->
+              <ai-info-item label="执行案号" :value="data.executionCode"></ai-info-item>
+              <ai-info-item label="执行法院" :value="data.executionCourt"></ai-info-item>
+              <ai-info-item label="执行时间" :value="data.executionTime"></ai-info-item>
+              <ai-info-item label="履行情况" :value="data.executionSituation">{{  dict.getLabel('dishonestPersonSituation',data.executionSituation) }}</ai-info-item>
+              <ai-info-item label="失信被执行主体" :value="data.enterpriseName"></ai-info-item>
+              <ai-info-item label="统一信用代码" isLine :value="data.unifiedCode"></ai-info-item>
+              <ai-info-item label="失信事实" isLine :value="data.dishonestFact"></ai-info-item>
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </template>
+    </ai-detail>
   </section>
 </template>
 
@@ -83,6 +112,10 @@ export default {
   },
   created() {
     this.$dict.load('dishonestPersonSituation')
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.getDetail(this.params.id)
+    }
   },
   data() {
     return {
@@ -94,7 +127,10 @@ export default {
         enterpriseName: '',
         unifiedCode: '',
         dishonestFact: '',
-      }
+      },
+      data: {},
+      isEdit: false,
+      id: '',
     }
   },
   methods: {
@@ -104,13 +140,19 @@ export default {
         isRefresh: !!isRefresh,
       })
     },
+    getDetail(id) {
+      this.instance.post(`/appcreditdishonestperson/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.data = res.data
+        }
+      })
+    },
     confirm( ) {
       this.$refs.forms.validate((valid) => {
         if (valid) {
-          this.instance.post(`/appcreditdishonestperson/addOrUpdate`, {
+          this.instance.post(`/appcreditdishonestperson/queryDetailById`, {
             ...this.forms,
             id: this.params.id || '',
-            // picture: this.form.picture.length ? this.form.picture[0].url : ''
           }).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功')
@@ -146,6 +188,10 @@ export default {
     background: #fff !important;
   }
 
+  ::v-deep .ai-info-item label {
+    width: 100px;
+  }
+
   ::v-deep .ai-detail__content--active {
     padding: 20px;
 
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/Detail.vue b/project/xiushan/apps/AppDishonestExecutee/components/Detail.vue
deleted file mode 100644
index 934e4ef1..00000000
--- a/project/xiushan/apps/AppDishonestExecutee/components/Detail.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <section class="Detail">
-    <ai-detail class="Detail">
-      <template #title>
-        <ai-title :title="params.id ? '失信被执行人详情' : '新增失信被执行人'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
-      </template>
-      <template #content>
-        <div class="add-form">
-          <ai-bar title="失信被执行人信息"></ai-bar>
-          <el-form ref="rules" :model="forms" :rules="formRules" size="small"  label-width="150px">
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="执行安号" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="执行法院" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="执行时间" prop="num">
-                  <el-date-picker v-model="value1" type="date" placeholder="选择日期" style="width:375px">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="履行情况" prop="num">
-                  <ai-select v-model="readType" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('readType')"></ai-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="失信被执行主体" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="统一信用代码" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-form-item label="失信事实" prop="num">
-              <el-input v-model="input" placeholder="请输入失信事实" type="textarea" show-word-limit maxlength="500" :rows="5"></el-input>
-            </el-form-item>
-          </el-form>
-        </div>
-      </template>
-    </ai-detail>
-  </section>
-</template>
-
-<script>
-export default {
-  name: "Detail",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    params: Object,
-  },
-  computed: {
-    formRules() {
-      return {
-        num: [{required: true,message:"请输入执行编号",trigger: "blur"}]
-      }
-    }
-  },
-  data() {
-    return {
-      forms
-    }
-  },
-  created() {},
-  methods: {
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'List',
-        isRefresh: !!isRefresh,
-      })
-    },
-  },
-
-}
-</script>
-
-<style lang="scss" scoped>
-.Detail {
-  height: 100%;
-  overflow: hidden;
-  background: #f2f4f6 !important;
-
-  .add-form__item {
-    display: flex;
-    align-items: center;
-  }
-
-  ::v-deep .el-form-item__label {
-    padding-right: 40px;
-  }
-
-  ::v-deep .ai-detail__footer {
-    background: #fff !important;
-  }
-
-  ::v-deep .ai-detail__content--active {
-    padding: 20px;
-
-    .ai-detail__content--wrapper {
-      width: 100%;
-    }
-
-    .aibar {
-      padding: 0 16px;
-    }
-
-    .el-form {
-      padding: 0 96px 20px 50px;
-    }
-
-    .add-form {
-      background: #fff;
-    }
-  }
-
-  ::v-deep .ai-wrapper {
-    align-items: inherit !important;
-  }
-
-  .user-wrapper {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .avatar {
-    width: 100px;
-    height: 100px;
-    object-fit: contain;
-    border-radius: 10px;
-  }
-
-  .footer-btn {
-    width: 130px;
-  }
-
-  .el-form {
-    padding-bottom: 80px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppDishonestExecutee/components/List.vue b/project/xiushan/apps/AppDishonestExecutee/components/List.vue
index f62ff5c9..5f9aeeae 100644
--- a/project/xiushan/apps/AppDishonestExecutee/components/List.vue
+++ b/project/xiushan/apps/AppDishonestExecutee/components/List.vue
@@ -18,7 +18,7 @@
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="options" label="操作"  align="center">
             <template slot-scope="{ row }">
-              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="toAdd(row.id)">详情</el-button>
               <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
             </template>
           </el-table-column>
@@ -79,14 +79,14 @@ export default {
         }
       })
     },
-    toDetail(id) {
-      this.$emit('change', {
-        type: 'Detail',
-        params: {
-          id: id || ''
-        }
-      })
-    },
+    // toDetail(id) {
+    //   this.$emit('change', {
+    //     type: 'Detail',
+    //     params: {
+    //       id: id || ''
+    //     }
+    //   })
+    // },
     handleDelete(id) {
       this.$confirm("是否要删除？").then(() => {
         this.instance.post(`/appcreditdishonestperson/delete?ids=${id}`).then(res => {
diff --git a/project/xiushan/apps/AppRatepayingInfo/AppRatepayingInfo.vue b/project/xiushan/apps/AppRatepayingInfo/AppRatepayingInfo.vue
index c2eddf3d..c38030f8 100644
--- a/project/xiushan/apps/AppRatepayingInfo/AppRatepayingInfo.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/AppRatepayingInfo.vue
@@ -9,7 +9,6 @@
 <script>
 import List from "./components/List.vue";
 import Add from "./components/Add.vue";
-import Detail from "./components/Detail.vue";
 
 export default {
   name: "AppRatepayingInfo",
@@ -18,7 +17,7 @@ export default {
     instance: Function,
     dict: Object,
   },
-  components: {Add, List,Detail},
+  components: {Add, List},
   data() {
     return {
       component: "List",
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
index eb1c1d35..2f83c41a 100644
--- a/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/components/Add.vue
@@ -1,8 +1,8 @@
 <template>
   <section class="Add">
-    <ai-detail class="add">
+    <ai-detail class="add" v-if="isEdit == true || !id">
       <template #title>
-        <ai-title :title="params.id ? '纳税详情' : '新增纳税信息'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
+        <ai-title :title="params.id ? '编辑纳税信息' : '新增纳税信息'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
       </template>
       <template #content>
         <div class="add-form">
@@ -53,6 +53,36 @@
         <el-button class="footer-btn" type="primary" @click="confirm()">保存</el-button>
       </template>
     </ai-detail>
+
+    <ai-detail class="add" v-if="id && !isEdit">
+      <template slot="title">
+        <ai-title title="详情" isShowBack isShowBottomBorder @onBackClick="cancel(false)"></ai-title>
+
+      </template>
+      <template slot="content">
+        <ai-card title="基本信息">
+          <template #right>
+              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,forms=data">修改</span>
+              <!-- <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="searchDetail(),editOne=false">取消</span> -->
+              <!-- <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="editOne==true" @click="save()">保存</span> -->
+            </template>
+          <template #content>
+            <ai-wrapper>
+              <!-- dict.getLabel('fpRiskType', info.riskType) -->
+              <ai-info-item label="纳税人名称" :value="data.taxpayer"></ai-info-item>
+              <ai-info-item label="纳税人识别号" :value="data.taxpayerNumber"></ai-info-item>
+              <ai-info-item label="纳税年份" :value="data.taxLevel"></ai-info-item>
+              <ai-info-item label="纳税主体" :value="data.enterpriseName"></ai-info-item>
+              <ai-info-item label="统一信用代码" :value="data.unifiedCode"></ai-info-item>
+              <!-- <ai-info-item label="处罚依据" isLine :value="data.sanctionBasis"></ai-info-item> -->
+              <!-- <ai-info-item label="受罚主体" isLine :value="data.enterpriseName"></ai-info-item> -->
+              <!-- <ai-info-item label="统一信用代码" isLine :value="data.unifiedCode"></ai-info-item> -->
+              <!-- <ai-info-item label="违法事实" isLine :value="data.lllegalFact"></ai-info-item> -->
+            </ai-wrapper>
+          </template>
+        </ai-card>
+      </template>
+    </ai-detail>
   </section>
 </template>
 
@@ -87,10 +117,17 @@ export default {
         enterpriseName: '',
         unifiedCode: '',
       },
+      data: {},
+      isEdit: false,
+      id: {},
     }
   },
   created() {
     this.$dict.load('taxInfoLevel')
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.getDetail(this.params.id)
+    }
   },
   methods: {
     cancel(isRefresh) {
@@ -99,13 +136,19 @@ export default {
         isRefresh: !!isRefresh,
       })
     },
+    getDetail(id) {
+      this.instance.post(`/appcredittaxinfo/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.data = res.data
+        }
+      })
+    },
     confirm() {
       this.$refs.forms.validate((valid) => {
         if (valid) {
           this.instance.post(`/appcredittaxinfo/addOrUpdate`, {
             ...this.forms,
             id: this.params.id || '',
-            // picture: this.form.picture.length ? this.form.picture[0].url : ''
           }).then(res => {
             if (res.code == 0) {
               this.$message.success('提交成功')
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/Detail.vue b/project/xiushan/apps/AppRatepayingInfo/components/Detail.vue
deleted file mode 100644
index 30e96b52..00000000
--- a/project/xiushan/apps/AppRatepayingInfo/components/Detail.vue
+++ /dev/null
@@ -1,152 +0,0 @@
-<template>
-  <section class="Detail">
-    <ai-detail class="Detail">
-      <template #title>
-        <ai-title :title="params.id ? '纳税详情' : '新增纳税信息'" :isShowBack="true" :isShowBottomBorder="true" @onBackClick="cancel(false)" />
-      </template>
-      <template #content>
-        <div class="add-form">
-          <ai-bar title="纳税信息"></ai-bar>
-          <el-form ref="rules" :model="forms" :rules="formRules" size="small"  label-width="150px">
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="纳税人名称" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="纳税人识别号" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="纳税年份" prop="num">
-                  <el-date-picker v-model="value1" type="date" placeholder="选择日期" style="width:375px">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="纳税等级" prop="num">
-                  <ai-select v-model="readType" @change="onChange" placeholder="请选择文档类型" :selectList="$dict.getDict('readType')"></ai-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row type="flex">
-              <el-col :span="20">
-                <el-form-item label="纳税主题" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-              <el-col :span="20">
-                <el-form-item label="统一信用代码" prop="num">
-                  <el-input v-model="input" placeholder="请输入"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-        </div>
-      </template>
-    </ai-detail>
-  </section>
-</template>
-
-<script>
-export default {
-  name: "Detail",
-  props: {
-    instance: Function,
-    dict: Object,
-    permissions: Function,
-    params: Object,
-  },
-  computed: {
-    formRules() {
-      return {
-        num: [{required: true,message:"请输入执行编号",trigger: "blur"}]
-      }
-    }
-  },
-  data() {
-    return {
-      forms
-    }
-  },
-  created() {},
-  methods: {
-    cancel(isRefresh) {
-      this.$emit('change', {
-        type: 'List',
-        isRefresh: !!isRefresh,
-      })
-    },
-  },
-
-}
-</script>
-
-<style lang="scss" scoped>
-.Detail {
-  height: 100%;
-  overflow: hidden;
-  background: #f2f4f6 !important;
-
-  .add-form__item {
-    display: flex;
-    align-items: center;
-  }
-
-  ::v-deep .el-form-item__label {
-    padding-right: 40px;
-  }
-
-  ::v-deep .ai-detail__footer {
-    background: #fff !important;
-  }
-
-  ::v-deep .ai-detail__content--active {
-    padding: 20px;
-
-    .ai-detail__content--wrapper {
-      width: 100%;
-    }
-
-    .aibar {
-      padding: 0 16px;
-    }
-
-    .el-form {
-      padding: 0 96px 20px 50px;
-    }
-
-    .add-form {
-      background: #fff;
-    }
-  }
-
-  ::v-deep .ai-wrapper {
-    align-items: inherit !important;
-  }
-
-  .user-wrapper {
-    display: flex;
-    justify-content: space-between;
-  }
-
-  .avatar {
-    width: 100px;
-    height: 100px;
-    object-fit: contain;
-    border-radius: 10px;
-  }
-
-  .footer-btn {
-    width: 130px;
-  }
-
-  .el-form {
-    padding-bottom: 80px;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/project/xiushan/apps/AppRatepayingInfo/components/List.vue b/project/xiushan/apps/AppRatepayingInfo/components/List.vue
index 30ea0ac7..75c58114 100644
--- a/project/xiushan/apps/AppRatepayingInfo/components/List.vue
+++ b/project/xiushan/apps/AppRatepayingInfo/components/List.vue
@@ -18,7 +18,7 @@
                   @getList="getTableData" :col-configs="colConfigs" :dict="dict">
           <el-table-column slot="options" label="操作"  align="center">
             <template slot-scope="{ row }">
-              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
+              <el-button type="text" @click="toAdd(row.id)">详情</el-button>
               <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
             </template>
           </el-table-column>
@@ -79,14 +79,6 @@ export default {
         }
       })
     },
-    toDetail(id) {
-      this.$emit('change', {
-        type: 'Detail',
-        params: {
-          id: id || ''
-        }
-      })
-    },
     handleDelete(id) {
       this.$confirm("是否要删除？").then(() => {
         this.instance.post(`/appcredittaxinfo/delete?ids=${id}`).then(res => {