八爪鱼加晶限时已签约

fhKeeper/formulahousekeeper/octopus/src/views/customer/list.vue

@@ -18,6 +18,7 @@
                             <el-radio-button :label="1">已签约</el-radio-button>
                             <el-radio-button :label="2">即将到期</el-radio-button>
                         </el-radio-group>
+                        <el-checkbox v-model="onlyContract" v-if="isMeal == 2" style="margin-left: 20px" @change="selIsmeal()">仅显示已签约</el-checkbox>
                         <!-- <el-checkbox style="margin-left:20px" size="small" v-model="checked" @change="selIsmeal()">即将到期</el-checkbox> -->
                 </el-form-item>
             </el-form>
@@ -193,43 +194,46 @@
         </el-dialog>
         <!-- 其他设置 -->
         <el-dialog v-if="editDialogG" :visible.sync="editDialogG" title="其他设置" width="850px">
-            <el-form label-width="100px" class="otherForm">
-                <el-form-item><el-checkbox v-model="dialogData.reportWorkflow">是否开启审批流设置</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.needEvaluate">审核通过需输入评价</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.mainProjectState">是否启用主项目模式</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.isSecretSalary">是否秘薪模式</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.showFillauditTime">是否显示日报审批流程</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.isCro">是否CRO企业</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.onlyImportreport">是否仅使用导入日报审核（不要项目审核）</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.projectLevelState">是否开启项目级别自定义</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.outputValueStatus">是否开启项目产值字段</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.choseFromAlbum">是否开启从相册选择</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.reportApproveMsgpush">日报审核通过是否推送消息</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.projectWithDept">项目是否有所属部门</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.financeJobnumEnabled">财务导入薪资是否支持工号</el-checkbox></el-form-item>
-                <!-- <el-form-item><el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox></el-form-item> -->
-                <el-form-item><el-checkbox v-model="dialogData.notAllowedNoAttendance">是否开启考勤为0不可填报</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.stageHasEvtime">是否开启预估工时</el-checkbox></el-form-item>
-                <!-- <el-form-item><el-checkbox v-model="dialogData.pushReportData">是否开通【推送工时数据】</el-checkbox></el-form-item> -->
-                <el-form-item><el-checkbox v-model="dialogData.financeAudit">财务导入是否需要审核</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.includeWeekends">批量填报是否包含周末</el-checkbox></el-form-item>
-                <el-form-item><el-checkbox v-model="dialogData.multiWorktime">一个项目下可填报多个时间段工时</el-checkbox></el-form-item>
-                <el-form-item>
-                    日报审核模式：
-                    <el-select v-model="dialogData.reportAuditType" size="small">
-                        <el-option :value="0" label="项目审核人审核"></el-option>
-                        <el-option :value="1" label="任务分组负责人审核"></el-option>
-                        <el-option :value="2" label="先分组审核再PM审核"></el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item>
-                    <el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox>
-                    <el-input-number v-if="dialogData.reportAutoApprove" v-model.number="dialogData.reportAutoApproveDays" controls-position="right" size="mini" style="margin: 0 10px 0 10px;width: 90px;" :min="0"></el-input-number>
-                    <el-tooltip effect="dark" :content="`${dialogData.reportAutoApproveDays}天后自动审核`" placement="top-start" v-if="dialogData.reportAutoApprove">
-                        <i class="el-icon-question"></i>
-                    </el-tooltip>
-                </el-form-item>
-            </el-form>
+            <div style="height: 430px">
+                <el-form label-width="100px" class="otherForm">
+                    <el-form-item><el-checkbox v-model="dialogData.reportWorkflow">是否开启审批流设置</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.needEvaluate">审核通过需输入评价</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.mainProjectState">是否启用主项目模式</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.isSecretSalary">是否秘薪模式</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.showFillauditTime">是否显示日报审批流程</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.isCro">是否CRO企业</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.onlyImportreport">是否仅使用导入日报审核（不要项目审核）</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.projectLevelState">是否开启项目级别自定义</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.outputValueStatus">是否开启项目产值字段</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.choseFromAlbum">是否开启从相册选择</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.reportApproveMsgpush">日报审核通过是否推送消息</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.projectWithDept">项目是否有所属部门</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.financeJobnumEnabled">财务导入薪资是否支持工号</el-checkbox></el-form-item>
+                    <!-- <el-form-item><el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox></el-form-item> -->
+                    <el-form-item><el-checkbox v-model="dialogData.notAllowedNoAttendance">是否开启考勤为0不可填报</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.stageHasEvtime">是否开启预估工时</el-checkbox></el-form-item>
+                    <!-- <el-form-item><el-checkbox v-model="dialogData.pushReportData">是否开通【推送工时数据】</el-checkbox></el-form-item> -->
+                    <el-form-item><el-checkbox v-model="dialogData.financeAudit">财务导入是否需要审核</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.includeWeekends">批量填报是否包含周末</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.multiWorktime">一个项目下可填报多个时间段工时</el-checkbox></el-form-item>
+                    <el-form-item><el-checkbox v-model="dialogData.restartTaskNeedReason">重启任务是否需要原因</el-checkbox></el-form-item>
+                    <el-form-item>
+                        日报审核模式：
+                        <el-select v-model="dialogData.reportAuditType" size="small">
+                            <el-option :value="0" label="项目审核人审核"></el-option>
+                            <el-option :value="1" label="任务分组负责人审核"></el-option>
+                            <el-option :value="2" label="先分组审核再PM审核"></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-checkbox v-model="dialogData.reportAutoApprove">是否开启日报自动审核</el-checkbox>
+                        <el-input-number v-if="dialogData.reportAutoApprove" v-model.number="dialogData.reportAutoApproveDays" controls-position="right" size="mini" style="margin: 0 10px 0 10px;width: 90px;" :min="0"></el-input-number>
+                        <el-tooltip effect="dark" :content="`${dialogData.reportAutoApproveDays}天后自动审核`" placement="top-start" v-if="dialogData.reportAutoApprove">
+                            <i class="el-icon-question"></i>
+                        </el-tooltip>
+                    </el-form-item>
+                </el-form>
+            </div>
             <!-- 是否开启审批流设置，是否启用主项目模式，是否秘薪模式，是否显示日报审批流程，是否CRO企业，是否仅使用导入日报审核（不要项目审核） reportAuditType-->
             <span slot="footer" class="dialog-footer">
                 <el-button @click="editDialogG = false">取 消</el-button>
@@ -292,7 +296,9 @@
                 size: 20,
                 list: [],
                 roleList: [],
-                roleIdArr: []
+                roleIdArr: [],
+
+                onlyContract: false, // 仅显示已签约
             };
         },
         // 过滤器
@@ -389,6 +395,7 @@
                             this.$set(this.dialogData,'multiWorktime',res.data.multiWorktime ? true : false)
                             this.$set(this.dialogData,'reportAuditType',res.data.reportAuditType)
                             this.$set(this.dialogData,'reportAutoApproveDays',res.data.reportAutoApproveDays)
+                            this.$set(this.dialogData,'restartTaskNeedReason',res.data.restartTaskNeedReason ? true : false)
                         }else{
                             this.$message({
                                 message: res.msg,
@@ -553,7 +560,7 @@
                         packageEngineering: this.dialogData.packageEngineering ? 1 : 0,
                         packageSimple: this.dialogData.packageSimple ? 1 : 0,
                         packageFinance: this.dialogData.packageFinance ? 1 : 0,
-                        packageProvider: this.dialogData.packageProvider ? 1 : 0
+                        packageProvider: this.dialogData.packageProvider ? 1 : 0,
                     },
                 res => {
                     this.listLoading = false;
@@ -669,6 +676,7 @@
                     multiWorktime: this.dialogData.multiWorktime ? 1 : 0,
                     reportAuditType: this.dialogData.reportAuditType,
                     reportAutoApproveDays: this.dialogData.reportAutoApproveDays, // 自动审核的天数
+                    restartTaskNeedReason: this.dialogData.restartTaskNeedReason ? 1 : 0,
                 },res => {
                     if(res.code == 'ok'){
                         this.editDialogG = false
@@ -760,7 +768,8 @@
                     pageSize: this.size,
                     companyName: this.keyword,
                     isMeal: this.isMeal == 2 ? 0 : this.isMeal,
-                    key: this.isMeal == 2 ? 1 : 0
+                    key: this.isMeal == 2 ? 1 : 0,
+                    keyForIsMeal: this.onlyContract
                 },
                 res => {
                     this.listLoading = false;