From 6626316a7f42f779584475c5964701b17bdafa88 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Sun, 29 Sep 2024 10:22:35 +0800
Subject: [PATCH] fix

---
 src/layouts/header/index.vue                  |  1 -
 src/pages/index/list/index.vue                |  2 +-
 src/pages/manage/index/index.vue              | 26 +++++++----------
 src/pages/manage/list/agent/electricRate.vue  |  1 +
 src/pages/manage/list/agent/waterRate.vue     |  2 +-
 .../apply/creditEvaluation/basic.vue          |  1 -
 .../apply/creditEvaluation/rating.vue         | 29 +++++++++++++++++--
 .../manage/list/corporateLoans/management.vue |  2 +-
 .../list/foreignExchange/settlement.vue       |  6 ++--
 src/store/modules/user.js                     |  6 +++-
 src/styles/dialog.scss                        |  2 +-
 11 files changed, 51 insertions(+), 27 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index e396131..e0e5663 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -72,7 +72,6 @@ export default {
     '$route.path': {
       handler (newVal) {
         this.$nextTick(() => {
-          console.log(newVal)
           if (newVal === '/index/list') {
             this.$refs.exitHeader.style.backgroundColor = 'rgb(250, 250, 250)'
           } else {
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 25a8fb8..88b186b 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -13,7 +13,7 @@
 
     <div class="sth international cp" @click="toPart('/counter', true)">
       <!-- <img width="100%" v-lazy="lazy1" alt="" @click="toPart('/counter')">  -->
-      <img width="100%" v-lazy="lazy2" alt="" @click="showComing" />
+      <img width="100%" v-lazy="lazy2" alt="" />
       <!-- src="@/assets/img/integrated-counter.png" -->
       <div class="name" @click="toPart('/counter', true)">信贷部</div>
     </div>
diff --git a/src/pages/manage/index/index.vue b/src/pages/manage/index/index.vue
index 9621099..10f771d 100644
--- a/src/pages/manage/index/index.vue
+++ b/src/pages/manage/index/index.vue
@@ -1,9 +1,9 @@
 <template>
-  <!-- :style="full?'height:100vh;':'height: 80vh;'" -->
-  <div class="box" :class="full || isCredit ? 'h-4/5' : ''">
+  <!-- :style="fullScreen?'height:100vh;':'height: 80vh;'" -->
+  <div class="box" :class="fullScreen || isCredit ? 'h-4/5' : ''">
     <div class="nav">
-      <!-- <div class="top" :style="full?'border-radius:0':'border-top-left-radius: 20px;'">    select-none -->
-      <div class="top" :style="full ? 'border-radius:0' : 'border-top-left-radius: 20px;'">
+      <!-- <div class="top" :style="fullScreen?'border-radius:0':'border-top-left-radius: 20px;'">    select-none -->
+      <div class="top" :style="fullScreen ? 'border-radius:0' : 'border-top-left-radius: 20px;'">
         <p style="margin:auto">商业银行系统</p>
       </div>
       <!-- <div class="body2">
@@ -15,9 +15,10 @@
       <!-- <navbar class="body"></navbar> -->
     </div>
     <div class="manage-layout">
-      <div class="top" :style="full ? 'border-radius:0' : 'border-top-right-radius: 20px;'">
-        <img v-show="!full && !isCredit" src="../../../assets/svg/fullscreen.svg" alt="" @click="handleFullscreen">
-        <img v-show="full" src="../../../assets/svg/shrink.svg" alt="" @click="shrink">
+      <div class="top" :style="fullScreen ? 'border-radius:0' : 'border-top-right-radius: 20px;'">
+        <img v-show="!fullScreen && !isCredit" src="../../../assets/svg/fullscreen.svg" alt=""
+          @click="handleFullscreen">
+        <img v-show="fullScreen" src="../../../assets/svg/shrink.svg" alt="" @click="shrink">
         <i @click="close" class="el-icon-close"></i>
       </div>
       <div class="manage-content">
@@ -37,7 +38,7 @@ export default {
   name: 'index',
   data () {
     return {
-      fullscreen: this.$store.state.system.fullScreen,// 是否全屏--store读取
+
     }
   },
   components: {
@@ -56,22 +57,15 @@ export default {
       this.$router.push('/counter/list/')
     },
     handleFullscreen () {
-      this.fullscreen = true
       this.$store.commit('system/changeFullscreen', true)
     },
     shrink () {
-      this.fullscreen = false
       this.$store.commit('system/changeFullscreen', false)
     },
 
   },
   computed: {
-    full: function () {
-      return this.$store.state.system.fullScreen
-    },
-    ...mapState({
-      isCredit: state => state.system.isCredit
-    })
+    ...mapState('system', ['fullScreen', 'isCredit'])
   }
 };
 </script>
diff --git a/src/pages/manage/list/agent/electricRate.vue b/src/pages/manage/list/agent/electricRate.vue
index 7a92990..392ca41 100644
--- a/src/pages/manage/list/agent/electricRate.vue
+++ b/src/pages/manage/list/agent/electricRate.vue
@@ -358,6 +358,7 @@ export default {
         { answerId: 730, emptyOne: '', emptyTwo: '', operationIds: preId + ',730', type: '' },
         { answerId: 727, emptyOne: 113, emptyTwo: form.paymentMoney, operationIds: preId + ',727', type: 3 },
         { answerId: 728, emptyOne: 114, emptyTwo: form.monthlyWithholding, operationIds: preId + ',728', type: 1 },
+        { answerId: 729, emptyOne: 17, emptyTwo: form.drawPassword, operationIds: preId + ',729', type: 3 },
       )
       let params = {
         parentId: preId,
diff --git a/src/pages/manage/list/agent/waterRate.vue b/src/pages/manage/list/agent/waterRate.vue
index 9ed5485..541c9eb 100644
--- a/src/pages/manage/list/agent/waterRate.vue
+++ b/src/pages/manage/list/agent/waterRate.vue
@@ -335,7 +335,7 @@ export default {
         { answerId: 717, emptyOne: 112, emptyTwo: form.houseId, operationIds: preId + ',717', type: 3 },
         { answerId: 718, emptyOne: 113, emptyTwo: form.paymentMoney, operationIds: preId + ',718', type: 3 },
         { answerId: 719, emptyOne: 114, emptyTwo: form.monthlyWithholding, operationIds: preId + ',719', type: 1 },
-        { answerId: 720, emptyOne: 114, emptyTwo: form.drawPassword, operationIds: preId + ',720', type: 1 },
+        { answerId: 720, emptyOne: 114, emptyTwo: form.drawPassword, operationIds: preId + ',720', type: 3 },
       )
       let params = {
         parentId: preId,
diff --git a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue
index bd2323a..cfecb6b 100644
--- a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue
+++ b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/basic.vue
@@ -147,7 +147,6 @@ export default {
     }),
     // 账号blur事件
     accountBlur () {
-      console.log(333, typeof this.form.applicationAccount)
       if (this.form.applicationAccount === 12802851701099) {
         this.form.customerName = '袋鼠互联网科技有限公司'
         this.form.identificationType = 82
diff --git a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/rating.vue b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/rating.vue
index 30702df..e7b983d 100644
--- a/src/pages/manage/list/corporateLoans/apply/creditEvaluation/rating.vue
+++ b/src/pages/manage/list/corporateLoans/apply/creditEvaluation/rating.vue
@@ -65,8 +65,26 @@
 
     <div class="text-center m-t-20">
       <el-button @click="$emit('updateStep', 2)" type="primary" class="submitBtn" v-throttle>上一步</el-button>
-      <el-button @click="submit" type="primary" class="submitBtn" v-throttle>提交</el-button>
+      <el-button @click="confirmSubmit" type="primary" class="submitBtn" v-throttle>提交</el-button>
     </div>
+
+    <el-dialog :visible="submitVisible" append-to-body :close-on-click-modal="true" :show-close="false"
+      custom-class="dia">
+      <div class="data-dia23">
+        <div slot="title" class="dia-header">
+          <div class="data-title">提示</div>
+        </div>
+
+        <div class="popBody" style="flex-direction: column;">
+          <p class="text-lg" style="color: #333">评估完成</p>
+          <p class="text-lg" style="color: #333">信用评级为AAAA，可进行授信申请</p>
+        </div>
+
+        <div class="popBtns">
+          <el-button class="sure btn hover:bg-blue-700 " type="primary" @click="submit">确 定</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -192,6 +210,8 @@ export default {
           }
         ],
       },
+
+      submitVisible: false,
       submited: 0
     }
   },
@@ -199,6 +219,9 @@ export default {
 
   },
   methods: {
+    confirmSubmit () {
+      this.submitVisible = true
+    },
     async submit () {
       try {
         const { form } = this
@@ -233,7 +256,9 @@ export default {
   },
 }
 </script>
-<style lang='scss' scoped>
+<style lang="scss" scoped>
+@import '@/styles/dialog.scss';
+
 .l-title {
   margin-bottom: 15px;
   font-size: 18px;
diff --git a/src/pages/manage/list/corporateLoans/management.vue b/src/pages/manage/list/corporateLoans/management.vue
index 9b1ee77..dccc784 100644
--- a/src/pages/manage/list/corporateLoans/management.vue
+++ b/src/pages/manage/list/corporateLoans/management.vue
@@ -1,5 +1,5 @@
 <template>
-  <!-- 贷款管理 -->
+  <!-- 贷后管理 -->
   <div class="wrap">
     <my-title :titleArr="['公司贷款', '贷后管理']" />
 
diff --git a/src/pages/manage/list/foreignExchange/settlement.vue b/src/pages/manage/list/foreignExchange/settlement.vue
index 49fe55b..ddb2bc7 100644
--- a/src/pages/manage/list/foreignExchange/settlement.vue
+++ b/src/pages/manage/list/foreignExchange/settlement.vue
@@ -178,12 +178,14 @@ export default {
       }).catch(() => { })
     },
     submitForm () {
+      const { form } = this
       if (this.submited) return this.$message.error('已提交！')
-      if (!this.form.voucherNumber) {
+      if (!form.voucherNumber) {
         messageCard('请填写凭证号码')
         return
       }
-      if (!this.form.drawPassword) {
+      if (form.money > 5000) return this.$message.warning('外币金额最多结汇5000.00，请重新输入')
+      if (!form.drawPassword) {
         messagePassword()
         return
       }
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 3333bbe..c492fa7 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -30,9 +30,13 @@ export default {
       if (location.origin === 'http://121.37.12.51') {
         href = `http://121.37.12.51/${isAdmin ? 'admin' : 'student'}/#/`
       }
-      let assessmentId = sessionStorage.getItem('assessmentId')
+      const { query } = router.app._route
+      let assessmentId = sessionStorage.getItem('assessmentId') || query.assessmentId
+      let competitionId = sessionStorage.getItem('competitionId') || query.competitionId
       if (assessmentId != 'null' && assessmentId != null && assessmentId != '') {
         href += `ass/list`
+      } else if (competitionId != 'null' && competitionId != null && competitionId != '') {
+        href += `match/details?id=${competitionId}`
       } else {
         const cid = sessionStorage.getItem('cid')
         href += `station/preview?courseId=${cid}&curriculumName=银行项目&mallId=${router.currentRoute.query.mallId}`
diff --git a/src/styles/dialog.scss b/src/styles/dialog.scss
index 6056a1f..93dac19 100644
--- a/src/styles/dialog.scss
+++ b/src/styles/dialog.scss
@@ -49,7 +49,7 @@
             text-align: center;
             color: #fff;
             font-size: 24px;
-            background: url(../../../../assets/img/dia-title.png) 0 0 / cover no-repeat;
+            background: url(https://izhixinyun.com/images/dia-title.png) 0 0 / cover no-repeat;
         }
     }
 }