Merge remote-tracking branch 'origin/dev' into dev

project/xiushan/apps/AppAdministrativeLicense/components/Add.vue

@@ -7,7 +7,7 @@
       <template slot="content">
         <ai-card title="基本信息">
           <template #right v-if="params.id">
-            <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="getDetail(),isEdit=false">取消</span>
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>

project/xiushan/apps/AppAdministrativePenalty/components/Add.vue

@@ -7,7 +7,7 @@
       <template slot="content">
         <ai-card title="基本信息">
           <template #right v-if="params.id">
-            <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="getDetail(),isEdit=false">取消</span>
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>

project/xiushan/apps/AppDishonestExecutee/components/Add.vue

@@ -7,7 +7,7 @@
       <template slot="content">
         <ai-card title="基本信息">
           <template #right v-if="params.id">
-            <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="getDetail(),isEdit=false">取消</span>
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>

project/xiushan/apps/AppGroupShareholders/components/Add.vue

@@ -9,7 +9,7 @@
 
         <ai-card title="基本信息">
           <template #right v-if="params.id">
-            <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="getDetail(),isEdit=false">取消</span>
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>
@@ -82,7 +82,7 @@
 
         <ai-card title="基本信息">
           <template #right>
-              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,form=data">修改</span>
+              <span style="color:#2266FF;cursor: pointer;font-size: 12px;" class="iconfont iconEdit" v-if="isEdit==false" @click="isEdit=true,getDetail(),form=data">修改</span>
             </template>
           <template #content>
             <ai-wrapper>
@@ -172,7 +172,10 @@ export default {
       tableData: [],
       page: {current: 1, size: 10, total: 0},
       sysInfoDialog: false,
-      data: {},
+      data: {
+        areaId: '',
+        aareaName: '',
+      },
       isEditSys: false,
       sysIndex: ''
     }

project/xiushan/apps/AppGroupShareholders/components/List.vue

@@ -9,7 +9,7 @@
             <el-button type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
           </template>
           <template #right>
-            <el-input size="small" placeholder="组织名称/持证人/身份证号/股权证编号" v-model="search.executionCode" clearable @clear="page.current = 1, search.executionCode = '',getTableData()" 
+            <el-input size="small" placeholder="组织名称/持证人/身份证号/股权证编号" v-model="search.organizationName" clearable @clear="page.current = 1, search.organizationName = '',getTableData()" 
             suffix-icon="iconfont iconSearch" v-throttle="() => {(page.current = 1), getTableData();}"/>
             <!-- 导入导出 -->
             <ai-import :instance="instance" :dict="dict" importUrl="/appcollectiveeconomyequity/import" url="/appcollectiveeconomyequity/downloadTemplate" name="集体经济组织股权管理信息" @success="getTableData(), $message.success('导入成功!')">
@@ -45,7 +45,7 @@ export default {
   },
   data() {
     return {
-      search: {executionCode: "",areaId:''},
+      search: {organizationName: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       areaId: '',

project/xiushan/apps/AppHouseManagement/components/Add.vue

@@ -7,7 +7,7 @@
       <template #content>
         <ai-card title="宅基地所有权信息">
           <template #right v-if="params.id">
-            <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="getDetail(),isEdit=false">取消</span>
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>

project/xiushan/apps/AppLandTransfer/components/Add.vue

@@ -7,7 +7,7 @@
       <template #content>
         <ai-card title="合同信息">
           <template #right v-if="params.id">
-            <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="getDetail(),isEdit=false">取消</span>
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>

project/xiushan/apps/AppLandTransfer/components/List.vue

@@ -15,7 +15,7 @@
             <ai-import :instance="instance" :dict="dict" importUrl="/applandcirculateinfo/import" url="/applandcirculateinfo/downloadTemplate" name="土地流转经营信息" @success="getTableData(), $message.success('导入成功!')">
               <el-button size="small">导入</el-button>
             </ai-import>
-            <ai-download :instance="instance" url="/applandcirculateinfo/export" :params="search" fileName="土地流转经营信息"
+            <ai-download :instance="instance" url="/applandcirculateinfo/export" :params="param" fileName="土地流转经营信息"
                          :disabled="tableData.length == 0">
               <el-button size="small">导出</el-button>
             </ai-download>
@@ -67,7 +67,13 @@ export default {
         { slot: "options" ,},
       ]
     },
-    ...mapState(['user'])
+    ...mapState(['user']),
+    param() {
+      return {
+        ...this.select,
+        ...this.search,
+      }
+    }
   },
   created() {
     this.$dict.load('landCirculateType')

project/xiushan/apps/AppPublicArrearage/components/Add.vue

@@ -7,7 +7,7 @@
       <template slot="content">
         <ai-card title="基本信息">
           <template #right v-if="params.id">
-            <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="getDetail(),isEdit=false">取消</span>
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>

project/xiushan/apps/AppRatepayingInfo/components/Add.vue

@@ -7,7 +7,7 @@
       <template slot="content">
         <ai-card title="基本信息">
           <template #right v-if="params.id">
-            <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="getDetail(),isEdit=false">取消</span>
             <span style="color:#2266FF;margin-left: 16px;cursor: pointer;font-size: 12px;" v-if="isEdit==true" @click="confirm()">保存</span>
           </template>
           <template #content>

project/xiushan/apps/financing/AppFinancingNeeds/needsList.vue

@@ -9,7 +9,7 @@
                        :selectList="dict.getDict('financingDemandApplyType')"/>
           </template>
           <template #right>
-            <el-input size="small" placeholder="搜索联系人、企业名称" v-model="search.enterpriseName" clearable
+            <el-input size="small" placeholder="搜索联系人、企业名称" v-model="search.name" clearable
                       @change="page.current=1,getTableData()"/>
           </template>
         </ai-search-bar>
@@ -41,7 +41,7 @@ export default {
   },
   data() {
     return {
-      search: {enterpriseName: ""},
+      search: {name: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [