manage-client 3.2.51 → 3.2.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.51",
+  "version": "3.2.52",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {

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

@@ -1,372 +1,340 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
-      <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">
-                <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_userinfo_code"
-                         condition="f_userinfo_code = '{}' " placeholder="用户编号">
-                </div>
-                <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"
-                         condition=" f_user_name like '%{}%'" placeholder='用户名称'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气价状态</label>
-                  <v-select :value.sync="model.price_state" v-model='model.price_state'
-                            :options='$parent.$parent.pricestate' placeholder='气价状态'
-                            close-on-select style="width:60%" :value-single="true"
-                            v-el:cc></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"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="gasPriceQuery" 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.criteriaShow=!$parent.$parent.criteriaShow"></div>
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :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>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
-                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户类型</label>
-                  <v-select :value.sync="model.f_user_type"
-                            @change="$parent.$parent.userTypeChange1()"
-                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                            condition="f_user_type = '{}'"
-                            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_gasproperties" v-model="model.f_gasproperties"
-                            :options='$parent.$parent.gasproperties1' placeholder='请选择'
-                            condition="f_gasproperties = '{}'"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气价类型</label>
-                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
-                            @change="$parent.$parent.pricetypechanged"
-                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
-                            close-on-select v-ref:type>
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">表&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meter_number"
-                         condition="f_meternumber = '{}'" placeholder='表号'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
-                         condition="f_card_id = '{}'" placeholder='卡号'>
-                </div>
-                <div class="form-group col-sm-2" >
-                  <label  class="font_normal_body">气表状态</label>
-                  <v-select  style="width:60%" :value.sync="model.f_table_state"
-                             v-model="model.f_table_state"
-                             :options='$parent.$parent.gasStates' placeholder='气表状态'
-                             condition="f_table_state ='{}'"></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_classify" v-model="model.f_meter_classify"
-                            :options='$parent.$parent.meters' placeholder='气表类型'
-                            close-on-select
-                            condition="f_meter_classify = '{}'"
-                            style="width: 60%"
-                  >
-                  </v-select>
-                </div>
-              </div>
-
-            </div>
-          </criteria>
-
-          <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid :optional="true">
-            <template partial='head'>
-              <th><nobr>客户编号</nobr></th>
-              <th><nobr>表号</nobr></th>
-              <th><nobr>档案编号</nobr></th>
-              <th><nobr>气价名称</nobr></th>
-              <th><nobr>气价类型</nobr></th>
-              <th><nobr>客户类型</nobr></th>
-              <th><nobr>用气性质</nobr></th>
-              <th><nobr>客户名称</nobr></th>
-              <th><nobr>客户地址</nobr></th>
-            </template>
-            <template partial='body'>
-              <td style="text-align:center"><span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_userinfo_code}}</b></a></span></td>
-              <td style="text-align:center">{{row.f_meternumber}}</td>
-              <td style="text-align:center">{{row.f_olduserinfo_code}}</td>
-              <td style="text-align:center">{{row.f_price_name}}</td>
-              <td style="text-align:center">{{row.f_price_type}}</td>
-              <td style="text-align:center">{{row.f_user_type}}</td>
-              <td style="text-align:center">{{row.f_gasproperties}}</td>
-              <td style="text-align:center">{{row.f_user_name}}</td>
-              <td style="text-align:center;white-space: nowrap;">{{row.f_address}}</td>
-            </template>
-            <template partial='foot'></template>
-          </data-grid>
-        </criteria-paged>
-        <table class="table-hover">
-          <tr style="position: relative" class="table-bordered">
-            <td
-              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
-              汇总信息
-            </td>
-          </tr>
-        </table>
-      </div>
-      <div class="flex" v-if="show">
-        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import defaultPrint from '../config/DefaultPrint'
-  import exportConfig from '../config/exportConfig'
-
-  let readySomething = async function (self) {
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
-    await self.$MagLoadParams.loadParam()
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-  }
-  export default {
-    props:['data'],
-    title: '业务查询',
-    data() {
-      return {
-        data: {},
-        other: [],
-        footer: [],
-        model: new PagedList('rs/sql/gasPriceQuery', 20, {}, ),
-        criteriaShow: false,
-        bodyData: ["f_userinfo_code", "f_user_name", "f_orgname", "f_depname", "f_operator"],
-        orgCondtionStr: '',
-        show:false,
-        rowdata:{},
-        modelval: [],
-        printshow: false,
-        all: false,
-        fields: {},
-        thead: '',
-        tfoot: '',
-        defaultfield: [],
-        resshow:['company','department','operator','slicearea'],
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[]
-        },
-        gasproperties1:[],
-        f_filialeid: this.$login.f.orgid,
-        prices: [],
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_meternumber']
-        },
-        pricestate:[{label:'有效',value:''},{label:'无效',value:'无效'}],
-        //合计数据
-        sumsmodel: {},
-        meters: this.$appdata.getParam('气表类型') ? [{label: '全部',value: ''}, ...this.$appdata.getParam('气表类型')] : [],
-      }
-    },
-    ready() {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
-    },
-    methods: {
-      pricetypechanged(){
-        this.$refs.paged.$refs.cri.model.f_price_name = []
-      },
-      userTypeChange1 () {
-        this.gasproperties1 = []
-        if (this.$refs.paged.$refs.cri.model !== null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties1 = ''
-          this.gasproperties1 = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-        } else {
-          this.gasproperties1 = [{label: '全部', value: ''}]
-        }
-      },
-      getotherfooter() {
-        this.other = [];
-        this.footer = [];
-        let exportdata = this.getCondition;
-        let otherInData = [];
-        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
-        let footerData = [], exportfield = this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for (var field in self.sumsmodel) {
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
-      search(){
-        this.$refs.paged.$refs.cri.search()
-      },
-      selfSearch(args) {
-        console.log(this.$refs.paged.$refs.cri.model.price_state)
-        if(this.$refs.paged.$refs.cri.model.price_state){
-          args.condition = `${args.condition} and f_end_date < f_perform_date ` + this.orgCondtionStr
-        }
-        args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      },
-      clear() {
-        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
-        })
-      },
-      getRes(condition,obj) {
-        this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
-
-      },
-      stamp() {
-        this.all = false
-        //默认选择要打印的列
-        this.modelval = defaultPrint.config
-        this.fields = this.getfield
-        console.log('所有打印字段', this.fields)
-        this.printshow = true
-        this.put()
-      },
-      put() {
-        // 对Modelval进行排序
-        this.sortModelval()
-        this.thead = `<tr><th colspan=${this.modelval.length}>启用查询报表</th></tr><tr>`
-        for (let key of this.modelval) {
-          this.thead += '<th>' + this.fields[key] + '</th>'
-        }
-        this.thead += '</tr>'
-      },
-      cancel() {
-        this.show = false
-      },
-      dealmsg(val) {
-        console.log('---------------dealmsg')
-        this.rowdata=val
-        this.show=true
-        val.model = this.model.model
-        this.$dispatch('deal-msg', val)
-      },
-      print() {
-        this.$refs.print.PrintAsFile()
-        this.printshow = false
-      },
-      close() {
-        this.printshow = false
-        this.all = false
-      },
-      // 对选择的列进行排序
-      sortModelval() {
-        let sortModel = []
-        Object.keys(this.fields).forEach((key) => {
-          if (this.modelval.includes(key)) {
-            sortModel.push(key)
-          }
-        })
-        this.modelval = sortModel
-        console.log('选择的打印的字段', this.modelval)
-      }
-    },
-    watch: {
-      'all'(val) {
-        if (val) {
-          this.modelval = this.bodyData
-        } else {
-          this.modelval = defaultPrint.config
-          this.put()
-        }
-      },
-      sumsmodel: {
-        handler: function (val) {
-          this.getotherfooter();
-        },
-        deep: true
-      },
-      'modelval.length'() {
-        this.put()
-      },
-    },
-    computed: {
-      getPricenames() {
-        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
-        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
-        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
-        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          let rs = []
-          let priceArr = []
-          if ( pricetype.length >0) {
-            let params = {
-              f_price_type: pricetype[0],
-              filter: this.f_filialeid,
-              prices: this.prices
-            }
-            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
-              let temp = {}
-              temp.label = item.label
-              temp.value = item.value.f_price_name
-              priceArr.push(temp)
-            })
-            if(priceArr.length == 0 ){
-              rs= [{label: '全部', value: ''}]
-            }else{
-              rs = [ ...priceArr]
-            }
-          }
-          if (rs.length === 0) {
-            console.log('rs读出来是空')
-            this.$refs.paged.$refs.cri.model.f_price_name = ''
-          }
-          return rs
-        }
-      },
-      getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
-      },
-      getfield() {
-        console.log('export',exportConfig.gasPriceConfig)
-        return exportConfig.gasPriceConfig
-      },
-      gasStates () {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
-      },
-      pricetypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
-      },
-      usertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-    }
-  }
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <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 :show-component="$parent.$parent.resshow" :selectin="true" :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"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile" sql-name="gasPriceQuery" 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.criteriaShow=!$parent.$parent.criteriaShow"></div>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" :title="'参数名为：气价状态'">气价状态</label>
+                  <v-select :value.sync="model.f_state" v-model='model.f_state'
+                            :options='$parent.$parent.stateprice' placeholder='气价状态'
+                            condition="f_state = '{}'"
+                            close-on-select style="width:60%" :value-single="true"
+                            v-el:cc></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">是否启用</label>
+                  <v-select :value.sync="model.price_state" v-model='model.price_state'
+                            :options='$parent.$parent.pricestate' placeholder='是否启用'
+                            condition="price_state = '{}'"
+                            close-on-select style="width:60%" :value-single="true"
+                            v-el:cc></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange1()"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            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_gasproperties" v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties1' placeholder='请选择'
+                            condition="f_gasproperties = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            @change="$parent.$parent.pricetypechanged"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+              </div>
+
+            </div>
+          </criteria>
+
+          <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid :optional="true">
+            <template partial='head'>
+              <th><nobr>气价编号</nobr></th>
+              <th><nobr>气价类型</nobr></th>
+              <th><nobr>气价名称</nobr></th>
+              <th><nobr>用户类型</nobr></th>
+              <th><nobr>用气性质</nobr></th>
+              <th><nobr>阶段月数</nobr></th>
+              <th><nobr>执行日期</nobr></th>
+              <th><nobr>截止日期</nobr></th>
+              <th><nobr>版本号</nobr></th>
+              <th><nobr>状态</nobr></th>
+              <th><nobr>气价信息</nobr></th>
+            </template>
+            <template partial='body'>
+              <td style="text-align:center">{{row.f_price_id}}</td>
+              <td style="text-align:center">{{row.f_price_type  }}</td>
+              <td style="text-align:center">{{row.f_price_name}}</td>
+              <td style="text-align:center">{{row.f_user_type}}</td>
+              <td style="text-align:center">{{row.f_gasproperties}}</td>
+              <td style="text-align:center">{{row.f_stairmonths}}</td>
+              <td style="text-align:center">{{row.f_perform_date}}</td>
+              <td style="text-align:center;white-space: nowrap;">{{row.f_end_date}}</td>
+              <td style="text-align:center">{{row.f_version}}</td>
+              <td style="text-align:center">{{row.f_state}}</td>
+              <td style="text-align:center;white-space: nowrap;">{{row.detailvalue}}</td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    await self.$MagLoadParams.loadParam()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    props:['data'],
+    title: '业务查询',
+    data() {
+      return {
+        data: {},
+        other: [],
+        footer: [],
+        model: new PagedList('rs/sql/gasPriceQuery', 20, {}, ),
+        criteriaShow: false,
+        bodyData: ["f_userinfo_code", "f_user_name", "f_orgname", "f_depname", "f_operator"],
+        orgCondtionStr: '',
+        show:false,
+        rowdata:{},
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        defaultfield: [],
+        resshow:['company','department','operator'],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        gasproperties1:[],
+        f_filialeid: this.$login.f.orgid,
+        prices: [],
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_meternumber']
+        },
+        pricestate:[{label:'未启用',value:'未启用'},{label:'已启用',value:'已启用'}],
+        //合计数据
+        sumsmodel: {},
+        stateprice: this.$appdata.getParam('气价状态') ? [{label: '全部',value: ''}, ...this.$appdata.getParam('气价状态')] : [],
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      pricetypechanged(){
+        this.$refs.paged.$refs.cri.model.f_price_name = []
+      },
+      userTypeChange1 () {
+        this.gasproperties1 = []
+        if (this.$refs.paged.$refs.cri.model !== null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties1 = ''
+          this.gasproperties1 = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        } else {
+          this.gasproperties1 = [{label: '全部', value: ''}]
+        }
+      },
+      getotherfooter() {
+        this.other = [];
+        this.footer = [];
+        let exportdata = this.getCondition;
+        let otherInData = [];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData = [], exportfield = this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for (var field in self.sumsmodel) {
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        console.log(this.$refs.paged.$refs.cri.model.price_state)
+        if(this.$refs.paged.$refs.cri.model.price_state){
+          args.condition = `${args.condition} ` + this.orgCondtionStr
+        }
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      clear() {
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      getRes(condition,obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        this.printshow = true
+        this.put()
+      },
+      put() {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>启用查询报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      cancel() {
+        this.show = false
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      print() {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      sumsmodel: {
+        handler: function (val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+      'modelval.length'() {
+        this.put()
+      },
+    },
+    computed: {
+      getPricenames() {
+        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
+        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+        console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          let rs = []
+          let priceArr = []
+          if ( pricetype.length >0) {
+            let params = {
+              f_price_type: pricetype[0],
+              filter: this.f_filialeid,
+              prices: this.prices
+            }
+            this.$MagGetSaleParam.getPrice(params).forEach((item) => {
+              let temp = {}
+              temp.label = item.label
+              temp.value = item.value.f_price_name
+              priceArr.push(temp)
+            })
+            if(priceArr.length == 0 ){
+              rs= [{label: '全部', value: ''}]
+            }else{
+              rs = [ ...priceArr]
+            }
+          }
+          if (rs.length === 0) {
+            console.log('rs读出来是空')
+            this.$refs.paged.$refs.cri.model.f_price_name = ''
+          }
+          return rs
+        }
+      },
+      getCondition() {
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      },
+      getfield() {
+        console.log('export',exportConfig.gasPriceConfig)
+        return exportConfig.gasPriceConfig
+      },
+      gasStates () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+      },
+      pricetypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      usertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+    }
+  }
+</script>

package/src/main.js

@@ -1,66 +1,66 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条0
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-// sale()
-ldap()
-system(false)
-saleManage()
-
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage('tongchuan')
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条0
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+saleManage('qianneng')
+
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+