Browse Source

Merge branch 'dev' into test

shibei_master
13176889840 3 years ago
parent
commit
5fe863f133
  1. 4
      src/views/modules/communityService/ninePlaces/team/team.vue
  2. 1
      src/views/modules/secretaryLog/difficulty/difficultyForm.vue
  3. 1
      src/views/modules/secretaryLog/humanisticCare/careForm.vue
  4. 1
      src/views/modules/secretaryLog/workLog/form.vue

4
src/views/modules/communityService/ninePlaces/team/team.vue

@ -4,7 +4,7 @@
<el-form :inline="true" <el-form :inline="true"
:model="formData" :model="formData"
ref="ref_searchform" ref="ref_searchform"
:label-width="'100px'"> :label-width="'90px'">
<div> <div>
<el-form-item label="负责人" <el-form-item label="负责人"
@ -470,7 +470,7 @@ export default {
} }
.item_width_1 { .item_width_1 {
width: 230px; width: 170px;
} }
.div_table { .div_table {

1
src/views/modules/secretaryLog/difficulty/difficultyForm.vue

@ -163,6 +163,7 @@ export default {
methods: { methods: {
handleTime() { handleTime() {
if (!this.formData.remindTime) return
var startAt = new Date(this.formData.remindTime) * 1000 /1000; var startAt = new Date(this.formData.remindTime) * 1000 /1000;
if(startAt < Date.now()) { if(startAt < Date.now()) {
this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date()); this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());

1
src/views/modules/secretaryLog/humanisticCare/careForm.vue

@ -210,6 +210,7 @@ export default {
methods: { methods: {
handleTime () { handleTime () {
if (!this.formData.remindTime) return
var startAt = new Date(this.formData.remindTime) * 1000 / 1000; var startAt = new Date(this.formData.remindTime) * 1000 / 1000;
if (startAt < Date.now()) { if (startAt < Date.now()) {
this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date()); this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());

1
src/views/modules/secretaryLog/workLog/form.vue

@ -151,6 +151,7 @@ export default {
}, },
handleTime() { handleTime() {
if (!this.formData.remindTime) return
var startAt = new Date(this.formData.remindTime) * 1000 /1000; var startAt = new Date(this.formData.remindTime) * 1000 /1000;
if(startAt < Date.now()) { if(startAt < Date.now()) {
this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date()); this.formData.remindTime = dateFormats('YYYY-mm-dd HH:MM', new Date());

Loading…
Cancel
Save