manage-client 3.2.109-1 → 3.2.112

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/package.json

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

package/src/components/SellReport/ManageBusSummary.vue

@@ -1,221 +1,221 @@
-<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_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_state:['有效'],
-        model: new DataModel('rs/report/getmoneyall', {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
-/*        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('收费状态')]
-      }
-    }
-  }
-</script>
-<style scoped>
-  .noborder{
-    border: none;
-  }
-</style>
+<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_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_state:['有效'],
+        model: new DataModel('rs/report/getmoneyall', {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
+/*        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('收费状态')]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

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

@@ -114,6 +114,9 @@
                   <!--<nobr>用户地址</nobr>-->
                   <data-order field="f_address" name="用户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
                 <th>
                   <nobr>操作类型</nobr>
                 </th>
@@ -158,6 +161,9 @@
               <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_operat_type}}</nobr>
               </td>

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

@@ -104,6 +104,9 @@
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
                 <th>
                   <nobr>销户原因</nobr>
                 </th>
@@ -150,6 +153,9 @@
               <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_comments}}</nobr>
               </td>

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

@@ -117,6 +117,10 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                </th>
                 <th>
                   <nobr>档案编号</nobr>
                 </th>
@@ -169,6 +173,9 @@
               <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_olduserinfo_code}}</nobr>
               </td>

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

@@ -160,6 +160,9 @@
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
                 <th>
                   <nobr>停用原因</nobr>
                 </th>
@@ -215,6 +218,9 @@
               <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_disable_reason}}</nobr>
               </td>

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

@@ -133,6 +133,9 @@
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
                 <th>
                   <nobr>启用原因</nobr>
                 </th>
@@ -179,6 +182,9 @@
               <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_enable_reason}}</nobr>
               </td>

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

@@ -154,6 +154,9 @@
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
                 <th>
                   <nobr>小区</nobr>
                 </th>
@@ -212,6 +215,9 @@
               <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_residential_area}}</nobr>
               </td>

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

@@ -163,6 +163,9 @@
                   <data-order field="f_address" name="客户地址"
                               :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
                 </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
                 <th>
                   <nobr>卡号</nobr>
                 </th>
@@ -218,6 +221,9 @@
               <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_card_id}}</nobr>
               </td>

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

@@ -81,6 +81,15 @@
                   <!--<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>
+                  <data-order field="f_address" name="客户地址" :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
                 <th>
                   <nobr>缴费人</nobr>
                 </th>
@@ -129,6 +138,15 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_userinfo_code}}</nobr>
               </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_charge_person}}</nobr>
               </td>