Merge branch 'master' of http://132.232.92.186:3000/XinXiBu/oa-system

src/components/Resource/OpOfficialActivities.vue

@@ -64,8 +64,12 @@
                     </div>
                     <div style="width: 385px;">
                         <el-form-item label="公务日期:" prop="date" label-width="160px">
-                            <el-date-picker v-model="OpOfficialActivitiesDto.date" type="date" placeholder="选择公务日期">
+                            <el-date-picker
+                            type="date"
+                            v-model="OpOfficialActivitiesDto.date"
+                            placeholder="选择日期">
                             </el-date-picker>
+                            
                         </el-form-item>
                     </div>
                     <div style="width: 385px;">
@@ -460,6 +464,22 @@ export default {
     },
 
     methods: {
+        //日期处理（日）
+        TimeProcessingri(val){
+            if(val instanceof Date){
+                let newsyear=val.getFullYear();
+                let newsMonth=val.getMonth() + 1;
+                let newsday=val.getDate();
+                if((val.getMonth() + 1)<10){
+                    newsMonth='0'+newsMonth
+                }else{
+                    newsMonth=val.getMonth() + 1
+                }
+                return newsyear+ '-' +newsMonth+ '-' + newsday;
+            }else{
+                return val
+            }
+        },
         //团组下拉框
         GetGroupAllList() {
             var url = "/api/Resource/GetGroupAllList"
@@ -656,7 +676,8 @@ export default {
 
             })
         },
-        addBtn() {
+        addBtn() { 
+            console.log(this.OpOfficialActivitiesDto.date);
             if (this.DiId == null && this.DiId == undefined && this.DiId == "") {
                 this.$message.error("请选择团组名称");
                 return;
@@ -667,6 +688,7 @@ export default {
             }
             this.submitUpload();
             const that = this;
+            this.OpOfficialActivitiesDto.date=this.TimeProcessingri(this.OpOfficialActivitiesDto.date)
             that.OpOfficialActivitiesDto.createUserId = that.userId
             that.OpOfficialActivitiesDto.diId = that.DiId
             that.$refs.OpOfficialActivitiesDto.validate((valid) => {