合并

src/point/views/common/rewardTask.vue

@@ -44,12 +44,12 @@
               <el-option v-for="(item, index) in task_cycle_arr" :key="index" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期', trigger: 'blur' }]">
+          <el-form-item label="截止时间" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止时间', trigger: 'blur' }]">
             <el-date-picker
               v-model="formData.expire_time"
               type="datetime"
               :picker-options="pickerOptions"
-              placeholder="选择日期时间"
+              placeholder="选择截止时间"
               format="yyyy-MM-dd HH:mm"
               value-format="yyyy-MM-dd HH:mm"
               default-time="18:00"
@@ -57,20 +57,20 @@
             ></el-date-picker>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns1" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns2" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns3" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>

src/point/views/common/rewardTaskAmend.vue

@@ -40,13 +40,13 @@
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期'}]">
+          <el-form-item label="截止时间" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-date-picker
               v-model="formData.expire_time"
               type="datetime"
 
               :picker-options="pickerOptions"
-              placeholder="选择日期时间"
+              placeholder="选择截止时间"
               format="yyyy-MM-dd HH:mm"
               value-format="yyyy-MM-dd HH:mm"
               default-time="18:00"
@@ -54,8 +54,8 @@
               ></el-date-picker>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns1"
                 :key="item.value"
@@ -65,8 +65,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns2"
                 :key="item.value"
@@ -76,8 +76,8 @@
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option
                 v-for="item in columns3"
                 :key="item.value"

src/point/views/common/temporaryTask.vue

@@ -44,32 +44,32 @@
               <el-option v-for="(item, index) in task_cycle_arr" :key="index" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期'}]">
+          <el-form-item label="截止时间" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止时间'}]">
             <el-date-picker
               v-model="formData.expire_time"
               type="datetime"
               :picker-options="pickerOptions"
-              placeholder="选择日期时间"
+              placeholder="选择截止时间"
               format="yyyy-MM-dd HH:mm"
               value-format="yyyy-MM-dd HH:mm"
               default-time="18:00"
               :clearable="false"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns1" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns2" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns3" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>

src/point/views/common/temporaryTaskAmend.vue

@@ -50,32 +50,32 @@
               @confirm="reviewer_confirm"
             />
           </el-form-item>
-          <el-form-item label="截止日期" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期'}]">
+          <el-form-item label="截止时间" prop="expire_time" v-if="formData.task_cycle == 0" :rules="[{ required: true, message: '请选择截止日期'}]">
             <el-date-picker
               v-model="formData.expire_time"
               type="datetime"
               :picker-options="pickerOptions"
-              placeholder="选择日期时间"
+              placeholder="选择截止时间"
               format="yyyy-MM-dd HH:mm"
               value-format="yyyy-MM-dd HH:mm"
               default-time="18:00"
               :clearable="false"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 1" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns1" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 2" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns2" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>
 
-          <el-form-item label="截止日期" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止日期'}]">
-            <el-select v-model="formData.task_expire_day" placeholder="请选择截止日期">
+          <el-form-item label="截止时间" prop="task_expire_day" v-if="formData.task_cycle == 3" :rules="[{ required: true, message: '请选择截止时间'}]">
+            <el-select v-model="formData.task_expire_day" placeholder="请选择截止时间">
               <el-option v-for="item in columns3" :key="item.value" :label="item.name" :value="item.value"></el-option>
             </el-select>
           </el-form-item>