基础参数优化

src/views/module_base/elecfeeBase/ElecfeeBaseList.vue

@@ -3,7 +3,19 @@
     <!-- 查询区域 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
-        <a-row :gutter="24"> </a-row>
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="计费类型">
+              <j-dict-select-tag type="list" v-model="queryParam.feetype" dictCode="elecfee_base_feetype" placeholder="请选择计费类型" />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
       </a-form>
     </div>
     <!-- 查询区域-END -->
@@ -163,18 +175,18 @@ export default {
           title: '开始时间',
           align: 'center',
           dataIndex: 'begintime',
-          customRender: function (text) {
-            return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
-          },
+          // customRender: function (text) {
+          //   return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
+          // },
           width: 130,
         },
         {
           title: '结束时间',
           align: 'center',
           dataIndex: 'endtime',
-          customRender: function (text) {
-            return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
-          },
+          // customRender: function (text) {
+          //   return !text ? '' : text.length > 10 ? text.substr(0, 10) : text
+          // },
           width: 130,
         },
         {

src/views/module_base/elecfeeBase/modules/ElecfeeBaseForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="部门" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deptid">
-              <j-select-depart v-model="model.deptid" :multi="true"  />
+              <j-select-depart v-model="model.deptid" :multi="false"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -14,7 +14,7 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
-            <a-form-model-item label="变压器容量/合同最大需量(kVA)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kva">
+            <a-form-model-item label="变压器容量(kVA)" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="kva">
               <a-input-number v-model="model.kva" placeholder="请输入变压器容量/合同最大需量(kVA)" style="width: 100%" />
             </a-form-model-item>
           </a-col>
@@ -25,12 +25,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="begintime">
-              <j-date placeholder="请选择开始时间" v-model="model.begintime"  style="width: 100%" />
+              <j-date placeholder="请选择开始时间" v-model="model.begintime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="endtime">
-              <j-date placeholder="请选择结束时间" v-model="model.endtime"  style="width: 100%" />
+              <j-date placeholder="请选择结束时间" v-model="model.endtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

src/views/module_base/elecfeeDegree/ElecfeeDegreeList.vue

@@ -4,6 +4,17 @@
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="计费类型">
+              <j-dict-select-tag type="list" v-model="queryParam.feetype" dictCode="elecfee_degree_feetype" placeholder="请选择计费类型" />
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+            </span>
+          </a-col>
         </a-row>
       </a-form>
     </div>
@@ -143,18 +154,18 @@
             title:'开始时间',
             align:"center",
             dataIndex: 'begintime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            },
+            // customRender:function (text) {
+            //   return !text?"":(text.length>10?text.substr(0,10):text)
+            // },
             width: 150,
           },
           {
             title:'结束时间',
             align:"center",
             dataIndex: 'endtime',
-            customRender:function (text) {
-              return !text?"":(text.length>10?text.substr(0,10):text)
-            },
+            // customRender:function (text) {
+            //   return !text?"":(text.length>10?text.substr(0,10):text)
+            // },
             width: 150,
           },
           {

src/views/module_base/elecfeeDegree/modules/ElecfeeDegreeForm.vue

@@ -5,7 +5,7 @@
         <a-row>
           <a-col :span="24">
             <a-form-model-item label="部门ID" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deptid">
-              <j-select-depart v-model="model.deptid" :multi="true"  />
+              <j-select-depart v-model="model.deptid" :multi="false"  />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
@@ -20,12 +20,12 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="begintime">
-              <j-date placeholder="请选择开始时间" v-model="model.begintime"  style="width: 100%" />
+              <j-date placeholder="请选择开始时间" v-model="model.begintime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="endtime">
-              <j-date placeholder="请选择结束时间" v-model="model.endtime"  style="width: 100%" />
+              <j-date placeholder="请选择结束时间" v-model="model.endtime" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

src/views/module_base/energyItem/modules/EnergyItemForm.vue

@@ -21,7 +21,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
-              <a-input v-model="model.remark" placeholder="请输入备注"  ></a-input>
+              <a-textarea v-model="model.remark" placeholder="请输入备注" rows="3" ></a-textarea>
             </a-form-model-item>
           </a-col>
         </a-row>