整合

2022-07-06 12:08:28 +08:00
parent 83a30fda7d
commit eb408e0bfb
4 changed files with 59 additions and 44 deletions
--- a/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
+++ b/project/xiushan/apps/finance/AppLoanAudit/loanDetail.vue
@@ -27,7 +27,9 @@
                <el-form-item label="企业主体" v-if="detail.enterpriseId">
                  <el-row type="flex">
                    {{ detail.enterpriseName }}
-                    <el-link type="primary" @click="isShow=true">企业详情</el-link>
+                    <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>
@@ -36,7 +38,9 @@
                <el-form-item label="联系人">
                  <el-row type="flex">
                    {{ detail.name }}
-                    <person-credit-report :person="detail" :instance="instance" :dict="dict"/>
+                    <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>
@@ -93,20 +97,6 @@
        </el-form-item>
      </el-form>
    </ai-dialog>
-    <ai-dialog class="dialog" :title="detail.enterpriseName||'企业详情'" :visible.sync="isShow" width="1200px" customFooter>
-      <enterprise-dialog v-if="detail.enterpriseId" :enterprise-id="detail.enterpriseId" :instance="instance"
-                         :dict="dict"/>
-      <template #footer>
-        <el-button @click="isShow=false">关闭</el-button>
-      </template>
-    </ai-dialog>
-    <ai-dialog class="dialog" :title="detail.enterpriseName||'企业详情'" :visible.sync="isShow" width="1200px" customFooter>
-      <enterprise-dialog v-if="detail.enterpriseId" :enterprise-id="detail.enterpriseId" :instance="instance"
-                         :dict="dict"/>
-      <template #footer>
-        <el-button @click="isShow=false">关闭</el-button>
-      </template>
-    </ai-dialog>
  </section>
 </template>

@@ -114,10 +104,11 @@
 import {mapState} from "vuex";
 import EnterpriseDialog from "../../../components/enterpriseDialog";
 import PersonCreditReport from "../../../components/personCreditReport";
+import AiDialogBtn from "../../../components/AiDialogBtn";

 export default {
  name: "loanDetail",
-  components: {PersonCreditReport, EnterpriseDialog},
+  components: {AiDialogBtn, PersonCreditReport, EnterpriseDialog},
  props: {
    instance: Function,
    dict: Object,
@@ -147,7 +138,6 @@ export default {
        loanDate: [{required: true, message: "请选择 放款日期"}],
        auditDescription: [{required: true, message: "请输入 审批意见"}],
      },
-      isShow: false,
      personCR: false
    }
  },
--- a/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
+++ b/project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue
@@ -26,14 +26,18 @@
                <el-form-item label="企业主体" v-if="detail.applyType==1">
                  <el-row type="flex">
                    {{ detail.enterpriseName }}
-                    <el-link type="primary" @click="isShow=true">企业详情</el-link>
+                    <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 v-else/>
                <el-form-item label="联系人">
                  <el-row type="flex">
                    <div v-text="detail.name"/>
-                    <person-credit-report :person="detail" :instance="instance" :dict="dict"/>
+                    <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.areaName }}</el-form-item>
@@ -45,14 +49,6 @@
            </template>
          </ai-card>
        </el-form>
-        <ai-dialog class="dialog" :title="detail.enterpriseName||'企业详情'" :visible.sync="isShow" width="1200px"
-                   customFooter>
-          <enterprise-dialog v-if="detail.enterpriseId" :enterprise-id="detail.enterpriseId" :instance="instance"
-                             :dict="dict"/>
-          <template #footer>
-            <el-button @click="isShow=false">关闭</el-button>
-          </template>
-        </ai-dialog>
      </template>
    </ai-detail>
  </section>
@@ -62,10 +58,11 @@
 import {mapState} from "vuex";
 import EnterpriseDialog from "../../../components/enterpriseDialog";
 import PersonCreditReport from "../../../components/personCreditReport";
+import AiDialogBtn from "../../../components/AiDialogBtn";

 export default {
  name: "needsDetail",
-  components: {PersonCreditReport, EnterpriseDialog},
+  components: {AiDialogBtn, PersonCreditReport, EnterpriseDialog},
  props: {
    instance: Function,
    dict: Object,
@@ -81,7 +78,6 @@ export default {
    return {
      detail: {},
      info: {},
-      isShow: false,
    }
  },
  methods: {
--- a/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
+++ b/project/xiushan/apps/financing/AppGrabLog/grabDetail.vue
@@ -23,15 +23,17 @@
                </el-form-item>
                <el-form-item label="企业主体" v-if="detail.applyType==1">
                  {{ detail.enterpriseName }}
-                  <el-link type="primary" @click="showEnterpriseDetail=true">
-                    企业详情
-                  </el-link>
+                  <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-form-item>
                <el-form-item v-else/>
                <el-form-item label="联系人">
                  <el-row type="flex">
                    {{ detail.createUserName }}
-                    <person-credit-report :person="detail" :instance="instance" :dict="dict"/>
+                    <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.areaName }}</el-form-item>
@@ -75,14 +77,6 @@
        </el-form-item>
      </el-form>
    </ai-dialog>
-    <ai-dialog class="dialog" :title="detail.enterpriseName||'企业详情'" :visible.sync="showEnterpriseDetail" width="1200px"
-               customFooter>
-      <enterprise-dialog v-if="detail.enterpriseId" :enterprise-id="detail.enterpriseId" :instance="instance"
-                         :dict="dict"/>
-      <template #footer>
-        <el-button @click="showEnterpriseDetail=false">关闭</el-button>
-      </template>
-    </ai-dialog>
  </section>
 </template>

@@ -90,10 +84,12 @@
 import {mapState} from "vuex";
 import EnterpriseDialog from "../../../components/enterpriseDialog";
 import PersonCreditReport from "../../../components/personCreditReport";
+import AiDialogBtn from "../../../components/AiDialogBtn";
+

 export default {
  name: "grabDetail",
-  components: {PersonCreditReport, EnterpriseDialog},
+  components: {AiDialogBtn, PersonCreditReport, EnterpriseDialog},
  props: {
    instance: Function,
    dict: Object,
@@ -115,7 +111,6 @@ export default {
        auditLifespan: [{required: true, message: "请选择 使用期限"}],
        loanDate: [{required: true, message: "请选择 放款日期"}],
      },
-      showEnterpriseDetail: false
    }
  },
  methods: {