manage-client 3.2.18 → 3.2.22

package/package.json

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

package/src/components/SellReport/QibiaoShouqi.vue

@@ -1,282 +1,242 @@
-<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-4" >
-              <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-4" >
-              <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-4">
-              <label class="font_normal_body">&nbsp;&nbsp;&nbsp;公司&nbsp;&nbsp;&nbsp; </label>
-              <right-tree @re-res="$parent.$parent.getRes"></right-tree>
-            </div>
-            <div class="col-sm-4">
-              <label class="font_normal_body">气表类型</label>
-              <v-select :value.sync="model.f_meter_type" multiple
-                        :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
-                        condition="biaoleixing in {}"
-                        close-on-select></v-select>
-            </div>
-            <div class="col-sm-4">
-              <label class="font_normal_body">气表品牌</label>
-              <v-select :value.sync="model.f_meter_brand"
-                        v-model="model.f_meter_brand"
-                        :options='$parent.$parent.meterbrands' placeholder='请选择'
-                        condition="biaopinpai = '{}'"
-                        close-on-select></v-select>
-            </div>
-          </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>
-      </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='$parent.tablen' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">气表售气量</h3>
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
-              时间区间：{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
-              打印时间：{{{$parent.printTime}}}
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
-              <div>
-                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
-              </div>
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <td :colspan='$parent.tablen' style="border-style: none;">
-              {{{ model.data.replace(' ',' style="border-collapse:collapse; border:none;border: solid #000 2px;" ') }}}
-            </td>
-          </tr>
-          <tfoot>
-          <tr style="text-align: left">
-            <th :colspan='$parent.tablen/3'>财务审核：</th>
-            <th :colspan='$parent.tablen/3'>收款审核：</th>
-            <th :colspan='$parent.tablen/3'>收款员：</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, HttpResetClass} 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: [],
-        tablen:0,
-        orgname: '',
-        depname: '',
-        operatorname: '',
-        orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/qibiao-shouqi', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
-        reportStr: null,
-        criteriaShow: false,
-        // 下拉框
-        meterbrands: [],
-        show: false,
-      }
-    },
-    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)
-      // 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.initParams()
-    },
-    methods: {
-      async initParams (condition) {
-        // 初始化气表品牌
-        let HttpReset = new HttpResetClass()
-        let yy=this.$refs.paged.$refs.criteria.model.f_meter_type
-        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
-          data: {
-            condition: '1=1 and f_orgid in(' + this.f_orgid + ')' + (condition==null ? '' : condition),
-            tablename: 't_gasbrand',
-            groupitem: 'f_meter_brand',
-            orderitem: 'f_meter_brand',
-            items: 'f_meter_brand'
-          }
-        }, {resolveMsg: null, rejectMsg: '获取气表品牌失败!'})
-        console.log('气表品牌-->',data)
-        let brandArr = [{label: '全部', value: ''}]
-        for (let row of data.data){
-          brandArr.push({label: row.f_meter_brand, value: row.f_meter_brand})
-        }
-        this.meterbrands = brandArr
-      },
-      searchData () {
-        this.$refs.paged.$refs.criteria.search()
-      },
-      selfSearch (args) {
-        this.printTime = this.$login.toStandardTimeString()
-        let orgcondition = ' f_orgid in (' + this.f_orgid + ')'
-        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
-        this.$refs.paged.search(args)
-      },
-      getRes (obj) {
-        this.orgname = obj.res[0]
-        this.f_orgid = obj.resids
-        this.initParams()
-      },
-
-      // 根据文件路径获取储存的报表内容
-      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)
-      },
-      show() {
-        this.criteriaShow = true
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      close () {
-        this.show = false
-      },
-      // 将报表保存成文件
-      confirmReport () {
-        this.show = true
-        this.filename = this.data.f_report_name + this.$login.toStandardDateString()
-      }
-    },
-    watch: {
-      'data' (val) {
-        if (val.f_files_path) {
-          this.getFileContent(val.f_files_path)
-        } else {
-          this.reportStr = null
-        }
-      },
-      '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
-          }
-          continue
-        }
-        this.tablen=len
-      },
- //      '$refs.paged.$refs.criteria.model.f_meter_type' (val) {
- // this.initParams()
- //        console.log('进入监听--------------------')
- //          }
-    },
-    computed: {
-      operator () {
-        return this.$getParams('操作员查询用', [{label: '全部', value: ''}])
-      },
-      network () {
-        return this.$getParams('网点查询用', [{label: '全部', value: ''}])
-      },
-      metertypes() {
-        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"></right-tree>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" for="dep" >部&emsp;&emsp;门:</label>
+              <res-select id="dep" restype='department' style="width: 60%"
+                          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" for="oper">人&emsp;&emsp;员:</label>
+              <res-select id="oper" restype='user' style="width: 60%"
+                          is-mul="false"
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='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="model.f_meter_type" multiple
+                        :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
+                        condition="f_meter_classify in {}"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.f_meter_brand"
+                        v-model="model.f_meter_brand"
+                        :options='$parent.$parent.meterbrands' placeholder='请选择'
+                        condition="f_meter_brand = '{}'"
+                        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.tablen' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">气表售气量</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
+              时间区间：{{$refs.criteria.model.startDate}} - {{ $refs.criteria.model.endDate }}<br/>
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.tablen' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.tablen' style="border-style: none;">
+              {{{ model.data.replace(' ',' style="border-collapse:collapse; border:none;border: solid #000 2px;" ') }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th :colspan='$parent.tablen/3'>财务审核：</th>
+            <th :colspan='$parent.tablen/3'>收款审核：</th>
+            <th :colspan='$parent.tablen/3'>收款员：</th>
+          </tr>
+          </tfoot>
+        </table>
+      </div>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import {DataModel, HttpResetClass} 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: [],
+        tablen:0,
+        orgname: '',
+        depname: '',
+        operatorname: '',
+        orgCondtionStr: '1=1',
+        model: new DataModel('rs/report/qibiao-shouqi', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          f_orgid: 'this.model.f_orgid'}),
+        reportStr: null,
+        criteriaShow: false,
+        // 下拉框
+        meterbrands: [],
+        show: false,
+      }
+    },
+    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)
+      // 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.initParams()
+    },
+    methods: {
+      async initParams (condition) {
+        // 初始化气表品牌
+        let HttpReset = new HttpResetClass()
+        let yy=this.$refs.paged.$refs.criteria.model.f_meter_type
+        var data = await HttpReset.load('POST', 'rs/sql/singleTable_Final', {
+          data: {
+            condition: '1=1 and f_orgid in(' + this.f_orgid + ')' + (condition==null ? '' : condition),
+            tablename: 't_gasbrand',
+            groupitem: 'f_meter_brand',
+            orderitem: 'f_meter_brand',
+            items: 'f_meter_brand'
+          }
+        }, {resolveMsg: null, rejectMsg: '获取气表品牌失败!'})
+        console.log('气表品牌-->',data)
+        let brandArr = [{label: '全部', value: ''}]
+        for (let row of data.data){
+          brandArr.push({label: row.f_meter_brand, value: row.f_meter_brand})
+        }
+        this.meterbrands = brandArr
+      },
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        let orgcondition = '1=1'
+        if(this.f_orgid && this.f_orgid[0]) {
+          orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
+        }
+        if (this.f_depid && this.f_depid[0]) {
+          orgcondition += ' and f_depid in (' + this.f_depid + ')'
+        }
+        if(this.f_operatorid && this.f_operatorid[0]) {
+          orgcondition += ' and f_operatorid in (' + this.f_operatorid + ')'
+        }
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.search(args)
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.f_orgid = obj.resids
+        this.depresid = obj.resids
+        this.userresid = obj.resids
+        this.initParams()
+      },
+      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
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      close () {
+        this.show = false
+      }
+    },
+    watch: {
+      'model.data' (val) {
+        this.tablen = val.split('</tr>').map(item => item.split('</td>').length-1).reduce((x, y) => x > y ? x : y)
+      }
+    },
+    computed: {
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>