manage-client 4.0.57 → 4.0.58-2

package/package.json

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

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

@@ -70,6 +70,39 @@
                               condition="f_meter_brand = '{}'"
                     ></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_residential_area"
+                              class="select_list select"
+                              v-model="model.f_residential_area"
+                              style="width: 60%"
+                              multiple
+                              condition="f_residential_area in {}"
+                              :options='$parent.$parent.residentialArea' placeholder='选择小区'
+                              close-on-select>
+
+                    </v-select>
+                  </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_building"
+                           condition="f_building = '{}'" 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_unit"
+                           condition="f_unit = '{}'" 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_floor"
+                           condition="f_floor = '{}'" 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_room"
+                           condition="f_room = '{}'" placeholder='房间号'>
+                  </div>
                 </div>
               </div>
             </criteria>
@@ -98,6 +131,9 @@
                   <th>
                     <nobr>绑定状态</nobr>
                   </th>
+                  <th>
+                    <nobr>小区</nobr>
+                  </th>
                   <th>
                     <nobr>客户地址</nobr>
                   </th>
@@ -129,6 +165,9 @@
                 <td :class="'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_band_state}}</nobr>
                 </td>
+                <td :class="'back-blue'" style="text-align: center;">
+                  <nobr>{{row.f_residential_area}}</nobr>
+                </td>
                 <td :class="'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_address}}</nobr>
                 </td>
@@ -172,6 +211,7 @@
         criteriaShow: false,
         orgCondtionStr: '',
         modelval: [],
+        residentialArea: [],
         printshow: false,
         all: false,
         fields: {},
@@ -197,6 +237,7 @@
       }
     },
     ready() {
+      this.getaddress()
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -211,6 +252,22 @@
           this.meterbrands.push({label: row.label,value: row.value.f_meter_brand})
         }
       },
+      async getaddress(){
+        console.log('开始获取小区')
+        let HttpReset = new HttpResetClass()
+        var data = await HttpReset.load('POST', 'api/af-revenue/sql/manage_getarealist', {
+          data: {
+            condition: `1=1 and s.f_filialeid = '${this.$login.f.orgid}'`
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
+        console.log('小区',data)
+        let house = []
+        for (let row of data.data){
+          console.log('开始保存小区')
+          house.push({label: row.f_residential_area, value: row.f_residential_area})
+        }
+        this.residentialArea = house
+      },
       //把数据库查询数据转换为下拉数据
       calculate(rows){
         let data = []

package/src/filiale/bayan/ManageMaterialUsageDetails.vue

@@ -0,0 +1,178 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <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" >
+              <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" >
+              <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">
+              <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">
+              <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">
+              <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>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice'></report-excel>
+          </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;
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{$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>
+      </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: '',
+      operatorname: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('api/af-revenue/report/MaterialUsageDetails', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      spans: 0
+    }
+  },
+  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'
+  },
+  methods: {
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    },
+    selfSearch (args) {
+      this.printTime = this.$login.toStandardTimeString()
+      let orgcondition = '1=1'
+      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)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    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) {
+      this.spans = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

package/src/filiale/bayan/reportManage.js

@@ -0,0 +1,9 @@
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 气价分组汇总表
+  Vue.component('manage-material-usage-details', (resolve) => {
+    require(['./ManageMaterialUsageDetails'], resolve)
+  })
+}

package/src/filiale/tongchuan/UserQuery.vue

@@ -287,6 +287,13 @@
                               :options='$parent.$parent.safe' placeholder='请选择'
                               close-on-select></v-select>
                   </div>
+                  <div class="col-sm-2 form-group">
+                    <label class="font_normal_body">&nbsp;&nbsp;&nbsp;壁挂炉</label>
+                    <v-select :value.sync="model.isbgl" v-model="model.isbgl"
+                              :options='$parent.$parent.bgl' placeholder='请选择'
+                              condition="isbgl = '{}'"
+                              close-on-select></v-select>
+                  </div>
                   <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
                 </div>
               </div>
@@ -348,6 +355,9 @@
                   <th>
                     <nobr>缴费类型</nobr>
                   </th>
+                  <th>
+                    <nobr>是否壁挂炉</nobr>
+                  </th>
                   <th>
                     <nobr>银行户名</nobr>
                   </th>
@@ -426,6 +436,9 @@
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr>{{row.f_cost_type}}</nobr>
                 </td>
+                <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
+                  <nobr>{{row.isbgl}}</nobr>
+                </td>
                 <td :class="row.f_user_state !== '正常'? 'back-red' : 'back-blue'" style="text-align: center;">
                   <nobr><span v-if="row.f_cost_type =='银行代扣'">{{row.f_bank_accopen}}</span></nobr>
                 </td>
@@ -919,6 +932,9 @@
 
         return [{label: '全部', value: ''}, ...rs]
       },
+      bgl(){
+        return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
+      },
       userstates() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('客户状态')]
       },