前后:日常评价列表

src/dashoo.cn/backend/api/business/oilcontract/contractReview/contractReview.go

@@ -34,6 +34,7 @@ type OilContractReviewListVo struct {
 	Id                int       `json:"Id"`
 	ContractId        int       `json:"ContractId"`
 	Status            string    `json:"Status"`
+	PerformStatus     string    `json:"PerformStatus"`
 	WorkflowId        string    `json:"WorkflowId"`
 	BusinessKey       string    `json:"BusinessKey"`
 	ProcessKey        string    `json:"ProcessKey"`

src/dashoo.cn/backend/api/business/oilcontract/contractReview/contractReviewService.go

@@ -42,7 +42,7 @@ func (s *OilContractReviewService) GetContractReviewList(pageIndex, itemsPerPage
 		",c.StartDate" +
 		",c.EndDate" +
 		",c.PlanFinishDate" +
-		",c.SettleStatus" +
+		",c.Status as PerformStatus" +
 		",c.Remark " +
 		"FROM OilContractReview r " +
 		"LEFT JOIN OilContract c ON r.ContractId=c.Id " +

src/dashoo.cn/backend/api/controllers/oilcontract/contractReview.go

@@ -50,6 +50,8 @@ func (this *OilContractReviewController) GetEntityList() {
 	Id := this.GetString("Id")
 	ContractClass := this.GetString("ContractClass")
 	ContractName := this.GetString("ContractName")
+	ProjectOwner := this.GetString("ProjectOwner")
+	Telephone := this.GetString("Telephone")
 	ContractNo := this.GetString("ContractNo")
 	ContractId := this.GetString("ContractId")
 	WorkflowId := this.GetString("WorkflowId")
@@ -57,19 +59,38 @@ func (this *OilContractReviewController) GetEntityList() {
 	ProcessKey := this.GetString("ProcessKey")
 	BackRemark := this.GetString("BackRemark")
 	CreateOn := this.GetString("CreateOn")
+	CreateOn1 := this.GetString("CreateOn1")
 	SupplierName := this.GetString("SupplierName")
 	SecondUnit := this.GetString("SecondUnit")
+	PerformStatus := this.GetString("PerformStatus")
 	Status := this.GetString("Status")
 	Year := this.GetString("Year")
+	Amount := this.GetString("Amount")
 
 	if Id != "" {
 		where = where + " and r.Id like '%" + Id + "%'"
 	}
 
+	if PerformStatus != "" {
+		where = where + " and c.Status=" + PerformStatus + " "
+	}
+
+	if Amount != "" {
+		where = where + " and c.Amount like '%" + Amount + "%'"
+	}
+
 	if ContractClass != "" {
 		where = where + " and c.ContractClass = '" + ContractClass + "'"
 	}
 
+	if ProjectOwner != "" {
+		where = where + " and c.ProjectOwner like '%" + ProjectOwner + "%'"
+	}
+
+	if Telephone != "" {
+		where = where + " and c.Telephone like '%" + Telephone + "%'"
+	}
+
 	if ContractId != "" {
 		where = where + " and r.ContractId = '" + ContractId + "'"
 	}
@@ -119,6 +140,15 @@ func (this *OilContractReviewController) GetEntityList() {
 		}
 	}
 
+	if CreateOn1 != "" {
+		dates := strings.Split(CreateOn1, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and c.StartDate>='" + minDate + "' and c.EndDate<='" + maxDate + "'"
+		}
+	}
+
 	if Year != "" {
 		where = where + " and r.CreateOn>='" + Year + "-01-01 00:00:00' and r.CreateOn<='" + Year + "-12-31 23:59:59' "
 	}

src/dashoo.cn/frontend_web/src/api/oilcontract/contractReview.js

@@ -44,9 +44,9 @@ export default {
   },
 
   // 评价列表
-  getReviewList (CreateOn, params, myAxios) {
+  getReviewList (CreateOn,CreateOn1, params, myAxios) {
     return myAxios({
-      url: '/contract-review/list?CreateOn=' + CreateOn,
+      url: '/contract-review/list?CreateOn=' + CreateOn + '&CreateOn1=' + CreateOn1,
       method: 'GET',
       params: params
     })

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis/index.vue

@@ -140,19 +140,6 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="合同名称">
-              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="合同编号">
-              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="发起评价单位">
               <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
@@ -162,72 +149,59 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="工程地点">-->
-<!--              <el-input size="mini" v-model="searchForm.ProjectPlace" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="项目负责人">
-              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同名称">
+              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="联系人电话">
-              <el-input size="mini" v-model="searchForm.Telephone" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同编号">
+              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="项目类别">-->
-<!--              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="合同类别">
+              <el-input size="mini" v-model="searchForm.ClassName" style="width:100%" placeholder="请输入" clearable></el-input>
+            </el-form-item>
+          </el-col>
 
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="合同模式">-->
-<!--              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+          <el-col :span="12">
+            <el-form-item label="履行状态">
+              <el-select size="mini" v-model="searchForm.PerformStatus" placeholder="请选择" style="width: 100%" clearable>
+                <el-option label="全部" value="" key="01"></el-option>
+                <el-option label="未履行" :value="1" key="02"></el-option>
+                <el-option label="履行中" :value="2" key="03"></el-option>
+                <el-option label="履行完毕" :value="3" key="04"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="合同总金额(元)">
-              <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="项目负责人">
+              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="合同总工期(天)">
-              <el-input size="mini" v-model="searchForm.ContractPeriod" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同总金额(元)">
+              <el-input size="mini" v-model="searchForm.Amount" placeholder="请输入" style="width: 100%" clearable>
+                <template slot="append">(元)</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="履行期限(始)">
-                <el-input size="mini" v-model="searchForm.StartDate" style="width:100%" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-
-            <el-col :span="12">
-              <el-form-item label="履行期限(止)">
-                <el-input size="mini" v-model="searchForm.EndDate" style="width:100%" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+          <el-col :span="12">
+            <el-form-item label="履行时间">
+              <el-date-picker size="mini" v-model="CreateOn1" unlink-panels type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
-
-
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -304,6 +278,21 @@ export default {
         } else if (index === 'StartDate' || index === 'EndDate' || index === 'SubmitDate') {
           let timeString = this.jstimehandle(item)
           return timeString
+        } else if (index === 'PerformStatus') {
+          let items = Number(item)
+          switch (items) {
+            case 1:
+              return '未履行'
+              break
+            case 2:
+              return '履行中'
+              break
+            case 3:
+              return '履行完毕'
+              break
+            default:
+              return '--'
+          }
         } else {
           return item
         }
@@ -374,11 +363,13 @@ export default {
       },
       // 查询时间 new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
       CreateOn: [],
+      CreateOn1: [],
       // 查询项
       searchFormReset: {},
       searchForm: {
         Id: '',
         SecondUnit: '',
+        PerformStatus: '',
         SupplierId: '',
         SupplierName: '',
         ProjectName: '',
@@ -479,12 +470,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'Telephone',
-          label: '联系人电话',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'Telephone',
+        //   label: '联系人电话',
+        //   width: 100,
+        //   sort: true
+        // },
 
         // {
         //   prop: 'ProjectType',
@@ -507,12 +498,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ContractPeriod',
-          label: '合同总工期(天)',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'ContractPeriod',
+        //   label: '合同总工期(天)',
+        //   width: 100,
+        //   sort: true
+        // },
 
         {
           prop: 'StartDate',
@@ -526,6 +517,13 @@ export default {
           label: '履行期限(止)',
           width: 100,
           sort: true
+        },
+
+        {
+          prop: 'PerformStatus',
+          label: '履行状态',
+          width: 70,
+          sort: true
         }
       ]
     }
@@ -710,6 +708,7 @@ export default {
       // <el-option label="技术服务" value="03" key="03"></el-option>
 
       let myCreateOn = []
+      let myCreateOn1 = []
       // 解析时间
       if (this.CreateOn.length == 2) {
         this.CreateOn[1].setHours(23)
@@ -718,12 +717,18 @@ export default {
         myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
         myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
       }
+      if (this.CreateOn1.length == 2) {
+        this.CreateOn1[1].setHours(23)
+        this.CreateOn1[1].setMinutes(59)
+        this.CreateOn1[1].setSeconds(59)
+        myCreateOn1.push(this.formatDateTime(this.CreateOn1[0]))
+        myCreateOn1.push(this.formatDateTime(this.CreateOn1[1]))
+      }
       // 查询条件
       Object.assign(params, this.searchForm)
       // 访问接口
-      api.getReviewList(myCreateOn.join(','), params, this.$axios).then(res => {
+      apiReview.getReviewList(myCreateOn.join(','), myCreateOn1.join(','),  params, this.$axios).then(res => {
         this.tableLoading = false
-        console.log('评价接口', res)
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
         this.selectAllButtonBoolean = false

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods/index.vue

@@ -143,19 +143,6 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="合同名称">
-              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="合同编号">
-              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="发起评价单位">
               <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
@@ -165,68 +152,57 @@
               </el-select>
             </el-form-item>
           </el-col>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="工程地点">-->
-<!--              <el-input size="mini" v-model="searchForm.ProjectPlace" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="项目负责人">
-              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同名称">
+              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="联系人电话">
-              <el-input size="mini" v-model="searchForm.Telephone" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同编号">
+              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="项目类别">-->
-<!--              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="合同模式">-->
-<!--              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-        </el-row>
-        <el-row>
           <el-col :span="12">
-            <el-form-item label="合同总金额(元)">
-              <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同类别">
+              <el-input size="mini" v-model="searchForm.ClassName" style="width:100%" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="合同总工期(天)">
-              <el-input size="mini" v-model="searchForm.ContractPeriod" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="履行状态">
+              <el-select size="mini" v-model="searchForm.PerformStatus" placeholder="请选择" style="width: 100%" clearable>
+                <el-option label="全部" value="" key="01"></el-option>
+                <el-option label="未履行" :value="1" key="02"></el-option>
+                <el-option label="履行中" :value="2" key="03"></el-option>
+                <el-option label="履行完毕" :value="3" key="04"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="履行期限(始)">
-              <el-input size="mini" v-model="searchForm.StartDate" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="项目负责人">
+              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="履行期限(止)">
-              <el-input size="mini" v-model="searchForm.EndDate" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同总金额(元)">
+              <el-input size="mini" v-model="searchForm.Amount" placeholder="请输入" style="width: 100%" clearable>
+                <template slot="append">(元)</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+          <el-col :span="12">
+            <el-form-item label="履行时间">
+              <el-date-picker size="mini" v-model="CreateOn1" unlink-panels type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -301,6 +277,21 @@ export default {
           }
         } else if (index === 'StartDate' || index === 'EndDate' || index === 'SubmitDate') {
           return this.jstimehandle(item)
+        } else if (index === 'PerformStatus') {
+          let items = Number(item)
+          switch (items) {
+            case 1:
+              return '未履行'
+              break
+            case 2:
+              return '履行中'
+              break
+            case 3:
+              return '履行完毕'
+              break
+            default:
+              return '--'
+          }
         } else {
           return item
         }
@@ -370,12 +361,14 @@ export default {
       },
       // 查询时间 new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
       CreateOn: [],
+      CreateOn1: [],
       // 查询项
       searchFormReset: {},
       secondUnitOptions: [],
       searchForm: {
         Id: '',
         SecondUnit: '',
+        PerformStatus: '',
         SupplierId: '',
         SupplierName: '',
         ContractName: '',
@@ -462,13 +455,6 @@ export default {
           sort: true
         },
 
-        // {
-        //   prop: 'ProjectPlace',
-        //   label: '工程地点',
-        //   width: 100,
-        //   sort: true
-        // },
-
         {
           prop: 'ProjectOwner',
           label: '项目负责人',
@@ -476,27 +462,6 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'Telephone',
-          label: '联系人电话',
-          width: 100,
-          sort: true
-        },
-
-        // {
-        //   prop: 'ProjectType',
-        //   label: '项目类别',
-        //   width: 100,
-        //   sort: true
-        // },
-
-        // {
-        //   prop: "ContractMode",
-        //   label: '合同模式',
-        //   width: 100,
-        //   sort: true
-        // },
-
         {
           prop: 'Amount',
           label: '合同总金额(元)',
@@ -504,13 +469,6 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ContractPeriod',
-          label: '合同总工期(天)',
-          width: 100,
-          sort: true
-        },
-
         {
           prop: 'StartDate',
           label: '履行期限(始)',
@@ -523,6 +481,13 @@ export default {
           label: '履行期限(止)',
           width: 100,
           sort: true
+        },
+
+        {
+          prop: 'PerformStatus',
+          label: '履行状态',
+          width: 70,
+          sort: true
         }
 
       ]
@@ -701,6 +666,7 @@ export default {
       // <el-option label="技术服务" value="03" key="03"></el-option>
 
       let myCreateOn = []
+      let myCreateOn1 = []
       // 解析时间
       if (this.CreateOn.length == 2) {
         this.CreateOn[1].setHours(23)
@@ -709,10 +675,17 @@ export default {
         myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
         myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
       }
+      if (this.CreateOn1.length == 2) {
+        this.CreateOn1[1].setHours(23)
+        this.CreateOn1[1].setMinutes(59)
+        this.CreateOn1[1].setSeconds(59)
+        myCreateOn1.push(this.formatDateTime(this.CreateOn1[0]))
+        myCreateOn1.push(this.formatDateTime(this.CreateOn1[1]))
+      }
       // 查询条件
       Object.assign(params, this.searchForm)
       // 访问接口
-      api.getReviewList(myCreateOn.join(','), params, this.$axios).then(res => {
+      apiReview.getReviewList(myCreateOn.join(','), myCreateOn.join(','), params, this.$axios).then(res => {
         this.tableLoading = false
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-service/index.vue

@@ -142,19 +142,6 @@
               <el-input size="mini" v-model="searchForm.SupplierName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="合同名称">
-              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="合同编号">
-              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="发起评价单位">
               <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
@@ -165,71 +152,58 @@
             </el-form-item>
           </el-col>
 
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="工程地点">-->
-<!--              <el-input size="mini" v-model="searchForm.ProjectPlace" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="项目负责人">
-              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同名称">
+              <el-input size="mini" v-model="searchForm.ContractName" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="联系人电话">
-              <el-input size="mini" v-model="searchForm.Telephone" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同编号">
+              <el-input size="mini" v-model="searchForm.ContractNo" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="项目类别">-->
-<!--              <el-input size="mini" v-model="searchForm.ProjectType" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-
-<!--          <el-col :span="12">-->
-<!--            <el-form-item label="合同模式">-->
-<!--              <el-input size="mini" v-model="searchForm.ContractMode" style="width:100%" placeholder="请输入"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-        </el-row>
-        <el-row>
           <el-col :span="12">
-            <el-form-item label="合同总金额(元)">
-              <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同类别">
+              <el-input size="mini" v-model="searchForm.ClassName" style="width:100%" placeholder="请输入" clearable></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="合同总工期(天)">
-              <el-input size="mini" v-model="searchForm.ContractPeriod" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="履行状态">
+              <el-select size="mini" v-model="searchForm.PerformStatus" placeholder="请选择" style="width: 100%" clearable>
+                <el-option label="全部" value="" key="01"></el-option>
+                <el-option label="未履行" :value="1" key="02"></el-option>
+                <el-option label="履行中" :value="2" key="03"></el-option>
+                <el-option label="履行完毕" :value="3" key="04"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="履行期限(始)">
-              <el-input size="mini" v-model="searchForm.StartDate" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="项目负责人">
+              <el-input size="mini" v-model="searchForm.ProjectOwner" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
           <el-col :span="12">
-            <el-form-item label="履行期限(止)">
-              <el-input size="mini" v-model="searchForm.EndDate" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="合同总金额(元)">
+              <el-input size="mini" v-model="searchForm.Amount" placeholder="请输入" style="width: 100%" clearable>
+                <template slot="append">(元)</template>
+              </el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
-            <el-form-item label="备注">
-              <el-input size="mini" v-model="searchForm.Remark" style="width:100%" placeholder="请输入"></el-input>
+          <el-col :span="12">
+            <el-form-item label="履行时间">
+              <el-date-picker size="mini" v-model="CreateOn1" unlink-panels type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
-
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">
@@ -303,6 +277,21 @@ export default {
         } else if (index === 'StartDate' || index === 'EndDate' || index === 'SubmitDate') {
           let timeString = this.jstimehandle(item)
           return timeString
+        } else if (index === 'PerformStatus') {
+          let items = Number(item)
+          switch (items) {
+            case 1:
+              return '未履行'
+              break
+            case 2:
+              return '履行中'
+              break
+            case 3:
+              return '履行完毕'
+              break
+            default:
+              return '--'
+          }
         } else {
           return item
         }
@@ -373,11 +362,13 @@ export default {
       },
       // 查询时间 new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
       CreateOn: [],
+      CreateOn1: [],
       // 查询项
       searchFormReset: {},
       searchForm: {
         Id: '',
         SecondUnit: '',
+        PerformStatus: '',
         SupplierId: '',
         SupplierName: '',
         ContractName: '',
@@ -478,12 +469,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'Telephone',
-          label: '联系人电话',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'Telephone',
+        //   label: '联系人电话',
+        //   width: 100,
+        //   sort: true
+        // },
 
         // {
         //   prop: 'ProjectType',
@@ -506,12 +497,12 @@ export default {
           sort: true
         },
 
-        {
-          prop: 'ContractPeriod',
-          label: '合同总工期(天)',
-          width: 100,
-          sort: true
-        },
+        // {
+        //   prop: 'ContractPeriod',
+        //   label: '合同总工期(天)',
+        //   width: 100,
+        //   sort: true
+        // },
 
         {
           prop: 'StartDate',
@@ -525,6 +516,13 @@ export default {
           label: '履行期限(止)',
           width: 100,
           sort: true
+        },
+
+        {
+          prop: 'PerformStatus',
+          label: '履行状态',
+          width: 70,
+          sort: true
         }
 
       ]
@@ -701,11 +699,9 @@ export default {
         Prop: this.Column.Prop,
         ContractClass: '03'
       }
-      // <el-option label="物资类" value="01" key="01"></el-option>
-      // <el-option label="基建类" value="02" key="02"></el-option>
-      // <el-option label="技术服务" value="03" key="03"></el-option>
 
       let myCreateOn = []
+      let myCreateOn1 = []
       // 解析时间
       if (this.CreateOn.length == 2) {
         this.CreateOn[1].setHours(23)
@@ -714,12 +710,18 @@ export default {
         myCreateOn.push(this.formatDateTime(this.CreateOn[0]))
         myCreateOn.push(this.formatDateTime(this.CreateOn[1]))
       }
+      if (this.CreateOn1.length == 2) {
+        this.CreateOn1[1].setHours(23)
+        this.CreateOn1[1].setMinutes(59)
+        this.CreateOn1[1].setSeconds(59)
+        myCreateOn1.push(this.formatDateTime(this.CreateOn1[0]))
+        myCreateOn1.push(this.formatDateTime(this.CreateOn1[1]))
+      }
       // 查询条件
       Object.assign(params, this.searchForm)
       // 访问接口
-      api.getReviewList(myCreateOn.join(','), params, this.$axios).then(res => {
+      apiReview.getReviewList(myCreateOn.join(','),myCreateOn1.join(','), params, this.$axios).then(res => {
         this.tableLoading = false
-        console.log('评价接口', res)
         this.entityList = res.data.items
         this.currentItemCount = res.data.currentItemCount
         this.selectAllButtonBoolean = false