manage-client 3.2.76 → 3.2.79

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "manage-client",
-  "version": "3.2.76",
+  "version": "3.2.79",
   "description": "经营管控模块前台组件",
   "main": "src/index.js",
   "directories": {
@@ -8,7 +8,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "axios": "^0.21.1",
+    "axios": "0.15.3",
     "babel-core": "^6.0.0",
     "babel-loader": "^6.0.0",
     "babel-plugin-transform-runtime": "^6.0.0",

package/src/components/SellReport/GasBusinessDayMoney.vue

@@ -0,0 +1,263 @@
+-<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='8' style="font-weight: bold; text-align: left;">
+              <h3 style="text-align: center">营业厅收费日报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th colspan='8' style="font-weight: normal; text-align: center;">
+              开始时间：{{model.model.startDate}}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ model.model.endDate }}&nbsp;&nbsp;
+            </th>
+          </tr>
+          <tr>
+            <th colspan='8' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th colspan='8' 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='8' 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/GasBusinessDayMoney',
+        {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 t1.f_orgid in ( ' + this.f_orgid + ')'
+      }
+      if (this.f_depid[0]) {
+        orgcondition += ' and t1.f_depid in ( ' + this.f_depid + ')'
+      }
+      if(this.f_operatorid[0]) {
+        orgcondition += ' and t1.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_operator'},
+        {label:'付款方式', value:'f_payment'},
+        {label:'气价类型', value:'f_price_name'},
+        {label:'营业网点', value:'f_depname'}]
+    },
+    group2() {
+      return [{label:'用户类型', value:'f_user_type'},
+        {label:'用气性质', value:'f_gasproperties'},
+        {label:'操作员', value:'f_operator'},
+        {label:'付款方式', value:'f_payment'},
+        {label:'气价类型', value:'f_price_name'},
+        {label:'营业网点', value:'f_depname'},
+        {label:'气价', value:'f_price'}]
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder{
+  border: none;
+}
+</style>

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

@@ -283,7 +283,7 @@
                             condition="f_meter_book_num = '{}'"></v-select>
                 </div>
                   <div class="col-sm-2 form-group">
-                      <label class="font_normal_body">写卡状态</label>
+                      <label class="font_normal_body" title="参数名称:写卡状态">写卡状态</label>
                       <v-select :value.sync="model.f_write_card" v-model="model.f_write_card"
                                 :options='$parent.$parent.writecard' placeholder='写卡状态'
                                 style="width:60%"
@@ -793,12 +793,8 @@
   let readySomething = async function (self) {
     //加载抄表册
     self.initmeterbook();
-    // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-    // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
     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'
-    // self.$refs.paged.$refs.cri.model.f_state=['有效'];
-    // self.$refs.paged.$refs.cri.search()
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     await self.$MagLoadParams.loadParam()
     self.initParams()
@@ -880,8 +876,6 @@
         selected:{},
         meterbooks:[{label: '全部',value: ''}],  //抄表册
         inputtores:[{label: '全部',value: ''}],
-        writecard:[{label: '全部',value: ''},{label: '已写卡',value: '已写卡'},{label: '未写卡',value: '未写卡'}],
-        bluetoothpackage:[{label: '全部',value: ''},{label: '发送成功',value: '发送成功'},{label: '执行成功',value: '执行成功'}],
         allorgid:[],
         tempfalg :false,
         lastorgstr:'',
@@ -1265,7 +1259,14 @@
       },
       bank(){
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')]
+      },
+      writecard(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('写卡状态')]
+      },
+      bluetoothpackage(){
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('数据包状态')]
       }
+
     }
   }
 </script>