2022.6.7

fhKeeper/formulahousekeeper/timesheet/config/index.js

@@ -1,18 +1,18 @@
 var path = require('path')
 
 //  var ip = '127.0.0.1'
-// var ip = '192.168.2.15'
-// var ip = '192.168.2.39'
+// var ip = '192.168.2.9'
+var ip = '192.168.2.39'
 
-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
-        }
-    }
-}
+// 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
+//         }
+//     }
+// }
 
 module.exports = {
   build: {

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -5,7 +5,7 @@
             <el-card class="box-card daily" shadow="never">
                 <div style="position: relative;margin-top: -20px;margin-bottom: 20px">
                 <!-- <div class="jjk" style="display:inline-block;position:fixed;top:70px;background:#fff;left:250px;"> -->
-                <div class="jjk" style="display:inline-block;position:absolute;top:15px;background:#fff;left:0px;z-index: 10;margin-top: -10px;padding-top: 10px;height: 43px;">
+                <div class="jjk" style="display:inline-block;position:absolute;top:15px;background:#fff;left:0px;z-index: 10;margin-top: -10px;padding-top: 10px;height: 42px;">
                         <el-date-picker size="small" v-model="date" :editable="false" format="yyyy-MM" value-format="yyyy-MM"
                          style="width:190px;"
                          @change="changeMonthOut" :clearable="false" type="month" placeholder="选择月份"></el-date-picker>
@@ -33,8 +33,8 @@
                 </div>
                 </div>
                 <div style="display:flex;">
-                <div v-if="permissions.reportsCompany || user.manageDeptId != 0" >
-                    <div style="width:190px;">
+                <div v-if="permissions.reportsCompany || user.manageDeptId != 0" :style="'overflow-x:hidden;overflow-y:auto;height:' + tableHeight + 'px;'">
+                    <div style="width:205px;">
                         <el-select v-model="selectState" size="small" @change="stateChange" >
                         <el-option value="-1" label="全部状态" >全部状态</el-option>
                         <el-option value="-2" label="未填报">未填报</el-option>
@@ -70,7 +70,7 @@
                     </div>
                 </div>
                 
-                <div :style="'height:'+tableHeight+'px;width:0.5px;background:#eee;margin-right:10px;margin-left:10px;'" ></div>
+                <div :style="'height:'+tableHeight+'px;width:1px;background:#eee;margin-right:10px;margin-left:10px;'" ></div>
                 <div class="allDaily" style="float:left;flex-grow:1">
                     <!--系统管理员和部门负责人 -->
                     <div class="report_title" >
@@ -820,7 +820,9 @@
 
             </el-table>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="weixinNotify"  v-if="!isFill" :disabled="fillMembList == 0">微信催填</el-button>
+                <el-button type="primary" @click="Notify(0)"  v-if="!isFill && this.user.corpwxUserid" :disabled="fillMembList == 0">企业微信催填</el-button>
+                <el-button type="primary" @click="Notify(1)"  v-if="!isFill && !this.user.corpwxUserid && this.user.dingdingUserid" :disabled="fillMembList == 0">钉钉催填</el-button>
+                <el-button type="primary" @click="Notify(2)"  v-if="!isFill && !this.user.corpwxUserid && !this.user.dingdingUserid" :disabled="fillMembList == 0">微信催填</el-button>
                 <el-button type="default" @click="exportMemb"  :disabled="fillMembList == 0">导出</el-button>
             </div>
         </el-dialog>
@@ -2405,14 +2407,15 @@
             },
 
             //微信通知人员填写
-            weixinNotify() {
+            Notify(code) {
                 if (this.fillMembList.length == 0) return;
                 var ids = '';
                 this.fillMembList.forEach(f=>{
                     ids += f.id+',';
                 })
                 this.http.post('/user/pushFillReport',{ 
-                        ids: ids, date: this.curDate
+                        ids: ids, date: this.curDate,
+                        code: code
                     },
                     res => {
                         if (res.code == "ok") {