Merge remote-tracking branch 'origin/master'

attendance-performance-manager-ui/admin/src/views/perform/attend/record/drawershow.vue

@@ -190,7 +190,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType == 1 ? '加分分值' : '扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

attendance-performance-manager-ui/admin/src/views/perform/complain/record/drawershow.vue

@@ -162,6 +162,7 @@
               v-else
               v-model="form.complainTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -242,7 +243,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType==1?'加分分值':'扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

attendance-performance-manager-ui/admin/src/views/perform/effect/record/drawershow.vue

@@ -108,6 +108,7 @@
               v-else
               v-model="form.happenTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -137,6 +138,7 @@
               v-else
               v-model="form.alarmTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -216,7 +218,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType==1?'加分分值':'扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

attendance-performance-manager-ui/admin/src/views/perform/gowork/record/drawershow.vue

@@ -115,6 +115,7 @@
               v-else
               v-model="form.goworkTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -194,7 +195,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType==1?'加分分值':'扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

attendance-performance-manager-ui/admin/src/views/perform/other/record/drawershow.vue

@@ -74,6 +74,7 @@
               v-else
               v-model="form.happenTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -154,7 +155,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType==1?'加分分值':'扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

attendance-performance-manager-ui/admin/src/views/perform/review/record/drawershow.vue

@@ -127,6 +127,7 @@
               v-else
               v-model="form.reviewTime"
               type="datetime"
+              value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期时间"
               style="width: 100%;"
             >
@@ -207,7 +208,7 @@
       </el-row>
       <el-row>
         <el-col :span="22">
-          <el-form-item label="加分/扣分分值：">
+          <el-form-item :label="form.subAddType==1?'加分分值':'扣分分值'">
             <p>{{ form.score }}</p>
           </el-form-item>
         </el-col>

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/dingmsg/api/DingMessageController.java

@@ -60,7 +60,7 @@ public class DingMessageController {
     public Map<String, String> getOaMessage(@RequestParam(value = "msg_signature", required = false) String msg_signature,
                                             @RequestParam(value = "timestamp", required = false) String timeStamp,
                                             @RequestParam(value = "nonce", required = false) String nonce,
-                                            @RequestBody(required = false) JSONObject json) throws DingCallbackCrypto.DingTalkEncryptException {
+                                            @RequestBody(required = false) JSONObject json)  {
         try {
             // 1. 从http请求中获取加解密参数
 
@@ -81,10 +81,14 @@ public class DingMessageController {
             if ("check_url".equals(eventType)) {
                 // 测试回调url的正确性
                 log.info("测试回调url的正确性");
-            } else if ("user_add_org".equals(eventType)) {
-                // 处理通讯录用户增加事件
-                log.info("发生了：" + eventType + "事件");
-            } else {
+            }
+            else if("bpms_instance_change".equals(eventType)){  //请假等需要审批的消息
+                // 处理审批实例始末（审批任务开始、结束）
+                // 存入数据库
+                log.info("发生了：" + eventType + "事件" );
+                log.info("返回处理参数：" + eventJson.toJSONString() );
+            }
+            else {
                 // 添加其他已注册的
                 log.info("发生了：" + eventType + "事件");
             }