manage-client 3.2.26 → 3.2.27

package/src/filiale/tongchuan/ChargeQuery.vue

@@ -122,6 +122,14 @@
                             condition="f_type in {}"
                             v-model="model.f_type"></v-select>
                 </div>
+<!--                <div class="col-sm-2 form-group">-->
+<!--                  <label class="font_normal_body">票据类型</label>-->
+<!--                  <v-select :options='$parent.$parent.papertype'-->
+<!--                            condition="f_paper_type = '{}'"-->
+<!--                            v-model="model.f_paper_type"-->
+<!--                            :value.sync="model.f_paper_type" close-on-select-->
+<!--                            placeholder='请选择'></v-select>-->
+<!--                </div>-->
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
                   <v-select :value.sync="model.f_user_type"
@@ -214,7 +222,7 @@
                 <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_serial_id"
-                         condition="f_serial_id = '{}'" placeholder='流水号'>
+                         condition="f_serial_id like '%{}%'" placeholder='流水号'>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">发票号码</label>
@@ -451,6 +459,9 @@
                 <th>
                   <nobr>开票时间</nobr>
                 </th>
+                <th>
+                  <nobr>是否征税</nobr>
+                </th>
                 <th>
                   <nobr>累计写卡气量</nobr>
                 </th>
@@ -634,6 +645,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_invoice_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_tax_logotype}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_write_totalgas}}</nobr>
               </td>
@@ -807,6 +821,10 @@
         },
         //f_price_name:[],
         gasproperties:[],
+        // papertype: this.$appdata.getParam('票据类型') ? [{
+        //   label: '全部',
+        //   value: ''
+        // }, ...this.$appdata.getParam('票据类型')] : [],
         gaspropertiessecond: this.$appdata.getParam('二级用气性质') ? [{
           label: '全部',
           value: ''

package/src/filiale/tongchuan/FillGasQuery.vue

@@ -80,9 +80,10 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">补气类型</label>
                   <v-select :value.sync="model.f_fill_type"
+                            :multiple="true"
                             v-model="model.f_fill_type"
                             :options='$parent.$parent.fillTypes' placeholder='请选择'
-                            condition="f_fill_type = '{}'"
+                            condition="f_fill_type in {}"
                             close-on-select></v-select>
                 </div>
 
@@ -91,6 +92,13 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
                          condition="f_card_id like '%{}%'" placeholder='卡号'>
                 </div>
+                <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_type 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"
@@ -251,6 +259,9 @@
             <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               补气金额合计:&emsp;{{sumsmodel.f_preamount}}
             </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>
@@ -293,7 +304,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0}),
+        model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0,hushu: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_fillgas", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -317,6 +328,7 @@
           dep:[],
           user:[],
         },
+        metertypes: this.$appdata.getParam('气表类型')?[{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]:[],
         showupload:false,
         selected:{},
         gasproperties:[],
@@ -367,14 +379,17 @@
         })
         this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
       },
-      selfSearch(args) {
+      async 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)
+        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
+        console.log("this.sumsmodel",this.sumsmodel,this.$refs.paged.$refs.grid)
+
       },
       clear() {
         //清空部门和人员

package/src/filiale/tongchuan/config/exportConfig.js

@@ -70,7 +70,7 @@ export default{
     'f_delaypay': '滞纳金','f_comments': '备注','f_operator': '操作员','f_depname': '部门','f_orgname': '公司',
     'f_yucun': '预存金额','f_card_id': '卡号','f_stairamount1':"一阶气量",'f_stair1price':"一阶单价",'f_stair1fee':"一阶气费",
     'f_stair2amount': "二阶气量",'f_stair2price': "二阶单价",'f_stair2fee':"二阶气费",
-    'f_stair3amount':"三阶气量",'f_stair3price': "三阶单价",'f_stair3fee':"三阶气费",'f_inputtor':"抄表员",'f_serial_id':'流水号'
+    'f_stair3amount':"三阶气量",'f_stair3price': "三阶单价",'f_stair3fee':"三阶气费",'f_inputtor':"抄表员",'f_serial_id':'流水号','f_tax_logotype':'是否征税'
   },
   pricetypeGasConfig: {
     'f_price': '价格类型', 'f_gas': '当日售气量', 'f_money': '当日售气金额'

package/src/main.js

@@ -1,67 +1,66 @@
-import Vue from 'vue'
-import App from './App'
-import { all } from 'vue-client'
-
-// import { sale } from 'sale-client'
-import { system } from 'system-clients'
-import { ldap } from 'ldap-clients'
-import { sale } from 'sale-client'
-import saleManage from './saleManage'
-import webmeterManage from './webmeterManage'
-import reportManage from './reportManage'
-import newmanage from './newmanage'
-import ManageHome from './ManageHome'
-import echarts from 'echarts'
-import AMap from 'vue-amap'
-
-Vue.config.silent = true
-// Vue.mmType = 'AES'
-
-Vue.use(AMap);
-
-// 初始化vue-amap
-AMap.initAMapApiLoader({
-  // 高德key
-  key: '3cec9ae8e2349207f7ac29279e3f4abe',
-  // 插件集合 （插件按需引入）
-  plugin: [
-    "AMap.Autocomplete", //输入提示插件
-    "AMap.PlaceSearch", //POI搜索插件
-    "AMap.Scale", //右下角缩略图插件 比例尺
-    "AMap.OverView", //地图鹰眼插件
-    "AMap.ToolBar", //地图工具条
-    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
-    "AMap.PolyEditor", //编辑 折线多，边形
-    "AMap.CircleEditor", //圆形编辑器插件
-    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
-  ],
-  uiVersion: "1.0"
-});
-/** **************************通用组件******************************/
-
-Vue.prototype.$echarts = echarts
-all()
-sale()
-ldap()
-system(false)
-saleManage('macheng')
-
-webmeterManage()
-ManageHome()
-newmanage()
-reportManage()
-require('system-clients/src/styles/less/bootstrap.less')
-require('./components/qinhua/Style/qinhuaStyle.less')
-// require('./bootstrap/less/manageStyle/manageChile.less')
-// require('./bootstrap/less/manageStyle/safeStyle.less')
-
-//大屏展示要放开的样式
-// require('system-clients/src/styles/less/manageStyle/manageChile.less')
-// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
-// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
-
-new Vue({
-  el: 'body',
-  components: { App }
-})
-
+import Vue from 'vue'
+import App from './App'
+import { all } from 'vue-client'
+
+// import { sale } from 'sale-client'
+import { system } from 'system-clients'
+import { ldap } from 'ldap-clients'
+import saleManage from './saleManage'
+import webmeterManage from './webmeterManage'
+import reportManage from './reportManage'
+import newmanage from './newmanage'
+import ManageHome from './ManageHome'
+import echarts from 'echarts'
+import AMap from 'vue-amap'
+
+Vue.config.silent = true
+// Vue.mmType = 'AES'
+
+Vue.use(AMap);
+
+// 初始化vue-amap
+AMap.initAMapApiLoader({
+  // 高德key
+  key: '3cec9ae8e2349207f7ac29279e3f4abe',
+  // 插件集合 （插件按需引入）
+  plugin: [
+    "AMap.Autocomplete", //输入提示插件
+    "AMap.PlaceSearch", //POI搜索插件
+    "AMap.Scale", //右下角缩略图插件 比例尺
+    "AMap.OverView", //地图鹰眼插件
+    "AMap.ToolBar", //地图工具条
+    "AMap.MapType", //类别切换控件，实现默认图层与卫星图、实施交通图层之间切换的控制
+    "AMap.PolyEditor", //编辑 折线多，边形
+    "AMap.CircleEditor", //圆形编辑器插件
+    "AMap.Geolocation" //定位控件，用来获取和展示用户主机所在的经纬度位置
+  ],
+  uiVersion: "1.0"
+});
+/** **************************通用组件******************************/
+
+Vue.prototype.$echarts = echarts
+all()
+// sale()
+ldap()
+system(false)
+saleManage('liaoyuan')
+
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
+require('system-clients/src/styles/less/bootstrap.less')
+require('./components/qinhua/Style/qinhuaStyle.less')
+// require('./bootstrap/less/manageStyle/manageChile.less')
+// require('./bootstrap/less/manageStyle/safeStyle.less')
+
+//大屏展示要放开的样式
+// require('system-clients/src/styles/less/manageStyle/manageChile.less')
+// require('system-clients/src/styles/less/manageStyle/safeStyle.less')
+// require('system-clients/src/styles/less/manageStyle/manageStyle.less')
+
+new Vue({
+  el: 'body',
+  components: { App }
+})
+