调整加班倍数

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -2,19 +2,19 @@ var path = require('path')
 
 //  var ip = '127.0.0.1'
 // var ip = '192.168.2.20'
-var ip = '192.168.2.25'
+var ip = '192.168.2.32'
 // var ip = '47.100.37.243' 
 
-var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
+// var os = require('os'), ip = '', ifaces = os.networkInterfaces() // 获取本机ip
 
-for (var i in ifaces) {
-    for (var j in ifaces[i]) {
-        var val = ifaces[i][j]
-        if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
-            ip = val.address
-        }
-    } 
-}
+// for (var i in ifaces) {
+//     for (var j in ifaces[i]) {
+//         var val = ifaces[i][j]
+//         if (val.family === 'IPv4' && val.address !== '127.0.0.1') {
+//             ip = val.address
+//         }
+//     } 
+// }
 
 module.exports = {
   build: {

fhKeeper/formulahousekeeper/timesheet/src/permissions.js

@@ -26,7 +26,7 @@ const StringUtil = {
         reportsPersonnel: false, // 查看相关人员工时 // 后台
         reportsFillOut: false, // 代填日报 //
         reportsDeleteAll: false, // 删除全公司日报
-        importReport: false, //导入工时
+        importReport: false, //导入工时lij
 
         // 财务核算成本 
         financialCustom: false, // 自定义薪资项 // 

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

@@ -26,6 +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-form-item>
             </el-form>
             

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

@@ -287,6 +287,7 @@
                         </div>
                     </div>
                 </div> -->
+
             </el-form>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible=false">取消</el-button>
@@ -1207,6 +1208,7 @@
             submitInsert() {
                 var form = {}
                 var ssR = this.upRepeat(this.insertForm.certJson)
+                var trs = true
                 this.$refs.form1.validate(valid => {
                     if (valid) {
                         this.submitLoading = true;
@@ -1218,6 +1220,19 @@
                             this.submitLoading = false;
                             return false
                         }
+                        for(var s in this.insertForm.certJson) {
+                            if(!this.insertForm.certJson[s].certDate || !this.insertForm.certJson[s].certId) {
+                                trs = false
+                            }
+                        }
+                        if(!trs) {
+                            this.$message({
+                                message: '证书未填写完整',
+                                type: 'warning'
+                            });
+                            this.submitLoading = false;
+                            return false
+                        }
                         form = {
                             name: this.insertForm.name,
                             phone: this.insertForm.phone,
@@ -1241,9 +1256,10 @@
                         }
                     }
                 });
-                // console.log(form, '提交的数据')
+                console.log(form, '提交的数据')
                 // return
-                if(!ssR) {
+                console.log(ssR, trs)
+                if(!ssR && trs) {
                     this.http.post( this.port.manage.insert, form,
                     res => {
                         this.submitLoading = false;