fix

src/components/case/index.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- <transition name="slide-fade" enter-active-class="animate__animated animate__bounceInLeft" leave-active-class=" animate__animated animate__bounceOutLeft"> -->
 
-    <el-container v-show="showIt">
+    <el-container v-show="showIt" v-loading="loading">
       <el-header>
         <div class="flex a-center j-between">
           <div class="flex a-center" style="width: 28%">
@@ -32,7 +32,7 @@
           <div>
             <el-button @click="toReport" v-if="popContainer">查看实验报告</el-button>
             <el-button style="background: #202020;color: #d0d0d0;font-size:16px;" v-show="projectPermissions == 0"
-              @click="reload"
+              @click="reloadConfirm"
               :disabled="popContainer && (assessmentId != '' && assessmentId != 'null' && assessmentId != null)">
               重新开始
             </el-button>
@@ -65,7 +65,7 @@
               <el-row>
                 <el-col :span="24">
                   <el-card shadow="hover">
-                    <el-table :data="requires" height="43.5vh" v-loading="loading" ref='testTable'>
+                    <el-table :data="requires" height="43.5vh" ref='testTable'>
                       <el-table-column type="index"></el-table-column>
                       <el-table-column prop="name" label="判分点" align="left">
                       </el-table-column>
@@ -823,6 +823,24 @@ export default {
         this.seconds = seconds;
       }
     },
+    //重新开始
+    async reloadConfirm () {
+      // 已提交状态则直接重新开始，未提交则询问弹框
+      if (this.popContainer) {
+        this.reload()
+      } else {
+        try {
+          await this.$confirm('<p style="color: #f56c6c;">点击重新开始，之前操作会清空。</p><p>确定重新开始吗？</p>', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'warning',
+            // closeOnClickModal: false,
+            dangerouslyUseHTMLString: true,
+          })
+          this.reload()
+        } catch (e) { }
+      }
+    },
     reload () {
       this.submitType = false
       this.lockIt = false

src/pages/manage/list/personal/currentAccount/accountCancellation.vue

@@ -5,7 +5,8 @@
       <el-form ref="form" :model="form" label-width="120px" :rules="rules">
         <el-col :span="10" :offset="1">
           <el-form-item label="卡号" required>
-                        <el-input ref="cardNumber" disabled :value="form.cardNumber" @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
+            <el-input ref="cardNumber" disabled :value="form.cardNumber"
+              @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
           </el-form-item>
           <el-form-item label="证件类型">
             <el-select v-model.trim="form.idType" placeholder="请选择">
@@ -23,7 +24,8 @@
         </el-col>
         <el-col :span="10" :offset="1">
           <el-form-item label="客户姓名" prop="userName">
-                        <el-input ref="userName" disabled :value="form.userName" @input="(val) => checkName(val, form, 'userName')"></el-input>
+            <el-input ref="userName" disabled :value="form.userName"
+              @input="(val) => checkName(val, form, 'userName')"></el-input>
           </el-form-item>
           <el-form-item label="证件号码" required>
             <div class="idCard" @click="popUp2('身份证扫描仪')" v-if='!idNumberJudge'>
@@ -37,7 +39,8 @@
       </el-form>
     </el-row>
     <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" />
+    <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
+      @submitIt="submitForm2" />
   </div>
   <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -261,6 +264,7 @@ export default{
 .body {
   margin-top: 50px;
   overflow: auto;
+
   .idCard {
     border-radius: 5px;
     background: #CFDDFF;
@@ -271,6 +275,7 @@ export default{
     color: #6191FF;
     cursor: pointer;
   }
+
   // .submitBtn{
   //     position: relative;
   //     width: 300px;

src/pages/manage/list/personal/currentAccount/settle.vue

@@ -9,12 +9,14 @@
               <p>请刷卡</p>
             </div>
             <div v-else>
-                            <el-input ref="cardNumber" disabled v-model.trim="form.cardNumber" @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
+              <el-input ref="cardNumber" disabled v-model.trim="form.cardNumber"
+                @input="(val) => inputListen(val, form, 'cardNumber')"></el-input>
             </div>
           </el-form-item>
           <el-form-item label="币种" prop="currency">
             <el-select v-model.trim="form.currency" placeholder="请选择" ref="currency">
-                            <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option>
+              <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="余额">
@@ -34,11 +36,13 @@
         </el-col>
         <el-col :span="10" :offset="1">
           <el-form-item label="客户姓名" prop="userName" :rules="rules.userName">
-                        <el-input :value="form.userName" disabled maxlength="20" @input="(val) => checkName(val, form, 'userName')" ref="userName"></el-input>
+            <el-input :value="form.userName" disabled maxlength="20" @input="(val) => checkName(val, form, 'userName')"
+              ref="userName"></el-input>
           </el-form-item>
           <el-form-item label="钞汇标识">
             <el-select v-model.trim="form.goldLogo" placeholder="请选择">
-                            <el-option v-for="item in getSelectList.goldLogoSelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option>
+              <el-option v-for="item in getSelectList.goldLogoSelectList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="利息">
@@ -52,13 +56,15 @@
         </el-col>
         <el-col :span="21" :offset="1">
           <el-form-item label="摘要">
-                        <el-input type="textarea" maxlength="60" :rows="3" placeholder="请输入内容" v-model.trim="form.remark"></el-input>
+            <el-input type="textarea" maxlength="60" :rows="3" placeholder="请输入内容"
+              v-model.trim="form.remark"></el-input>
           </el-form-item>
         </el-col>
       </el-form>
     </el-row>
     <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" :needAuth="needAuth" @submitIt="submitForm2" />
+    <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
+      :needAuth="needAuth" @submitIt="submitForm2" />
   </div>
   <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -253,10 +259,6 @@ export default{
       }, this.$refs));
     },
     submitForm2 () {
-        let nomCurrentSettleCard = sessionStorage.getItem('nomCurrentSettleCard')
-        let nomCurrentSettleCards = JSON.parse(nomCurrentSettleCard);
-        let nomCurrentSettlePassword = sessionStorage.getItem('nomCurrentSettlePassword')
-        let nomCurrentSettlePasswords = JSON.parse(nomCurrentSettlePassword);
       const cards = [
         // {
         //     103: nomCurrentSettleCard
@@ -343,5 +345,4 @@ export default{
 //     //     left: 50%;
 //     //     transform: translate(-50%,-20%);
 //     // }
-// }
+// }</style>
-</style>

src/pages/manage/list/personal/currentAccount/transferAccounts.vue

@@ -14,15 +14,18 @@
           </el-form-item>
           <el-form-item label="币种" prop="currency">
             <el-select v-model.trim="form.currency" placeholder="请选择" ref="currency">
-                            <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option>
+              <el-option v-for="item in getSelectList.currencySelectList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
               <!-- <el-option value="CNY人民币">CNY人民币</el-option> -->
             </el-select>
           </el-form-item>
           <el-form-item label="金额" prop="money">
-                        <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')" ref="money"></el-input>
+            <el-input :value="form.money" maxlength="15" @input="val => ismoney(val, form, 'money')"
+              ref="money"></el-input>
           </el-form-item>
           <el-form-item label="收款卡号" prop="shroffAccount">
-                        <el-input :value="form.shroffAccount" @input="(val) => checkHanzi(val, form, 'shroffAccount')" ref="shroffAccount"></el-input>
+            <el-input :value="form.shroffAccount" @input="(val) => checkHanzi(val, form, 'shroffAccount')"
+              ref="shroffAccount"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="10" :offset="1">
@@ -31,7 +34,8 @@
           </el-form-item>
           <el-form-item label="钞汇标识" prop="goldLogo">
             <el-select v-model.trim="form.goldLogo" placeholder="请选择" ref="goldLogo">
-                            <el-option v-for="item in getSelectList.goldLogoSelectList" :label="item.options" :value="item.itemId"  :key="item.itemId"> </el-option>
+              <el-option v-for="item in getSelectList.goldLogoSelectList" :label="item.options" :value="item.itemId"
+                :key="item.itemId"> </el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="支取密码" required>
@@ -43,18 +47,21 @@
             </div>
           </el-form-item>
           <el-form-item label="收款人名称" prop="payeeName">
-                        <el-input :value="form.payeeName" maxlength="40" @input="(val) => checkName(val, form, 'payeeName')" ref="payeeName"></el-input>
+            <el-input :value="form.payeeName" maxlength="40" @input="(val) => checkName(val, form, 'payeeName')"
+              ref="payeeName"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="21" :offset="1">
           <el-form-item label="摘要">
-                        <el-input type="textarea" :rows="3" maxlength="60" placeholder="请输入内容" v-model.trim="form.remark"></el-input>
+            <el-input type="textarea" :rows="3" maxlength="60" placeholder="请输入内容"
+              v-model.trim="form.remark"></el-input>
           </el-form-item>
         </el-col>
       </el-form>
     </el-row>
     <el-button @click="submitForm" type="primary" class="submitBtn" v-throttle>提交</el-button>
-        <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName" @submitIt="submitForm2" :needAuth="needAuth" />
+    <my-dialog :moduleName="moduleName" v-if="visible" :visible.sync="visible" :showForm="form" :formName="formName"
+      @submitIt="submitForm2" :needAuth="needAuth" />
   </div>
   <!-- <need-before v-else :moduleName='needBefore' :unNeed="unNeed" /> -->
 </template>
@@ -259,10 +266,6 @@ export default{
       }, this.$refs));
     },
     submitForm2 () {
-        let nomCurrentTransferCard = sessionStorage.getItem('nomCurrentTransferCard')
-        let nomCurrentTransferCards = JSON.parse(nomCurrentTransferCard);
-        let nomCurrentTransferPassword = sessionStorage.getItem('nomCurrentTransferPassword')
-        let nomCurrentTransferPasswords = JSON.parse(nomCurrentTransferPassword);
       const cards = [
         // {
         //     94: nomCurrentTransferCard
@@ -336,5 +339,4 @@ export default{
 //     //     left: 50%;
 //     //     transform: translate(-50%,-50%);
 //     // }
-// }
+// }</style>
-</style>