manage-client 3.2.80 → 3.2.83

package/src/components/sale/businessquery/FMYGasQuery.vue

@@ -6,32 +6,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-inline 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="FMYgasQuery"
-                                template-name='用气查询导出'
-                                :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="用气查询打印"
-                  ></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%"
@@ -72,6 +46,32 @@
                   >
                   </datepicker>
                 </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="FMYgasQuery"
+                                template-name='用气查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="用气查询打印"
+                  ></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>

package/src/components/sale/businessquery/FillGasQuery.vue

@@ -80,8 +80,9 @@
                             v-model="model.f_type"
                             :multiple="true"
                             :options='$parent.$parent.fillGasTypes' placeholder='请选择'
-                            condition="f_fill_type in {}"
+                            condition="f_type in {}"
                             close-on-select></v-select>
+                  <!--:options='$parent.$parent.fillGasTypes' placeholder='请选择'-->
                 </div>
 
                 <div class="col-sm-2 form-group">
@@ -325,6 +326,7 @@
         show:false,
         rowdata:{},
         meterbrands: [],
+        filltype: [],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -374,13 +376,18 @@
       initParams() {
         // 初始化气表品牌
         let brandArr = []
+        let typeArr = []
         this.$MagGetSaleParam.getGasbrand().forEach((item) => {
           let temp = {}
+          let temp2 = {}
           temp.label = item.label
           temp.value = item.value.f_meter_brand
+          temp.value = item.value.f_type
           brandArr.push(temp)
+          typeArr.push(temp2)
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+        this.filltype = [{label: '全部', value: ''}, ...typeArr]
       },
       selfSearch(args) {
         if (this.data) {

package/src/components/sale/businessquery/GasLossQuery.vue

@@ -19,7 +19,7 @@
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&ensp;</label>
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"

package/src/components/sale/businessquery/HandBookQuery.vue

@@ -6,44 +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;">
-                  <!--<read-idcard></read-idcard>-->
-                  <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="handBookQuery"
-                                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 class="font_normal_body">小区名称</label>
-                  <v-select :value.sync="model.f_residential_area"
-                            class="select_list select"
-                            enter-push
-                            multiple = "true"
-                            v-model="model.f_residential_area"
-                            style="width: 60%"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            close-on-select>
-
-                  </v-select>
-                </div>
-
-
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="抄表开始日期" style="width:60%"
@@ -64,6 +26,19 @@
                   >
                   </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">小区名称</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            class="select_list select"
+                            enter-push
+                            multiple = "true"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -72,6 +47,30 @@
                             condition="f_user_type = '{}'"
                             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>
+                  <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="handBookQuery"
+                                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">用气性质</label>
                   <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"

package/src/components/sale/businessquery/HandGasPropertiesQuery.vue

@@ -6,43 +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;">
-                  <!--<read-idcard></read-idcard>-->
-                  <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="handGasPropertiesQuery"
-                                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 class="font_normal_body">小区名称</label>
-                  <v-select :value.sync="model.f_residential_area"
-                            class="select_list select"
-                            enter-push
-                            multiple
-                            condition="f_residential_area in {}"
-                            v-model="model.f_residential_area"
-                            style="width: 60%"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            close-on-select>
-
-                  </v-select>
-                </div>
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="抄表开始日期" style="width:60%"
@@ -63,6 +26,20 @@
                   >
                   </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">小区名称</label>
+                  <v-select :value.sync="model.f_residential_area"
+                            class="select_list select"
+                            enter-push
+                            multiple
+                            condition="f_residential_area in {}"
+                            v-model="model.f_residential_area"
+                            style="width: 60%"
+                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                            close-on-select>
+
+                  </v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -71,6 +48,30 @@
                             condition="f_user_type = '{}'"
                             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>
+                  <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="handGasPropertiesQuery"
+                                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">用气性质</label>
                   <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"

package/src/components/sale/businessquery/HandPeopleQuery.vue

@@ -6,8 +6,27 @@
           <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">-->
+                <div :class="{'col-sm-2 form-group':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
+                  <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"
+                  >
+                  </datepicker>
+                </div>
+                <div :class="{'col-sm-2 form-group':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
+                  <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"
+                  >
+                  </datepicker>
+                </div>
+                <!--                <div class="col-sm-2 form-group">-->
 <!--                  <label class="font_normal_body">组织机构</label>-->
 <!--&lt;!&ndash;                  <right-tree @re-res="$parent.$parent.getRes"></right-tree>&ndash;&gt;-->
 <!--                 -->
@@ -34,26 +53,7 @@
                 </div>
               </div>
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <div :class="{'col-sm-2 form-group':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
-                  <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"
-                  >
-                  </datepicker>
-                </div>
-                <div :class="{'col-sm-2 form-group':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
-                  <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"
-                  >
-                  </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':!$parent.$parent.usershow,'col-sm-3 form-group':$parent.$parent.usershow}">
                   <label class="font_normal_body">小区名称</label>
                   <v-select :value.sync="model.f_residential_area"

package/src/components/sale/businessquery/Handgasquery.vue

@@ -6,28 +6,6 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
             <div novalidate class="form-inline 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="handgasquery"
-                                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%"
@@ -53,7 +31,26 @@
                   <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="handgasquery"
+                                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"
@@ -339,16 +336,16 @@
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
-      clear() {
-        //清空部门和人员
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
-        //部门和人员变为全选
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
-        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
-        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
-        })
-      },
+        clear() {
+          //清空部门和人员
+          this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+          //部门和人员变为全选
+          this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+          this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+          Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+            this.$refs.paged.$refs.cri.model[key] = []
+          })
+        },
       show() {
         this.criteriaShow = true
       },