manage-client 4.0.26 → 4.0.28

package/package.json

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

package/src/components/SellReport/YuShouTable.vue

@@ -160,38 +160,53 @@
           f_orgid: 'this.model.f_orgid'}),
         reportStr: null,
         show: false,
-        startDate:"",
-        endDate:"",
-        startdate:'',
-        enddate:'',
-        orgFlag:false,
-        depFlag:false,
-        operFlag:false,
+        startDate: '',
+        endDate: '',
+        startdate: '',
+        enddate: '',
+        orgFlag: false,
+        depFlag: false,
+        operFlag: false,
       }
     },
     ready () {
       this.startdate = this.$login.toStandardDateString() + ' 00:00:00'
       this.enddate = this.$login.toStandardDateString() + ' 23:59:59'
-      this.startDate=this.startdate.substring(0,10)
-      this.endDate=this.startDate.substring(0,10)
+      this.startDate = this.startdate.substring(0, 10)
+      this.endDate = this.startDate.substring(0, 10)
       console.log(this.$login.f)
     },
     methods: {
+      appendCondition (data) {
+        console.log('data=====>', data)
+        let stringValue = ''
+        for (var i = 0; i < data.length; i++) {
+          if (data[i]) {
+            if (i === data.length - 1) {
+              stringValue = stringValue + "'" + data[i] + "'"
+            } else {
+              stringValue = stringValue + "'" + data[i] + "',"
+            }
+          }
+        }
+        return stringValue
+      },
       searchData () {
         this.$refs.paged.$refs.criteria.search()
       },
       selfSearch (args) {
-        let f_dep=this.f_depid
+        let f_dep = this.f_depid
         let orgcondition = ` ts.f_orgid in ('${this.f_orgid}')`
         if (f_dep[0]) {
-          orgcondition += " and ts.f_depid in('"+f_dep[0]+"'"
-            for( let i=1;i<f_dep.length;i++){
-              orgcondition += ",'"+f_dep[i]+"'"
-            }
-          orgcondition +=')'
+          orgcondition += " and ts.f_depid in('" + f_dep[0] + "'"
+          for (let i = 1; i < f_dep.length; i++) {
+            orgcondition += ",'" + f_dep[i] + "'"
+          }
+          orgcondition += ')'
         }
-        if(this.f_operatorid[0]) {
-          orgcondition += ` and ts.f_operatorid in ('${this.f_operatorid}')`
+        if (this.f_operatorid[0]) {
+          const operatorIds = this.f_operatorid.map(id => `'${id}'`).join(',')
+          orgcondition += ` and ts.f_operatorid in (${operatorIds})`
         }
         // console.log(this.orgname,this.depname.toString(),this.operatorname)
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
@@ -207,7 +222,7 @@
         this.userresid = obj
         this.f_depid = obj
       },
-      getuser ( obj, val) {
+      getuser (obj, val) {
         this.operatorname = val[0]
         this.f_operatorid = obj
       },

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

@@ -0,0 +1,180 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <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 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 00:00:00'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <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 23:59:59'"
+                              :show-reset-button="true">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
+                  <right-tree @re-res="$parent.$parent.getRes"></right-tree>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='department'
+                              @res-select="$parent.$parent.getdep"
+                              :parentresid="$parent.$parent.depresid"
+                              :initresid='$parent.$parent.depid'>
+                  </res-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;人员&nbsp;&nbsp;&nbsp; </label>
+                  <res-select restype='user'
+                              is-mul ="false"
+                              @res-select="$parent.$parent.getuser"
+                              :parentresid="$parent.$parent.userresid"
+                              :initresid='$parent.$parent.operatorid'>
+                  </res-select>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                </div>
+                </div>
+              </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>设备类型</nobr>
+                </th>
+                <th>
+                  <nobr>用户数量</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{row.f_devices_type}}</nobr>
+              </td>
+              <td style="text-align: center;"><nobr>
+                <nobr>{{row.f_number}}</nobr>
+              </nobr> </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+    </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import {methods} from 'babel-plugin-transform-runtime/lib/definitions'
+
+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.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  title: '用气统计报表',
+  props: ['data'],
+  data () {
+    return {
+      model: new PagedList('api/af-revenue/sql/gasDeviceStatistics', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate', f_orgid: 'this.model.f_orgid'}),
+      show: false,
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: [],
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      startDate: '',
+      endDate: '',
+      resshow: ['company', 'department', 'operator', 'slicearea'],
+      orderitem: 'f_operate_date desc'
+    }
+  },
+  ready() {
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    search(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    selfSearch(args) { // 调用sql文件
+      let f_dep=this.f_depid
+      let f_org=this.f_orgid
+      let f_oper = this.f_operatorid
+      let orgcondition = ''
+      if (f_org[0]) {
+        orgcondition += "f_orgid in('"+f_org[0]+"'"
+        for( let i=1;i<f_org.length;i++){
+          orgcondition += ",'"+f_org[i]+"'"
+        }
+        orgcondition +=') '
+      }else if (f_org[0]==='' || f_org[0]===undefined) {
+        orgcondition = ' 1=1 '
+      }else {
+        orgcondition = ' f_orgid = ' + this.f_orgid
+      }
+      if (f_dep[0]) {
+        orgcondition += " and f_depid in('"+f_dep[0]+"'"
+        for( let i=1;i<f_dep.length;i++){
+          orgcondition += ",'"+f_dep[i]+"'"
+        }
+        orgcondition +=') '
+      }
+      if(f_oper[0]) {
+        orgcondition += "and uf.f_operatorid in('"+f_oper[0]+"'"
+        for( let i=1;i<f_oper.length;i++){
+          orgcondition += ",'"+f_oper[i]+"'"
+        }
+        orgcondition +=') '
+      }
+      this.$refs.paged.$refs.cri.model.f_orgid = orgcondition
+      args.condition = orgcondition + 'and'  + args.condition
+      console.log("condition:" + args.condition)
+      this.startDate=this.$refs.paged.$refs.cri.model.startDate.substring(0,10)
+      this.endDate=this.$refs.paged.$refs.cri.model.endDate.substring(0,10)
+      this.model.search(args.f_orgid, args.model, args.condition)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      this.depname = val
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    },
+  },
+  computed: {
+
+  }
+}
+</script>

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

@@ -673,7 +673,10 @@ export default {
     'f_devices_type': '灶具信息',
     'f_network_valve': '自动阀控',
     'f_defendcard': '防盗卡号',
-    'f_factory_date': '生产年月'
+    'f_factory_date': '生产年月',
+    'latest_f_pregas' : '最后购气量',
+    'latest_f_collection':'最后购气金额',
+    'f_max_operate_date': '最后购气日期'
   },
 
   compreConfigGY: {

package/src/components/sale/filesquery/RecordInfoQuery.vue

@@ -612,7 +612,9 @@
                     <!--<nobr>最后抄表日期</nobr>-->
                     <data-order field="f_hand_date" name="最后抄表日期" :order.sync="$parent.$parent.$parent.orderFields.f_hand_date"></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>
@@ -767,7 +769,9 @@
                 <td style="text-align: center;"><nobr>{{row.f_meter_base}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_balance}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_hand_date}}</nobr></td>
-               <!-- <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>-->
+                <td style="text-align: center;"><nobr>{{row.latest_f_pregas}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.latest_f_collection}}</nobr></td>
+                <td style="text-align: center;"><nobr>{{row.f_max_operate_date}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_network_valve}}</nobr></td>
                 <td style="text-align: center;"><nobr>{{row.f_valve_state}}</nobr></td>
 

package/src/filiale/meihekou/CardHandplanQuery.vue

@@ -334,7 +334,7 @@
               气量合计: {{sumsmodel.f_real_amount}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              总购气量合计:&emsp;{{sumsmodel.f_card_total_gas}}
+              气费合计:&emsp;{{sumsmodel.f_real_fee}}
             </td>
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               余量合计:&emsp;{{sumsmodel.f_yuliang}}
@@ -398,7 +398,7 @@
         other:[],
         footer:[],
         data: {},
-        model: new PagedList('api/af-revenue/sql/cardhandplanQuery', 20, {},{f_real_amount:0,f_card_total_gas:0,f_yuliang:0,f_stairamount1:0,
+        model: new PagedList('api/af-revenue/sql/cardhandplanQuery', 20, {},{f_real_amount:0,f_real_fee:0,f_card_total_gas:0,f_yuliang:0,f_stairamount1:0,
           f_stair1fee:0,
           f_stair2amount:0,
           f_stair2fee:0,