From 1dfe676da9c6fe4c72c0a7be490a088a88715bc9 Mon Sep 17 00:00:00 2001
From: 77 <77@77.com>
Date: Mon, 20 May 2024 12:32:47 +0800
Subject: [PATCH] 123

---
 src/components/ImageUpload/index.vue          |  2 ++
 src/components/ImageUpload2/index.vue         |  2 ++
 src/router/index.js                           | 25 +++++++++++++++++++
 src/views/dk/AgreementSetting/index.vue       | 20 +++++++--------
 src/views/dk/HomeSetting/index.vue            |  4 +--
 src/views/dk/LoansSetting/index.vue           |  4 +--
 src/views/dk/dkCustomer/index.vue             |  5 ++--
 .../add-or-update-tenant-package.vue          | 12 ++++-----
 8 files changed, 52 insertions(+), 22 deletions(-)

diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 9c92e86..d34a0de 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -45,6 +45,7 @@
 <script>
 import { getToken } from "@/utils/auth";
 import { listByIds, delOss } from "@/api/system/oss";
+import store from '@/store'
 
 export default {
   props: {
@@ -81,6 +82,7 @@ export default {
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
+        "Tenant-Id" : store.getters.tenantId
       },
       fileList: []
     };
diff --git a/src/components/ImageUpload2/index.vue b/src/components/ImageUpload2/index.vue
index fb90f29..5f0f073 100644
--- a/src/components/ImageUpload2/index.vue
+++ b/src/components/ImageUpload2/index.vue
@@ -46,6 +46,7 @@
 <script>
 import { getToken } from "@/utils/auth";
 import { listByIds, delOss } from "@/api/system/oss";
+import store from '@/store'
 
 export default {
   props: {
@@ -86,6 +87,7 @@ export default {
       uploadImgUrl: process.env.VUE_APP_BASE_API + "/system/oss/upload", // 上传的图片服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
+        "Tenant-Id" : store.getters.tenantId
       },
       fileList: []
     };
diff --git a/src/router/index.js b/src/router/index.js
index 42e6fa2..e841535 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -90,6 +90,31 @@ export const constantRoutes = [
         meta: { title: '个人中心', icon: 'user' }
       }
     ]
+  },
+  {
+    path: '/dk',
+    component: Layout,
+    hidden: true,
+    children: [
+      {
+        path: 'transAccount/:borrowId(\\d+)',
+        component: (resolve) => require(['@/views/dk/borrow/trans-account'], resolve),
+        name: 'TransAccount',
+        meta: { title: '转账记录' }
+      },
+      {
+        path: 'contract/:borrowId(\\d+)',
+        component: (resolve) => require(['@/views/dk/borrow/contract'], resolve),
+        name: 'Contract',
+        meta: { title: '合同保单' }
+      },
+      {
+        path: 'contractTemplate/:borrowTradeNo(\\w+)',
+        component: (resolve) => require(['@/views/dk/borrow/contract-template'], resolve),
+        name: 'ContractTemplate',
+        meta: { title: '合同' }
+      }
+    ]
   }
 ]
 
diff --git a/src/views/dk/AgreementSetting/index.vue b/src/views/dk/AgreementSetting/index.vue
index b3958d1..2ba64cf 100644
--- a/src/views/dk/AgreementSetting/index.vue
+++ b/src/views/dk/AgreementSetting/index.vue
@@ -2,33 +2,33 @@
   <div class="app-container">
     <el-tabs v-model="activeName" type="card">
       <el-tab-pane label="借款协议" name="loansAgreement">
-        <el-button type="primary" size="mini" v-if="!loansAgreement" @click="showEdit('loansAgreement')">编辑</el-button>
-        <el-button :loading="buttonLoading" v-if="loansAgreement"  type="primary" size="mini" @click="submitForm2('loansAgreement')">保存</el-button>
+        <el-button type="primary" size="mini" v-hasPermi="['dk:AgreementSetting:edit']" v-if="!loansAgreement" @click="showEdit('loansAgreement')">编辑</el-button>
+        <el-button :loading="buttonLoading" v-hasPermi="['dk:AgreementSetting:edit']" v-if="loansAgreement"  type="primary" size="mini" @click="submitForm2('loansAgreement')">保存</el-button>
         <div v-if="!loansAgreement" v-html="form.loansAgreement" style="width: 98%" />
         <!--        <editor v-if="privacyAgreement" v-model="form.privacyAgreement" :min-height="192"></editor>-->
         <wang-edit v-if="loansAgreement" v-model="form.loansAgreement" :min-height="800" />
       </el-tab-pane>
       <el-tab-pane label="服务协议" name="serviceAgreement">
-        <el-button type="primary" size="mini" v-if="!serviceAgreement" @click="showEdit('serviceAgreement')">编辑</el-button>
-        <el-button :loading="buttonLoading" v-if="serviceAgreement" type="primary" size="mini" @click="submitForm2('serviceAgreement')">保存</el-button>
+        <el-button type="primary" size="mini"  v-hasPermi="['dk:AgreementSetting:edit']" v-if="!serviceAgreement" @click="showEdit('serviceAgreement')">编辑</el-button>
+        <el-button :loading="buttonLoading"  v-hasPermi="['dk:AgreementSetting:edit']" v-if="serviceAgreement" type="primary" size="mini" @click="submitForm2('serviceAgreement')">保存</el-button>
         <div v-if="!serviceAgreement" v-html="form.serviceAgreement" style="width: 98%" />
         <editor v-if="serviceAgreement" v-model="form.serviceAgreement" :min-height="192"></editor>
       </el-tab-pane>
       <el-tab-pane label="授权协议" name="authAgreement">
-        <el-button type="primary" size="mini" v-if="!authAgreement" @click="showEdit('authAgreement')">编辑</el-button>
-        <el-button :loading="buttonLoading" v-if="authAgreement" type="primary" size="mini" @click="submitForm2('authAgreement')">保存</el-button>
+        <el-button type="primary" size="mini"  v-hasPermi="['dk:AgreementSetting:edit']" v-if="!authAgreement" @click="showEdit('authAgreement')">编辑</el-button>
+        <el-button :loading="buttonLoading"  v-hasPermi="['dk:AgreementSetting:edit']" v-if="authAgreement" type="primary" size="mini" @click="submitForm2('authAgreement')">保存</el-button>
         <div v-if="!authAgreement" v-html="form.authAgreement" style="width: 98%" />
         <editor v-if="authAgreement" v-model="form.authAgreement" :min-height="192"></editor>
       </el-tab-pane>
       <el-tab-pane label="法律责任" name="lawAgreement">
-        <el-button type="primary" size="mini" v-if="!lawAgreement" @click="showEdit('lawAgreement')">编辑</el-button>
-        <el-button :loading="buttonLoading" v-if="lawAgreement" type="primary" size="mini" @click="submitForm2('lawAgreement')">保存</el-button>
+        <el-button type="primary" size="mini"  v-hasPermi="['dk:AgreementSetting:edit']" v-if="!lawAgreement" @click="showEdit('lawAgreement')">编辑</el-button>
+        <el-button :loading="buttonLoading"  v-hasPermi="['dk:AgreementSetting:edit']" v-if="lawAgreement" type="primary" size="mini" @click="submitForm2('lawAgreement')">保存</el-button>
         <div v-if="!lawAgreement" v-html="form.lawAgreement" style="width: 98%" />
         <editor v-if="lawAgreement" v-model="form.lawAgreement" :min-height="192"></editor>
       </el-tab-pane>
       <el-tab-pane label="合同模板" name="contractTemplate">
-        <el-button type="primary" size="mini" v-if="!contractTemplate" @click="showEdit('contractTemplate')">编辑</el-button>
-        <el-button :loading="buttonLoading" v-if="contractTemplate" type="primary" size="mini" @click="submitForm2('contractTemplate')">保存</el-button>
+        <el-button type="primary" size="mini"  v-hasPermi="['dk:AgreementSetting:edit']" v-if="!contractTemplate" @click="showEdit('contractTemplate')">编辑</el-button>
+        <el-button :loading="buttonLoading"  v-hasPermi="['dk:AgreementSetting:edit']" v-if="contractTemplate" type="primary" size="mini" @click="submitForm2('contractTemplate')">保存</el-button>
         <div v-if="!contractTemplate" v-html="form.contractTemplate" style="width: 98%" />
         <editor v-if="contractTemplate" v-model="form.contractTemplate" :min-height="192"></editor>
       </el-tab-pane>
diff --git a/src/views/dk/HomeSetting/index.vue b/src/views/dk/HomeSetting/index.vue
index eb5e493..426eaaf 100644
--- a/src/views/dk/HomeSetting/index.vue
+++ b/src/views/dk/HomeSetting/index.vue
@@ -8,7 +8,7 @@
       </el-row>-->
       <el-row>
         <el-form-item label="banner图" prop="bannerOne">
-          <imageUpload v-model="form.bannerOne"/>
+          <ImageUpload2 v-model="form.bannerOne"/>
         </el-form-item>
       </el-row>
       <el-row>
@@ -59,7 +59,7 @@
         </el-form-item>
       </el-row>-->
       <el-form-item>
-        <el-button :loading="buttonLoading" type="primary" size="mini" @click="submitForm">保存</el-button>
+        <el-button :loading="buttonLoading"  v-hasPermi="['dk:HomeSetting:edit']" type="primary" size="mini" @click="submitForm">保存</el-button>
       </el-form-item>
     </el-form>
   </div>
diff --git a/src/views/dk/LoansSetting/index.vue b/src/views/dk/LoansSetting/index.vue
index 53bbe52..adfe2bd 100644
--- a/src/views/dk/LoansSetting/index.vue
+++ b/src/views/dk/LoansSetting/index.vue
@@ -38,8 +38,8 @@
         </el-form-item>
       </el-row>
       <el-form-item>
-        <el-button :disabled="!formDisable" type="primary" size="mini" @click="formDisable = false">编辑</el-button>
-        <el-button :disabled="formDisable" :loading="buttonLoading" type="primary" size="mini" @click="submitForm">保存</el-button>
+        <el-button :disabled="!formDisable"  v-hasPermi="['dk:LoansSetting:edit']" type="primary" size="mini" @click="formDisable = false">编辑</el-button>
+        <el-button :disabled="formDisable"  v-hasPermi="['dk:LoansSetting:edit']" :loading="buttonLoading" type="primary" size="mini" @click="submitForm">保存</el-button>
       </el-form-item>
     </el-form>
   </div>
diff --git a/src/views/dk/dkCustomer/index.vue b/src/views/dk/dkCustomer/index.vue
index a4338b1..d1269fe 100644
--- a/src/views/dk/dkCustomer/index.vue
+++ b/src/views/dk/dkCustomer/index.vue
@@ -96,6 +96,7 @@
           <el-button
               size="mini"
               type="text"
+              v-hasPermi="['dk:dkCustomer:edit']"
               @click="handleUpdateAccount(scope.row)"
           >修改余额
           </el-button>
@@ -108,8 +109,8 @@
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
             <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
             <el-dropdown-menu slot="dropdown">
-              <el-dropdown-item command="handleUpdatePwd" icon="el-icon-key">重置密码</el-dropdown-item>
-              <el-dropdown-item command="handleLogoOut" icon="el-icon-close"><span style="color: red">强制APP下线</span></el-dropdown-item>
+              <el-dropdown-item v-hasPermi="['dk:dkCustomer:edit']" command="handleUpdatePwd" icon="el-icon-key">重置密码</el-dropdown-item>
+              <el-dropdown-item v-hasPermi="['dk:dkCustomer:edit']" command="handleLogoOut" icon="el-icon-close"><span style="color: red">强制APP下线</span></el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
diff --git a/src/views/system/tenantPackage/add-or-update-tenant-package.vue b/src/views/system/tenantPackage/add-or-update-tenant-package.vue
index 16de6ee..a23c5dd 100644
--- a/src/views/system/tenantPackage/add-or-update-tenant-package.vue
+++ b/src/views/system/tenantPackage/add-or-update-tenant-package.vue
@@ -52,7 +52,7 @@ export default {
       menuOptions: [],
       borrowList: [],
       form:{
-        id: undefined,
+        packageId: undefined,
         packageName: undefined,
         menuCheckStrictly: true,
         remark: undefined,
@@ -69,19 +69,19 @@ export default {
 
   },
   methods: {
-    init (id) {
-      this.form.id = id || undefined;
+    init (packageId) {
+      this.form.packageId = packageId || undefined;
       this.open = true;
       this.title = "新增租户套餐";
       this.$nextTick(() => {
         this.$refs['form'].resetFields();
         this.form.menuIds = undefined
-        if(this.form.id){
+        if(this.form.packageId){
           this.title = "修改租户";
-          getTenantPackage(id).then(response => {
+          getTenantPackage(packageId).then(response => {
             this.form = response.data;
           });
-          tenantPackageMenuTreeselect(id).then(res => {
+          tenantPackageMenuTreeselect(packageId).then(res => {
             this.menuOptions = res.data.menus;
             let checkedKeys = res.data.checkedKeys
             checkedKeys.forEach((v) => {