npm - manage-client - Versions diffs - 3.2.108 → 3.2.109-1 - Mend

manage-client 3.2.108 → 3.2.109-1

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 (10) hide show

package/package.json +1 -1
package/src/components/SellReport/ManageBusSummary.vue +221 -224
package/src/components/daping/CallCenter.vue +1 -1
package/src/components/daping/DataManagement.vue +1 -1
package/src/components/daping/SafecheckBarChart.vue +1 -1
package/src/components/sale/businessquery/FillCardQuery.vue +1 -5
package/src/components/sale/config/exportConfig.js +5 -4
package/src/filiale/qianneng/GasLossQuery.vue +632 -0
package/src/filiale/qianneng/HandplanQuery.vue +1 -0
package/src/filiale/qianneng/sale.js +1 -1

package/package.json CHANGED Viewed

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

package/src/components/SellReport/ManageBusSummary.vue CHANGED Viewed

@@ -1,224 +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 + ')'
-        }*/
-        if(this.f_state && this.f_state[0]) {
-          orgcondition += ` and f_state in('${this.f_state.toString().replace(/,/g,"','")}')`
-        }
-        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/daping/CallCenter.vue CHANGED Viewed

@@ -84,7 +84,7 @@
 <script>
   import {HttpResetClass} from "vue-client";
-  import dataManage from 'src/components/daping/json/dataManage.json'
+  import dataManage from './json/dataManage.json'
   export default {
     title: '收费',
     data() {

package/src/components/daping/DataManagement.vue CHANGED Viewed

@@ -84,7 +84,7 @@
 <script>
 import {HttpResetClass} from 'vue-client'
-import dataManage from 'src/components/daping/json/dataManage.json'
+import dataManage from './json/dataManage.json'
 export default {
   title: '数据展示',
   data() {

package/src/components/daping/SafecheckBarChart.vue CHANGED Viewed

@@ -5,7 +5,7 @@
 <script>
   import {HttpResetClass} from "vue-client";
-  import dataManage from 'src/components/daping/json/dataManage.json'
+  import dataManage from './json/dataManage.json'
   export default {
     title: '收费',
     data() {

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

@@ -266,9 +266,6 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               卡费合计:&emsp;{{sumsmodel.f_cardfees}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              户数合计:&emsp;{{sumsmodel.hushu}}
-            </td>
           </tr>
         </table>
       </div>
@@ -312,7 +309,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0,hushu:0}),
+        model: new PagedList('rs/sql/fillCardQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_cardfees: 0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补卡类型", "表编号", "卡号", "气表品牌", "气表状态", "卡费", "补卡日期", "人员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", " f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -396,7 +393,6 @@
         args.condition = `${args.condition}` + this.orgCondtionStr
        await this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-        this.sumsmodel.hushu=[...new Set(this.$refs.paged.$refs.grid.model.rows.map(item => item.f_userinfo_code))].length
       },
       initParams() {

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

@@ -227,7 +227,7 @@ export default{
     'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_user_name': '客户名称', 'f_address': '客户地址',
     'f_type': '换表类型', 'f_changemeter_fee': '换表费', 'f_meternumber_old': '旧表号', 'f_meternumber': '新表号',
     'f_meter_brand_old': '旧气表品牌', 'f_meter_brand': '新气表品牌', 'f_remanent_gas': '补气量', 'f_remanent_money': '补气金额',
-    'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_install_date': '换表日期', 'f_operate_date': '操作日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
+    'f_comments': '备注', 'f_change_operator': '换表人', 'f_state': '状态', 'f_operate_date': '操作日期', 'f_payment': '付款方式', 'f_othereason': '换表原因',
     'f_operator': '人员', 'f_depname': '部门', 'f_orgname': '公司'
   },
   changemeterprintConfig: {
@@ -283,9 +283,10 @@ export default{
     'f_month7': '七月','f_month8': '八月', 'f_month9': '九月', 'f_month10': '十月', 'f_month11': '十一月', 'f_month12': '十二月'
   },
   gaslossConfig: {
-    'f_userinfo_code': '客户编号', 'f_olduserinfo_code': '档案编号', 'f_charge_person': '缴费人', 'f_charge_phone': '缴费人电话',
-    'f_charge_address': '缴费人地址', 'f_collection': '缴费金额', 'f_payment': '付款方式', 'f_bill_style': '打印格式',
-    'f_serial_id': '流水号', 'f_pay_id': '支付单号', 'detail': '详细信息', 'f_charge_date': '缴费日期',
+    'f_userinfo_code': '客户编号', 'f_charge_person': '缴费人', 'f_charge_phone': '缴费人电话', 'f_charge_address': '缴费人地址',
+    'f_type': '气损分类', 'f_loss_type': '气损类型', 'f_number': '数量', 'f_unitprice': '单价', 'f_collection': '缴费金额',
+    'f_payment': '付款方式', 'f_charge_date': '缴费日期', 'f_bill_style': '打印格式',
+    'f_serial_id': '流水号', 'f_pay_id': '支付单号',
     'f_depname': '部门', 'f_operator': '操作员'
   },
   balanceConfig: {

package/src/filiale/qianneng/GasLossQuery.vue ADDED Viewed

@@ -0,0 +1,632 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search" v-if="!show">
+      <div class="flex">
+        <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 HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_charge_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_charge_date <= '{}'">
+                  </datepicker>
+                </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_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">缴&nbsp;费&nbsp;人&nbsp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_charge_person"
+                         condition="f_charge_person like '%{}%'" placeholder="缴费人">
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile" sql-name="gaslossQuery" template-name='气损收费导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="气损收费打印"
+                               titletable="气损收费打印"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <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>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :show-component="['company','operator']" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数:气损分类">气损分类</label>
+                  <v-select :value.sync="model.f_type" multiple
+                            v-model="model.f_type"
+                            :options='$parent.$parent.gaslosstypes' placeholder='请选择'
+                            condition="f_type in {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数:气损类型">气损类型</label>
+                  <v-select :value.sync="model.f_loss_type" multiple
+                            v-model="model.f_loss_type"
+                            :options='model.f_type?this.$appdata.getParam(model.f_type):[]'
+                            placeholder='请选择'
+                            condition="f_loss_type in {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">地&emsp;&emsp;址</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_charge_address"
+                         condition="f_charge_address like '%{}%'" placeholder="缴费人地址">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
+                  <v-select :value.sync="model.f_payment" multiple
+                            v-model="model.f_payment"
+                            :options='$parent.$parent.payment' placeholder='请选择'
+                            condition="f_payment in {}"
+                            close-on-select></v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+          <data-grid :model="model" partial='list' class="list_area table_sy"  v-ref:grid :classname="$parent.classname">
+            <template partial='head'>
+              <tr>
+                <th>
+                  <!--<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>
+                  <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>
+                <th>
+                  <nobr>打印格式</nobr>
+                </th>
+                <th>
+                  <nobr>流水号</nobr>
+                </th>
+                <th>
+                  <nobr>支付单号</nobr>
+                </th>
+                <th>
+                  <nobr>详情</nobr>
+                </th>
+                <th>
+                  <!--<nobr>缴费日期</nobr>-->
+                  <data-order field="f_charge_date" name="缴费日期" :order.sync="$parent.$parent.$parent.orderFields.f_charge_date"></data-order>
+                </th>
+                <th>
+                  <nobr>操作人</nobr>
+                </th>
+                <th>
+                  <nobr>部门</nobr>
+                </th>
+                <th>
+                  <nobr>公司</nobr>
+                </th>
+<!--                <th><nobr>附件</nobr></th>-->
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{row.f_userinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_charge_person}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_charge_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_charge_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_loss_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_number}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_unitprice}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_collection}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_bill_style}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_serial_id}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_pay_id}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.detail}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_charge_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+<!--              <td style="text-align: center;"><nobr>-->
+<!--                <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>-->
+<!--              </nobr></td>-->
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+        <table class="table-hover">
+          <tr style="position: relative;margin-top: -16px;" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              金额合计:&emsp;{{sumsmodel.f_collection}}
+            </td>
+          </tr>
+        </table>
+      </div>
+    </div>
+    <div class="flex" v-if="show">
+      <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    </div>
+    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+        <upload :blodid="selected.f_userinfo_id" :businessid="selected.id" v-ref:upload isupload="false" takeimg="false"  fusetype="气损收费" :isremark="false" style="width:auto" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <modal :show.sync="progressShow" v-ref:modal backdrop="true"  width="50%" style="width:auto;" >
+      <header slot="modal-header" class="modal-header">
+        反盘导入
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="progress" style="margin: 20px" >
+          <div class="progress-bar progress-bar-success progress-bar-striped active" :style="{width: percent+'%'}">
+            {{percent}}%
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-default" @click='progressclose'>关闭</button>
+      </footer>
+    </modal>
+    <work-busy :is-busy="iswork" v-show="iswork"></work-busy>
+  </div>
+</template>
+<script>
+  import {PagedList, HttpResetClass} from 'vue-client'
+  import defaultPrint from '../../components/sale/config/DefaultPrint'
+  import exportConfig from '../../components/sale/config/exportConfig'
+  import axios from 'axios'
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    await self.$getConfig(self, 'GasLossQuery')
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    console.log('开始查询')
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    props:['data'],
+    title: '气损收费查询',
+    data() {
+      return {
+        iswork:false,
+        other:[],
+        footer:[],
+        data: {},
+        model: new PagedList('rs/sql/gaslossQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userinfo_code desc'`}, {
+          f_collection: 0
+        }),
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        show:false,
+        rowdata:{},
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        inputtouPerson: [],
+        meterbrands: [],
+        printshow: false,
+        f_filialeid: this.$login.f.f_orgid,
+        all: false,
+        fields: {},
+        //排序
+        orderitem:'f_userinfo_code desc',
+        orderFields: {
+          f_userinfo_code: 'no'
+        },
+        thead: '',
+        tfoot: '',
+        showupload:false,
+        selected:{},
+        // 下拉框
+        //合计数据
+        sumsmodel: {},
+        defaultfield: [],
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_charge_person', 'f_charge_phone', 'f_charge_address', 'f_collection']
+        },
+        prices: [],
+        meterbooks:[{label: '全部',value: ''}],  //抄表册
+        tempfalg :false,
+        lastorgstr:'',
+        allorgid:[],
+        inputtores:[{label: '全部',value: ''}],  //抄表员
+        //表册片区
+        bookSlice:[{label: '全部',value: ''}],
+        imgshow:false,
+        imgfilename:'',
+        percent:0,
+        progressShow:false,
+        uuida:'',
+        timer:'',
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      getuuid(){
+        let uuidA = '';
+        var s = [];
+        var hexDigits = '0123456789abcdef';
+        for (var i = 0; i < 36; i++) {
+          s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
+        }
+        s[14] = '4';
+        s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+        s[8] = s[13] = s[18] = s[23] = '-';
+        uuidA = s.join('');
+        this.uuida = uuidA;
+      },
+      progressclose(){
+        this.progressShow = false;
+        if(this.timer != null){
+          clearInterval(this.timer);
+        }
+      },
+      view(row){
+        this.showupload = true
+        this.selected= row
+      },
+      imgclose(){
+        this.imgshow = false
+      },
+      imgShow(val){
+        this.imgfilename = `rs/image/file/`+val
+        this.imgshow = true
+      },
+      getotherfooter(){
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other=[];
+        this.footer=[];
+        let exportdata = this.getCondition;
+        let otherInData=[];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      Fileinput(){
+        this.batchmoneyShow=true;
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      selfSearch(args) {
+        if (this.data) {
+          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+        }
+        args.condition = `${args.condition} ` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        //部门和人员变为全选
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+        this.$refs.paged.$refs.cri.model.f_meter_classify = []
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      async getRes(condition,obj) {
+        this.orgCondtionStr = condition
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        this.printshow = true
+        this.put()
+      },
+      put() {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>气损收费统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print() {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      dealmsg(val) {
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+        this.search()
+      }
+    },
+    watch: {
+      'model.rows'(val) {
+        if(val.length === 0){
+          this.sumsmodel = {}
+        }
+      },
+      async 'orgCondtionStr'(val) {
+        this.$refs.paged.$refs.cri.model.f_inputtor=[]
+        this.$refs.paged.$refs.cri.model.f_book_slice_area=[]
+        this.$refs.paged.$refs.cri.model.f_meter_book = []
+        this.meterbooks = [{label: '全部',value: ''}];
+        if(this.lastorgstr != val){
+          this.tempfalg = true;
+          this.lastorgstr = val;
+        }
+        if(this.tempfalg && val != null && val!=''  && val.indexOf("(")>-1){
+          this.tempfalg = false;
+          let a = val.substring(val.indexOf("(")+2)
+          await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
+        }
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.f_filialeid = res[1]
+          if(res.input !=null){
+            let resorgid = res.input.substring(res.input.indexOf("'"));
+            if(resorgid!= null && resorgid!=''){
+              resorgid = resorgid.substring(0,resorgid.lastIndexOf("'")+1);
+              // resorgid = resorgid.replaceAll("'","");
+              resorgid = resorgid.replace(/'/g,"");
+              this.allorgid = resorgid.split(",")
+            }
+          }
+          // this.updateParams()
+        }
+      },
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      }
+    },
+    computed: {
+      getCondition() {
+        return {
+          startDate: this.$refs.paged.$refs.cri.model.startDate,
+          endDate: this.$refs.paged.$refs.cri.model.endDate,
+          orderitem: this.orderitem,
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      },
+      getfield() {
+        return exportConfig.gaslossConfig
+      },
+      payment() {
+        return [{label: '全部', value: ''},...this.$appdata.getParam('付款方式查询')]
+      },
+      gaslosstypes() {
+        return [{label: '全部', value: ''},...this.$appdata.getParam('气损分类')]
+      }
+    },
+    events:{
+      'onFileUpload': async function (file, res) {
+        if (this.batchmoneyShow) {
+          this.percent = 0;
+          this.getuuid();
+          let param = {
+            filepath: res.f_downloadpath,
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps,
+            uuid: this.uuida
+          }
+          this.batchmoneyShow=false;
+          try{
+            await this.$resetpost('rs/logic/SumSettleFileImport',{data: param},{resolveMsg: null, rejectMsg: null},1000).then((res)=>{
+              if(res.data){
+              }
+            })
+          }catch(error){}
+          let getparam = {
+            uuid: this.uuida
+          }
+          let self = this;
+          this.progressShow=true;
+          this.timer = setInterval(function(){
+            self.$resetpost('/rs/logic/getBatchOperaPro',{data:getparam},{resolveMsg: null, rejectMsg: null}, 0).then((res)=>{
+              if(res.data ){
+                if(res.data.speed){
+                  if(res.data.speed>= 100){
+                    clearInterval(self.timer);
+                    if(res.data.speed){
+                      self.percent = 99;
+                    }
+                    setTimeout(()=>{
+                      self.percent = 100;
+                      self.progressclose();
+                      self.$showMessage(`导入成功! 累计导入:${res.data.totalsum}, 成功:${res.data.successsum},失败:${res.data.errorsum}(包含之前导入${res.data.aftersum}),失败数据请在稽查查询中错误查询进行查看!!`);
+                    },600);
+                  }else{
+                    self.percent = res.data.speed
+                  }
+                }else{
+                  self.percent=0;
+                }
+              }
+            });
+          },3000);
+        }
+      }
+    }
+  }
+</script>

package/src/filiale/qianneng/HandplanQuery.vue CHANGED Viewed

@@ -845,6 +845,7 @@
       }
     },
     ready() {
+      this.$refs.paged.$refs.cri.model.f_meter_state=['已抄表']
       this.getaddress()
       readySomething(this).then(() => {
         this.$emit('ready')

package/src/filiale/qianneng/sale.js CHANGED Viewed

@@ -4,12 +4,12 @@ let specialComp = {
   'arrears-query': (resolve) => { require(['./ArrearsQuery'], resolve) },
   'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
   'handplan-query': (resolve) => { require(['./HandplanQuery'], resolve) },
+  'gasloss-query': (resolve) => { require(['./GasLossQuery'], resolve) },
   // 表具查询
   'meter-query': (resolve) => { require(['./MeterQuery'], resolve) },
   // 用户查询
   'user-query': (resolve) => { require(['./UserQuery'], resolve) },
   'business-manage': (resolve) => { require(['./BusinessManage'], resolve) }
 }
 exports.specialComp = specialComp