manage-client 3.1.43 → 3.1.47

package/src/components/webmeter/reportdata/ReportDataQuery.vue

@@ -52,27 +52,18 @@
                     placeholder='气表品牌'
                     :value.sync="model.f_meter_brand"
                     v-model="model.f_meter_brand"
-                    :options='$parent.$parent.WarningType'
-                    @change="$parent.$parent.getMeterType"
+                    :options='$parent.$parent.meterbrands'
                     close-on-select
                     condition="f_meter_brand='{}'">
                   </v-select>
                 </div>
                 <div class="col-sm-2 form-group" >
                   <label class="font_normal_body">气表型号</label>
-                  <v-select v-if="$parent.$parent.styles"
-                            placeholder='气表型号'
-                            :value.sync="model.f_meter_style"
-                            v-model="model.f_meter_style"
-                            :options='$parent.$parent.Warningstyle'
-                            close-on-select
-                            condition="f_meter_style='{}'">
-                  </v-select>
-                  <v-select v-if="!$parent.$parent.styles"
+                  <v-select
                             placeholder='气表型号'
                             :value.sync="model.f_meter_style"
                             v-model="model.f_meter_style"
-                            :options='$parent.$parent.Warningstyles'
+                            :options='$parent.$parent.metertypes'
                             close-on-select
                             condition="f_meter_style='{}'">
                   </v-select>
@@ -132,6 +123,8 @@
   import plugin from 'system-clients/src/plugins/GetLoginInfoService'
 
   let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
     // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
   }
   export default {
@@ -158,7 +151,7 @@
         orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
         resshow:['company'],
         org:[this.$login.f.orgid],
-
+        meterbrands:[]
       }
     },
     created () {
@@ -176,49 +169,25 @@
     },
     ready() {
       this.$refs.paged.$refs.cri.search()
-      this.getMeterTypeAndBrand('f_meter_brand', '1=1')
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
     },
     methods: {
-      getMeterType() {
-        this.Warningstyle = [{label: '全部', value: ''}]
-        this.styles = false
-        let f_meter_brand = this.$refs.paged.$refs.cri.model.f_meter_brand
-        this.getMeterTypeAndBrand('f_meter_style', `f_meter_brand='${f_meter_brand}'`)
-      },
-      getMeterTypeAndBrand(groupname, condition) {
-        condition = `${condition} and ui.f_orgid like '${this.$login.f.orgid}%'`
-        let self = this
-        let load = new HttpResetClass()
-        load.load('POST', 'rs/sql/getMeterStyleAndBrand1', {
-          data: {
-            condition: condition,
-            groupname: groupname
-          }
-        }, {warnMsg: null, resolveMsg: null}).then((res) => {
-          let dr = {label: '', value: ''}
-          let i = 0
-          for (i = 0; i < res.data.length; i++) {
-            dr = {label: '', value: ''}
-            if (groupname == 'f_meter_brand') {
-              dr.label = res.data[i].f_meter_brand
-              dr.value = res.data[i].f_meter_brand
-              //气表品牌
-              self.WarningType[i + 1] = dr
-              console.log('气表品牌~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~')
-              console.log(dr)
-              console.log( self.WarningType)
-            } else if (groupname == 'f_meter_style') {
-              dr.label = res.data[i].f_meter_style
-              dr.value = res.data[i].f_meter_style
-              //气表类型
-              self.Warningstyle[i + 1] = dr
-            }
-          }
-          if (self.Warningstyle.length > 1) {
-            self.showMeterStyle()
-          }
+      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]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
       },
       showMeterStyle() {
         this.styles = true
@@ -272,6 +241,9 @@
     watch: {
     },
     computed: {
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
     }
   }
 </script>

package/src/filiale/alashan/SellingTable.vue

@@ -1,234 +1,234 @@
-<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>
-        <p class="bg-info text-center" style="padding: 8px;">财务统计报表</p>
-      <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
-        <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" 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>
-          <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:res_select></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>
-        </div>
-    </criteria>
-    <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
-      <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
-        <thead>
-        <tr>
-          <th colspan='6' style="font-weight: normal; text-align: left;">
-            <h3 style="text-align: center">财务统计报表</h3>
-          </th>
-        </tr>
-        <tr>
-          <th colspan='6' style="font-weight: normal; text-align: center;">
-            开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
-            结束时间：{{ model.model.endDate }}<br>
-            打印时间：{{$parent.printTime}}
-          </th>
-        </tr>
-        <tr>
-          <th colspan='6' style="font-weight: normal; text-align: center;">
-              <span style="font-weight: normal;" v-show="$refs.criteria.$refs.res_select.obj.orgnames[0]">公司：{{$parent.orgname}}</span>
-              <span v-show="$refs.criteria.$refs.res_select.obj.depnames[0]"> 部门：{{$parent.depname}}</span>
-              <span style="font-weight: normal" v-show="$refs.criteria.$refs.res_select.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
-          </th>
-        </tr>
-        </thead>
-        <tr>
-          <td colspan='6'>
-            {{{ model.data.substring(26,model.data.length-8) }}}
-          </td>
-        </tr>
-        <tfoot>
-        <tr style="text-align: left">
-          <th colspan='2'>财务审核：</th>
-          <th colspan='2'>收款审核：</th>
-          <th colspan='2'>收款员：</th>
-        </tr>
-        </tfoot>
-      </table>
-      {{{ $parent.reportStr}}}
-    </div>
-  </criteria-paged>
-  <modal :show.sync="show" v-ref:modal small backdrop="false">
-    <header slot="modal-header" class="modal-header">
-      <h4 class="modal-title">输入文件名称</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="form-group">
-        <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer">
-      <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
-      <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
-    </footer>
-  </modal>
-  </div>
-</template>
-
-<script>
-  import { DataModel } from 'vue-client'
-  import co from 'co'
-  let saveFile = function * (self) {
-    // 线验证文件是否重名
-    let count = yield self.$resetpost('rs/sql/manageSingleTable',
-      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
-      {resolveMsg: null, rejectMsg: null})
-    if (count.data.length > 0) {
-      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
-      return
-    }
-    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
-      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
-      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
-      f_outlets: this.$login.f.depname})
-    if (saveBack.data.status === 'succeed') {
-      self.show = false
-      self.filename = ''
-      // 后台保存完成，通知刷新
-      self.$dispatch('save-success', self.filename)
-    }
-  }
-  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('rs/report/sellingTable', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
-        reportStr: null,
-        show: false,
-        initres: {
-          org: [this.$login.f.orgid],
-          dep: [],
-          user: []
-        }
-      }
-    },
-    ready () {
-      this.$refs.paged.$refs.criteria.$refs.res_select.sliceareashow = false
-      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'
-      // this.$refs.paged.$refs.criteria.search()
-      console.log(this.$login.f)
-    },
-    methods: {
-      searchData () {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch (args) {
-        this.printTime = this.$login.toStandardTimeString()
-        console.log('xxxxxxxxxxx',this.orgCondtionStr)
-        let orgstr = '1=1 '
-        if(this.orgCondtionStr){
-          orgstr+=this.orgCondtionStr
-        }
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
-        this.$refs.paged.search(args)
-      },
-      // 根据文件路径获取储存的报表内容
-      getFileContent (path) {
-        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
-          this.reportStr = res.data.filecontent
-          this.model.state = '正确'
-        })
-      },
-      confirm () {
-        if (!this.filename || this.filename === '') {
-          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
-        }
-        let saveGen = saveFile(this)
-        co(saveGen)
-      },
-      close () {
-        this.show = false
-      },
-      // 将报表保存成文件
-      confirmReport () {
-        this.show = true
-        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
-      },
-      async getRes (condition, obj) {
-        this.orgCondtionStr = condition
-        if(obj.orgnames.length>0){
-          this.orgname = obj.orgnames.toString();
-        }
-        if(obj.depnames.length>0){
-          this.depname = obj.depnames.toString();
-        }
-        if(obj.operatornames.length>0){
-          let users = await this.$resetpost('rs/sql/manageSingleTable',
-            {data: {tablename: 't_user', condition: ` id in( ${obj.operatornames.toString()})`}},
-            {resolveMsg: null, rejectMsg: null});
-          if(users.data){
-            this.operatorname = users.data.map(x => x.name).toString();
-          }
-        }
-      }
-    },
-    watch: {
-      'data' (val) {
-        if (val.f_files_path) {
-          this.getFileContent(val.f_files_path)
-        } else {
-          this.reportStr = null
-        }
-      }
-    },
-    computed: {
-      payment() {
-        return [...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>
+        <p class="bg-info text-center" style="padding: 8px;">财务统计报表</p>
+      <div class="form-group" v-if="!$parent.$parent.data.f_files_path"></div>
+        <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" 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>
+          <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" v-ref:res_select></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>
+        </div>
+    </criteria>
+    <div  partial='list' v-el:handcollect id='gasprice' style="overflow-y: scroll">
+      <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
+        <thead>
+        <tr>
+          <th colspan='6' style="font-weight: normal; text-align: left;">
+            <h3 style="text-align: center">财务统计报表</h3>
+          </th>
+        </tr>
+        <tr>
+          <th colspan='6' style="font-weight: normal; text-align: center;">
+            开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+            结束时间：{{ model.model.endDate }}<br>
+            打印时间：{{$parent.printTime}}
+          </th>
+        </tr>
+        <tr>
+          <th colspan='6' style="font-weight: normal; text-align: center;">
+              <span style="font-weight: normal;" v-show="$refs.criteria.$refs.res_select.obj.orgnames[0]">公司：{{$parent.orgname}}</span>
+              <span v-show="$refs.criteria.$refs.res_select.obj.depnames[0]"> 部门：{{$parent.depname}}</span>
+              <span style="font-weight: normal" v-show="$refs.criteria.$refs.res_select.obj.operatornames[0]">人员：{{$parent.operatorname}}</span>
+          </th>
+        </tr>
+        </thead>
+        <tr>
+          <td colspan='6'>
+            {{{ model.data.substring(26,model.data.length-8) }}}
+          </td>
+        </tr>
+        <tfoot>
+        <tr style="text-align: left">
+          <th colspan='2'>财务审核：</th>
+          <th colspan='2'>收款审核：</th>
+          <th colspan='2'>收款员：</th>
+        </tr>
+        </tfoot>
+      </table>
+      {{{ $parent.reportStr}}}
+    </div>
+  </criteria-paged>
+  <modal :show.sync="show" v-ref:modal small backdrop="false">
+    <header slot="modal-header" class="modal-header">
+      <h4 class="modal-title">输入文件名称</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <input  type="text" class="form-control" v-model="filename" placeholder='保存的文件名'>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="show" type="button" class="btn btn-default" @click='close'>取消</button>
+      <button v-show="show" type="button" class="btn btn-success" @click='confirm(filename)'>确认</button>
+    </footer>
+  </modal>
+  </div>
+</template>
+
+<script>
+  import { DataModel } from 'vue-client'
+  import co from 'co'
+  let saveFile = function * (self) {
+    // 线验证文件是否重名
+    let count = yield self.$resetpost('rs/sql/manageSingleTable',
+      {data: {tablename: 't_report_record', condition: `f_files_name = '${self.filename}'`}},
+      {resolveMsg: null, rejectMsg: null})
+    if (count.data.length > 0) {
+      self.$showAlert('无法保存，文件名重名', 'warning', 3000)
+      return
+    }
+    let saveBack = yield self.$resetpost('rs/logic/saveReport', {f_files_content: self.$refs.paged.$els.handcollect.innerHTML,
+      f_files_name: self.filename, f_files_type: self.data.f_report_type, f_component_name: 'manage-bus-summary',
+      f_operator: this.$login.f.name, f_query_month: `${self.model.model.startDate}-${self.model.model.endDate}`,
+      f_outlets: this.$login.f.depname})
+    if (saveBack.data.status === 'succeed') {
+      self.show = false
+      self.filename = ''
+      // 后台保存完成，通知刷新
+      self.$dispatch('save-success', self.filename)
+    }
+  }
+  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('rs/report/sellingTable', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          f_orgid: 'this.model.f_orgid'}),
+        reportStr: null,
+        show: false,
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        }
+      }
+    },
+    ready () {
+      this.$refs.paged.$refs.criteria.$refs.res_select.sliceareashow = false
+      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'
+      // this.$refs.paged.$refs.criteria.search()
+      console.log(this.$login.f)
+    },
+    methods: {
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        console.log('xxxxxxxxxxx',this.orgCondtionStr)
+        let orgstr = '1=1 '
+        if(this.orgCondtionStr){
+          orgstr+=this.orgCondtionStr
+        }
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgstr
+        this.$refs.paged.search(args)
+      },
+      // 根据文件路径获取储存的报表内容
+      getFileContent (path) {
+        this.$resetpost('rs/logic/getReportFileContent', {f_files_path: path}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+          this.reportStr = res.data.filecontent
+          this.model.state = '正确'
+        })
+      },
+      confirm () {
+        if (!this.filename || this.filename === '') {
+          this.$showAlert('无法保存，文件名不能为空', 'warning', 3000)
+        }
+        let saveGen = saveFile(this)
+        co(saveGen)
+      },
+      close () {
+        this.show = false
+      },
+      // 将报表保存成文件
+      confirmReport () {
+        this.show = true
+        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
+      },
+      async getRes (condition, obj) {
+        this.orgCondtionStr = condition
+        if(obj.orgnames.length>0){
+          this.orgname = obj.orgnames.toString();
+        }
+        if(obj.depnames.length>0){
+          this.depname = obj.depnames.toString();
+        }
+        if(obj.operatornames.length>0){
+          let users = await this.$resetpost('rs/sql/manageSingleTable',
+            {data: {tablename: 't_user', condition: ` id in( ${obj.operatornames.toString()})`}},
+            {resolveMsg: null, rejectMsg: null});
+          if(users.data){
+            this.operatorname = users.data.map(x => x.name).toString();
+          }
+        }
+      }
+    },
+    watch: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      }
+    },
+    computed: {
+      payment() {
+        return [...this.$appdata.getParam('付款方式查询')]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/filiale/alashan/reportManage.js

@@ -1,10 +1,10 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  // 收费查询
-  'selling-table': (resolve) => { require(['./SellingTable'], resolve) }
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'selling-table': (resolve) => { require(['./SellingTable'], resolve) }
+}
+exports.specialComp = specialComp
+
+
+
+

package/src/filiale/jingwei/ChargeQuery.vue

@@ -313,6 +313,9 @@
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
+                <th>
+                  <nobr>客户电话</nobr>
+                </th>
                 <th>
                   <nobr>片区</nobr>
                 </th>
@@ -496,6 +499,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_zones}}</nobr>
               </td>