fix

2022-08-19 09:00:10 +08:00
parent 583b210687
commit 79bfd71a8e
21 changed files with 1231 additions and 532 deletions
--- a/examples/store/index.js
+++ b/examples/store/index.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import preState from 'vuex-persistedstate'
 import * as modules from "dvcp-ui/lib/js/modules"
+import axios from "../router/axios";

 Vue.use(Vuex)

@@ -15,6 +16,11 @@ export default new Vuex.Store({
    },
    cleanApps(state) {
      state.apps = []
+    },
+    setFinanceUser(state) {
+      axios.post("appfinancialorganizationuser/checkUser").then(res => {
+        state.user.financeUser = res.data
+      }).catch(() => 0)
    }
  },
  modules,
--- a/package.json
+++ b/package.json
@@ -1,94 +0,0 @@
-{
-  "name": "cw-webapps",
-  "version": "2.0.0",
-  "private": false,
-  "author": "kubbo",
-  "main": "lib/cw-webapps.common.js",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "lib": "vue-cli-service build --no-clean --target lib --dest lib packages/index.js&&npm unpublish --force&&npm publish",
-    "lib:core": "vue-cli-service build --target lib --dest core/dist core/index.js --name dvcp-core&&npm unpublish dvcp-core --force&&npm publish core/",
-    "lib:project": "node project/build.js",
-    "lib:all": "node project/allProject.js&&npm unpublish --workspaces --force&&npm publish --workspaces",
-    "ui": "npm i dvcp-ui@latest"
-  },
-  "workspaces": [
-    "project/*"
-  ],
-  "dependencies": {
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@jiaminghi/c-render": "^0.4.3",
-    "@jiaminghi/charts": "^0.2.18",
-    "@jiaminghi/data-view": "^2.10.0",
-    "bin-code-editor": "^0.9.0",
-    "dayjs": "^1.8.35",
-    "dvcp-ui": "^1.42.2",
-    "echarts": "^5.1.2",
-    "mp4box": "^0.4.1",
-    "print-js": "^1.0.63",
-    "serialize-javascript": "^6.0.0",
-    "sortablejs": "^1.12.0",
-    "vue-draggable-resizable": "^2.3.0",
-    "vue-json-editor": "^1.4.3",
-    "vue-okr-tree": "~1.0.5",
-    "vue-ruler-tool": "^1.2.4",
-    "vuedraggable": "^2.24.3"
-  },
-  "publishConfig": {
-    "registry": "http://192.168.1.87:4873/"
-  },
-  "devDependencies": {
-    "@babel/plugin-proposal-logical-assignment-operators": "^7.10.4",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-    "@babel/plugin-proposal-optional-chaining": "^7.10.4",
-    "@vue/cli-plugin-babel": "^3.6.0",
-    "@vue/cli-plugin-eslint": "^3.6.0",
-    "@vue/cli-service": "^3.6.0",
-    "axios": "^0.19.2",
-    "babel-eslint": "^10.1.0",
-    "core-js": "^2.6.11",
-    "element-ui": "^2.15.9",
-    "eslint": "^5.16.0",
-    "eslint-plugin-vue": "^5.0.0",
-    "image-webpack-loader": "^6.0.0",
-    "inquirer": "^6.5.2",
-    "readline": "^1.3.0",
-    "sass": "^1.32.12",
-    "sass-loader": "^7.3.1",
-    "uglifyjs-webpack-plugin": "^2.2.0",
-    "v-viewer": "^1.6.4",
-    "vue": "^2.6.14",
-    "vue-router": "^3.3.4",
-    "vue-style-loader": "^4.1.3",
-    "vue-template-compiler": "^2.6.14",
-    "vuex": "^3.5.1",
-    "vuex-persistedstate": "^2.7.1"
-  },
-  "vetur": {
-    "attributes": "./attributes.json"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "rules": {},
-    "parserOptions": {
-      "parser": "babel-eslint"
-    }
-  },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
-}
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue
@@ -120,10 +120,10 @@ export default {
      this.getDetail()
      this.getIntegralChange()
      this.getEventSummary()
-      let timeSta = dayjs().format('YYYY-MM-DD')
-      let timeEnd = dayjs().subtract(29, 'day').format('YYYY-MM-DD')
-      this.startPla = timeSta
-      this.endPla = timeEnd
+      let nowTime = dayjs().format('YYYY-MM-DD')
+      let timeAgo = dayjs().subtract(29, 'day').format('YYYY-MM-DD')
+      this.startPla = timeAgo
+      this.endPla = nowTime
    })
    
  },
--- a/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
+++ b/packages/conv/creditScore/AppGridMemberScore/components/gridScoreManage.vue
@@ -18,7 +18,7 @@
            </ai-download>
          </template>
        </ai-search-bar>
-        <ai-table :tableData="tableData" :total="page.total" :current.sync="current" :size.sync="page.size"
+        <ai-table :tableData="tableData" :total="total" :current.sync="current" :size.sync="size"
                  @getList="getTableData()" :col-configs="colConfigs" :dict="dict" @sort-change="changeTableSort">

          
@@ -90,7 +90,8 @@ export default {
      },
      girdIdList: [],
      tableData: [],
-      page: {size: 10, total: 0},
+      size: 10, 
+      total: 0,
      current: 1,
      girdList: [],
      form: {
@@ -144,14 +145,15 @@ export default {
    getTableData() {
      this.instance.post(`/app/appintegraluser/integralManager`,null,{
        params: {
-          ...this.page,
          ...this.search,
          current: this.current,
+          size: this.size,
+          total: this.total
        }
      }).then(res => {
        if(res?.data) {
          this.tableData = res.data.records
-          this.page.total = res.data.total
+          this.total = res.data.total
        }
      })
    },
--- a/packages/meta/AppResident/AppResident.vue
+++ b/packages/meta/AppResident/AppResident.vue
@@ -1,8 +1,7 @@
 <template>
  <section class="AppResident">
    <ai-list v-if="!showDetail" isTabs>
-      <ai-title slot="title" title="居民档案" :instance="instance" :hideLevel="hideLevel-1" isShowArea
-                v-model="areaId"/>
+      <ai-title slot="title" title="居民档案" :instance="instance" :hideLevel="hideLevel-1" :isShowArea="permissions('app_datastatistics')" v-model="areaId"/>
      <template #tabs>
        <el-tabs v-model="activeName">
          <el-tab-pane v-for="op in tabs" :key="op.value" :name="op.value" :label="op.label">
@@ -67,14 +66,14 @@ export default {
          comp: ResidentList,
          detail: ResidentDetail
        })),
-        {label: "居民统计", value: "3", comp: ResidentSta},
+        {label: "居民统计", value: "3", comp: ResidentSta, permit: "app_datastatistics"},
        {label: "居民档案审核", value: "4", comp: auditList, detail: auditDetail, permit: "app_appresident_examine"}
      ].filter(e => !e.permit || this.permissions(e.permit))
    }
  },
  created() {
    this.activeName = this.$route.query?.type
-    this.areaId = this.$copy(this.user.info.areaId)
+    this.areaId = this.permissions("app_datastatistics") ? this.$copy(this.user.info.areaId) : ""
    this.dict.load('residentType', "sex", "faithType", "fileStatus", "legality", "education", "maritalStatus",
        "politicsStatus", "householdName", "nation", "liveReason", "certificateType", "job", "militaryStatus",
        "householdRelation", "logoutReason", "nation", "registerStatus", "residentTipType", "liveCategory",
--- a/packages/publicity/AppVillageIntroduction/AppVillageIntroduction.vue
+++ b/packages/publicity/AppVillageIntroduction/AppVillageIntroduction.vue
@@ -1,73 +1,71 @@
 <template>
  <div class="doc-circulation ailist-wrapper">
    <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+      <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
    </keep-alive>
  </div>
 </template>

 <script>
-  import List from './components/List'
-  import Add from './components/Add'
-  import Detail from './components/Detail'
+import List from './components/List'
+import Add from './components/Add'
+import Detail from './components/Detail'

-  export default {
-    name: 'AppVillageIntroduction',
-    label: '本村简介',
+export default {
+  name: 'AppVillageIntroduction',
+  label: '本村简介',
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: {default: "本村简介"}
+  },
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      include: []
+    }
+  },
+  components: {
+    Add,
+    List,
+    Detail
+  },

-    props: {
-      instance: Function,
-      dict: Object
-    },
+  mounted() {
+  },

-    data () {
-      return {
-        component: 'List',
-        params: {},
-        include: []
+  methods: {
+    onChange(data) {
+      if (data.type === 'Add') {
+        this.component = 'Add'
+        this.params = data.params
      }
-    },

-    components: {
-      Add,
-      List,
-      Detail
-    },
+      if (data.type === 'Detail') {
+        this.component = 'Detail'
+        this.params = data.params
+      }

-    mounted () {
-    },
+      if (data.type === 'list') {
+        this.component = 'List'
+        this.params = data.params

-    methods: {
-      onChange (data) {
-        if (data.type === 'Add') {
-          this.component = 'Add'
-          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
-
-          this.$nextTick(() => {
-            if (data.isRefresh) {
-              this.$refs.component.getList()
-            }
-          })
-        }
+        this.$nextTick(() => {
+          if (data.isRefresh) {
+            this.$refs.component.getList()
+          }
+        })
      }
    }
  }
+}
 </script>

 <style lang="scss">
-  .doc-circulation {
-    height: 100%;
-    background: #F3F6F9;
-    overflow: auto;
-  }
+.doc-circulation {
+  height: 100%;
+  background: #F3F6F9;
+  overflow: auto;
+}
 </style>
--- a/packages/publicity/AppVillageIntroduction/components/Add.vue
+++ b/packages/publicity/AppVillageIntroduction/components/Add.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-detail>
    <template slot="title">
-      <ai-title :title="params.id ? '编辑本村简介' : '添加本村简介'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
      </ai-title>
    </template>
    <template slot="content">
@@ -19,12 +19,12 @@
            </el-form-item>
            <el-form-item label="缩略图" prop="thumbUrl">
              <ai-uploader
-                :instance="instance"
-                isShowTip
-                v-model="form.thumbUrl"
-                :limit="1"
-                :cropOps="cropOps"
-                is-crop>
+                  :instance="instance"
+                  isShowTip
+                  v-model="form.thumbUrl"
+                  :limit="1"
+                  :cropOps="cropOps"
+                  is-crop>
                <template slot="tips">
                  <p>最多上传1张图片,单个文件最大10MB，支持jpg、jpeg、png格式</p>
                  <p>图片比例：1.6：1</p>
@@ -43,89 +43,91 @@
 </template>

 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'Add',
+import {mapState} from 'vuex'

-    props: {
-      instance: Function,
-      dict: Object,
-      params: Object
-    },
+export default {
+  name: 'Add',

-    data () {
-      return {
-        info: {},
-        form: {
-          title: '',
-          content: '',
-          areaId: '',
-          createUnitName: '',
-          createUserName: '',
-          status: '',
-          thumbUrl: []
-        },
-        cropOps: {
-          width: "336px",
-          height: "210px"
-        },
-        id: ''
-      }
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+    params: Object,
+    menuName: String
+  },

-    computed: {
-      ...mapState(['user'])
-    },
-
-    created () {
-      this.form.areaId = this.user.info.areaId
-      this.disabledLevel = this.user.info.areaList.length
-      if (this.params && this.params.id) {
-        this.id = this.params.id
-        this.getInfo(this.params.id)
-      }
-    },
-
-    methods: {
-      getInfo (id) {
-        this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
-          if (res.code === 0) {
-            this.form = res.data
-            this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
-          }
-        })
+  data() {
+    return {
+      info: {},
+      form: {
+        title: '',
+        content: '',
+        areaId: '',
+        createUnitName: '',
+        createUserName: '',
+        status: '',
+        thumbUrl: []
      },
-
-      confirm () {
-        this.$refs.form.validate((valid) => {
-          if (valid) {
-            this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
-              ...this.form,
-              type: 0,
-              createUserName: this.user.info.name,
-              thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
-                url: this.form.thumbUrl[0].url
-              }]) : ''
-            }).then(res => {
-              if (res.code == 0) {
-                this.$message.success('提交成功')
-                setTimeout(() => {
-                  this.cancel(true)
-                }, 600)
-              }
-            })
-          }
-        })
+      cropOps: {
+        width: "336px",
+        height: "210px"
      },
+      id: ''
+    }
+  },

-      cancel (isRefresh) {
-        this.$emit('change', {
-          type: 'list',
-          isRefresh: !!isRefresh
-        })
-      }
+  computed: {
+    ...mapState(['user']),
+    pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
+  },
+  created() {
+    this.form.areaId = this.user.info.areaId
+    this.disabledLevel = this.user.info.areaList.length
+    if (this.params && this.params.id) {
+      this.id = this.params.id
+      this.getInfo(this.params.id)
+    }
+  },
+
+  methods: {
+    getInfo(id) {
+      this.instance.post(`/app/appcountrysidetourism/queryDetailById?id=${id}`).then(res => {
+        if (res.code === 0) {
+          this.form = res.data
+          this.form.thumbUrl = res.data.thumbUrl ? JSON.parse(res.data.thumbUrl) : []
+        }
+      })
+    },
+
+    confirm() {
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.instance.post(`/app/appcountrysidetourism/addOrUpdate`, {
+            ...this.form,
+            type: 0,
+            createUserName: this.user.info.name,
+            thumbUrl: this.form.thumbUrl.length ? JSON.stringify([{
+              url: this.form.thumbUrl[0].url
+            }]) : ''
+          }).then(res => {
+            if (res.code == 0) {
+              this.$message.success('提交成功')
+              setTimeout(() => {
+                this.cancel(true)
+              }, 600)
+            }
+          })
+        }
+      })
+    },
+
+    cancel(isRefresh) {
+      this.$emit('change', {
+        type: 'list',
+        isRefresh: !!isRefresh
+      })
    }
  }
+}
 </script>

 <style scoped lang="scss">
--- a/packages/publicity/AppVillageIntroduction/components/List.vue
+++ b/packages/publicity/AppVillageIntroduction/components/List.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-list class="notice">
    <template slot="title">
-      <ai-title title="本村简介" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
+      <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
    </template>
    <template slot="content">
      <ai-search-bar class="search-bar">
@@ -57,9 +57,9 @@

    props: {
      instance: Function,
-      dict: Object
+      dict: Object,
+      menuName:String
    },
-
    data() {
      return {
        search: {
--- a/packages/publicity/AppVillageRegulations/AppVillageRegulations.vue
+++ b/packages/publicity/AppVillageRegulations/AppVillageRegulations.vue
@@ -1,73 +1,74 @@
 <template>
  <div class="doc-circulation ailist-wrapper">
    <keep-alive :include="['List']">
-      <component ref="component" :is="component" @change="onChange" :params="params" :instance="instance" :dict="dict"></component>
+      <component ref="component" :is="component" @change="onChange" :params="params" v-bind="$props"/>
    </keep-alive>
  </div>
 </template>

 <script>
-  import List from './components/List'
-  import Add from './components/Add'
-  import Detail from './components/Detail'
+import List from './components/List'
+import Add from './components/Add'
+import Detail from './components/Detail'

-  export default {
-    name: 'AppVillageRegulations',
-    label: '村规民约',
+export default {
+  name: 'AppVillageRegulations',
+  label: '村规民约',

-    props: {
-      instance: Function,
-      dict: Object
-    },
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: {default: "村规民约"}
+  },

-    data () {
-      return {
-        component: 'List',
-        params: {},
-        include: []
+  data() {
+    return {
+      component: 'List',
+      params: {},
+      include: []
+    }
+  },
+
+  components: {
+    Add,
+    List,
+    Detail
+  },
+
+  mounted() {
+  },
+
+  methods: {
+    onChange(data) {
+      if (data.type === 'Add') {
+        this.component = 'Add'
+        this.params = data.params
      }
-    },

-    components: {
-      Add,
-      List,
-      Detail
-    },
+      if (data.type === 'Detail') {
+        this.component = 'Detail'
+        this.params = data.params
+      }

-    mounted () {
-    },
+      if (data.type === 'list') {
+        this.component = 'List'
+        this.params = data.params

-    methods: {
-      onChange (data) {
-        if (data.type === 'Add') {
-          this.component = 'Add'
-          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
-
-          this.$nextTick(() => {
-            if (data.isRefresh) {
-              this.$refs.component.getList()
-            }
-          })
-        }
+        this.$nextTick(() => {
+          if (data.isRefresh) {
+            this.$refs.component.getList()
+          }
+        })
      }
    }
  }
+}
 </script>

 <style lang="scss">
-  .doc-circulation {
-    height: 100%;
-    background: #F3F6F9;
-    overflow: auto;
-  }
+.doc-circulation {
+  height: 100%;
+  background: #F3F6F9;
+  overflow: auto;
+}
 </style>
--- a/packages/publicity/AppVillageRegulations/components/Add.vue
+++ b/packages/publicity/AppVillageRegulations/components/Add.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-detail>
    <template slot="title">
-      <ai-title :title="params.id ? '编辑村规民约' : '添加村规民约'" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
+      <ai-title :title="pageTitle" isShowBack isShowBottomBorder @onBackClick="cancel(false)">
      </ai-title>
    </template>
    <template slot="content">
@@ -50,7 +50,8 @@
    props: {
      instance: Function,
      dict: Object,
-      params: Object
+      params: Object,
+      menuName: String
    },

    data () {
@@ -74,7 +75,8 @@
    },

    computed: {
-      ...mapState(['user'])
+      ...mapState(['user']),
+      pageTitle: v => `${!!v.params.id ? '编辑' : '添加'}${v.menuName}`
    },

    created () {
--- a/packages/publicity/AppVillageRegulations/components/List.vue
+++ b/packages/publicity/AppVillageRegulations/components/List.vue
@@ -1,7 +1,7 @@
 <template>
  <ai-list class="notice">
    <template slot="title">
-      <ai-title title="村规民约" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
+      <ai-title :title="menuName" isShowBottomBorder isShowArea v-model="search.areaId" :instance="instance" @change="search.current = 1, getList()"></ai-title>
    </template>
    <template slot="content">
      <ai-search-bar class="search-bar">
@@ -10,25 +10,25 @@
        </template>
        <template #right>
          <el-input
-            v-model="search.title"
-            class="search-input"
-            size="small"
-            v-throttle="() => {search.current=1,getList()}"
-            placeholder="请输入标题"
-            clearable
-            @clear="search.current = 1, search.title = '', getList()"
-            suffix-icon="iconfont iconSearch">
+              v-model="search.title"
+              class="search-input"
+              size="small"
+              v-throttle="() => {search.current=1,getList()}"
+              placeholder="请输入标题"
+              clearable
+              @clear="search.current = 1, search.title = '', getList()"
+              suffix-icon="iconfont iconSearch">
          </el-input>
        </template>
      </ai-search-bar>
      <ai-table
-        :tableData="tableData"
-        :col-configs="colConfigs"
-        :total="total"
-        style="margin-top: 6px;"
-        :current.sync="search.current"
-        :size.sync="search.size"
-        @getList="getList">
+          :tableData="tableData"
+          :col-configs="colConfigs"
+          :total="total"
+          style="margin-top: 6px;"
+          :current.sync="search.current"
+          :size.sync="search.size"
+          @getList="getList">
        <el-table-column slot="tags" label="标签">
          <template slot-scope="{ row }">
            <div class="table-tags">
@@ -51,101 +51,103 @@
 </template>

 <script>
-  import { mapState } from 'vuex'
-  export default {
-    name: 'List',
+import {mapState} from 'vuex'

-    props: {
-      instance: Function,
-      dict: Object
+export default {
+  name: 'List',
+
+  props: {
+    instance: Function,
+    dict: Object,
+    menuName: String
+  },
+
+  data() {
+    return {
+      search: {
+        current: 1,
+        size: 10,
+        title: '',
+        areaId: ''
+      },
+      currIndex: -1,
+      areaList: [],
+      total: 10,
+      colConfigs: [
+        {prop: 'title', label: '标题', align: 'left', width: '200px'},
+        {prop: 'areaName', label: '地区', align: 'center'},
+        {prop: 'status', label: '发布状态', align: 'center', formart: v => v === '1' ? '已发布' : '未发布'},
+        {prop: 'createUserName', label: '发布人', align: 'center'},
+        {prop: 'createDate', label: '发布时间', align: 'center'},
+        {slot: 'options', label: '操作', align: 'center'}
+      ],
+      areaName: '',
+      unitName: '',
+      tableData: []
+    }
+  },
+
+  computed: {
+    ...mapState(['user'])
+  },
+
+  mounted() {
+    this.search.areaId = this.user.info.areaId
+    this.getList()
+  },
+
+  methods: {
+    getList() {
+      this.instance.post(`/app/appcountrysidetourism/list`, null, {
+        params: {
+          type: 4,
+          ...this.search
+        }
+      }).then(res => {
+        if (res.code == 0) {
+          this.tableData = res.data.records
+          this.total = res.data.total
+        }
+      })
    },

-    data() {
-      return {
-        search: {
-          current: 1,
-          size: 10,
-          title: '',
-          areaId: ''
-        },
-        currIndex: -1,
-        areaList: [],
-        total: 10,
-        colConfigs: [
-          { prop: 'title',  label: '标题', align: 'left', width: '200px' },
-          { prop: 'areaName', label: '地区', align: 'center' },
-          { prop: 'status', label: '发布状态', align: 'center', formart: v => v === '1' ? '已发布' : '未发布' },
-          { prop: 'createUserName', label: '发布人', align: 'center' },
-          { prop: 'createDate', label: '发布时间', align: 'center' },
-          { slot: 'options', label: '操作', align: 'center' }
-        ],
-        areaName: '',
-        unitName: '',
-        tableData: []
-      }
-    },
-
-    computed: {
-      ...mapState(['user'])
-    },
-
-    mounted() {
-      this.search.areaId = this.user.info.areaId
-      this.getList()
-    },
-
-    methods: {
-      getList() {
-        this.instance.post(`/app/appcountrysidetourism/list`, null, {
-          params: {
-            type: 4,
-            ...this.search
+    changeStatus(item) {
+      let title = item.status == '1' ? '是否要取消发布?' : '是否要发布?';
+      this.$confirm(title, {type: 'warning'}).then(() => {
+        item.status = item.status == '1' ? '0' : '1'
+        this.instance.post('/app/appcountrysidetourism/addOrUpdate', item).then(res => {
+          if (res && res.code == 0) {
+            title == '是否要发布?' ? this.$message.success('发布成功') : this.$message.success('取消发布成功')
+            this.getList()
          }
-        }).then(res => {
+        })
+      })
+    },
+
+    remove(id) {
+      this.$confirm('确定删除该数据？').then(() => {
+        this.instance.post(`/app/appcountrysidetourism/delete?ids=${id}`).then(res => {
          if (res.code == 0) {
-            this.tableData = res.data.records
-            this.total = res.data.total
+            this.$message.success('删除成功！')
+            this.getList()
          }
        })
-      },
+      })
+    },

-      changeStatus (item) {
-        let title = item.status == '1' ? '是否要取消发布?' : '是否要发布?';
-        this.$confirm(title, {type: 'warning'}).then(() => {
-          item.status = item.status == '1' ? '0' : '1'
-          this.instance.post('/app/appcountrysidetourism/addOrUpdate', item).then(res => {
-            if (res && res.code == 0) {
-              title == '是否要发布?' ? this.$message.success('发布成功') : this.$message.success('取消发布成功')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      remove(id) {
-        this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appcountrysidetourism/delete?ids=${id}`).then(res => {
-            if (res.code == 0) {
-              this.$message.success('删除成功！')
-              this.getList()
-            }
-          })
-        })
-      },
-
-      toAdd(id) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            id: id || ''
-          }
-        })
-      }
+    toAdd(id) {
+      this.$emit('change', {
+        type: 'Add',
+        params: {
+          id: id || ''
+        }
+      })
    }
  }
+}
 </script>

 <style lang="scss" scoped>
-  .notice {
-  }
+.notice {
+}
 </style>
--- a/packages/wxwork/Announce/AppAnnounce/components/Add.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Add.vue
@@ -34,12 +34,7 @@
                    <div class="AppAnnounceDetail-select">
                      <el-input size="small" class="AppAnnounceDetail-select__input" placeholder="请选择..." disabled v-model="form.wxGroupsName"></el-input>
                      <div class="select-left" v-if="form.wxGroups.length">
-                        <span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">
-                          <ai-open-data
-                            type="userName"
-                            :openid="item.groupOwnerId">
-                            </ai-open-data>
-                        </span>
+                        <span v-for="(item, index) in form.wxGroups" :key="index" v-if="index < 9">{{ item.groupOwnerName }}</span>
                        <em v-if="form.wxGroups.length > 9">等{{ form.wxGroups.length }}个</em>
                      </div>
                      <i v-if="!form.wxGroups.length">请选择</i>
@@ -150,18 +145,16 @@
                  </el-switch>
                </el-form-item>
                <el-form-item v-if="form.enableExamine === '1'" label="审批人员" prop="examines" style="width: 100%;" :rules="[{ required: true, message: '请选择审批人员', trigger: 'change' }]">
-                  <ai-user-get :instance="instance" v-model="form.examines" @change="onUserChange">
+                  <ai-wechat-selecter :instance="instance" v-model="form.examines" @change="onUserChange">
                    <div class="AppAnnounceDetail-select">
                      <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examinesName"></el-input>
                      <div class="select-left" v-if="form.examines.length">
-                        <span v-for="(item, index) in form.examines" :key="index">
-                          <ai-open-data type="userName" :openid="item.wxOpenUserId"></ai-open-data>
-                        </span>
+                        <span v-for="(item, index) in form.examines" :key="index">{{ item.name }}</span>
                      </div>
                      <i v-if="!form.examines.length">请选择</i>
                        <div class="select-right">{{ form.examines.length ? '重新选择' : '选择' }}</div>
                    </div>
-                  </ai-user-get>
+                  </ai-wechat-selecter>
                </el-form-item>
              </div>
            </template>
@@ -249,21 +242,21 @@
          </el-form>
        </ai-dialog>
        <ai-dialog
-            :visible.sync="isShowDate"
-            width="590px"
-            title="定时发送"
-            customFooter>
+          :visible.sync="isShowDate"
+          width="590px"
+          title="定时发送"
+          customFooter>
          <el-form ref="dateForm" :model="dateForm" label-width="130px" label-position="right">
            <div class="ai-form">
              <el-form-item label="定时发送时间" style="width: 100%;" prop="choiceTime" :rules="[{ required: true, message: '请选择定时发送时间', trigger: 'change' }]">
                <el-date-picker
-                    style="width: 100%;"
-                    v-model="dateForm.choiceTime"
-                    type="datetime"
-                    size="small"
-                    :picker-options="pickerOptions"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="请选择定时发送时间">
+                  style="width: 100%;"
+                  v-model="dateForm.choiceTime"
+                  type="datetime"
+                  size="small"
+                  :picker-options="pickerOptions"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="请选择定时发送时间">
                </el-date-picker>
              </el-form-item>
            </div>
@@ -639,7 +632,8 @@ export default {
            examines: this.form.examines.length ? this.form.examines.map(v => {
              return {
                ...v,
-                examineUserId: v.id
+                examineUserId: v.id,
+                examineUserName: v.name
              }
            }) : []
          }).then(res => {
--- a/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/Detail.vue
@@ -25,15 +25,15 @@
            <ai-info-item label="创建人" isLine>
              <div class="user">
                <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                <span><ai-open-data type="userName" :openid="info.createUserId"></ai-open-data></span>
-                （<span><ai-open-data type="departmentName" :openid="info.createUserDept"></ai-open-data></span>）
+                <span>{{ info.createUserName }}</span>
+                （<span>{{ info.createUserDeptName }}</span>）
              </div>
            </ai-info-item>
            <ai-info-item label="审批人" isLine v-if="info.enableExamine === '1'">
              <div class="user-wrapper">
                <div class="user" v-for="(item, index) in info.examines" :key="index">
                  <img src="https://cdn.cunwuyun.cn/dvcp/announce/user.png" />
-                  <span><ai-open-data type="userName" :openid="item.examineUserId"></ai-open-data></span>
+                  <span>{{ item.examineUserName }}</span>
                </div>
              </div>
            </ai-info-item>
@@ -121,7 +121,7 @@
                    :instance="instance"
                    @pick="e => onUserChange(e, 'search1')" :multiple="false" v-model="user1">
                    <div class="userSelcet">
-                      <span style="color: #606266;" v-if="search1.deptartId"><ai-open-data type="departmentName" :openid="search1.deptartId"></ai-open-data></span>
+                      <span style="color: #606266;" v-if="search1.deptartId">{{ name1 }}</span>
                      <span v-else>部门</span>
                      <i class="el-icon-arrow-up"  v-if="!search1.deptartId"></i>
                      <i class="el-icon-circle-close" v-if="search1.deptartId" @click.stop="user1 = [], search1.deptartId = '', search1.current = 1, getMemberInfo()"></i>
@@ -142,12 +142,8 @@
                <el-table-column slot="user" label="成员" align="left">
                  <template slot-scope="{ row }">
                    <div class="userinfo">
-                      <span>
-                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
-                      </span>
-                      <span style="color: #999">
-                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
-                      </span>
+                      <span>{{ row.groupOwnerName }}</span>
+                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
                    </div>
                  </template>
                </el-table-column>
@@ -195,7 +191,7 @@
                    :instance="instance"
                    @pick="e => onUserChange(e, 'search2')" :multiple="false" v-model="user2">
                    <div class="userSelcet">
-                      <span style="color: #606266;" v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
+                      <span style="color: #606266;" v-if="search2.deptartId">{{ name2 }}</span>
                      <span v-else>部门</span>
                      <i class="el-icon-arrow-up"  v-if="!search2.deptartId"></i>
                      <i class="el-icon-circle-close" v-if="search2.deptartId" @click.stop="user1 = [], search2.deptartId = '', search2.current = 1, getGroupInfo()"></i>
@@ -216,12 +212,8 @@
                <el-table-column slot="user" label="群主" align="center">
                  <template slot-scope="{ row }">
                    <div class="userinfo">
-                      <span>
-                        <ai-open-data type="userName" :openid="row.groupOwnerId"></ai-open-data>
-                      </span>
-                      <span style="color: #999">
-                        <ai-open-data type="departmentName" :openid="row.mainDepartment"></ai-open-data>
-                      </span>
+                      <span>{{ row.groupOwnerName }}</span>
+                      <span style="color: #999">{{ row.mainDepartmentName }}</span>
                    </div>
                  </template>
                </el-table-column>
@@ -276,6 +268,8 @@
        total2: 0,
        user1: [],
        user2: [],
+        name1: '',
+        name2: '',
        radio1: '未执行',
        search1: {
          current: 1,
@@ -300,11 +294,11 @@
        content: '',
        currIndex: 0,
        colConfigs3: [
-          { prop: 'groupOwnerId', label: '群主', openType: 'userName' },
+          { prop: 'groupOwnerName', label: '群主' },
          { prop: 'groupNames', label: '群名称' }
        ],
        colConfigs1: [
-          { slot: 'user', label: '成员', openType: 'userName' },
+          { slot: 'user', label: '成员' },
          { prop: 'groupCount', label: '预计送达居民群', align: 'center' }
        ],
        colConfigs2: [
@@ -352,9 +346,11 @@

      onUserChange (e, search) {
        if (e.length) {
+          search === 'search1' ? this.name1 = e[0].name : this.name2 = e[0].name
          this[search].deptartId = e[0].id
        } else {
          this[search].deptartId = ''
+          search === 'search1' ? this.name1 = '' : this.name2 = ''
        }

        this[search].current = 1
--- a/packages/wxwork/Announce/AppAnnounce/components/List.vue
+++ b/packages/wxwork/Announce/AppAnnounce/components/List.vue
@@ -33,14 +33,14 @@
            @change="search.current = 1, getList()"
            placeholder="选择群发结束日期">
          </el-date-picker>
-          <ai-user-get :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
+          <ai-wechat-selecter :instance="instance" @change="onUserChange" :isMultiple="false" v-model="user">
            <div class="userSelcet">
-              <span style="color: #606266;" v-if="search.createUserId"><ai-open-data type="userName" :openid="search.createUserId"></ai-open-data></span>
+              <span style="color: #606266;" v-if="search.createUserId">{{ name }}</span>
              <span v-else>创建人</span>
              <i class="el-icon-arrow-up"  v-if="!search.createUserId"></i>
-              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', search.current = 1, getList()"></i>
+              <i class="el-icon-circle-close" v-if="search.createUserId" @click.stop="user = [], search.createUserId = '', name = '', search.current = 1, getList()"></i>
            </div>
-          </ai-user-get>
+          </ai-wechat-selecter>
        </template>
        <template slot="right">
          <el-input
@@ -66,12 +66,8 @@
        <el-table-column slot="user" width="140px" label="创建人" align="center">
          <template slot-scope="{ row }">
            <div class="userinfo">
-              <span>
-                <ai-open-data type="userName" :openid="row.createUserId"></ai-open-data>
-              </span>
-              <span style="color: #999">
-                <ai-open-data type="departmentName" :openid="row.createUserDept"></ai-open-data>
-              </span>
+              <span>{{ row.createUserName }}</span>
+              <span style="color: #999">{{ row.createUserDeptName }}</span>
            </div>
          </template>
        </el-table-column>
@@ -110,6 +106,7 @@
          startTime: '',
          endTime: ''
        },
+        name: '',
        user: [],
        tableData: [],
        loading: false,
@@ -145,9 +142,11 @@
    methods: {
      onUserChange (e) {
        if (e.length) {
-          this.search.createUserId = e[0].wxOpenUserId
+          this.name = e[0].name
+          this.search.createUserId = e[0].id
        } else {
          this.search.createUserId = ''
+          this.name = ''
        }

        this.search.current = 1
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
@@ -0,0 +1,41 @@
+<template>
+  <section class="AppGuaranteeProduct">
+    <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
+  </section>
+</template>
+
+<script>
+
+import ProductDetail from "./productDetail";
+import ProductList from "./productList";
+import ProductAdd from "./productAdd";
+import ProductRecommend from "./productRecommend";
+
+export default {
+  name: "AppGuaranteeProduct",
+  components: {ProductRecommend, ProductAdd, ProductList, ProductDetail},
+  label: "担保产品发布",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    currentComponent() {
+      return this.$route.hash == "#add" ? ProductAdd :
+          this.$route.hash == "#productRecommend" ? ProductRecommend :
+              !!this.$route.query.id ? ProductDetail : ProductList
+    }
+  },
+  created() {
+    this.dict.load("productGuaranteeMode", "productRepaymentMethod", "productRepaymentTimeline", "productStatus", "productFaceUser",
+        "enterpriseAuditStatus", "yesOrNo", "financialOrganizationType", "financialProductChannels")
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.AppGuaranteeProduct {
+  height: 100%;
+}
+</style>
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
@@ -0,0 +1,172 @@
+<template>
+  <section class="productAdd">
+    <ai-detail>
+      <ai-title slot="title" :title="addTitle" isShowBottomBorder isShowBack @onBackClick="back"/>
+      <template #content>
+        <el-form size="small" label-width="120px" :model="form" ref="ProductForm" :rules="rules">
+          <ai-card title="基本信息">
+            <template #content>
+              <el-form-item label="产品名称" prop="productName">
+                <el-input v-model="form.productName" placeholder="请输入" clearable show-word-limit maxlength="30"/>
+              </el-form-item>
+              <el-form-item label="产品介绍" prop="productFeatures">
+                <el-input type="textarea" rows="5" v-model="form.productFeatures" placeholder="请输入" clearable
+                          maxlength="500" show-word-limit/>
+              </el-form-item>
+              <el-row type="flex" class="flexWrap">
+                <el-form-item label="客户经理" prop="bankCounterpart">
+                  <el-input type="text" v-model="form.bankCounterpart" placeholder="客户经理姓名" clearable maxlength="6"/>
+                </el-form-item>
+                <el-form-item label="联系方式" prop="consultationTelephone">
+                  <el-input type="text" v-model="form.consultationTelephone" placeholder="客户经理电话" clearable
+                            maxlength="11"/>
+                </el-form-item>
+              </el-row>
+              <el-form-item label="企业微信二维码" prop="qrCodeUrl">
+                <ai-uploader v-model="form.qrCodeUrl" :instance="instance" :limit="1" isShowTip valueIsUrl/>
+              </el-form-item>
+            </template>
+          </ai-card>
+          <ai-card title="适用范围">
+            <template #content>
+              <el-form-item label="适用范围" prop="areaId">
+                <ai-area-get :instance="instance" v-model="form.areaId" showAll/>
+              </el-form-item>
+              <el-form-item label="面向对象" prop="faceUser">
+                <el-checkbox-group v-model="form.faceUser">
+                  <el-checkbox v-for="op in dict.getDict('productFaceUser')" :key="op.dictValue" :label="op.dictValue">
+                    {{ op.dictName }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </template>
+          </ai-card>
+          <ai-card title="办理渠道">
+            <template #content>
+              <el-form-item label="业务办理渠道" prop="handlingChannels">
+                <ai-select v-model="form.handlingChannels" :selectList="dict.getDict('financialProductChannels')" @change="form.zwspId=null"/>
+              </el-form-item>
+              <el-form-item v-if="form.handlingChannels==1" label="关联贷款联审" prop="zwspId">
+                <ai-select v-model="form.zwspId" :instance="instance" action="/approval-process-def/list?processDefStatus=1" :prop="{label:'processName'}"/>
+              </el-form-item>
+            </template>
+          </ai-card>
+        </el-form>
+      </template>
+      <template #footer>
+        <el-button @click="back">取消</el-button>
+        <el-button type="primary" @click="submit">申请发布</el-button>
+      </template>
+    </ai-detail>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "productAdd",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    addTitle() {
+      return !!this.$route.query.id ? "编辑金融产品" : "添加金融产品"
+    },
+    rules() {
+      return {
+        productName: [{required: true, message: "请输入产品名称", trigger: 'blur'}],
+        loanMin: [{required: true, message: "请输入最低贷款额度"}],
+        loanMax: [
+          {required: true, message: "请输入最高贷款额度", trigger: 'blur'},
+          {validator: (r, v, cb) => v < this.form.loanMin ? cb("输入的最高贷款需大于最低贷款") : cb()}
+        ],
+        interestRateMin: [{required: true, message: "请输入最低参考利率", trigger: 'blur'}],
+        interestRateMax: [
+          {required: true, message: "请输入最高参考利率", trigger: 'blur'},
+          {validator: (r, v, cb) => v < this.form.interestRateMin ? cb("输入的最高参考利率需大于最低参考利率") : cb()}
+        ],
+        repaymentTimeline: [{required: true, message: "请选择还款期限", trigger: 'blur'}],
+        repaymentMethod: [{required: true, message: "请选择还款方式", trigger: 'blur'}],
+        guaranteeMode: [{required: true, message: "请选择担保方式", trigger: 'blur'}],
+        areaId: [{required: true, message: "请选择适用范围", trigger: 'blur'}],
+        faceUser: [{required: true, message: "请选择面向对象", trigger: 'blur'}],
+        applyCondition: [{required: true, message: "请输入申请条件", trigger: 'blur'}],
+        needMaterial: [{required: true, message: "请输入所需材料", trigger: 'blur'}],
+        productFeatures: [{required: true, message: "请输入产品特色", trigger: 'blur'}],
+        handlingChannels: [{required: true, message: "请选择办理渠道"}],
+        zwspId: [{required: true, message: "请选择关联贷款联审"}],
+        // bankCounterpart: [{required: true, message: "请输入客户经理姓名", trigger: 'change'}],
+        // consultationTelephone: [ {required: true, message: "请输入客户经理电话", trigger: 'change'}],
+      }
+    }
+  },
+  data() {
+    return {
+      dialog: false,
+      form: {guaranteeMode: [], faceUser: [], loanMin: null, zwspId: null},
+    }
+  },
+  methods: {
+    getDetail() {
+      let {id} = this.$route.query
+      id && this.instance.post("/appfinancialproduct/queryDetailById", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.data) {
+          this.form = res.data
+          this.form.faceUser = res.data.faceUser?.split(",")
+          this.form.guaranteeMode = res.data.guaranteeMode?.split(",")
+        }
+      })
+    },
+    submit() {
+      this.$refs.ProductForm.validate(v => {
+        if (v) {
+          let {form} = this
+          form.faceUser = form.faceUser?.toString()
+          form.guaranteeMode = form.guaranteeMode?.toString()
+          this.instance.post("/appfinancialproduct/addOrUpdate", form).then(res => {
+            if (res?.code == 0) {
+              this.$message.success("提交成功!")
+              this.back()
+            }
+          })
+        }
+      })
+    },
+    back() {
+      this.$router.push({})
+    },
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.productAdd {
+  height: 100%;
+
+  .flexWrap {
+    flex-wrap: wrap;
+
+    .el-form-item {
+      width: 50%;
+    }
+  }
+
+  ::v-deep.half {
+    width: 50%;
+  }
+
+  ::v-deep input[type="number"] {
+    line-height: 1px !important;
+
+    &::-webkit-outer-spin-button, &::-webkit-inner-spin-button {
+      -webkit-appearance: none !important;
+    }
+  }
+}
+</style>
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
@@ -0,0 +1,165 @@
+<template>
+  <section class="productDetail">
+    <ai-detail>
+      <ai-title slot="title" title="金融产品详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
+        <template #rightBtn>
+          <el-button v-if="isAdmin&&detail.status==0" type="primary" @click="dialog=true">审核</el-button>
+        </template>
+      </ai-title>
+      <template #content>
+        <el-form v-if="detail.id" size="small" label-width="120px">
+          <ai-card title="基本信息">
+            <template #content>
+              <el-row type="flex" class="flexWrap">
+                <el-form-item class="half" label="产品名称">{{ detail.productName }}</el-form-item>
+                <el-form-item class="half" label="状态">{{ dict.getLabel('productStatus', detail.status) }}</el-form-item>
+              </el-row>
+              <el-form-item label="产品简介">{{ detail.productFeatures }}</el-form-item>
+              <el-row type="flex" class="flexWrap">
+                <el-form-item label="客户经理" class="half">{{ detail.bankCounterpart }}</el-form-item>
+                <el-form-item label="联系方式" class="half">{{ detail.consultationTelephone }}</el-form-item>
+              </el-row>
+              <el-form-item label="企业微信二维码" v-if="detail.qrCodeUrl">
+                <el-image class="qrCode" :src="detail.qrCodeUrl" :preview-src-list="[detail.qrCodeUrl]"/>
+              </el-form-item>
+            </template>
+          </ai-card>
+          <ai-card title="适用范围">
+            <template #content>
+              <el-form-item label="适用范围">{{ detail.areaName }}</el-form-item>
+              <el-form-item label="面向对象">{{ detail.faceUserLabel }}</el-form-item>
+            </template>
+          </ai-card>
+          <ai-card title="办理渠道">
+            <template #content>
+              <el-form-item label="业务办理渠道">{{ dict.getLabel('financialProductChannels', detail.handlingChannels) }}</el-form-item>
+              <el-form-item label="关联贷款联审" v-if="detail.handlingChannels==1">{{ detail.zwspName }}</el-form-item>
+            </template>
+          </ai-card>
+          <ai-card title="审核结果" v-if="!isAuthing">
+            <template #content>
+              <el-row type="flex" class="flexWrap">
+                <el-form-item class="half" label="审核结果">
+                  {{ dict.getLabel("productStatus", detail.status) }}
+                </el-form-item>
+                <el-form-item class="half" label="审核人">{{ detail.auditUserName }}</el-form-item>
+                <el-form-item class="half" label="审核时间">{{ detail.auditTime }}</el-form-item>
+              </el-row>
+              <el-form-item label="备注">{{ detail.auditDescription }}</el-form-item>
+            </template>
+          </ai-card>
+        </el-form>
+      </template>
+    </ai-detail>
+    <ai-dialog :visible.sync="dialog" title="审批" @closed="form={}" @onConfirm="submitAudit" width="560px">
+      <el-form :model="form" :rules="rules" ref="AuditForm" size="small" label-width="120px">
+        <el-form-item label="审批结果" prop="status">
+          <ai-select v-model="form.status" :selectList="dict.getDict('enterpriseAuditStatus')"/>
+        </el-form-item>
+        <el-form-item label="审批意见" prop="remark" :required="form.status==2">
+          <el-input type="textarea" v-model="form.remark" placeholder="请输入" maxlength="200" rows="4" show-word-limit/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "productDetail",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user']),
+    isAuthing() {
+      return this.detail.status == "0"
+    },
+    isAdmin() {
+      return this.user?.financeUser?.userRole == 1
+    },
+    rules() {
+      return {
+        status: [{required: true, message: "请选择审批结果"}],
+        remark: [{validator: (r, v, cb) => this.form.status == 2 && !v ? cb("请输入审批意见") : cb()}],
+      }
+    }
+  },
+  data() {
+    return {
+      dialog: false,
+      detail: {},
+      form: {},
+    }
+  },
+  methods: {
+    getDetail() {
+      let {id} = this.$route.query
+      this.instance.post("/appfinancialproduct/queryDetailById", null, {
+        params: {id}
+      }).then(res => {
+        if (res?.data) {
+          this.detail = res.data
+          this.detail.guaranteeModeLabel = res.data.guaranteeMode?.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
+          this.detail.faceUserLabel = res.data.faceUser?.split(",").map(g => this.dict.getLabel("productFaceUser", g))?.toString()
+          if (this.detail.handlingChannels == 1) {
+            this.getZWSP(this.detail.zwspId).then(zwsp => this.$set(this.detail, 'zwspName', zwsp.processName))
+          }
+        } else {
+          this.$message.error("该产品已下架!")
+        }
+      })
+    },
+    getZWSP(id) {
+      //贷款联审信息
+      return this.instance.post("/approval-process-def/info-id", null, {params: {id}}).then(res => {
+        if (res?.data) {
+          return res.data
+        }
+      })
+    },
+    submitAudit() {
+      this.$refs.AuditForm.validate(v => {
+        if (v) {
+          let {id} = this.detail
+          this.instance.post("/appfinancialproduct/auditProduct", null, {
+            params: {id, ...this.form}
+          }).then(res => {
+            if (res?.code == 0) {
+              this.dialog = false
+              this.$message.success("提交成功!")
+              this.getDetail()
+            }
+          })
+        }
+      })
+    }
+  },
+  created() {
+    this.getDetail()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.productDetail {
+  height: 100%;
+
+  .flexWrap {
+    flex-wrap: wrap;
+  }
+
+  ::v-deep.half {
+    width: 50%;
+  }
+
+  .qrCode {
+    width: 120px;
+    height: 120px;
+  }
+}
+</style>
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
@@ -0,0 +1,135 @@
+<template>
+  <section class="productList">
+    <ai-list>
+      <ai-title slot="title" title="产品发布管理" isShowBottomBorder>
+        <template #rightBtn>
+          <el-button type="primary" @click="$router.push({hash:'#productRecommend'})"
+                     v-if="permissions('app_appfinancialproductrecommend_detail')">推荐产品
+          </el-button>
+        </template>
+      </ai-title>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" icon="iconfont iconAdd" @click="handleEdit()" v-if="isFinanceUser">添加产品</el-button>
+            <ai-select v-model="search.guaranteeMode" :selectList="dict.getDict('productGuaranteeMode')"
+                       placeholder="担保方式" @change="page.current=1,getTableData()"/>
+          </template>
+          <template #right>
+            <el-input size="small" placeholder="搜索产品名称" v-model="search.productName" clearable
+                      @change="page.current=1,getTableData()"/>
+
+          </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">
+          <el-table-column slot="hot" label="热门推荐" align="center" v-if="!isFinanceUser">
+            <template slot-scope="{row}">
+              <el-switch v-model="row.isHot" active-value="1" inactive-value="0" @change="handleIsHot(row)"/>
+            </template>
+          </el-table-column>
+          <el-table-column slot="interestRateMin" label="参考利率" align="center">
+            <template slot-scope="{row}">
+              {{ row.interestRateMin }}%~{{ row.interestRateMax }}%
+            </template>
+          </el-table-column>
+          <el-table-column slot="options" label="操作" fixed="right" align="center" width="200px">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="showDetail(row.id)">详情</el-button>
+              <template v-if="isFinanceUser">
+                <el-button type="text" @click="handleEdit(row.id)" v-if="['2','1'].includes(row.status)">编辑</el-button>
+                <el-button type="text" @click="handleDelete(row.id)" v-if="['2','1'].includes(row.status)">删除</el-button>
+              </template>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "productList",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user']),
+    isFinanceUser: v => !!v.user.financeUser?.id && v.user.financeUser.organizationType == 2
+  },
+  data() {
+    return {
+      search: {productName: ""},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      colConfigs: [
+        {label: "产品名称", prop: "productName"},
+        {label: "客户经理", prop: "bankCounterpart", align: "center"},
+        {label: "联系方式", prop: "consultationTelephone"},
+        {label: "操作人", prop: "createUserName", align: "center"},
+        {label: "状态", prop: "status", dict: "productStatus", align: "center"},
+        {label: "热门推荐", slot: "hot"},
+        {slot: "options"}
+      ]
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/appfinancialproduct/list", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records.map(e => {
+            let guaranteeModeLabel = e.guaranteeMode.split(",").map(g => this.dict.getLabel("productGuaranteeMode", g))?.toString()
+            return {...e, guaranteeModeLabel}
+          })
+          this.page.total = res.data.total
+        }
+      })
+    },
+    showDetail(id) {
+      this.$router.push({query: {id}})
+    },
+    handleEdit(id) {
+      this.$router.push({query: {id}, hash: "#add"})
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该产品?").then(() => {
+        this.instance.post("/appfinancialproduct/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    },
+    handleIsHot(row) {
+      let {id, isHot} = row
+      this.instance.post("appfinancialproduct/setIsHot", null, {
+        params: {id, isHot}
+      }).then(res => {
+        if (res?.code == 0) {
+          this.$message.success("修改成功!")
+          this.getTableData()
+        }
+      })
+    }
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.productList {
+  height: 100%;
+}
+</style>
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productRecommend.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productRecommend.vue
@@ -0,0 +1,163 @@
+<template>
+  <section class="productRecommend">
+    <ai-list>
+      <ai-title slot="title" title="推荐产品" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})"/>
+      <template #content>
+        <ai-search-bar>
+          <template #left>
+            <el-button type="primary" @click="dialog=true">新增推荐</el-button>
+            <ai-select placeholder="机构类型" v-model="search.organizationType" @change="page.current=1,getTableData()"
+                       :selectList="dict.getDict('financialOrganizationType')"/>
+          </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">
+          <el-table-column slot="options" label="操作" fixed="right" align="center" width="200px">
+            <template slot-scope="{row}">
+              <el-button type="text" @click="handleEdit(row)">编辑</el-button>
+              <el-button type="text" @click="handleDelete(row.id)">删除</el-button>
+            </template>
+          </el-table-column>
+        </ai-table>
+      </template>
+    </ai-list>
+    <ai-dialog :visible.sync="dialog" :title="dialogTitle" @closed="form={}" @onConfirm="submitAudit" width="560px">
+      <el-form :model="form" :rules="rules" ref="PRForm" size="small" label-width="120px">
+        <el-form-item label="机构类型" prop="organizationType">
+          <ai-select v-model="form.organizationType" :selectList="dict.getDict('financialOrganizationType')"
+                     @change="getProducts(),form.productId=null"/>
+        </el-form-item>
+        <el-form-item label="推荐产品" prop="productId">
+          <ai-select v-model="form.productId" :selectList="productOps" @change="getOrgId"/>
+        </el-form-item>
+        <el-form-item label="推荐顺序" prop="showIndex">
+          <el-input type="number" v-model.number="form.showIndex" placeholder="请输入" clearable/>
+        </el-form-item>
+      </el-form>
+    </ai-dialog>
+  </section>
+</template>
+
+<script>
+import {mapState} from "vuex";
+
+export default {
+  name: "productRecommend",
+  props: {
+    instance: Function,
+    dict: Object,
+    permissions: Function
+  },
+  computed: {
+    ...mapState(['user']),
+    isFinanceUser() {
+      return !!this.user.financeUser?.id
+    },
+    dialogTitle() {
+      return this.form.id ? "编辑推荐" : "新增推荐"
+    },
+    productOps() {
+      return this.productList.map(e => ({dictName: e.productName, dictValue: e.id})) || []
+    }
+  },
+  data() {
+    return {
+      search: {productName: ""},
+      page: {current: 1, size: 10, total: 0},
+      tableData: [],
+      colConfigs: [
+        {label: "产品名称", prop: "productName"},
+        {label: "机构类型", prop: "organizationType", dict: "financialOrganizationType", width: 120},
+        {label: "推荐顺序", prop: "showIndex", align: "center", width: 120},
+        {label: "机构名称", prop: "organizationName"},
+        {slot: "options"}
+      ],
+      dialog: false,
+      form: {},
+      rules: {
+        showIndex: [
+          {required: true, message: "请输入推荐顺序"},
+          {pattern: /^[1-7]$/, message: "请输入1~7之间的整数"}
+        ],
+        productId: [{required: true, message: "请选择推荐产品", trigger: "blur"}],
+        organizationType: [{required: true, message: "请选择机构类型"}],
+      },
+      productList: []
+    }
+  },
+  methods: {
+    getTableData() {
+      this.instance.post("/appfinancialproductrecommend/list", null, {
+        params: {...this.page, ...this.search}
+      }).then(res => {
+        if (res?.data) {
+          this.tableData = res.data?.records
+          this.page.total = res.data.total
+        }
+      })
+    },
+    handleEdit(row) {
+      this.dialog = true
+      this.form = JSON.parse(JSON.stringify(row))
+      this.getProducts()
+    },
+    handleDelete(ids) {
+      this.$confirm("是否要删除该推荐?").then(() => {
+        this.instance.post("/appfinancialproductrecommend/delete", null, {
+          params: {ids}
+        }).then(res => {
+          if (res?.code == 0) {
+            this.$message.success("删除成功!")
+            this.getTableData()
+          }
+        })
+      }).catch(() => 0)
+    },
+    submitAudit() {
+      this.$refs.PRForm.validate(v => {
+        if (v) {
+          this.instance.post("/appfinancialproductrecommend/addOrUpdate", this.form).then(res => {
+            if (res?.code == 0) {
+              this.$message.success("提交成功!")
+              this.getTableData()
+              this.dialog = false
+            }
+          })
+        }
+      })
+    },
+    getProducts() {
+      let {organizationType} = this.form
+      this.instance.post("/appfinancialproduct/list", null, {
+        params: {organizationType, size: 999, status: 1}
+      }).then(res => {
+        if (res?.data) {
+          this.productList = res.data?.records
+        }
+      })
+    },
+    getOrgId(productId) {
+      let product = this.productList.find(e => e.id == productId)
+      this.form.organizationId = product?.organizationId || ""
+      this.$forceUpdate()
+    }
+  },
+  created() {
+    this.getTableData()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.productRecommend {
+  height: 100%;
+
+  ::v-deep input[type="number"] {
+    line-height: 1px !important;
+
+    &::-webkit-outer-spin-button, &::-webkit-inner-spin-button {
+      -webkit-appearance: none !important;
+    }
+  }
+}
+</style>
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -7,71 +7,135 @@
        </template>
      </ai-title>
      <template #content>
-        <el-form size="small" label-width="160px">
-          <ai-card title="贷款申请">
-            <template #content>
-              <el-row type="flex" class="flexWrap">
-                <el-form-item label="产品名称">
-                  <el-row type="flex">
-                    {{ detail.productName }}
-                    <el-link type="primary"
-                             @click="$router.push({name:'27338cb83e77461dbd44356a6760df84',query:{id:detail.productId}})">
-                      产品详情
-                    </el-link>
-                  </el-row>
-                </el-form-item>
-                <el-form-item label="贷款银行">{{ detail.organizationName }}</el-form-item>
-                <el-form-item label="贷款金额(万)">{{ detail.loanAmount }}</el-form-item>
-                <el-form-item label="期望使用期限">{{ dict.getLabel('productRepaymentTimeline', detail.hopeLifespan) }}
-                </el-form-item>
-                <el-form-item label="企业主体" v-if="detail.enterpriseId">
-                  <el-row type="flex">
-                    {{ detail.enterpriseName }}
-                    <ai-dialog-btn text="企业详情" :dialog-title="detail.enterpriseName||'企业详情'">
-                      <enterprise-dialog v-if="detail.enterpriseId" :enterprise-id="detail.enterpriseId" :instance="instance" :dict="dict"/>
-                    </ai-dialog-btn>
-                  </el-row>
-                </el-form-item>
-                <el-form-item label="所在地区">{{ detail.areaName }}</el-form-item>
-                <el-form-item label="资金用途">{{ dict.getLabel('financialFundPurpose', detail.fundPurpose) }}
-                </el-form-item>
-                <el-form-item label="联系人">
-                  <el-row type="flex">
-                    {{ detail.name }}
-                    <ai-dialog-btn text="个人详情" :dialog-title="detail.name||'个人详情'">
-                      <person-credit-report :personId="detail.idNumber" :instance="instance" :dict="dict"/>
-                    </ai-dialog-btn>
-                  </el-row>
-                </el-form-item>
-                <el-form-item label="身份证号">{{ detail.idNumber }}</el-form-item>
-                <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
-                <el-form-item label="申请时间">{{ detail.createTime }}</el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item label="备注">{{ detail.remark }}</el-form-item>
-              </el-row>
-            </template>
-          </ai-card>
-          <ai-card title="办理结果" v-if="!isAuthing">
-            <template #content>
-              <el-row type="flex" class="flexWrap">
-                <el-form-item label="贷款进度">{{ dict.getLabel('financialLoanApplyStatus', detail.status) }}</el-form-item>
-                <el-form-item label="贷款银行">{{ detail.organizationName }}</el-form-item>
-                <el-form-item label="贷款经理">{{ detail.auditUserName }}</el-form-item>
-                <el-form-item label="联系方式 ">{{ detail.auditPhone }}</el-form-item>
-                <template v-if="detail.status==1">
-                  <el-form-item label="放款金额(万)">{{ detail.auditAmount }}</el-form-item>
-                  <el-form-item label="放款日期">{{ detail.loanDate }}</el-form-item>
-                  <el-form-item label="实际使用期限">{{ dict.getLabel('productRepaymentTimeline', detail.auditLifespan) }}
+        <el-form v-if="detail.id" size="small" label-width="160px">
+          <template v-if="isGuaranteeProduct">
+            <ai-card title="担保贷款申请">
+              <template #content>
+                <el-row type="flex" class="flexWrap">
+                  <el-form-item label="产品名称">
+                    <el-row type="flex">
+                      {{ detail.productName }}
+                      <el-link type="primary"
+                               @click="$router.push({name:'27338cb83e77461dbd44356a6760df84',query:{id:detail.productId}})">
+                        产品详情
+                      </el-link>
+                    </el-row>
                  </el-form-item>
-                </template>
-                <el-form-item label="操作时间">{{ detail.auditTime }}</el-form-item>
-              </el-row>
-              <el-row>
-                <el-form-item v-if="detail.status==2" label="备注">{{ detail.auditDescription }}</el-form-item>
-              </el-row>
-            </template>
-          </ai-card>
+                  <el-form-item label="担保机构">{{ detail.organizationName }}</el-form-item>
+                  <el-form-item label="企业主体" v-if="detail.enterpriseId">
+                    <el-row type="flex">
+                      {{ detail.enterpriseName }}
+                      <ai-dialog-btn text="企业详情" :dialog-title="detail.enterpriseName||'企业详情'">
+                        <enterprise-dialog v-if="detail.enterpriseId" :enterprise-id="detail.enterpriseId" :instance="instance" :dict="dict"/>
+                      </ai-dialog-btn>
+                    </el-row>
+                  </el-form-item>
+                  <el-form-item label="联系人">
+                    <el-row type="flex">
+                      {{ detail.name }}
+                      <ai-dialog-btn text="个人详情" :dialog-title="detail.name||'个人详情'">
+                        <person-credit-report :personId="detail.idNumber" :instance="instance" :dict="dict"/>
+                      </ai-dialog-btn>
+                    </el-row>
+                  </el-form-item>
+                  <el-form-item label="身份证号">{{ detail.idNumber }}</el-form-item>
+                  <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
+                  <el-form-item label="申请时间">{{ detail.createTime }}</el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="备注">{{ detail.remark }}</el-form-item>
+                </el-row>
+                <el-form-item label="身份证">
+                  <el-image class="thumb" :src="detail.idCardFrontFile.url" :preview-src-list="[detail.idCardFrontFile.url]"/>
+                  <el-image class="thumb mar-l16" :src="detail.idCardbackFile.url" :preview-src-list="[detail.idCardbackFile.url]"/>
+                </el-form-item>
+                <el-form-item label="营业执照">
+                  <el-image class="thumb" :src="detail.businessLicenseFile.url" :preview-src-list="[detail.businessLicenseFile.url]"/>
+                </el-form-item>
+              </template>
+            </ai-card>
+            <ai-card title="办理结果" v-if="!isAuthing">
+              <template #content>
+                <el-row type="flex" class="flexWrap">
+                  <el-form-item label="审核进度">{{ dict.getLabel('financialLoanApplyStatus', detail.status) }}</el-form-item>
+                  <el-form-item label="担保机构">{{ detail.organizationName }}</el-form-item>
+                  <el-form-item label="客户经理">{{ detail.auditUserName }}</el-form-item>
+                  <el-form-item label="联系方式 ">{{ detail.auditPhone }}</el-form-item>
+                  <el-form-item label="担保日期">{{ detail.loanDate }}</el-form-item>
+                  <el-form-item label="操作时间">{{ detail.auditTime }}</el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item v-if="detail.status==2" label="备注">{{ detail.auditDescription }}</el-form-item>
+                </el-row>
+              </template>
+            </ai-card>
+          </template>
+          <template v-else>
+            <ai-card title="贷款申请">
+              <template #content>
+                <el-row type="flex" class="flexWrap">
+                  <el-form-item label="产品名称">
+                    <el-row type="flex">
+                      {{ detail.productName }}
+                      <el-link type="primary"
+                               @click="$router.push({name:'27338cb83e77461dbd44356a6760df84',query:{id:detail.productId}})">
+                        产品详情
+                      </el-link>
+                    </el-row>
+                  </el-form-item>
+                  <el-form-item label="贷款银行">{{ detail.organizationName }}</el-form-item>
+                  <el-form-item label="贷款金额(万)">{{ detail.loanAmount }}</el-form-item>
+                  <el-form-item label="期望使用期限">{{ dict.getLabel('productRepaymentTimeline', detail.hopeLifespan) }}
+                  </el-form-item>
+                  <el-form-item label="企业主体" v-if="detail.enterpriseId">
+                    <el-row type="flex">
+                      {{ detail.enterpriseName }}
+                      <ai-dialog-btn text="企业详情" :dialog-title="detail.enterpriseName||'企业详情'">
+                        <enterprise-dialog v-if="detail.enterpriseId" :enterprise-id="detail.enterpriseId" :instance="instance" :dict="dict"/>
+                      </ai-dialog-btn>
+                    </el-row>
+                  </el-form-item>
+                  <el-form-item label="所在地区">{{ detail.areaName }}</el-form-item>
+                  <el-form-item label="资金用途">{{ dict.getLabel('financialFundPurpose', detail.fundPurpose) }}
+                  </el-form-item>
+                  <el-form-item label="联系人">
+                    <el-row type="flex">
+                      {{ detail.name }}
+                      <ai-dialog-btn text="个人详情" :dialog-title="detail.name||'个人详情'">
+                        <person-credit-report :personId="detail.idNumber" :instance="instance" :dict="dict"/>
+                      </ai-dialog-btn>
+                    </el-row>
+                  </el-form-item>
+                  <el-form-item label="身份证号">{{ detail.idNumber }}</el-form-item>
+                  <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
+                  <el-form-item label="申请时间">{{ detail.createTime }}</el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item label="备注">{{ detail.remark }}</el-form-item>
+                </el-row>
+              </template>
+            </ai-card>
+            <ai-card title="办理结果" v-if="!isAuthing">
+              <template #content>
+                <el-row type="flex" class="flexWrap">
+                  <el-form-item label="贷款进度">{{ dict.getLabel('financialLoanApplyStatus', detail.status) }}</el-form-item>
+                  <el-form-item label="贷款银行">{{ detail.organizationName }}</el-form-item>
+                  <el-form-item label="贷款经理">{{ detail.auditUserName }}</el-form-item>
+                  <el-form-item label="联系方式 ">{{ detail.auditPhone }}</el-form-item>
+                  <template v-if="detail.status==1">
+                    <el-form-item label="放款金额(万)">{{ detail.auditAmount }}</el-form-item>
+                    <el-form-item label="放款日期">{{ detail.loanDate }}</el-form-item>
+                    <el-form-item label="实际使用期限">{{ dict.getLabel('productRepaymentTimeline', detail.auditLifespan) }}
+                    </el-form-item>
+                  </template>
+                  <el-form-item label="操作时间">{{ detail.auditTime }}</el-form-item>
+                </el-row>
+                <el-row>
+                  <el-form-item v-if="detail.status==2" label="备注">{{ detail.auditDescription }}</el-form-item>
+                </el-row>
+              </template>
+            </ai-card>
+          </template>
        </el-form>
      </template>
    </ai-detail>
@@ -81,16 +145,26 @@
          <ai-select v-model="form.auditStatus" :selectList="dict.getDict('enterpriseAuditStatus')"/>
        </el-form-item>
        <template v-if="form.auditStatus==1">
-          <el-form-item label="放款金额(万)" prop="amount">
-            <el-input v-model="form.amount" placeholder="请输入"/>
-          </el-form-item>
-          <el-form-item label="使用期限" prop="auditLifespan">
-            <ai-select v-model="form.auditLifespan" placeholder="请选择"
-                       :selectList="dict.getDict('productRepaymentTimeline')"/>
-          </el-form-item>
-          <el-form-item label="放款日期" prop="loanDate">
-            <el-date-picker v-model="form.loanDate" placeholder="请选择" clearable value-format="yyyy-MM-dd"/>
-          </el-form-item>
+          <template v-if="isGuaranteeProduct">
+            <el-form-item label="担保日期" prop="loanDate">
+              <el-date-picker v-model="form.loanDate" placeholder="请选择" clearable value-format="yyyy-MM-dd"/>
+            </el-form-item>
+            <el-form-item label="审批意见">
+              <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入" maxlength="200" show-word-limit/>
+            </el-form-item>
+          </template>
+          <template v-else>
+            <el-form-item label="放款金额(万)" prop="amount">
+              <el-input v-model="form.amount" placeholder="请输入"/>
+            </el-form-item>
+            <el-form-item label="使用期限" prop="auditLifespan">
+              <ai-select v-model="form.auditLifespan" placeholder="请选择"
+                         :selectList="dict.getDict('productRepaymentTimeline')"/>
+            </el-form-item>
+            <el-form-item label="放款日期" prop="loanDate">
+              <el-date-picker v-model="form.loanDate" placeholder="请选择" clearable value-format="yyyy-MM-dd"/>
+            </el-form-item>
+          </template>
        </template>
        <el-form-item v-else-if="form.auditStatus==2" label="审批意见" prop="auditDescription">
          <el-input type="textarea" v-model="form.auditDescription" placeholder="请输入" maxlength="200" show-word-limit/>
@@ -120,7 +194,8 @@ export default {
    },
    isAuthing() {
      return this.detail.status == "0"
-    }
+    },
+    isGuaranteeProduct: v => v.detail.organizationType == 2
  },
  data() {
    return {
@@ -134,7 +209,7 @@ export default {
          {pattern: /\d+/, message: "请输入 正确的放款金额"},
        ],
        auditLifespan: [{required: true, message: "请选择 使用期限"}],
-        loanDate: [{required: true, message: "请选择 放款日期"}],
+        loanDate: [{required: true, message: "请选择 日期"}],
        auditDescription: [{required: true, message: "请输入 审批意见"}],
      },
      personCR: false
@@ -194,5 +269,10 @@ export default {
  .el-date-editor {
    width: 100%;
  }
+
+  .thumb {
+    width: 320px;
+    height: 180px;
+  }
 }
 </style>
--- a/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanList.vue
@@ -26,6 +26,17 @@
                </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">
+                  <el-table-column slot="expand" type="expand">
+                    <template slot-scope="{row}">
+                      <ai-wrapper>
+                        <ai-info-item labelWidth="200px" v-for="op in desConfigs(row)" :key="op.prop" v-bind="op">
+                          <custom-render v-if="op.render" :row="row" :render="op.render"/>
+                          <p v-else-if="op.dict" v-text="dict.getLabel(op.dict,row[op.prop])"/>
+                          <p v-else v-text="row[op.prop]"/>
+                        </ai-info-item>
+                      </ai-wrapper>
+                    </template>
+                  </el-table-column>
                  <el-table-column slot="options" label="操作" fixed="right" align="center">
                    <template slot-scope="{row}">
                      <el-button type="text" @click="showDetail(row.id)">详情</el-button>
@@ -50,7 +61,19 @@ import LoanSta from "./loanSta";

 export default {
  name: "loanList",
-  components: {LoanSta},
+  components: {
+    LoanSta,
+    customRender: {
+      props: {
+        row: Object,
+        render: Function
+      },
+      render(h) {
+        const {row, render} = this.$props
+        return render(h, {row})
+      }
+    }
+  },
  props: {
    instance: Function,
    dict: Object,
@@ -60,15 +83,12 @@ export default {
    ...mapState(['user']),
    colConfigs() {
      return [
+        {slot: "expand"},
        {label: "产品名称", prop: "productName"},
+        {label: "企业主体", prop: "enterpriseName"},
+        {label: "申请时间", prop: "createTime", width: 160},
        {label: "联系人", prop: "name"},
        {label: "联系方式", prop: "phone"},
-        {label: "身份证号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 160},
-        {label: "企业主体", prop: "enterpriseName"},
-        {label: "贷款金额(万)", prop: "loanAmount"},
-        {label: "申请时间", prop: "createTime", width: 160},
-        {label: "贷款机构", prop: "organizationName"},
-        {label: "机构类型", prop: "organizationType", dict: "financialOrganizationType"},
        {label: "状态", prop: "status", align: "center", dict: "financialLoanApplyStatus"},
        {slot: "options"}
      ]
@@ -102,6 +122,22 @@ export default {
      this.search.applyEndDate = this.search.applyTime?.[1].substring(0, 10)
      this.getTableData()
    },
+    desConfigs(row) {
+      let ops = []
+      if (row.organizationType == 2) {//担保产品
+        ops = [
+          {label: "担保机构", prop: "organizationName"},
+        ]
+      } else {//金融产品
+        ops = [
+          {label: "身份证号", render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 160},
+          {label: "贷款金额(万)", prop: "loanAmount"},
+          {label: "贷款机构", prop: "organizationName"},
+          {label: "机构类型", prop: "organizationType", dict: "financialOrganizationType"},
+        ]
+      }
+      return ops
+    }
  },
  created() {
    this.$dict.load('financialLoanApplyStatus')