From 1ec38cb03d7bde332fdcf5788c2d87ebdfb71a48 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 19 Sep 2022 11:31:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E9=99=A9=E4=BA=A7=E5=93=81=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E8=B0=83=E6=95=B4=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../finance/AppGuaranteeProduct/AppGuaranteeProduct.vue   | 5 +++--
 .../apps/finance/AppGuaranteeProduct/productAdd.vue       | 7 +++----
 .../apps/finance/AppGuaranteeProduct/productDetail.vue    | 5 +++--
 .../apps/finance/AppGuaranteeProduct/productList.vue      | 8 +++++---
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
index 7acd89a8..0ffab8c3 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/AppGuaranteeProduct.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="AppGuaranteeProduct">
-    <component :is="currentComponent" :instance="instance" :dict="dict" :permissions="permissions"/>
+    <component :is="currentComponent" v-bind="$props"/>
   </section>
 </template>
 
@@ -18,7 +18,8 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    permissions: Function
+    permissions: Function,
+    menuName: {default: "担保产品"}
   },
   computed: {
     currentComponent() {
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
index b6b3d89a..836f2181 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productAdd.vue
@@ -54,12 +54,11 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    permissions: Function
+    permissions: Function,
+    menuName: String
   },
   computed: {
-    addTitle() {
-      return !!this.$route.query.id ? "编辑担保产品" : "添加担保产品"
-    },
+    addTitle: v => `${!!v.$route.query.id ? "编辑" : "添加"}${v.menuName}`,
     rules() {
       return {
         productName: [{required: true, message: "请输入产品名称", trigger: 'blur'}],
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
index efb22180..971b677d 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <section class="productDetail">
     <ai-detail>
-      <ai-title slot="title" title="担保产品详情" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
+      <ai-title slot="title" :title="`${menuName}详情`" isShowBottomBorder isShowBack @onBackClick="$router.push({query:{}})">
         <template #rightBtn>
           <el-button v-if="isAdmin&&detail.status==0" type="primary" @click="dialog=true">审核</el-button>
         </template>
@@ -63,7 +63,8 @@ export default {
   props: {
     instance: Function,
     dict: Object,
-    permissions: Function
+    permissions: Function,
+    menuName: String
   },
   computed: {
     ...mapState(['user']),
diff --git a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
index d348f9f4..75da1b4c 100644
--- a/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
+++ b/project/xiushan/apps/finance/AppGuaranteeProduct/productList.vue
@@ -60,11 +60,12 @@ export default {
   },
   computed: {
     ...mapState(['user']),
-    isFinanceUser: v => !!v.user.financeUser?.id && v.user.financeUser.organizationType == 2
+    isFinanceUser: v => !!v.user.financeUser?.id && v.user.financeUser.organizationType == 2,
+    queryType: v => v?.$route.query.queryType || 1
   },
   data() {
     return {
-      search: {productName: "", queryType: 1},
+      search: {productName: ""},
       page: {current: 1, size: 10, total: 0},
       tableData: [],
       colConfigs: [
@@ -80,8 +81,9 @@ export default {
   },
   methods: {
     getTableData() {
+      const {queryType} = this
       this.instance.post("/app/appfinancialproduct/list", null, {
-        params: {...this.page, ...this.search}
+        params: {...this.page, ...this.search, queryType}
       }).then(res => {
         if (res?.data) {
           this.tableData = res.data?.records.map(e => {