新增周期变更

src/views/modules/base/smartExcel/cpts/excel-add.vue

@@ -21,37 +21,33 @@
                     <el-radio-group v-model.trim="form.taskPeriod" @change="handleChangetaskPeriod">
                         <el-radio label="once">一次性</el-radio>
                         <el-radio label="weekly">每周</el-radio>
-                        <!-- <el-radio label="halfAMonth">每半月</el-radio>
+                        <el-radio label="halfAMonth">每半月</el-radio>
                         <el-radio label="month">每月</el-radio>
-                        <el-radio label="quarter">每季度</el-radio> -->
+                        <el-radio label="quarter">每季度</el-radio>
                     </el-radio-group>
                     <span>（说明：当任务周期选择每周/每月/每半月/每季度时，系统会于每个时间阶段的第一天自动创建阶段性子任务）</span>
                 </el-form-item>
-                <el-form-item label="完成时限" prop="completeLimitHour" v-if="form.taskPeriod">
+                <el-form-item label="完成时限" prop="completeLimitDay" v-if="form.taskPeriod">
                     <template v-if="form.taskPeriod === 'once'">
                         <el-date-picker v-model="form.completeLimitDay" type="date" placeholder="选择日期"
                             value-format="yyyy-MM-dd" >
                         </el-date-picker>
-                        <el-time-select v-model="form.completeLimitHour" class="cell-width-1" placeholder="选择时间"
-                            style="margin-left: 10px;" :picker-options="{start: '00:00', step: '00:15',end: '23:59'}">
-                        </el-time-select>
                     </template>
-                    <template v-if="form.taskPeriod === 'weekly'">
+                    <template v-if="form.taskPeriod !== 'once'">
-                        <el-select v-model.trim="form.completeLimitDay" placeholder="请选择" size="small" clearable
+                        <div>
-                            class="cell-width-1" style="margin-left: 10px;">
+                            <span>每周期的第 </span>
-                            <el-option v-for="item in weeklyList" :key="item.value" :label="item.label"
+                            <el-input-number v-model="form.completeLimitDay" :min="1" :max="365" label="天数"
-                                :value="item.value">
+                                style="width: 150px;padding: 0 5px;"></el-input-number>
-                            </el-option>
+                            <span> 天完成</span>
-                        </el-select>
+                        </div>
-                        <el-time-select v-model="form.completeLimitHour" class="cell-width-1" placeholder="选择时间"
+
-                            style="margin-left: 10px;" :picker-options="{start: '00:00', step: '00:15',end: '23:59'}">
-                        </el-time-select>
                     </template>
                 </el-form-item>
-                <el-form-item label="任务有效期" prop="effectiveDateRange"  v-if="form.taskPeriod === 'weekly'" :rules="[{ required: true, message: '任务有效期不能为空', trigger:'blur' }]">
+                <el-form-item label="任务有效期" prop="effectiveDateRange" v-if="form.taskPeriod === 'weekly'"
-                    <template >
+                    :rules="[{ required: true, message: '任务有效期不能为空', trigger:'blur' }]">
-                        <el-date-picker v-model="form.effectiveDateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+                    <template>
-                            end-placeholder="结束日期"  value-format="yyyy-MM-dd HH:mm:ss">
+                        <el-date-picker v-model="form.effectiveDateRange" type="daterange" range-separator="至"
+                            start-placeholder="开始日期" end-placeholder="结束日期" value-format="yyyy-MM-dd HH:mm:ss">
                         </el-date-picker>
                     </template>
                 </el-form-item>
@@ -136,7 +132,6 @@ export default {
                 taskType: '1',//任务类型
                 taskPeriod: 'once',//任务周期
                 completeLimitDay: '',//完成时限 一次性时传日期，周期性时传天数
-                completeLimitHour: '',//完成时限 周期或者一次性都传小时
                 receiverIds: '',//分发人员
                 moduleUrl: '',//上传模板
                 taskIntroduction: '',//任务要求
@@ -148,7 +143,6 @@ export default {
                 taskPeriod: [{ required: 'true', message: '任务周期不能为空', trigger: 'blur' }],
                 receiverIds: [{ required: 'true', message: '分发人员不能为空', trigger: 'blur' }],
                 moduleUrl: [{ required: 'true', message: '模板不能为空', trigger: 'blur' }],
-                completeLimitHour: [{ required: 'true', message: '完成时限不能为空', trigger: 'blur' }],
             },
             typeList: [
                 {
@@ -316,8 +310,8 @@ export default {
             }
         },
         handleChangetaskPeriod(val) {
-            this.form.completeLimitDay = '';
+            console.log(this.form.taskPeriod,"dsflksdfkl");
-            this.form.completeLimitHour = '';
+            this.form.completeLimitDay = "";
         },
         handleClickSave() {
             console.log(this.form, 'addForm');
@@ -374,7 +368,15 @@ export default {
         },
         ...mapGetters(['clientHeight', 'resolution']),
     },
-    watch: {},
+    watch: {
+        'form.taskPeriod': function (newPeriod) {
+            if (newPeriod === 'once') {
+                this.form.completeLimitDay = ''; // 如果是 'once'，清空 completeLimitDay 以防止数值冲突
+            } else {
+                this.form.completeLimitDay = 1; // 如果不是 'once'，可以设置一个默认值
+            }
+        }
+    }
 }
 </script>
 

src/views/modules/base/smartExcel/cpts/excel-info.vue

@@ -42,7 +42,7 @@
                     </el-col>
                     <el-col :span="16">
                         <el-form-item label="任务周期">
-                            <div>{{formData.taskPeriod === 'once' ? '一次性' : '每周'}}</div>
+                            <div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : '每季度' }}</div>
                         </el-form-item>
                     </el-col>
                     <el-col :span="24">

src/views/modules/base/smartExcel/cpts/filling-info.vue

@@ -36,6 +36,16 @@
                             <div>{{ formData.createByName }}</div>
                         </el-form-item>
                     </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="任务类型">
+                            <div>{{ formData.type }}</div>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="16">
+                        <el-form-item label="任务周期">
+                            <div>{{ formData.taskPeriod === 'once' ? '一次性' : formData.taskPeriod === 'weekly' ? '每周' : formData.taskPeriod === 'halfAMonth' ? '每半月' : formData.taskPeriod === 'month' ? '每月' : '每季度' }}</div>
+                        </el-form-item>
+                    </el-col>
                     <el-col :span="24">
                         <el-form-item label="任务接收人">
                             <div style="display: flex;flex-direction: row; align-items: center;">

src/views/modules/base/smartExcel/filling.vue

@@ -68,7 +68,8 @@
                     <el-table-column prop="taskPeriod" align="center" width="100" label="任务周期"
                         :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                            {{ scope.row.taskPeriod === 'once' ? '一次性' : '每周' }}
+                            {{ scope.row.taskPeriod === 'once' ? '一次性' : scope.row.taskPeriod === 'weekly' ? '每周' : scope.row.taskPeriod
+              === 'halfAMonth'?'每半月': scope.row.taskPeriod === 'month'?'每月':'每季度'}}
                         </template>
                     </el-table-column>
 

src/views/modules/base/smartExcel/index.vue

@@ -67,7 +67,8 @@
 
           <el-table-column prop="taskPeriod" align="center" width="100" label="任务周期" :show-overflow-tooltip="true">
             <template slot-scope="scope">
-              {{ scope.row.taskPeriod === 'once' ? '一次性' : '每周' }}
+              {{ scope.row.taskPeriod === 'once' ? '一次性' : scope.row.taskPeriod === 'weekly' ? '每周' : scope.row.taskPeriod
+              === 'halfAMonth'?'每半月': scope.row.taskPeriod === 'month'?'每月':'每季度'}}
             </template>
           </el-table-column>