前后:合同高级查询

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

@@ -80,6 +80,7 @@ func (this *OilContractController) GetEntityList() {
 	Remark := this.GetString("Remark")
 	IsDelete := this.GetString("IsDelete")
 	CreateOn := this.GetString("CreateOn")
+	CreateOn1 := this.GetString("CreateOn1")
 	CreateUserId := this.GetString("CreateUserId")
 	CreateBy := this.GetString("CreateBy")
 	ModifiedOn := this.GetString("ModifiedOn")
@@ -283,6 +284,15 @@ func (this *OilContractController) GetEntityList() {
 		}
 	}
 
+	if CreateOn1 != "" {
+		dates := strings.Split(CreateOn1, ",")
+		if len(dates) == 2 {
+			minDate := dates[0]
+			maxDate := dates[1]
+			where = where + " and StartDate>='" + minDate + "' and EndDate<='" + maxDate + "'"
+		}
+	}
+
 	if SubPackage != "" {
 		where = where + " and SubPackage like '%" + SubPackage + "%'"
 	}

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

@@ -151,9 +151,9 @@ export default {
     })
   },
 
-  getList (CreateOn, params, myAxios) {
+  getList (CreateOn, CreateOn1, params, myAxios) {
     return myAxios({
-      url: '/contract/list?CreateOn=' + CreateOn,
+      url: '/contract/list?CreateOn=' + CreateOn + '&CreateOn1=' + CreateOn1,
       method: 'GET',
       params: params
     })

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

@@ -20,11 +20,11 @@
           <!-- <el-button type="primary" size="mini" style="margin-left:10px; margin-top: -4px;">分发给二级单位评价</el-button> -->
         </span>
         <el-form ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="">
+          <el-form-item label="企业名称">
             <el-input size="mini" clearable v-model="searchForm.SupplierName" style="width: 120px;" placeholder="企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="状态" style="width: 150px">
-            <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 100px" clearable>
+          <el-form-item label="履行状态">
+            <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 90px" 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>
@@ -38,8 +38,8 @@
 <!--              <el-option label="阶段性结算" value="2" key="03"></el-option>-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
-          <el-form-item label="企业类别" style="width: 180px">
-            <el-select size="mini" v-model="searchForm.ContractClass" placeholder="请选择" style="width: 110px" clearable>
+          <el-form-item label="企业类别">
+            <el-select size="mini" v-model="searchForm.ContractClass" placeholder="请选择" style="width: 90px" clearable>
               <el-option label="全部" value="" key="01"></el-option>
               <el-option label="供应商" value="01" key="02"></el-option>
               <el-option label="承包商" value="02" key="03"></el-option>
@@ -118,15 +118,17 @@
         <el-row>
 
           <el-col :span="12">
-            <el-form-item label="创建时间">
-              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
-                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            <el-form-item label="企业名称">
+              <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.SupplierName" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="项目建设单位">
+              <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择" style="width: 100%">
+                <el-option v-for="item in secondUnitOptions" :key="item.Id" :label="item.Fullname" :value="item.Id"
+                           style="width: 100%">
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -136,6 +138,12 @@
             </el-form-item>
           </el-col>
 
+          <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-input size="mini" v-model="searchForm.ClassName" style="width:100%" placeholder="请输入"></el-input>
@@ -143,8 +151,24 @@
           </el-col>
 
           <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 label="履行状态">
+              <el-select size="mini" v-model="searchForm.Status" 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-col :span="12">
+            <el-form-item label="企业类别">
+              <el-select size="mini" v-model="searchForm.ContractClass" placeholder="请选择" style="width: 100%" clearable>
+                <el-option label="全部" value="" key="01"></el-option>
+                <el-option label="供应商" value="01" key="02"></el-option>
+                <el-option label="承包商" value="02" key="03"></el-option>
+                <el-option label="服务商" value="03" key="04"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
 
@@ -166,12 +190,6 @@
             </el-form-item>
           </el-col>
 
-          <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>
@@ -179,8 +197,10 @@
           </el-col>
 
           <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.Amount" placeholder="请输入" style="width: 100%">
+                <template slot="append">(元)</template>
+              </el-input>
             </el-form-item>
           </el-col>
 
@@ -189,6 +209,18 @@
               <el-input size="mini" v-model="searchForm.ContractPeriod" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="履行时间">
+              <el-date-picker size="mini" v-model="CreateOn1" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="创建时间">
+              <el-date-picker size="mini" v-model="CreateOn" type="daterange" style="width:100%" range-separator="至"
+                              start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
 <!--        <el-row>-->
 <!--          <el-col :span="12">-->
@@ -675,6 +707,7 @@
         },
         // 查询时间new Date(new Date().getTime() - 30 * 24 * 60 * 60 * 1000), new Date()
         CreateOn: [],
+        CreateOn1: [],
         // 查询项
         searchFormReset: {},
         tableDataList: {
@@ -683,6 +716,7 @@
         searchForm: {
           Id: '',
           SupplierId: '',
+          SecondUnit: '',
           ContractClass: '',
           ImportSecondUnit: '',
           SupplierName: '',
@@ -1296,6 +1330,7 @@
           Prop: this.Column.Prop
         }
         let myCreateOn = []
+        let myCreateOn1 = []
         // 解析时间
         if (this.CreateOn.length == 2) {
           this.CreateOn[1].setHours(23)
@@ -1304,10 +1339,17 @@
           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.CreateOn[0]))
+          myCreateOn1.push(this.formatDateTime(this.CreateOn[1]))
+        }
         // 查询条件
         Object.assign(params, this.searchForm)
         // 访问接口
-        api.getList(myCreateOn.join(','), params, this.$axios).then(res => {
+        api.getList(myCreateOn.join(','),myCreateOn1.join(','), params, this.$axios).then(res => {
           this.tableLoading = false// 表格loading
           console.log('列表数据', res.data)
           this.entityList = res.data.items