2
3
dubch 4 роки тому
батько
коміт
9b2d7cc2cf

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

@@ -30,32 +30,28 @@
                      v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>
         <el-form v-model="searchForm" ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="发起评价单位">
+          <el-form-item >
             <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
               <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-form-item label="企业名称">
+          <el-form-item >
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="状态" style="width: 200px">
+          <el-form-item>
             <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 150px" clearable>
-              <el-option label="全部" value="" key="01"></el-option>
+              <el-option label="全部状态" value="" key="01"></el-option>
               <el-option v-for="(item, index) in auditOptions" :key="index" :label="item.label" :value="item.value" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="年度">
+          <el-form-item>
             <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
-              <el-option label="全部" value=""></el-option>
+              <el-option label="全部年度" value=""></el-option>
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
 
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -202,6 +198,12 @@
                               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" style="width: 100%" v-model="CreateOn" unlink-panels type="daterange" range-separator="至"
+                              start-placeholder="创建日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">

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

@@ -30,32 +30,28 @@
                      v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>
         <el-form v-model="searchForm" ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="发起评价单位">
+          <el-form-item >
             <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
               <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-form-item label="企业名称">
+          <el-form-item >
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="状态" style="width: 200px">
+          <el-form-item>
             <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 150px" clearable>
-              <el-option label="全部" value="" key="01"></el-option>
+              <el-option label="全部状态" value="" key="01"></el-option>
               <el-option v-for="(item, index) in auditOptions" :key="index" :label="item.label" :value="item.value" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="年度">
+          <el-form-item >
             <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
-              <el-option label="全部" value=""></el-option>
+              <el-option label="全部年度" value=""></el-option>
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
 
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -205,6 +201,12 @@
                               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" style="width: 100%" v-model="CreateOn" unlink-panels type="daterange" range-separator="至"
+                              start-placeholder="创建日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">

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

@@ -30,32 +30,28 @@
                      v-if="selectAllButtonBoolean" @click="onSelectAllButtonTrue">确定</el-button>
         </span>
         <el-form v-model="searchForm" ref="form" :inline="true" style="float: right; margin-top: -10px">
-          <el-form-item label="发起评价单位">
+          <el-form-item>
             <el-select filterable size="mini" v-model="searchForm.SecondUnit" placeholder="请选择发起评价单位" style="width: 100%" clearable>
               <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-form-item label="企业名称">
+          <el-form-item>
             <el-input size="mini" clearable v-model="searchForm.SupplierName" placeholder="请输入企业名称"></el-input>
           </el-form-item>
-          <el-form-item label="状态" style="width: 200px">
+          <el-form-item>
             <el-select size="mini" v-model="searchForm.Status" placeholder="请选择" style="width: 150px" clearable>
-              <el-option label="全部" value="" key="01"></el-option>
+              <el-option label="全部状态" value="" key="01"></el-option>
               <el-option v-for="(item, index) in auditOptions" :key="index" :label="item.label" :value="item.value" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="年度">
+          <el-form-item>
             <el-select size="mini" style="width:100px" v-model="searchForm.Year" placeholder="年度">
-              <el-option label="全部" value=""></el-option>
+              <el-option label="全部年度" value=""></el-option>
               <el-option v-for="(item, index) in yearList" :key="index" :label="item" :value="item" style="width: 100%"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="创建时间">
-            <el-date-picker size="mini" style="width: 220px" v-model="CreateOn" type="daterange" range-separator="至"
-                            start-placeholder="生成日期" end-placeholder="结束日期"></el-date-picker>
-          </el-form-item>
 
           <el-form-item>
             <el-dropdown split-button type="primary" size="mini" @click="handleSearch" @command="searchCommand">
@@ -204,6 +200,13 @@
                               start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="12" label="创建时间">
+            <el-form-item>
+              <el-date-picker size="mini" style="width: 100%" v-model="CreateOn" unlink-panels type="daterange" range-separator="至"
+                              start-placeholder="创建日期" end-placeholder="结束日期"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
         </el-row>
       </el-form>
       <span slot="footer" class="dialog-footer">