manage-client 3.3.104 → 3.3.106

package/package.json

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

package/src/filiale/WEINAN/ManageSummaryReport.vue

@@ -194,6 +194,9 @@
                 <th v-show="$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
                   <nobr>表具数量</nobr>
                 </th>
+                <th v-show="$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
+                  <nobr>期间购气表具数</nobr>
+                </th>
                 <th>
                   <nobr>购气（充值）数量</nobr>
                 </th>
@@ -248,6 +251,9 @@
               <td style="text-align: center;" v-show="$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
                 <nobr>{{ row.f_table_num }}</nobr>
               </td>
+              <td style="text-align: center;" v-show="$parent.$parent.$parent.isAreaShow || $parent.$parent.$parent.isCompanyShow">
+                <nobr>{{ row.f_sell_num }}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{ row.f_pregas }}</nobr>
               </td>
@@ -295,6 +301,14 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               收款合计:&emsp;{{ sumsmodel.f_collection.toFixed(2) }}元
             </td>
+            <td v-if="isAreaShow || isCompanyShow"
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              表具数:&emsp;{{ sumsmodel.f_table_num }}
+            </td>
+            <td v-if="isAreaShow || isCompanyShow"
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              期间购气表具数:&emsp;{{ sumsmodel.f_sell_num }}
+            </td>
           </tr>
         </table>
       </div>
@@ -460,7 +474,7 @@ export default {
             startDate: 'this.model.startDate',
             endDate: 'this.model.endDate',
             condition2: 'this.model.condition2'
-          }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0})
+          }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,f_sell_num:0,f_table_num:0})
         } else {
           this.isCompanyShow = false
           this.model = new PagedList('rs/sql/manage_chargeSummary', 20, {
@@ -478,7 +492,7 @@ export default {
             startDate: 'this.model.startDate',
             endDate: 'this.model.endDate',
             condition2: 'this.model.condition2'
-          }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,})
+          }, {f_collection: 0, f_gas: 0, f_money: 0,f_card_money:0,f_sell_num:0,f_table_num:0})
         } else {
           this.isAreaShow = false
           this.model = new PagedList('rs/sql/manage_chargeSummary', 20, {

package/src/filiale/WEINAN/config/exportConfig.js

@@ -842,6 +842,7 @@ monthGasConfig: {
     'f_card_money': '卡表购气金额',
     'f_money': '物联网表购气金额',
     'f_table_num': '表具数量',
+    'f_sell_num': '期间购气表具数',
     'f_stairamount1': '一阶气量',
     'f_collection': '实收款'
   },
@@ -852,6 +853,7 @@ monthGasConfig: {
     'f_card_money': '卡表购气金额',
     'f_money': '物联网表购气金额',
     'f_table_num': '表具数量',
+    'f_sell_num': '期间购气表具数',
     'f_stairamount1': '一阶气量',
     'f_stairamount2': '二阶气量',
     'f_stairamount3': '三阶气量',

package/src/filiale/xinkang/ChangeUserQuery.vue

@@ -0,0 +1,426 @@
+<template>
+  <div id="unit" class="flex-row" class="foot_tabset"  @keyup.enter="search">
+    <div class="basic-main">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <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>
+                  <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 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">客户编号</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" 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="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                :header="$parent.$parent.other"
+                                v-if="$parent.$parent.authArr.includes('档案查询导出')"
+                                sqlurl="rs/logic/exportfile" sql-name="changeuserquery" 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>
+                  <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>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                         condition="f_user_phone like '%{}%'" 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_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="col-sm-2 form-group">
+                  <label class="font_normal_body">更改内容</label>
+                  <v-select :value.sync="model.f_field_name"
+                            v-model="model.f_field_name"
+                            :options='$parent.$parent.field_name' placeholder='请选择'
+                            condition="f_field_name = '{}'"
+                            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_community_id"
+                            v-model="model.f_community_id"
+                            condition="f_community_id = '{}'"
+                            :options='$parent.$parent.communitys'
+                            placeholder='请选择'
+                            close-on-select></v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid @dblclick="$parent.$parent.toBusiness">
+            <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>
+                </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>-->
+                  <data-order field="f_operate_date" name="操作日期" :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                </th>
+                <th>
+                  <nobr>部门</nobr>
+                </th>
+                <th>
+                  <nobr>公司</nobr>
+                </th>
+                <th>
+                  <nobr>修改原因</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;"><nobr>
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+              </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_field_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_used_content}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_new_content}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </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 {HttpResetClass, PagedList} from 'vue-client'
+  import defaultPrint from '../../components/sale/config/DefaultPrint'
+  import exportConfig from './exportConfig'
+
+  let readySomething = async function (self) {
+
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+    // self.$refs.paged.$refs.cri.search()
+    await self.$MagLoadParams.loadParam()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '档案变更记录',
+    data() {
+      return {
+        data: {},
+        other:[],
+        footer:[],
+        meterbrands: [],
+        pricenames: [],
+        model: new PagedList('rs/sql/changeuserquery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        communitys:[],
+        defaultfield: [],
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone']
+        },
+        show:false,
+        rowdata:{},
+        thead: '',
+        tfoot: '',
+
+        // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
+
+
+        //合计数据
+        sumsmodel: {}
+      }
+    },
+    ready() {
+      this.initcommunitys()
+      readySomething(this)
+    },
+    methods: {
+      //初始化社区
+      async initcommunitys(){
+        this.communitys = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/manage_singleTable', {
+          data: {
+            items: 'id,f_community_name',
+            tablename: 't_community',
+            orderitem: 'id',
+            condition: `1=1`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取社区失败!'})
+        let redata = [{label: "全部", value: ""}]
+        req.data.forEach((row, n) => {
+          redata.push({
+            label: row.f_community_name,
+            value: row.id
+          })
+        })
+        this.communitys=redata
+      },
+      getotherfooter () {
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+        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()
+      },
+      cancel() {
+        this.show = false
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.show=true
+      },
+
+      selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        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] = []
+      })
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(obj) {
+        console.log(obj,"========")
+        this.orgCondtionStr = obj
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        this.printshow = true
+        this.put()
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      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>'
+      },
+      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)
+      },
+      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()
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+    },
+    computed: {
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
+      getCondition() {
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,orderitem:this.orderitem}
+      },
+      getfield() {
+        return exportConfig.changUserConfig
+      },
+      field_name() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('更改内容')]
+      }
+    }
+  }
+</script>