coys 1 år sedan
förälder
incheckning
b357a2c85d

+ 1 - 0
src/views/resumptionEvaluate/evaluate/index.vue

@@ -377,6 +377,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.onlyManager = false;
+      this.queryParams.orgType = null;
       this.handleQuery();
     },
     reset() {

+ 35 - 30
src/views/resumptionEvaluate/evaluatePlan/index.vue

@@ -20,8 +20,9 @@
               ref="queryForm"
               size="small"
               :inline="true"
-              v-show="showSearch" >
-              <el-form-item label="外包评价名称" >
+              v-show="showSearch"
+            >
+              <el-form-item label="外包评价名称">
                 <el-input
                   :maxlength="20"
                   v-model="queryParams.evaluateName"
@@ -45,26 +46,28 @@
                 </el-select>
               </el-form-item>
 
-            
-                <el-form-item  label="计划时间">
-                  <el-date-picker
-                    v-model="queryParams.dataTime"
-                    type="daterange"
-                    range-separator="至"
-                    start-placeholder="开始日期"
-                    end-placeholder="结束日期"
-                    value-format="yyyy-MM-dd"
-                    
-                    @change="changeHandler"
-                  >
-                  </el-date-picker>
-                </el-form-item>
-                
-            
+              <el-form-item label="计划时间">
+                <DataRangePicker
+                  v-model="queryParams.dataTime"
+                  key="daterange"
+                  type="daterange"
+                  value-format="yyyy-MM-dd"
+                  @input="changeHandler"
+                />
+                <!-- <el-date-picker
+                  v-model="queryParams.dataTime"
+                  type="daterange"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  value-format="yyyy-MM-dd"
+                  @input="changeHandler"
+                > -->
+                <!-- </el-date-picker> -->
+              </el-form-item>
             </el-form>
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
-                
                 <el-button
                   type="primary"
                   icon="el-icon-search"
@@ -73,7 +76,7 @@
                   >搜索</el-button
                 >
                 <el-button
-                type="primary"
+                  type="primary"
                   icon="el-icon-refresh"
                   size="mini"
                   @click="resetQuery"
@@ -117,7 +120,6 @@
               label="操作"
               width="180"
               fixed="right"
-         
               class-name="small-padding fixed-width"
             >
               <template slot-scope="{ row }">
@@ -129,7 +131,7 @@
                   icon="el-icon-plus"
                   >评价</el-button
                 >
-               
+
                 <el-button
                   size="mini"
                   @click="editHandler(row)"
@@ -157,6 +159,7 @@
 </template>
 <script>
 import { mapGetters } from "vuex";
+import DataRangePicker from "@/components/dateTime/daterange.picker.vue";
 
 import { getEvaluatePage } from "@/api/core/evalulateTask.js";
 import OrgTree from "@/components/orgTree";
@@ -166,6 +169,7 @@ export default {
   dicts: ["sys_org_type", "evaluate_task_status"],
   components: {
     OrgTree,
+    DataRangePicker,
     editEvaluate,
   },
   data() {
@@ -209,7 +213,7 @@ export default {
           break;
       }
     },
-    changeHandler(time){
+    changeHandler(time) {
       console.log(time);
     },
     //获取列表
@@ -236,7 +240,7 @@ export default {
     //判断是否能评价
     isEvaluateHandler(row) {
       let falg = false;
-      let statsFalg=false
+      let statsFalg = false;
       row.roleName?.split(",").forEach((item) => {
         this.roleList.forEach((i) => {
           if (i.roleName == item) {
@@ -244,14 +248,13 @@ export default {
           }
         });
       });
-      if(row.status=='0'){
-        statsFalg=true
+      if (row.status == "0") {
+        statsFalg = true;
       }
-      if(statsFalg&&falg){
-
+      if (statsFalg && falg) {
         return true;
-      }else{
-        return false
+      } else {
+        return false;
       }
       // row
     },
@@ -288,6 +291,8 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.onlyManager = false;
+      this.queryParams.dataTime = [];
+      this.queryParams.evaluateName = "";
       this.handleQuery();
     },
   },