manage-client 3.3.121 → 3.3.122

package/package.json

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

package/src/components/SellReport/OpenEticketSummary.vue

@@ -0,0 +1,245 @@
+<template>
+  <div class="basic-main" style="height: 98%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <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">&nbsp;&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">&nbsp;&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;&nbsp; </label>
+              <res-select restype='user'
+                          is-mul="false"
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+
+
+
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice' top='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;">
+          <thead>
+          <tr>
+            <th colspan='18' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">开票统计报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='18' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;<br/>
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='18'>
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          <tr style="text-align: left">
+            <th colspan='6'>财务审核：</th>
+            <th colspan='6'>收款审核：</th>
+            <th colspan='6'>收款员：</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: '',
+      meterbrands: [],
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/openEticketSummary', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid'}),
+      reportStr: null,
+      show: false,
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardYearMonth() + '-01 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 = ` f_orgid in ('${this.f_orgid}')`
+      if (this.f_depid[0]) {
+        orgcondition += ` and f_depid  in ('${this.f_depid}')`
+      }
+      if(this.f_operatorid[0]) {
+        orgcondition += ` and f_operatorid  in ('${this.f_operatorid}')`
+      }
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    getRes (obj) {
+      this.orgname = obj.res[0]
+      this.depresid = obj.resids
+      this.f_orgid = obj.resids
+    },
+    getdep (obj, val) {
+      // this.depname = val[0]
+      this.userresid = obj
+      this.f_depid = obj
+    },
+    getuser ( obj, val) {
+      this.operatorname = val[0]
+      this.f_operatorid = obj
+    },
+
+    // 根据文件路径获取储存的报表内容
+    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()
+    },
+  },
+  watch: {
+    'data' (val) {
+      if (val.f_files_path) {
+        this.getFileContent(val.f_files_path)
+      } else {
+        this.reportStr = null
+      }
+    }
+  },
+  computed: {
+    metertypes () {
+      return [{label: ' 全部  ', value: ''}, ...this.$appdata.getParam('气表类型')]
+    },
+    chargetype () {
+      return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('付款方式')]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+.fontSize{
+  font-size: 13px;
+}
+</style>

package/src/components/SellReport/PublicGasPriceReport.vue

@@ -0,0 +1,257 @@
+<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">&nbsp;&nbsp;&nbsp;部门&nbsp;&nbsp;&nbsp; </label>
+              <res-select restype='department'
+                          @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'
+                          @res-select="$parent.$parent.getuser"
+                          :parentresid="$parent.$parent.userresid"
+                          :initresid='$parent.$parent.operatorid'>
+              </res-select>
+            </div>
+            <div class="col-sm-2 form-group">
+              <label class="font_normal_body" title="分组项一">分组项一</label>
+              <v-select :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1' placeholder='请选择'
+                        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_public_group2"
+                        v-ref:grouptwo
+                        v-model="model.f_public_group2"
+                        :options='$parent.$parent.group2' placeholder='请选择'
+                        close-on-select></v-select>
+            </div>
+            <div  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>
+        </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='5' style="font-weight: bold; text-align: left;">
+              <h3 style="text-align: center">气量统计报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='5' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td colspan='5' style="font-weight: normal;" id="test">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+<!--          <tfoot>-->
+<!--          <tr style="text-align: left">-->
+<!--            <th colspan='3' style="font-weight: normal; text-align: center;">-->
+<!--              收款人：-->
+<!--            </th><th colspan='3' style="font-weight: normal; text-align: center;">-->
+<!--              审核人：-->
+<!--            </th><th colspan='2' style="font-weight: normal; text-align: center;">-->
+<!--              经手人：-->
+<!--            </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: [],
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        f_public_group1: '',
+        f_public_group2: '',
+        f_orgid: this.$login.f.orgid,
+        f_depid: this.$login.f.depids,
+        f_operatorid: this.$login.f.id,
+        operatorid: [],
+        depid: [],
+        orgname: '',
+        group1Name: '',
+        group2Name: '',
+        depname: '',
+        operatorname: '',
+        orgCondtionStr: '1=1',
+        model: new DataModel('rs/report/PublicGasPriceReport',
+          {startDate: 'this.model.startDate',
+                  endDate: 'this.model.endDate',
+                  f_orgid: 'this.model.f_orgid',
+                  f_public_group1: 'this.model.f_public_group1[0]',
+                  f_public_group2: 'this.model.f_public_group2[0]',
+                  group1Name: 'this.model.group1Name',
+                  group2Name: 'this.model.group2Name'
+          }
+        ),
+        reportStr: null,
+        show: false,
+        spans: ''
+      }
+    },
+    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'
+      // this.$refs.paged.$refs.criteria.search()
+    },
+    methods: {
+      searchData () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      selfSearch (args) {
+        this.printTime = this.$login.toStandardTimeString()
+        this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+        this.$refs.paged.$refs.criteria.model.group2Name = this.$refs.paged.$refs.criteria.$refs.grouptwo.selectedItems
+        let orgcondition = '1 = 1'
+        if (this.f_orgid[0]) {
+          orgcondition += `  and  f_orgid in ('${this.f_orgid}')`
+        }
+        if (this.f_depid[0]) {
+          orgcondition += `  and  f_depid in ('${this.f_depid}')`
+        }
+        if(this.f_operatorid[0]) {
+          orgcondition += `  and  f_operatorid in ('${this.f_operatorid}')`
+        }
+        let name1 = args.model.f_public_group1
+        let name2 = args.model.f_public_group2
+        if (name1 == null || name1 == '' || name2 == null || name2 == ''){
+          alert("请选择分组项！！！")
+          return
+        }
+        if (name2.toString() == name1.toString()){
+          alert("分组项一与分组项二不能重复！！！")
+          return
+        }
+        console.log(args.model.f_public_group1)
+        this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+        this.$refs.paged.search(args)
+      },
+      getRes (obj) {
+        this.orgname = obj.res[0]
+        this.depresid = obj.resids
+        this.f_orgid = obj.resids
+      },
+      getdep (obj, val) {
+        this.depname = val[0]
+        this.userresid = obj
+        this.f_depid = obj
+      },
+      getuser ( obj, val) {
+        this.operatorname = val[0]
+        this.f_operatorid = obj
+      }
+    },
+    watch: {
+      'data' (val) {
+        if (val.f_files_path) {
+          this.getFileContent(val.f_files_path)
+        } else {
+          this.reportStr = null
+        }
+      },
+      'model.data' (val) {
+        let tab = document.getElementById('test').children[0]
+        var tds = tab.getElementsByTagName('td')
+        var num = 0
+        for (let td of tds) {
+          let span = td.getAttribute('colspan')
+          num = num + ((span ? span : 1) - 0)
+        }
+        this.spans = num
+      }
+    },
+    computed: {
+      group1() {
+        return [{label:'用户类型', value:'f_user_type'},
+          {label:'用气性质', value:'f_gasproperties'},
+          {label:'气价名称 ', value:'f_price_name'}]
+      },
+      group2() {
+        return [{label:'用户类型', value:'f_user_type'},
+          {label:'用气性质', value:'f_gasproperties'},
+          {label:'气价名称', value:'f_price_name'},
+          {label:'单价', value:'f_stair_price'}]
+      }
+    }
+  }
+</script>
+<style scoped>
+  .noborder{
+    border: none;
+  }
+</style>

package/src/components/handReport/WebGastypeReport.vue

@@ -51,23 +51,23 @@
         <table class='tableprint' style="margin: 0px auto"  v-if="!$parent.data.f_files_path">
           <thead>
           <tr>
-            <th colspan='5' style="font-weight: bold; text-align: left;">
+            <th colspan='4' style="font-weight: bold; text-align: left;">
               <h3 style="text-align: center">抄表性质统计报表</h3>
             </th>
           </tr>
           <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
+            <th colspan='4' style="font-weight: normal; text-align: center;">
               开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
               结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
             </th>
           </tr>
           <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
+            <th colspan='4' style="font-weight: normal; text-align: center;">
               打印时间：{{{$parent.printTime}}}
             </th>
           </tr>
           <tr>
-            <th colspan='5' style="font-weight: normal; text-align: center;">
+            <th colspan='4' style="font-weight: normal; text-align: center;">
               <div>
                 <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
                 <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
@@ -76,7 +76,7 @@
           </tr>
           </thead>
           <tr>
-            <td colspan='5' style="font-weight: normal;" id="test">
+            <td colspan='4' style="font-weight: normal;" id="test">
               {{{ model.data.substring(26,model.data.length-8) }}}
             </td>
           </tr>

package/src/filiale/WEINAN/ResSelectGroupNew.vue

@@ -6,10 +6,11 @@
                 :initresid='initres.org'></right-tree>
   </div>
   <div :class="style" v-show="departmentshow">
-    <label class="font_normal_body">部&emsp;&emsp;门</label>
+    <label class="font_normal_body" v-html="deptitle"></label>
     <res-select restype='department' v-ref:department
                 @res-select="getdep"
                 :parentresid="depresid"
+                :specialquery="specialquery"
                 :initresid='initres.dep'
                 :mustselect="mustselect"
                 :is-mul="mul">
@@ -62,6 +63,11 @@ export default {
       type: Object,
       default: null,
     },
+    //是否只查询营业厅
+    specialquery: {
+      type: Boolean,
+      default: false
+    },
     showComponent:{
       default:['company','department','operator','slicearea']
     },
@@ -88,6 +94,7 @@ export default {
       operatorshow:false,
       sliceareashow:false,
       mustselect:false,
+      deptitle: this.specialquery ? '营&ensp;业&ensp;厅' : '部&emsp;&emsp;门',
       obj:{
         orgnames:[],
         depnames:[],

package/src/filiale/WEINAN/businessquery/WallHangingFurnaceUserQuery.vue

@@ -62,6 +62,7 @@
                   :show-component="['company','department','operator']"
                   :initres="$parent.$parent.initres"
                   @re-res="$parent.$parent.getRes"
+                  :specialquery="true"
                   v-ref:sel
                 ></res-select-group>
                 <div class="col-sm-2 form-group">

package/src/filiale/lixianV3/GasAnalysisQuery.vue

@@ -68,7 +68,7 @@
                          condition="f_gasdiff >= '{}' " placeholder="大于等于">
                   <input type="text" style="width:30%" class="input_search" title="小于等于"
                          v-model="model.f_gasdiff_big"
-                         condition="f_gasdiff >= '{}' " placeholder="小于等于">
+                         condition="f_gasdiff <= '{}' " placeholder="小于等于">
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>

package/src/filiale/lixianV3/useGasYearRatioQuery.vue

@@ -166,7 +166,7 @@
                          condition="f_gasdiff >= '{}' " placeholder="大于等于">
                   <input type="text" style="width:30%" class="input_search" title="小于等于"
                          v-model="model.f_gasdiff_big"
-                         condition="f_gasdiff >= '{}' " placeholder="小于等于">
+                         condition="f_gasdiff <= '{}' " placeholder="小于等于">
                 </div>
               </div>
             </div>