manage-client 3.2.124 → 3.2.127

package/package.json

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

package/src/components/SellReport/MarketMonthMoney.vue

@@ -0,0 +1,237 @@
+<template>
+  <div class="basic-main" style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <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" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2 form-group" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :show-reset-button="reset">
+              </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" style="width: 60%"></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'
+                          is-mul="false"
+                          @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>
+-->
+            <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>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='3cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+            <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 class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">用户类型</label>
+              <v-select :value.sync="$parent.$parent.f_user_type"
+                        v-model="$parent.$parent.f_user_type"
+                        :options='$parent.$parent.user_type' placeholder='请选择'
+                        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="$parent.$parent.f_state" multiple-->
+            <!--v-model="$parent.$parent.f_state"-->
+            <!--:options='$parent.$parent.charge_state' placeholder='请选择'-->
+            <!--condition="f_state in {}"-->
+            <!--close-on-select></v-select>-->
+            <!--</div>-->
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">天然气售气表具月报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              <!--打印时间：{{{$parent.printTime}}}-->
+              打印时间：{{$parent.printTime}}
+              <!--收费员：{{// $parent.operatorname}}-->
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$parent.orgname">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname"> 部门：{{$parent.depname}}</span>
+                <span style="font-weight: normal;text-align: center;margin:5px 15px" v-show="$refs.criteria.$refs.res.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="noborder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='Math.floor($parent.spans/3)'>财务审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款审核：</th>
+            <th :colspan='Math.floor($parent.spans/3)'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+        {{{ $parent.reportStr}}}
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+import { DataModel } from 'vue-client'
+import co from 'co'
+
+export default {
+  title: '天然气售气表具月报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      criteriaShow: false,
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      f_user_type: '',
+      f_state:['有效'],
+      model: new DataModel('rs/report/MarketMonthMoney', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      resshow:['company','department','operator'],
+      spans: 0,
+      initres: {
+        org: [this.$login.f.orgid],
+        dep: [],
+        user: []
+      }
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+    console.log(this.$login.f)
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      let orgstr = this.orgCondtionStr
+      orgcondition = orgcondition + orgstr
+      console.log('23231312321:',this.f_user_type)
+      if(this.f_user_type && this.f_user_type[0]) {
+        orgcondition += ` and f_user_type = '${ this.f_user_type}  '`
+      }
+      /*        if (this.f_orgid && this.f_orgid[0]) {
+                orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+              }
+              if (this.f_depid && this.f_depid[0]) {
+                orgcondition += ' and f_depid in (' + this.f_depid + ')'
+              }
+              if(this.f_operatorid && this.f_operatorid[0]) {
+                orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+              }*/
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes (condition, obj) {
+      this.orgCondtionStr = condition
+      this.orgname = obj.orgnames[0]
+      this.depname = obj.depnames[0]
+    },
+    getdep (obj, val) {
+      this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    }
+  },
+  watch: {
+    'model.data' (val) {
+      let len=0
+      let a=val.split('</tr>')
+      for(let i=0;i<a.length;i++){
+        if(a[i].split('</td>').length-1>len){
+          len=a[i].split('</td>').length-1
+        }
+      }
+      this.spans = len
+    }
+  },
+  computed: {
+    charge_state() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    user_type () {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -57,6 +57,9 @@
     <tabs header="抄表册统计" v-if="permission('抄表册统计')">
       <hand-book-query v-if="show.includes('抄表册统计')"  @deal-msg="dealMsg"></hand-book-query>
     </tabs>
+    <tabs header="抄表册统计2" v-if="permission('抄表册统计2')">
+      <hand-book-two-query v-if="show.includes('抄表册统计2')"  @deal-msg="dealMsg"></hand-book-two-query>
+    </tabs>
     <tabs header="用气性质抄表率统计" v-if="permission('用气性质抄表率统计')">
       <hand-gas-properties-query v-if="show.includes('用气性质抄表率统计')"  @deal-msg="dealMsg"></hand-gas-properties-query>
     </tabs>

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

@@ -124,6 +124,14 @@
                     <input type="text" style="width: 36%;" placeholder="室号" class="input_search" v-model="model.f_room" condition="f_room = '{}'" />
                   </div>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select :value.sync="model.f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </div>
                 <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
               </div>
             </div>
@@ -163,6 +171,9 @@
                 <th>
                   <nobr>表号</nobr>
                 </th>
+                <th>
+                  <nobr>气表品牌</nobr>
+                </th>
                 <th>
                   <nobr>停用原因</nobr>
                 </th>
@@ -221,6 +232,9 @@
               <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_disable_reason}}</nobr>
               </td>
@@ -289,7 +303,7 @@
     // await self.$refs.paged.$refs.cri.search()
     //self.$refs.paged.$refs.cri.model.f_sendsuccess = ['有效']
     await self.$MagLoadParams.loadParam()
-
+    self.initParams()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -332,7 +346,8 @@
         },
         //合计数据
         sumsmodel: {},
-        operattype:[{label: '全部', value: ''},{label: '停用', value: '停用'},{label: '拆表', value: '拆表'}]
+        operattype:[{label: '全部', value: ''},{label: '停用', value: '停用'},{label: '拆表', value: '拆表'}],
+        meterbrands: []
       }
     },
     ready() {
@@ -459,8 +474,18 @@
         }
 
         this.search()
+      },
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       }
-
     },
     watch: {
       'all'(val) {

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

@@ -110,6 +110,14 @@
                             condition="f_meter_brand = '{}'"
                             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_price_name"
+                            v-model="model.f_price_name"
+                            :options="$parent.$parent.pricenames" placeholder='气价名称'
+                            condition="f_price_name in {}"
+                  ></v-select>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">补气状态</label>
                   <v-select :value.sync="model.f_state"
@@ -309,6 +317,7 @@
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     self.initParams()
     await self.$MagLoadParams.loadParam()
+    self.getPricenames()
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
@@ -343,6 +352,7 @@
         show:false,
         rowdata:{},
         meterbrands: [],
+        pricenames:[],
         filltype: [],
         initres: {
           org:[this.$login.f.orgid],
@@ -424,6 +434,17 @@
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
         this.filltype = [{label: '全部', value: ''}, ...typeArr]
       },
+      getPricenames() {
+        this.pricenames = []
+        let priceArr = []
+        this.$MagGetSaleParam.prices.forEach((item) => {
+          let temp = {}
+          temp.label = item.f_price_name
+          temp.value = item.f_price_name
+          priceArr.push(temp)
+        })
+        this.pricenames  = [{label: '全部', value: ''}, ...priceArr]
+      },
       selfSearch(args) {
         if (this.data) {
           this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate