调整导入审核日报

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -108,9 +108,9 @@
                                 <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item1.data[0].inchargerId) && (item1.state == 0 || item1.state == -1)" type="primary" :loading="logining" size="small" @click="approve(item1.id, item1)">通过</el-button>
                                 <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item1.data[0].inchargerId) && (item1.state == 0 || item1.state == -1)" type="danger" :loading="logining" size="small" @click="showDenyDialog(item1.id,0, item1)">驳回</el-button>
                                 <!--自己可以撤回待审核状态的报告 -->
-                                <el-button v-if="(user.id == item1.id) && (item1.state == 0 || item1.state == -1)" type="normal" :loading="logining" size="small" @click="cancel(item1)">撤回</el-button>
+                                <el-button v-if="(user.id == item1.id || user.role == 1 || user.role == 2 || user.manageDeptId != 0) && (item1.state == 0 || item1.state == -1)" type="normal" :loading="logining" size="small" @click="cancel(item1)">撤回</el-button>
                                 <el-button v-if="(user.role == 1 || user.role == 2 || user.id == item1.data[0].inchargerId) && item1.state == 1" type="normal" :loading="logining" size="small" @click="showDenyDialog(item1.id,1, item1)">撤销</el-button>
-                                <el-button v-if="item1.state >= 2 && user.id == item1.id" type="primary" size="small" @click="isSubstitude=false; fillInReport(index1,0)">编辑日报</el-button>
+                                <el-button v-if="item1.state >= 2 && (user.id == item1.id || user.role == 1 || user.role == 2 || user.manageDeptId != 0)" type="primary" size="small" @click="isSubstitude=false; fillInReport(index1,0)">编辑日报</el-button>
                             </div>
                             <div class="one_daily_body">
                                 <el-timeline>
@@ -124,7 +124,7 @@
                                             <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 2">[ 已驳回 ] 原因:{{item2.rejectReason}}</span>
                                             <span style="margin-left:15px;color:#FF0000;" v-else-if="item2.state == 3">[ 已撤回 ]</span>
                                             </span>
-                                            <el-button v-if="(user.role == 1 || user.role == 2) && item2.state != 1 && user.manageDeptId != 0" size="mini" @click="guanli(item2, item1)" style="float: right;">删除</el-button>
+                                            <!-- <el-button v-if="(user.role == 1 || user.role == 2) && item2.state != 1 && user.manageDeptId != 0" size="mini" @click="guanli(item2, item1)" style="float: right;">删除</el-button> -->
                                             <span v-if="user.company.packageEngineering == 1">
                                                 <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == -1">[ 待审核 ]</span>
                                                 <span style="margin-left:15px;color:#DAA520;" v-if="item2.state == 0 && item2.departmentAuditState == -1">[ 待专业审核 ]</span>

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list.vue

@@ -3,17 +3,17 @@
         <!--工具条-->
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
             <el-form :inline="true">
-                <el-form-item label="项目：">
-                    <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true">
-                        <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
                 <el-form-item label="部门：">
                     <el-cascader v-model="search.departmentIdArray" placeholder="请选择部门" style="width: 100%"
                     :options="option" :props="{ checkStrictly: false,expandTrigger: 'hover' }" :show-all-levels="false" clearable
                     @change="getList()"
                     ></el-cascader>
                 </el-form-item>
+                <el-form-item label="项目：">
+                    <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true">
+                        <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
                 <el-form-item label="日期：" style="margin-left:20px;">
                     <el-date-picker v-model="search.date" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
                     @change="getList()" :clearable="true" type="date" placeholder="选择工作日期"></el-date-picker>

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/list_import.vue

@@ -3,28 +3,34 @@
         <!--工具条-->
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
             <el-form :inline="true">
-                <el-form-item label="项目：">
-                    <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true">
-                        <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
-                    </el-select>
-                </el-form-item>
                 <el-form-item label="部门：">
                     <el-cascader v-model="search.departmentId" placeholder="请选择部门" style="width: 100%"
                     :options="option" :props="{ checkStrictly: true,expandTrigger: 'hover' }" :show-all-levels="false" clearable
                     @change="getList()"
                     ></el-cascader>
                 </el-form-item>
-                <el-form-item label="日期：" style="margin-left:20px;">
+                <el-form-item label="项目：">
+                    <el-select v-model="search.projectId" placeholder="请选择" clearable @change="getList()" filterable="true">
+                        <el-option v-for="item in projectList" :key="item.id" :label="item.projectName" :value="item.id"></el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item style="margin-left:20px;">
+                    <template>
+                        <div>
+                            <el-select v-model="search.dateType" placeholder="请选择" style="width: 80px" @change="dataFlgs()">
+                                <el-option v-for="item in dataFlgList" :key="item.value" :label="item.label" :value="item.value">
+                                </el-option>
+                            </el-select>
+                            <el-date-picker v-if="search.dateType == 0" v-model="search.date" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
+                                @change="getList()" :clearable="true" type="date" placeholder="选择工作日期"></el-date-picker>
+                            <!-- <el-date-picker v-if="search.dateType == 0" v-model="date" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd"  @change="getList()" :clearable="true">
+                            </el-date-picker> -->
+                             <el-date-picker v-if="search.dateType == 1" v-model="search.date" type="month" placeholder="请选择月份" format="yyyy-MM" value-format="yyyy-MM"  @change="dataYue()" :clearable="true">
+                             </el-date-picker>
+                        </div>
+                    </template>
                     <!-- <el-date-picker v-model="search.date" :editable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
                     @change="getList()" :clearable="true" type="date" placeholder="选择工作日期"></el-date-picker> -->
-                    <el-date-picker
-                        v-model="date"
-                        type="daterange"
-                        range-separator="至"
-                        start-placeholder="开始日期"
-                        end-placeholder="结束日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" 
-                    @change="getList()" :clearable="true">
-                    </el-date-picker>
                 </el-form-item>
                 <el-form-item   style="margin-left:20px;">
                     <el-button @click="batchApprove(true)" style="margin-left:10px;" :disabled="multipleSelection.length==0">批量通过</el-button>
@@ -94,20 +100,19 @@
                 </template>
             </el-table-column> -->
             
-            <el-table-column prop="name" label="姓名" sortable width="120"></el-table-column>
-            <el-table-column prop="date" label="日期" sortable width="150">
+            <el-table-column prop="name" label="姓名" sortable></el-table-column>
+            <el-table-column prop="date" label="日期" sortable>
             </el-table-column>
             <el-table-column prop="project" label="项目" >
             </el-table-column>
-            <el-table-column prop="time" label="工作时长(h)"  align="right">
+            <el-table-column prop="time" label="工作时长(h)" align="right">
                 <template slot-scope="scope">
                     <span>{{scope.row.time.toFixed(1)}}</span>
-                    
                 </template>
             </el-table-column>
-            <el-table-column prop="cost" label="成本(元)"   align="right">
+            <el-table-column prop="cost" label="成本(元)" align="right">
             </el-table-column>
-            <el-table-column prop="state" label="状态" width="150">
+            <el-table-column prop="state" label="状态">
                 <template slot-scope="scope">
                     <span v-if="scope.row.state == -1" style="color:#DAA520;">待审核</span>
                     <span v-else-if="scope.row.state == 1" style="color:#32CD32;">已通过</span>
@@ -163,7 +168,9 @@
                     // date: null,
                     departmentId: null,
                     startDate: null,
-                    endDate: null
+                    endDate: null,
+                    dateType: 0,
+                    date: null
                 },
 
                 users: [],
@@ -176,11 +183,26 @@
                 list: [],
                 logining: false,
                 multipleSelection: [],
-                date: ''
+                date: '',
+                dataFlg: 0,
+                dataFlgList:[{label: '日期', value: 0}, {label: '月份', value: 1}],
+                yuefen: ''
             };
         },
         methods: {
-            
+            dataFlgs() {
+                console.log(this.dataFlg)
+                if(this.search.dateType == 0) {
+                    this.search.date = null
+                } else {
+                    this.search.startDate = null
+                    this.search.endDate = null
+                    this.date = ''
+                }
+            },
+            dataYue() {
+                this.getList()
+            },
             // 获取部门列表
             getDepartment() {
                 this.http.post( this.port.manage.depList, {},
@@ -267,6 +289,8 @@
                 obj.projectId = this.search.projectId
                 obj.startDate = this.search.startDate
                 obj.endDate = this.search.endDate
+                obj.dateType = this.search.dateType
+                obj.date = this.search.date
                 if(this.search.departmentId) {
                     obj.departmentId = this.search.departmentId[this.search.departmentId.length - 1]
                 } else {