Merge branch 'refs/heads/develop' into glf

src/views/business/component/paidUsers.vue

@@ -302,10 +302,10 @@
               <div class="projectTitle">合计金额</div>
             </el-col>
             <el-col :span="3" :offset="11">
-              <div class="amountMain">{{ companyTotalAmount.toFixed(2) }}</div>
+              <div class="amountMain">{{ companyTotalAmount }}</div>
             </el-col>
             <el-col :span="3" :offset="5">
-              <div class="amountMain">{{ personTotalAmount.toFixed(2) }}</div>
+              <div class="amountMain">{{ personTotalAmount }}</div>
             </el-col>
           </el-row>
           <!-- 承担方式部分 -->
@@ -341,8 +341,7 @@
             <el-col :span="7">
               <el-form-item label="岗位工资" :prop="formData.calculaType == 1 ? 'postWage' : ''">
                 <el-input-number @change="postcalculateShow = true" v-model="formData.postWage" placeholder="请输入请输入岗位工资"
-                  :step="1" :min="0" controls-position="right"
-                  :disabled="formData.calculaType == 2"></el-input-number>
+                  :step="1" :min="0" controls-position="right" :disabled="formData.calculaType == 2"></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="7">
@@ -354,8 +353,8 @@
             </el-col>
             <el-col :span="7">
               <el-form-item label="实发工资">
-                <el-input-number v-model="formData.actualPayable" placeholder="请输入请输入实发工资：" :step="1"
-                  :min="0" controls-position="right" :disabled="true"></el-input-number>
+                <el-input-number v-model="formData.actualPayable" placeholder="请输入请输入实发工资：" :step="1" :min="0"
+                  controls-position="right" :disabled="true"></el-input-number>
               </el-form-item>
             </el-col>
             <el-col :span="3">
@@ -553,6 +552,18 @@ export default {
       postcalculateShow: true
     }
   },
+  watch: {
+    companyTotalAmount(newValue, oldValue) {
+      if (typeof newValue === 'number') {
+        this.companyTotalAmount = newValue.toFixed(2)
+      };
+    },
+    personTotalAmount(newValue, oldValue) {
+      if (typeof newValue === 'number') {
+        this.personTotalAmount = newValue.toFixed(2)
+      }
+    }
+  },
   created() {
   },
   mounted() {

src/views/business/outContract/index.vue

@@ -326,7 +326,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除发薪合同编号为"' + ids + '"的数据项？').then(function () {
+      const msgName = row.contractName || this.contractNames;
+      this.$modal.confirm('是否确认删除合同[' + msgName + ']？').then(function () {
         return delOutContract(ids);
       }).then(() => {
         this.getList();

src/views/business/outPersonal/index.vue

@@ -172,6 +172,7 @@ export default {
       loading: true,
       // 选中数组
       ids: [],
+      userNames: [],
       // 非单个禁用
       single: true,
       // 非多个禁用
@@ -300,6 +301,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
+      this.userNames = selection.map(item => item.userName)
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
@@ -364,7 +366,8 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除收薪人员信息编号为"' + ids + '"的数据项？').then(function () {
+      const msgName = row.userName || this.userNames
+      this.$modal.confirm('是否确认删除收薪人员[' + msgName + ']？').then(function () {
         return delOutPersonal(ids);
       }).then(() => {
         this.getList();

src/views/login.vue

@@ -71,7 +71,7 @@
         </div>
         <div class="againVerificationCode">
           <el-button @click="reactText" type="text" :disabled="VerificationCodeTime != 60">{{ VerificationCodeTitle
-          }}</el-button>
+            }}</el-button>
         </div>
       </div>
     </div>
@@ -104,6 +104,7 @@
 import { getCodeImg, getLoginSmsCode } from '@/api/login'
 import Cookies from "js-cookie";
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { set } from 'nprogress';
 
 export default {
   name: "Login",
@@ -143,7 +144,9 @@ export default {
       VerificationCodeTime: 60,
       VerificationCodeTitle: null,
       // 重新发送验证码弹窗
-      dialogVisible: false
+      dialogVisible: false,
+      // 节流参数控制
+      throttle: null,
     };
   },
   watch: {
@@ -180,7 +183,12 @@ export default {
           }
         });
         if (code.length == 6) {
-          this.handleLogin(code)
+          if (!this.throttle) {
+            this.throttle = setTimeout(() => {
+              this.handleLogin(code)
+              this.throttle = null
+            }, 500)
+          }
         }
         this.$forceUpdate()
       },
@@ -263,6 +271,11 @@ export default {
               this.textMessageShow = false
               this.countdownMethod()
               this.$forceUpdate()
+              setTimeout(() => {
+                this.$nextTick(() => {
+                  this.$refs.firstInputRef.focus()
+                })
+              }, 1000)
             }
           })
         }