前后:时间

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

@@ -111,6 +111,7 @@ type HandOnStatisticsQuery struct {
 	PageIndex		int64
 	ItemsPerPage 	int64
 	Order 			string
+	Prop 			string
 	Asc 			string
 	SecondUnit		string
 	YearNum			int

src/dashoo.cn/backend/api/business/oilcontract/contract/contractService.go

@@ -43,7 +43,7 @@ func (s *OilContractService) GetHandOnStatisticsList (queryParam HandOnStatistic
 	}
 
 	if queryParam.Order != "" {
-		sql += " ORDER BY " + queryParam.Order  + " " + queryParam.Asc
+		sql += " ORDER BY " + queryParam.Prop  + " " + queryParam.Order
 	}
 
 	startLimit := int((queryParam.PageIndex-1) * queryParam.ItemsPerPage)

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

@@ -67,6 +67,8 @@ type OilContractReviewListVo struct {
 	Amount         string    `json:"Amount"`
 	ContractPeriod string    `json:"ContractPeriod"`
 	OpenDate       time.Time `json:"OpenDate"`
+	StartDate      time.Time `json:"StartDate"`
+	EndDate        time.Time `json:"EndDate"`
 	PlanFinishDate time.Time `json:"PlanFinishDate"`
 	SettleStatus   string    `json:"SettleStatus"`
 	Remark         string    `json:"Remark"`

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

@@ -36,6 +36,8 @@ func (s *OilContractReviewService) GetContractReviewList(pageIndex, itemsPerPage
 		",c.Amount" +
 		",c.ContractPeriod" +
 		",c.OpenDate" +
+		",c.StartDate" +
+		",c.EndDate" +
 		",c.PlanFinishDate" +
 		",c.SettleStatus" +
 		",c.Remark " +

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-check/_opera/operation.vue

@@ -122,13 +122,13 @@
               </el-row>
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="开工日期">
+                  <el-form-item label="履行期限(始)">
                     <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
+                  <el-form-item label="履行期限(止)">
                     <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-basis-year-single/_opera/operation.vue

@@ -126,13 +126,13 @@
               </el-row>
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="开工日期">
+                  <el-form-item label="履行期限(始)">
                     <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
+                  <el-form-item label="履行期限(止)">
                     <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>

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

@@ -146,7 +146,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="合同总金额(万元)">
+            <el-form-item label="合同总金额(元)">
               <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -158,13 +158,13 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="开工日期">
+            <el-form-item label="履行期限(始)">
               <el-input size="mini" v-model="searchForm.OpenDate" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="计划竣工时间">
+            <el-form-item label="履行期限(止)">
               <el-input size="mini" v-model="searchForm.PlanFinishDate" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -440,7 +440,7 @@
 
           {
             prop: "Amount",
-            label: '合同总金额(万元)',
+            label: '合同总金额(元)',
             width: 100,
             sort: true
           },
@@ -454,14 +454,14 @@
 
           {
             prop: "OpenDate",
-            label: '开工日期',
+            label: '履行期限(始)',
             width: 100,
             sort: true
           },
 
           {
             prop: "PlanFinishDate",
-            label: '计划竣工时间',
+            label: '履行期限(止)',
             width: 100,
             sort: true
           },

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

@@ -114,20 +114,6 @@
     <el-dialog title="高级查询" :close-on-click-modal="false" :visible.sync="dialogVisible" width="720px">
       <el-form ref="advancedsearchForm" label-width="110px">
         <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>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="供应商ID">
-              <el-input size="mini" v-model="searchForm.SupplierId" 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>
@@ -139,7 +125,8 @@
               <el-input size="mini" v-model="searchForm.ProjectName" 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>
@@ -151,7 +138,8 @@
               <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>
@@ -163,7 +151,8 @@
               <el-input size="mini" v-model="searchForm.Telephone" 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>
@@ -175,9 +164,10 @@
               <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-form-item label="合同总金额(元)">
               <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -187,21 +177,22 @@
               <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-input size="mini" v-model="searchForm.OpenDate" 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.PlanFinishDate" style="width:100%" placeholder="请输入"></el-input>
-            </el-form-item>
-          </el-col>
-
-
-          <el-col :span="12">
+        </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-form-item>
@@ -281,8 +272,9 @@ export default {
               return '--'
               break
           }
-        } else if (index === 'OpenDate' || index === 'EndDate' || index === 'PlanFinishDate' || index === 'SubmitDate') {
+        } else if (index === 'StartDate' || index === 'EndDate' || index === 'SubmitDate') {
           let timeString = this.timeStyle(item)
+          console.log(timeString, item, '123请问')
           return timeString
         } else {
           return item
@@ -368,8 +360,8 @@ export default {
         ContractMode: '',
         Amount: '',
         ContractPeriod: '',
-        OpenDate: '',
-        PlanFinishDate: '',
+        StartDate: '',
+        EndDate: '',
         ConstructionUnit: '',
         ConstructionOwner: '',
         ConstructionTelphone: '',
@@ -467,7 +459,7 @@ export default {
 
         {
           prop: 'Amount',
-          label: '合同总金额(万元)',
+          label: '合同总金额(元)',
           width: 100,
           sort: true
         },
@@ -480,15 +472,15 @@ export default {
         },
 
         {
-          prop: 'OpenDate',
-          label: '开工日期',
+          prop: 'StartDate',
+          label: '履行期限(始)',
           width: 100,
           sort: true
         },
 
         {
-          prop: 'PlanFinishDate',
-          label: '计划竣工时间',
+          prop: 'EndDate',
+          label: '履行期限(止)',
           width: 100,
           sort: true
         }

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-goods-year-check/_opera/operation.vue

@@ -122,13 +122,13 @@
               </el-row>
               <el-row>
                 <el-col :span="8">
-                  <el-form-item label="开工日期">
+                  <el-form-item label="履行期限(始)">
                     <el-input v-model="formData.OpenDate" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item label="计划竣工时间">
+                  <el-form-item label="履行期限(止)">
                     <el-input v-model="formData.PlanFinishDate" placeholder="请输入"  style="width: 100%"></el-input>
                   </el-form-item>
                 </el-col>

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

@@ -116,20 +116,6 @@
     <el-dialog title="高级查询" :visible.sync="dialogVisible" width="720px">
       <el-form ref="advancedsearchForm" label-width="110px">
         <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>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="供应商ID">
-              <el-input size="mini" v-model="searchForm.SupplierId" 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>
@@ -141,7 +127,8 @@
               <el-input size="mini" v-model="searchForm.ProjectName" 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>
@@ -153,7 +140,8 @@
               <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>
@@ -165,7 +153,8 @@
               <el-input size="mini" v-model="searchForm.Telephone" 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>
@@ -177,9 +166,10 @@
               <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-form-item label="合同总金额(元)">
               <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -189,20 +179,22 @@
               <el-input size="mini" v-model="searchForm.ContractPeriod" 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.OpenDate" style="width:100%" placeholder="请输入"></el-input>
+            <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.PlanFinishDate" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="履行期限(止)">
+              <el-input size="mini" v-model="searchForm.EndDate" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="12">
+        </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-form-item>
@@ -277,7 +269,7 @@ export default {
               return '--'
               break
           }
-        } else if (index === 'OpenDate' || index === 'EndDate' || index === 'PlanFinishDate' || index === 'SubmitDate') {
+        } else if (index === 'StartDate' || index === 'EndDate' || index === 'SubmitDate') {
           return this.timeStyle(item)
         } else {
           return item
@@ -363,8 +355,8 @@ export default {
         ContractMode: '',
         Amount: '',
         ContractPeriod: '',
-        OpenDate: '',
-        PlanFinishDate: '',
+        StartDate: '',
+        EndDate: '',
         ConstructionUnit: '',
         ConstructionOwner: '',
         ConstructionTelphone: '',
@@ -462,7 +454,7 @@ export default {
 
         {
           prop: 'Amount',
-          label: '合同总金额(万元)',
+          label: '合同总金额(元)',
           width: 100,
           sort: true
         },
@@ -475,15 +467,15 @@ export default {
         },
 
         {
-          prop: 'OpenDate',
-          label: '开工日期',
+          prop: 'StartDate',
+          label: '履行期限(始)',
           width: 100,
           sort: true
         },
 
         {
-          prop: 'PlanFinishDate',
-          label: '计划竣工时间',
+          prop: 'EndDate',
+          label: '履行期限(止)',
           width: 100,
           sort: true
         }

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

@@ -145,7 +145,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="合同总金额(万元)">
+            <el-form-item label="合同总金额(元)">
               <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -157,13 +157,13 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="开工日期">
+            <el-form-item label="履行期限(始)">
               <el-input size="mini" v-model="searchForm.OpenDate" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="计划竣工时间">
+            <el-form-item label="履行期限(止)">
               <el-input size="mini" v-model="searchForm.PlanFinishDate" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -439,7 +439,7 @@
 
           {
             prop: "Amount",
-            label: '合同总金额(万元)',
+            label: '合同总金额(元)',
             width: 100,
             sort: true
           },
@@ -453,14 +453,14 @@
 
           {
             prop: "OpenDate",
-            label: '开工日期',
+            label: '履行期限(始)',
             width: 100,
             sort: true
           },
 
           {
             prop: "PlanFinishDate",
-            label: '计划竣工时间',
+            label: '履行期限(止)',
             width: 100,
             sort: true
           },

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

@@ -546,7 +546,7 @@ export default {
     var StartDateVar = (rule, value, callback) => {
       if ((this.formData.EndDate != '' && this.formData.EndDate != null) && (value != '' && value != null)) {
         if (this.formData.EndDate < value) {
-          callback(new Error('开工日期不能大于竣工日期'))
+          callback(new Error('履行期限(始)不能大于履行期限(止)'))
         } else {
           callback()
         }
@@ -557,7 +557,7 @@ export default {
     var EndDateVar = (rule, value, callback) => {
       if ((this.formData.StartDate != '' && this.formData.StartDate != null) && (value != '' && value != null)) {
         if (this.formData.StartDate > value) {
-          callback(new Error('竣工日期不能小于开工日期'))
+          callback(new Error('履行期限(止)不能小于履行期限(始)'))
         } else {
           callback()
         }

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

@@ -174,7 +174,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="合同总金额(万元)">
+            <el-form-item label="合同总金额(元)">
               <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -860,7 +860,7 @@
 
           {
             prop: 'Amount',
-            label: '合同总金额(万元)',
+            label: '合同总金额(元)',
             width: 100,
             sort: true
           },
@@ -1389,9 +1389,9 @@
 
       jstimehandle (val) {
         if (val === '') {
-          return '----'
-        } else if (val === '0001-01-01T08:00:00+08:00') {
-          return '----'
+          return '--'
+        } else if (val === '0001-01-01T08:00:00+08:00' || val ===  '0001-01-01T00:00:00Z') {
+          return '--'
         } else if (val === '5000-01-01T23:59:59+08:00') {
           return '永久'
         } else {

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

@@ -116,20 +116,6 @@
     <el-dialog title="高级查询" :close-on-click-modal="false" :visible.sync="dialogVisible" width="720px">
       <el-form ref="advancedsearchForm" label-width="110px">
         <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>
-          </el-col>
-
-          <el-col :span="12">
-            <el-form-item label="供应商ID">
-              <el-input size="mini" v-model="searchForm.SupplierId" 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>
@@ -141,7 +127,8 @@
               <el-input size="mini" v-model="searchForm.ProjectName" 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>
@@ -153,7 +140,8 @@
               <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>
@@ -165,7 +153,8 @@
               <el-input size="mini" v-model="searchForm.Telephone" 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>
@@ -177,9 +166,10 @@
               <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-form-item label="合同总金额(元)">
               <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -189,20 +179,22 @@
               <el-input size="mini" v-model="searchForm.ContractPeriod" 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.OpenDate" style="width:100%" placeholder="请输入"></el-input>
+            <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.PlanFinishDate" style="width:100%" placeholder="请输入"></el-input>
+            <el-form-item label="履行期限(止)">
+              <el-input size="mini" v-model="searchForm.EndDate" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
-
-          <el-col :span="12">
+        </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-form-item>
@@ -278,7 +270,7 @@ export default {
               return '--'
               break
           }
-        } else if (index === 'OpenDate' || index === 'EndDate' || index === 'PlanFinishDate' || index === 'SubmitDate') {
+        } else if (index === 'StartDate' || index === 'EndDate' || index === 'SubmitDate') {
           let timeString = this.timeStyle(item)
           return timeString
         } else {
@@ -365,8 +357,8 @@ export default {
         ContractMode: '',
         Amount: '',
         ContractPeriod: '',
-        OpenDate: '',
-        PlanFinishDate: '',
+        StartDate: '',
+        EndDate: '',
         ConstructionUnit: '',
         ConstructionOwner: '',
         ConstructionTelphone: '',
@@ -464,7 +456,7 @@ export default {
 
         {
           prop: 'Amount',
-          label: '合同总金额(万元)',
+          label: '合同总金额(元)',
           width: 100,
           sort: true
         },
@@ -477,15 +469,15 @@ export default {
         },
 
         {
-          prop: 'OpenDate',
-          label: '开工日期',
+          prop: 'StartDate',
+          label: '履行期限(始)',
           width: 100,
           sort: true
         },
 
         {
-          prop: 'PlanFinishDate',
-          label: '计划竣工时间',
+          prop: 'EndDate',
+          label: '履行期限(止)',
           width: 100,
           sort: true
         }

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

@@ -145,7 +145,7 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="合同总金额(万元)">
+            <el-form-item label="合同总金额(元)">
               <el-input size="mini" v-model="searchForm.Amount" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -157,13 +157,13 @@
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="开工日期">
+            <el-form-item label="履行期限(始)">
               <el-input size="mini" v-model="searchForm.OpenDate" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="12">
-            <el-form-item label="计划竣工时间">
+            <el-form-item label="履行期限(止)">
               <el-input size="mini" v-model="searchForm.PlanFinishDate" style="width:100%" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
@@ -439,7 +439,7 @@
 
           {
             prop: "Amount",
-            label: '合同总金额(万元)',
+            label: '合同总金额(元)',
             width: 100,
             sort: true
           },
@@ -453,14 +453,14 @@
 
           {
             prop: "OpenDate",
-            label: '开工日期',
+            label: '履行期限(始)',
             width: 100,
             sort: true
           },
 
           {
             prop: "PlanFinishDate",
-            label: '计划竣工时间',
+            label: '履行期限(止)',
             width: 100,
             sort: true
           },

src/dashoo.cn/frontend_web/src/pages/oilcontract/contract-work-order/_opera/operation.vue

@@ -119,7 +119,7 @@
               </el-row>
               <el-row>
                 <el-col :span="8">
-                  <el-form-item  label="开工日期" prop="OpenDate">
+                  <el-form-item  label="履行期限(始)" prop="OpenDate">
                     <el-date-picker
                       :disabled="formDisabled"
                       v-model="formData.OpenDate"
@@ -130,7 +130,7 @@
                 </el-col>
 
                 <el-col :span="8">
-                  <el-form-item  label="计划竣工时间" prop="PlanFinishDate">
+                  <el-form-item  label="履行期限(止)" prop="PlanFinishDate">
                     <el-date-picker
                       :disabled="formDisabled"
                       v-model="formData.PlanFinishDate"