npm - manage-client - Versions diffs - 3.3.116 → 3.3.117 - Mend

manage-client 3.3.116 → 3.3.117

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

Files changed (13) hide show

package/package.json CHANGED Viewed

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

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

@@ -365,6 +365,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>身份证号</nobr>
+                </th>
                 <th>
                   <nobr>片区</nobr>
                 </th>
@@ -576,6 +579,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_idnumber}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_zones}}</nobr>
               </td>

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

@@ -212,6 +212,9 @@
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
+                  <nobr>身份证号</nobr>
+                </th>
+                <th>
 <!--                  <nobr>客户地址</nobr>-->
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
@@ -297,6 +300,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_idnumber}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>

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

@@ -43,7 +43,7 @@
                               :value.sync="model.handStartDate"
                               :format="'yyyy-MM-dd 00:00:00'"
                               :show-reset-button="true"
-                              condition="f_hand_date >= '{}'">
+                              condition="f_input_date >= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">
@@ -53,7 +53,7 @@
                               :value.sync="model.handEndDate"
                               :format="'yyyy-MM-dd 23:59:59'"
                               :show-reset-button="true"
-                              condition="f_hand_date <= '{}'">
+                              condition="f_input_date <= '{}'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group">

package/src/components/sale/config/exportConfig.js CHANGED Viewed

@@ -92,7 +92,7 @@ export default{
     'f_price_name': '气价名称','f_type': '收费类型', 'f_price': '单价', 'f_gas': '气量','f_money': '气费'
   },
   chargeConfig: {
-    'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
+    'id': '收费编号', 'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_idnumber': '身份证号', 'f_user_phone': '客户电话', 'f_address': '客户地址', 'f_zones': '片区', 'f_user_type': '客户类型',
     'f_gasproperties': '用气性质', 'f_meternumber': '表号', 'f_meter_brand': '气表品牌', 'f_times': '购气次数', 'f_price_name': '气价名称',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_pregas': '气量', 'fee': '金额', 'f_preamount': '燃气费', 'f_collection': '收款', 'f_privilege_money': '优惠金额', 'f_balance': '上期结余',
     'f_curbalance': '本期结余', 'f_type': '收费类型', 'f_payment': '付款方式', 'f_bank_type': '支付渠道', 'f_state': '状态', 'f_operate_date': '收费日期', 'f_serial_id': '流水号',
@@ -281,7 +281,7 @@ export default{
   },
   otherchargeConfig: {
-    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
+    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_idnumber': '身份证号', 'f_address': '客户地址', 'f_user_phone': '客户电话', 'f_meter_classify': '气表类型',
     'f_meter_brand': '气表品牌',
     'f_bill_number': '收据票号', 'f_brand_spec': '收费类型', 'f_typename': '品名规格',
     'f_typenumber': '型号', 'f_unitprice': '单价', 'f_number': '数量','hushu':'户数',

package/src/components/webmeter/WebmeterQuery.vue CHANGED Viewed

@@ -39,6 +39,9 @@
     <tabs header="物联网表结算分析" v-if="newWebHand &&permission('物联网表结算分析')">
       <new-webmeter-settlement-analysis v-if="show.includes('物联网表结算分析')"></new-webmeter-settlement-analysis>
     </tabs>
+    <tabs header="开关阀记录查询" v-if="permission('开关阀记录查询')">
+      <operation-value-record v-if="show.includes('开关阀记录查询')"></operation-value-record>
+    </tabs>
   </tab-button>
 </template>

package/src/components/webmeter/gasStatistics/GasStatistics.vue CHANGED Viewed

@@ -184,9 +184,6 @@
                 <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>
@@ -217,9 +214,6 @@
                 <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>

package/src/components/webmeter/gasStatistics/NewGasStatistics.vue CHANGED Viewed

@@ -192,10 +192,6 @@
                 <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>
@@ -226,9 +222,6 @@
                 <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>

package/src/components/webmeter/operationValueRecord.vue ADDED Viewed

@@ -0,0 +1,331 @@
+<template >
+  <div class="flex-row">
+    <div @keyup.enter="search1" class="basic-main">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row">
+              <div class="col-sm-2">
+                <res-select-group :show-component="['company']" :initres="$parent.$parent.org" @re-res="$parent.$parent.getorg" style="width:60%"></res-select-group>
+              </div>
+              <div class="col-sm-2 form-group ">
+                <label class="font_normal_body">客户编号</label>
+                <input
+                       class="input_search" condition="f_userinfo_code = '{}'"
+                       placeholder='客户编号'
+                       style="width:60%"
+                       type="text"
+                       v-model="model.f_userinfo_code">
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">客户名称</label>
+                <input
+                       class="input_search" condition="f_user_name like '%{}%'"
+                       placeholder='客户名称'
+                       style="width:60%"
+                       type="text"
+                       v-model="model.f_user_name"
+                >
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">客户地址</label>
+                <input  class="input_search"
+                       condition="f_address like '%{}%'"
+                       placeholder='客户地址'
+                       style="width:60%"
+                       type="text"
+                       v-model="model.f_address"
+                >
+              </div>
+              <div style="float:right">
+                <button @click="search()" class="button_search" v-el:cba>查询</button>
+                <button @click="$parent.$parent.clearmsg" class="button_clear">清空</button>
+                <export-excel
+                  :choose-col="true"
+                  :data="{condition: $parent.$parent.condition,
+                          f_orgid: $parent.$parent.f_orgid,
+                          f_start_date: $parent.$parent.f_start_date,
+                          f_end_date: $parent.$parent.f_end_date
+                          }"
+                  :field="$parent.$parent.getfield" sql-name="operationValueRecord" sqlurl="rs/logic/exportfile"
+                  template-name='开关阀记录'></export-excel>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.hidden()" class="button_spacing" style="float: right"></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 style="width:60%" :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                          placeholder='用气性质'
+                          value-single="true"
+                          :options='$parent.$parent.Gasproperties'
+                          close-on-select
+                          condition="f_gasproperties = '{}'"
+                ></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">表&ensp;&ensp;&ensp;&ensp;号</label>
+                <input
+                  class="input_search" condition="u1.f_meternumber = '{}'"
+                  placeholder='表号'
+                  style="width:60%"
+                  type="text"
+                  v-model="model.f_meternumber">
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气表品牌</label>
+                <v-select
+                  :options='$parent.$parent.meterbrand'
+                  :value.sync="model.f_gasbrand"
+                  close-on-select
+                  condition="f_meter_brand='{}'"
+                  placeholder='气表品牌'
+                  style="width:60%"
+                  v-model="model.f_gasbrand">
+                </v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">操作时间</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_start_date"
+                            condition="f_instruct_date >= '{}'"
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">&emsp;&emsp;至&emsp;</label>
+                <datepicker :format="'yyyy-MM-dd HH:mm:ss'" :value.sync="model.f_end_date"
+                            condition="f_instruct_date <= '{}'"
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" id="queryinstruct" partial='list' :modelval="$parent.$parent.modelval" v-ref:grid>
+          <template partial='head'>
+            <tr>
+              <th style="text-align:center">
+                <nobr>序号</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户编号</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户名称</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>客户地址</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>表号</nobr>
+              </th>
+              <th style="text-align:center">
+                <nobr>气表品牌</nobr>
+              </th>
+              <th style="text-align:center"><nobr>操作类型</nobr></th>
+              <th style="text-align:center"><nobr>操作人</nobr></th>
+              <th style="text-align:center"><nobr>操作时间</nobr></th>
+              <th style="text-align:center"><nobr>开发阀原因</nobr></th>
+              <th style="text-align:center"><nobr>组织机构</nobr></th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align:center">
+                <nobr>{{$index+1}}</nobr>
+              </td>
+              <td style="text-align:center">
+               {{row.f_userinfo_code}}
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_instruct_title}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_instruct_date}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_info}}</nobr>
+              </td>
+              <td style="text-align:center">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import * as Util from '../../Util'
+  let readyGen = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.getfield = self.config.excelHeaders
+  }
+  export default {
+    title: '开关阀记录查询',
+    data () {
+      return {
+        model: new PagedList('rs/sql/operationValueRecord', 50),
+        row: null,
+        isLoading: true,
+        searchshow: true,
+        criteriaShow:false,
+        Gasproperties:[],
+        meterbrand: [],
+        userType:[],
+        instructtype:[],
+        instructstate:[],
+        org:{
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        orgcondition:'',
+        show: false,
+        condition:'',
+        f_orgid:'',
+        f_start_date:'',
+        f_end_date:'',
+        getfield: {},
+        config: {
+          excelHeaders: {
+            'f_userinfo_code': '客户编号','f_address': '客户地址','f_user_name': '客户姓名',
+            'f_meternumber': '表号','f_meter_brand': '气表品牌','f_instruct_title':'操作类型',
+            'f_info':'开关阀原因','f_inputtor':'操作人','f_instruct_date':'操作时间',
+            'f_orgname': '组织机构'
+          }
+        },
+        instructtitle: [],
+        detailShow: false,
+        f_instruct_content: '',
+        modelval: [
+          '序号','客户编号','客户名称','客户地址','表号','气表品牌','操作类型','操作人','操作时间','充值金额','开发阀原因','组织机构'
+        ]
+      }
+    },
+    ready () {
+      readyGen(this)
+      this.$refs.paged.$refs.criteria.model.f_start_date = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.paged.$refs.criteria.model.f_end_date = Util.toStandardDateString() + ' 23:59:59'
+      this.$refs.paged.$refs.grid.modelval = this.modelval
+    },
+    methods: {
+      hidden(){
+        this.criteriaShow = !this.criteriaShow
+      },
+      getorg(condition,obj) {
+        this.orgcondition = condition.replace('f_orgid','i.f_orgid')
+        this.orgcondition = this.orgcondition.replace('f_depid','i.f_depid')
+        this.orgcondition = this.orgcondition.replace('f_operatorid','i.f_operatorid')
+        this.orgname = obj.orgnames[0]
+      },
+      initQueryParam () {
+        let arr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          if(item.value.f_meter_type==='物联网表'){
+            temp.label = item.label
+            temp.value = item.value.f_meter_brand
+            arr.push(temp )
+          }
+        })
+        this.meterbrand = [{label: '全部', value: ''}, ...arr]
+      },
+      clearmsg () {
+        this.$refs.paged.$refs.criteria.model = {}
+      },
+      clickshow () {
+        this.searchshow = !this.searchshow
+      },
+      dealmsg (val) {
+        val.model = this.model.model
+        this.$emit('deal-msg', val)
+      },
+      async search (args) {
+        // this.obj.resids = this.obj.resids.replace(/\./g, ''),
+        args.condition =  `${args.condition}`+this.orgcondition
+        console.log(args.condition+"args.condition")
+        this.condition = args.condition
+        if( this.$refs.paged.$refs.criteria.model.f_start_date!=null &&  this.$refs.paged.$refs.criteria.model.f_start_date!=''){
+          this.model.params.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
+          this.f_start_date = `'${this.$refs.paged.$refs.criteria.model.f_start_date}'`;
+        }else{
+          this.model.params.f_start_date = '';
+          this.f_start_date = '';
+        }
+        if( this.$refs.paged.$refs.criteria.model.f_end_date!=null &&  this.$refs.paged.$refs.criteria.model.f_end_date!=''){
+          this.model.params.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
+          this.f_end_date = `'${this.$refs.paged.$refs.criteria.model.f_end_date}'`;
+        }else{
+          this.model.params.f_end_date  = "";
+          this.f_end_date  = "";
+        }
+        if(this.f_orgid_new == '' || this.f_orgid_new == null){
+          this.model.params.f_orgid = `'${this.$login.f.orgid}'`;
+          this.f_orgid = `${this.$login.f.orgid}`;
+        }else{
+          this.model.params.f_orgid = `'${this.f_orgid_new}'`;
+          this.f_orgid = `${this.f_orgid_new}`;
+        }
+        await this.model.search(args.condition, args.model)
+        await this.initQueryParam();
+        await this.$refs.paged.$refs.grid.InitializedData()
+        await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
+      },
+    },
+    computed: {
+     userType () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+       Gasproperties () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+    }
+    }
+  }
+</script>
+<style>
+  .form-input-group label {
+    text-align: right;
+    width: auto;
+  }
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 30px 10px 30px;
+    border-radius:15px;
+  }
+</style>

package/src/filiale/ningjin/ChargeQuery.vue CHANGED Viewed

@@ -63,7 +63,7 @@
                 <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 = '{}'" placeholder="客户名称">
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">收费编号</label>

package/src/filiale/ningjin/GasStatistics.vue CHANGED Viewed

@@ -193,10 +193,6 @@
                 <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>
@@ -226,10 +222,6 @@
                 <th style="text-align:center"><nobr>{{row.f_meter_title}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_price_name}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair1price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair2price}}</nobr></th>
-                <th style="text-align:center"><nobr>{{row.f_stair3price}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_user_nature}}</nobr></th>
                 <th style="text-align:center"><nobr>{{row.f_gasproperties}}</nobr></th>

package/src/filiale/wenxi/config/exportConfig.js CHANGED Viewed

@@ -263,6 +263,12 @@ export default{
     'f_userinfo_code': '客户编号', 'f_user_name': '客户名称', 'f_address': '客户地址', 'f_meternumber': '表号',
     'f_last_tablebase': '上期底数', 'f_tablebase': '本期底数', 'f_real_amount': '用气量', 'totalgas': '总购气量',
     'f_yuliang': '余量', 'f_inputtor': '抄表员', 'f_hand_date': '下发日期', 'f_input_date': '录入日期',
+    'f_instantaneous_flow': '瞬时流量',
+    'f_pressure': '压力',
+    'f_temperature': '温度',
+    'f_controller_power': '控制器电量',
+    'f_flowmeter_capacity': '流量计电量',
+    'f_valve_switch': '阀门开关',
     'f_meter_state': '抄表状态', 'f_operator': '操作员', 'f_depname': '部门'
   },
   handplanConfig: {

package/src/webmeterManage.js CHANGED Viewed

@@ -116,5 +116,7 @@ export default function () {
   Vue.component('webmeter-settlement-analysis', (resolve) => { require(['./components/webmeter/gasAnalysis/WebmeterSettlementAnalysis'], resolve) })
   // 物联网表结算分析新
   Vue.component('new-webmeter-settlement-analysis', (resolve) => { require(['./components/webmeter/gasAnalysis/NewWebmeterSettlementAnalysis'], resolve) })
+  // 开关阀记录
+  Vue.component('operation-value-record', (resolve) => { require(['./components/webmeter/operationValueRecord'], resolve) })
 }