调整警告颜色

fhKeeper/formulahousekeeper/timesheet/src/views/settings/timetype.vue

@@ -26,7 +26,7 @@
             <el-form-item label="加班设置" prop="allday">
                 <el-checkbox v-model="timeType.payOvertime" label="加班工时记入成本" />
                 <!-- <el-checkbox v-model="timeType.doubleOvertime" label="加班双倍成本" :disabled="!timeType.payOvertime"/> -->
-                <el-input v-model="timeType.overtimeRatio" placeholder="" clearable style="width: 100px;margin: 0 10px 0 20px" v-if="timeType.payOvertime"></el-input> <span v-if="timeType.payOvertime">倍工资</span>
+                <el-input v-model="timeType.overtimeRatio" placeholder="" clearable style="width: 100px;margin: 0 10px 0 20px" v-if="timeType.payOvertime" @keyup.native="timeType.overtimeRatio = oninput(timeType.overtimeRatio, 1)"></el-input> <span v-if="timeType.payOvertime">倍工资</span>
             </el-form-item>
             </el-form>
             
@@ -504,6 +504,17 @@
                         } else {
                             param.customDataActive = 0
                         }
+                        if(param.payOvertime) {
+                            if(param.overtimeRatio == 0 || param.overtimeRatio == '') {
+                                this.$message({
+                                    message:"请设置加班几倍工资",
+                                    type:"error"
+                                })
+                                return
+                            }
+                        }
+                        // console.log(param, '将要提交的值')
+                        // return
                         this.http.post('/time-type/save',param,
                             res => {
                                 this.listLoading = false;
@@ -560,6 +571,36 @@
                     );
             },
 
+            // 限制加班填写的即被工作
+             oninput(num, limit) {
+                var str = num
+                var len1 = str.substr(0, 1)
+                var len2 = str.substr(1, 1)
+                //如果第一位是0，第二位不是点，就用数字把点替换掉
+                if (str.length > 1 && len1 == 0 && len2 != ".") {
+                    str = str.substr(1, 1)
+                }
+                //第一位不能是.
+                if (len1 == ".") {
+                    str = ""
+                }
+                //限制只能输入一个小数点
+                if (str.indexOf(".") != -1) {
+                    var str_ = str.substr(str.indexOf(".") + 1)
+                    if (str_.indexOf(".") != -1) {
+                    str = str.substr(0, str.indexOf(".") + str_.indexOf(".") + 1)
+                    }
+                }
+                //正则替换
+                str = str.replace(/[^\d^\.]+/g, '') // 保留数字和小数点
+                if (limit / 1 === 1) {
+                    str = str.replace(/^\D*([0-9]\d*\.?\d{0,1})?.*$/,'$1') // 小数点后只能输 1 位
+                } else {
+                    str = str.replace(/^\D*([0-9]\d*\.?\d{0,2})?.*$/,'$1') // 小数点后只能输 2 位
+                }
+                return str
+            }
+
         },
         created() {
             let height = window.innerHeight;

fhKeeper/formulahousekeeper/timesheet/src/views/team/index.vue

@@ -273,7 +273,7 @@
                     <el-input v-model="insertForm.position" placeholder="请输入岗位职级别" clearable></el-input>
                 </el-form-item>
 
-                <!-- <div class="zhaunye"><p>专业证书</p><p><el-link type="primary" @click="addCertificateList()">添加更多证书</el-link><el-link v-if="permissions.structureCertificate" type="primary" @click="managementDiolog = true" style="margin-left: 20px">管理专业证书</el-link></p></div>
+                <div class="zhaunye"><p>专业证书</p><p><el-link type="primary" @click="addCertificateList()">添加更多证书</el-link><el-link v-if="permissions.structureCertificate" type="primary" @click="managementDiolog = true" style="margin-left: 20px">管理专业证书</el-link></p></div>
                 <div class="certificateList">
                     <div class="moreList">
                         <div class="moreLiList" v-for="(item,index) in insertForm.certJson" :key="index">
@@ -286,7 +286,7 @@
                             <div style="color: red;margin-left: 15px;cursor:pointer;" @click="deteFrames(index)"><i class="el-icon-delete"></i></div>
                         </div>
                     </div>
-                </div> -->
+                </div>
 
             </el-form>
             <span slot="footer" class="dialog-footer">
@@ -1215,7 +1215,7 @@
                         if(ssR) {
                             this.$message({
                                 message: '重复证书',
-                                type: 'warning'
+                                type: 'error'
                             });
                             this.submitLoading = false;
                             return false
@@ -1228,7 +1228,7 @@
                         if(!trs) {
                             this.$message({
                                 message: '证书未填写完整',
-                                type: 'warning'
+                                type: 'error'
                             });
                             this.submitLoading = false;
                             return false