manage-client 3.2.83-2 → 3.2.83-jb

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

@@ -3,7 +3,7 @@
     <div class="basic-main" @keyup.enter="search">
       <div class="flex" v-if="!show">
 
-        <criteria-paged :model="model" v-ref:paged @sort="sort">
+        <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">
@@ -82,7 +82,6 @@
                             :options='$parent.$parent.fillGasTypes' placeholder='请选择'
                             condition="f_type in {}"
                             close-on-select></v-select>
-                  <!--:options='$parent.$parent.fillGasTypes' placeholder='请选择'-->
                 </div>
 
                 <div class="col-sm-2 form-group">
@@ -142,9 +141,7 @@
             <template partial='head'>
               <tr>
                 <th>
-<!--                  <nobr>客户编号</nobr>-->
-                  <data-order field="f_userinfo_code" name="客户编号"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  <nobr>客户编号</nobr>
                 </th>
                 <th>
                   <nobr>客户名称</nobr>
@@ -159,9 +156,7 @@
                   <nobr>客户电话</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
                   <nobr>卡号</nobr>
@@ -179,9 +174,7 @@
                   <nobr>补气类型</nobr>
                 </th>
                 <th>
-<!--                  <nobr>补气日期</nobr>-->
-                  <data-order field="f_operate_date" name="补气日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  <nobr>补气日期</nobr>
                 </th>
                 <th>
                   <nobr>补气原因</nobr>
@@ -313,7 +306,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillGasQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_pregas: 0,f_preamount: 0,hushu:0}),
+        model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0,hushu:0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补气类型", "表编号", "卡号", "气表品牌", "气表状态", "补气量", "补气日期", "操作员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", "f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_fillgas", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -321,11 +314,6 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_idnumber', 'f_type', 'f_meter_brand', 'f_fillgas','f_operate_date', 'f_operator']
         },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
-        },
         //默认打印列
         defaultfield: [],
         modelval: [],
@@ -337,7 +325,6 @@
         show:false,
         rowdata:{},
         meterbrands: [],
-        filltype: [],
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
@@ -381,42 +368,19 @@
         this.footer.push(footerData);
         this.other.push(otherInData);
       },
-      sort (field, rule) {
-        // 将所有排序方式设为不排序，实现相互排斥
-        for (let key in this.orderFields) {
-          if (key === field) {
-            this.orderFields[key] = rule
-          } else {
-            this.orderFields[key] = 'no'
-          }
-        }
-        // 如果新规则不排序，还原为默认排序
-        if (rule === 'no') {
-          this.model.paramSource.orderitem = `'${this.orderitem}'`
-        } else {
-          this.model.paramSource.orderitem = `'${field} ${rule}'`
-        }
-
-        this.search()
-      },
       search(){
         this.$refs.paged.$refs.cri.search()
       },
       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) {
@@ -539,9 +503,7 @@
     },
     computed: {
       getCondition() {
-        return {
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.fillgasConfig

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;&nbsp;</label>
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&ensp;</label>
                   <datepicker id="endDate" placeholder="结束日期" style="width:60%"
                               v-model="model.endDate"
                               :value.sync="model.endDate"

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

@@ -6,6 +6,44 @@
           <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%"
@@ -26,19 +64,6 @@
                   >
                   </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"
@@ -47,30 +72,6 @@
                             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,6 +6,43 @@
           <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%"
@@ -26,20 +63,6 @@
                   >
                   </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"
@@ -48,30 +71,6 @@
                             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,27 +6,8 @@
           <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri >
             <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
               <div class="row">
-                <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">-->
+                <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>-->
 <!--&lt;!&ndash;                  <right-tree @re-res="$parent.$parent.getRes"></right-tree>&ndash;&gt;-->
 <!--                 -->
@@ -53,7 +34,26 @@
                 </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':!$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':!$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,6 +6,28 @@
           <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%"
@@ -31,26 +53,7 @@
                   <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"
@@ -336,16 +339,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
       },