npm - manage-client - Versions diffs - 3.2.80 → 3.2.83 - Mend

manage-client 3.2.80 → 3.2.83

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (52) hide show

package/src/components/sale/businessquery/InfoOperateRecord.vue CHANGED Viewed

@@ -39,6 +39,18 @@
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="infoOperateRecordQuery"
+                                template-name='维护记录导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model"
+                              :field="$parent.$parent.getfield"
+                              titletable="维护记录导出"></print-data>
                   <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
                 </div>
               </div>
@@ -278,7 +290,7 @@
           condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
-        return exportConfig.pricechangeRecordConfig
+        return exportConfig.InfoOperateRecordConfig
       },
       metertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')]

package/src/components/sale/businessquery/MonthGasQuery.vue CHANGED Viewed

@@ -94,7 +94,6 @@
                                           condition="f_state in {} "
                                           close-on-select></v-select>
                               </div>
-                              <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                               <div class="col-sm-2 form-group">
                                 <label class="font_normal_body" title="参数名称:气表类型">气表类型</label>
                                 <v-select :value.sync="model.f_meter_style"
@@ -102,6 +101,8 @@
                                           condition="f_meter_style = '{}'"
                                           close-on-select></v-select>
                               </div>
+                              <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                             </div>
                         </div>
                     </criteria>

package/src/components/sale/businessquery/MoveMeterQuery.vue CHANGED Viewed

@@ -57,7 +57,7 @@
                             </div>
                             <div class="row" v-show="$parent.$parent.criteriaShow">
-                                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                              <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                               <div class="col-sm-2 form-group">
                                 <label class="font_normal_body">客户名称</label>
                                 <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"

package/src/components/sale/businessquery/NoBusinessQuery.vue CHANGED Viewed

@@ -6,32 +6,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="noBusinessQuery"
-                                template-name='非收费业务查询导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield" :sum-field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="非收费业务查询"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
-                  'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
@@ -58,6 +32,29 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
                          condition="f_userinfo_code = '{}' " placeholder="客户编号">
                 </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="noBusinessQuery"
+                                template-name='非收费业务查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield" :sum-field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="非收费业务查询"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,
+                  'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户名称</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"

package/src/components/sale/businessquery/PlotSummaryQuery.vue CHANGED Viewed

@@ -5,27 +5,6 @@
         <criteria-paged :model="model" v-ref:paged>
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-              <div class="row">
-                <res-select-group :style="'col-sm-2 form-group'" :show-component="$parent.$parent.showComponent" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                             :defaultfield="$parent.$parent.defaultfield"
-                            titletable="小区用户分布统计"
-                            :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="plotSummaryQuery"
-                                template-name='小区用户分布统计'
-                                :choose-col="true"></export-excel>
-                </div>
-              </div>
               <div class="row">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
@@ -60,6 +39,28 @@
                   </v-select>
                 </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear  button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="plotSummaryQuery"
+                                template-name='小区用户分布统计'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield"
+                              titletable="小区用户分布统计"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row " v-show="$parent.$parent.criteriaShow">
+                <res-select-group :style="'col-sm-2 form-group'" :show-component="$parent.$parent.showComponent" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>

package/src/components/sale/businessquery/PrickBillQuery.vue CHANGED Viewed

@@ -7,9 +7,7 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :show-component="['company', 'department', 'operator']"
-                                  :initres="$parent.$parent.initres"
-                                  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">扎帐归属日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -52,17 +50,9 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">扎帐状态</label>
-                  <v-select :value.sync="model.f_state" multiple
-                            title="参数: 扎帐状态查询"
-                            v-model="model.f_state"
-                            :options='$parent.$parent.state' placeholder='请选择'
-                            condition=" f_state in {}"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">操作日期</label>
+                  <label class="font_normal_body">操作&emsp;&emsp;日期</label>
                   <datepicker id="startOperDate" placeholder="开始日期" style="width:60%"
                               v-model="model.startOperDate"
                               :value.sync="model.startOperDate"
@@ -83,6 +73,18 @@
                   >
                   </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">扎帐状态</label>
+                  <v-select :value.sync="model.f_state" multiple
+                            title="参数: 扎帐状态查询"
+                            v-model="model.f_state"
+                            :options='$parent.$parent.state' placeholder='请选择'
+                            condition=" f_state in {}"
+                            close-on-select></v-select>
+                </div>
+                <res-select-group :show-component="['company', 'department', 'operator']"
+                                  :initres="$parent.$parent.initres"
+                                  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
           </criteria>

package/src/components/sale/businessquery/PrivilegeQuery.vue CHANGED Viewed

@@ -63,7 +63,7 @@
                   :show-component="['company','department','operator']"
                     :initres="$parent.$parent.initres"
                     @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <div class="col-sm-2 ">
+                <div class="col-sm-2 form-group">
                   <label class="font_normal_body">用户类型</label>
                   <v-select :value.sync="model.f_user_type"
                             :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"

package/src/components/sale/businessquery/ProceedsOper.vue CHANGED Viewed

@@ -32,14 +32,9 @@
                             condition="f_payment in {}"
                             close-on-select></v-select>
                 </div>
-                <res-select-group :initres="$parent.$parent.initres"
-                                  @re-res="$parent.$parent.getRes"
-                                  :show-component="['company','operator']"
-                                  v-ref:sel></res-select-group>
                 <div class="span" style="float:right;">
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
                   <export-excel :data="$parent.$parent.getCondition"
                                 :field="$parent.$parent.getfield"
                                 :footer="$parent.$parent.footer"
@@ -53,13 +48,12 @@
                               :sum-field="$parent.$parent.getfield"
                               titletable="操作员日结列表"
                               :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-<!--                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>-->
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
                 </div>
               </div>
-<!--              <div class="row" v-show="$parent.$parent.criteriaShow">-->
-<!--              </div>-->
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :show-component="['company','operator']" v-ref:sel></res-select-group>
+              </div>
             </div>
           </criteria>

package/src/components/sale/businessquery/ResidentialArrearsQuery.vue CHANGED Viewed

@@ -7,30 +7,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="residentialquery"
-                                template-name='小区综合查询(机表)导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                               :defaultfield="$parent.$parent.defaultfield"
-                              titletable="小区综合查询(机表)导出"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -64,6 +40,29 @@
                   </v-select>
                 </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="residentialquery"
+                                template-name='小区欠费综合查询(机表)导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                               :defaultfield="$parent.$parent.defaultfield"
+                              titletable="小区欠费综合查询(机表)导出"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"

package/src/components/sale/businessquery/ResidentialQuery.vue CHANGED Viewed

@@ -2,35 +2,10 @@
   <div id="unit" class="flex-row">
     <div class="basic-main">
       <div class="flex">
         <criteria-paged :model="model" v-ref:paged>
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <export-excel :data="$parent.$parent.getCondition"
-                                :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="residentialquery"
-                                template-name='小区综合查询(机表)导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
-                               :defaultfield="$parent.$parent.defaultfield"
-                              titletable="小区综合查询(机表)导出"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -51,7 +26,6 @@
                   >
                   </datepicker>
                 </div>
                 <div class="form-group col-sm-2">
                   <label class="font_normal_body">选择小区</label>
                   <v-select :value.sync="model.f_residential_area" :value-single="true"
@@ -63,7 +37,28 @@
                             close-on-select search="true">
                   </v-select>
                 </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :footer="$parent.$parent.footer"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile"
+                                sql-name="residentialquery"
+                                template-name='小区综合查询(机表)导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                               :defaultfield="$parent.$parent.defaultfield"
+                              titletable="小区综合查询(机表)导出"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
                   <v-select :value.sync="model.f_inputtor"
@@ -82,10 +77,8 @@
                             condition="f_meter_book_num = '{}'"></v-select>
                 </div>
               </div>
             </div>
           </criteria>
           <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
             <template partial='head'>
               <tr>

package/src/components/sale/businessquery/SellOrgnameQuery.vue CHANGED Viewed

@@ -6,7 +6,26 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
                 <div class="span" style="float:right;">
                   <!--<read-idcard></read-idcard>-->
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -31,28 +50,18 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-               <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_operate_date >= '{}'">
-                  </datepicker>
-                </div>
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_operate_date <= '{}'">
-                  </datepicker>
+                  <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
+                  <v-select :value.sync="model.f_payment" multiple
+                            v-model="model.f_payment"
+                            :options='$parent.$parent.payment' placeholder='请选择'
+                            condition="f_payment in {}"
+                            close-on-select></v-select>
                 </div>
                 <!--<div class="col-sm-2 form-group">-->
                   <!--<label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>-->
                   <!--<v-select :value.sync="model.f_residential_area"-->
@@ -66,14 +75,7 @@
                   <!--</v-select>-->
                 <!--</div>-->
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
-                  <v-select :value.sync="model.f_payment" multiple
-                            v-model="model.f_payment"
-                            :options='$parent.$parent.payment' placeholder='请选择'
-                            condition="f_payment in {}"
-                            close-on-select></v-select>
-                </div>
                 <!--<div class="col-sm-2 form-group">-->
                   <!--<label class="font_normal_body">收费类型</label>-->
                  <!--&lt;!&ndash; <v-select :value.sync="model.f_type"-->

package/src/components/sale/businessquery/SellPeopleQuery.vue CHANGED Viewed

@@ -6,7 +6,34 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
+                  <v-select :value.sync="model.f_payment" multiple
+                            v-model="model.f_payment"
+                            :options='$parent.$parent.payment' placeholder='请选择'
+                            condition="f_payment in {}"
+                            close-on-select></v-select>
+                </div>
                 <div class="span" style="float:right;">
                   <!--<read-idcard></read-idcard>-->
                   <button class="button_search button_spacing" @click="search()">查询</button>
@@ -30,27 +57,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-               <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_operate_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              condition="f_operate_date <= '{}'">
-                  </datepicker>
-                </div>
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
                 <!--<div class="col-sm-2 form-group">-->
                   <!--<label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>-->
@@ -65,14 +72,6 @@
                   <!--</v-select>-->
                 <!--</div>-->
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
-                  <v-select :value.sync="model.f_payment" multiple
-                            v-model="model.f_payment"
-                            :options='$parent.$parent.payment' placeholder='请选择'
-                            condition="f_payment in {}"
-                            close-on-select></v-select>
-                </div>
                 <!--<div class="col-sm-2 form-group">-->
                   <!--<label class="font_normal_body">收费类型</label>-->
                  <!--&lt;!&ndash; <v-select :value.sync="model.f_type"-->