manage-client 3.2.134 → 3.2.137

package/src/reportManage.js

@@ -100,6 +100,10 @@ export default function (filiale) {
   Vue.component('report-history', (resolve) => {
     require(['./components/SellReport/ReportHistory'], resolve)
   })
+  // 保存的报表展示
+  Vue.component('report-history-show', (resolve) => {
+    require(['./components/SellReport/ReportHistoryShow'], resolve)
+  })
 
   /** **************************营收模块(SellReport)******************************/
   // 报表相关，所属为抄表员汇总表（实际为报表汇总表，功能名称后期改变）,调整找那个，尚未归类
@@ -543,6 +547,10 @@ export default function (filiale) {
   // Vue.component('bill-use-report', (resolve) => {
   //   require(['./components/SellReport/BillUseReport'], resolve)
   // })
+  // 铜川售气占比报表
+  Vue.component('eSale-Month-Report', (resolve) => {
+    require(['./components/SellReport/ESaleMonthReport.vue'], resolve)
+  })
   // 报表展示组件(日结账报表)
   Vue.component('bus-summaryes', (resolve) => {
     require(['./components/SellReport/BusSummaryes'], resolve)
@@ -575,6 +583,14 @@ export default function (filiale) {
   Vue.component('user-gas-fill-money', (resolve) => {
     require(['./components/SellReport/UserFillmoney'], resolve)
   })
+  // 人员报建表
+  Vue.component('apply-gas-fill-money', (resolve) => {
+    require(['./components/SellReport/ApplyFillmoney'], resolve)
+  })
+  // 材料报建表
+  Vue.component('applys-gas-fill-money', (resolve) => {
+    require(['./components/SellReport/applysFillmoney'], resolve)
+  })
   if (filiale) {
     let filialeComp = require(`./filiale/${filiale}/reportManage`).specialComp
     Vue.filialeInfo = Vue.prototype.$filialeInfo = filiale

package/src/stores/MagGetSaleParams.js

@@ -1,156 +1,156 @@
-import Vue from 'vue'
-
-let MagGetSaleParam = {
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.MagGetSaleParam = Vue.prototype.$MagGetSaleParam = MagGetSaleParam
-  },
-  gasbrands: [],
-  prices: [],
-  adjustables: [],
-  inputtors : [],
-  smallareas:[],
-  async initinputtor(){
-    let res = await Vue.resetpost('rs/sql/getAlluserRes', {data:{
-      condition:" 1=1"
-    }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
-    if(res.data){
-      MagGetSaleParam.inputtors = res.data;
-    }
-  },
-  async getsmallarea(filiale){
-    let smallareas=[]
-    let condition=`f_small_area is not null and f_small_area <>''  group by f_small_area`
-    if(filiale){
-      condition=`f_filialeid='${filiale}' and f_small_area is not null and f_small_area <>''  group by f_small_area`
-    }
-    let res = await Vue.resetpost('rs/sql/manage_singleTable', {data:{
-    items: 'f_small_area', tablename: 't_user_address', orderitem: 'f_small_area DESC',condition:condition
-      }}, {resolveMsg: null, rejectMsg: '获取区域出错！！！'})
-    if(res.data){
-      res.data.forEach((item) => {
-        var param={
-          label:item.f_small_area,
-          value:item.f_small_area
-        }
-        smallareas.push(param)
-      })
-    }
-    return  smallareas
-  },
-  getresinputtor(orgid){
-    let inputtors = []
-    if(MagGetSaleParam.inputtors.length>0){
-      let arr = MagGetSaleParam.inputtors.filter((res) => {
-        if(res.rolestr != null &&  res.rolestr!='' ){
-          return res.rolestr.indexOf("抄表员")>-1 && res.f_orgid == orgid
-        }
-      })
-
-      arr.forEach((res) => {
-        inputtors.push({label: res.name, value: res.name})
-      })
-    }
-    return inputtors;
-  },
-  // 开启卡监听
-  organizeData (fromSystem) {
-    if(Vue.android){
-      console.log('接受System中返回的参数进行组织', fromSystem)
-      fromSystem.gasbrands.forEach((item, index) => {
-        MagGetSaleParam.gasbrands[index] = {}
-        MagGetSaleParam.gasbrands[index].label = item.f_meter_brand
-        let gasmodel = []
-        item.gasmodel.forEach((item, index) => {
-          gasmodel[index] = {}
-          gasmodel[index].label = item.f_meter_style + item.f_type
-          gasmodel[index].value = item
-        })
-        item.gasmodel = gasmodel
-      MagGetSaleParam.gasbrands[index].value = item
-      })
-      fromSystem.adjustable.forEach((item, index) => {
-        MagGetSaleParam.adjustables[index] = {}
-      MagGetSaleParam.adjustables[index].label = item.f_adjustable_name
-      MagGetSaleParam.adjustables[index].value = item
-      })
-      MagGetSaleParam.prices = [...MagGetSaleParam.prices, ...fromSystem.price]
-      console.log('参数组织完毕', MagGetSaleParam)
-    }
-  },
-  getAdjustable (val) {
-    // 数组去重
-    let arr = []
-    console.log("调压箱调压箱调压箱调压箱调压箱调压箱调压箱调压箱调压箱")
-    console.log(Vue.$appdata.saleParams)
-    console.log(MagGetSaleParam.adjustables)
-    if (val) {
-      MagGetSaleParam.adjustables.forEach((item, next) => {
-        if (item.value.f_orgid === val) {
-        arr.push(item)
-      }
-    })
-    } else {
-      MagGetSaleParam.adjustables.forEach((item, next) => {
-        arr.push(item)
-    })
-    }
-    let hash = {}
-    let result = arr.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-  },
-  getGasbrand () {
-    if (MagGetSaleParam.gasbrands.length === 0) {
-      MagGetSaleParam.organizeData(Vue.$appdata.saleParams)
-    }
-    return MagGetSaleParam.gasbrands
-  },
-  getPrices() {
-    return MagGetSaleParam.prices
-  },
-  getPrice (object) {
-    if (MagGetSaleParam.prices.length === 0) {
-      MagGetSaleParam.organizeData(Vue.$appdata.saleParams)
-    }
-    let result = []
-    console.log('获取价格。。。', MagGetSaleParam.prices)
-    if (object){
-      // 做筛选
-      MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' &&
-          item.f_price_type === object.f_price_type &&
-          item.f_filialeid === object.filter) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          result.push(value)
-        }
-      })
-    }else{
-      // 做筛选
-      MagGetSaleParam.prices.forEach((item) => {
-        if (item.f_state === '有效' &&
-          item.f_price_type === object.f_price_type) {
-          let value = {
-            label: item.f_price_name,
-            value: item
-          }
-          result.push(value)
-        }
-      })
-    }
-    // 数组去重
-    let hash = {}
-    result = result.reduce((item, next) => {
-      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
-      return item
-    }, [])
-    return Array.from(new Set(result))
-}
-}
-
-export default MagGetSaleParam
+import Vue from 'vue'
+
+let MagGetSaleParam = {
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.MagGetSaleParam = Vue.prototype.$MagGetSaleParam = MagGetSaleParam
+  },
+  gasbrands: [],
+  prices: [],
+  adjustables: [],
+  inputtors : [],
+  smallareas:[],
+  async initinputtor(){
+    let res = await Vue.resetpost('rs/sql/getAlluserRes', {data:{
+      condition:" 1=1"
+    }}, {resolveMsg: null, rejectMsg: '获取用户出错！！！'})
+    if(res.data){
+      MagGetSaleParam.inputtors = res.data;
+    }
+  },
+  async getsmallarea(filiale){
+    let smallareas=[]
+    let condition=`f_small_area is not null and f_small_area <>''  group by f_small_area`
+    if(filiale){
+      condition=`f_filialeid='${filiale}' and f_small_area is not null and f_small_area <>''  group by f_small_area`
+    }
+    let res = await Vue.resetpost('rs/sql/manage_singleTable', {data:{
+    items: 'f_small_area', tablename: 't_user_address', orderitem: 'f_small_area DESC',condition:condition
+      }}, {resolveMsg: null, rejectMsg: '获取区域出错！！！'})
+    if(res.data){
+      res.data.forEach((item) => {
+        var param={
+          label:item.f_small_area,
+          value:item.f_small_area
+        }
+        smallareas.push(param)
+      })
+    }
+    return  smallareas
+  },
+  getresinputtor(orgid){
+    let inputtors = []
+    if(MagGetSaleParam.inputtors.length>0){
+      let arr = MagGetSaleParam.inputtors.filter((res) => {
+        if(res.rolestr != null &&  res.rolestr!='' ){
+          return res.rolestr.indexOf("抄表员")>-1 && res.f_orgid == orgid
+        }
+      })
+
+      arr.forEach((res) => {
+        inputtors.push({label: res.name, value: res.name})
+      })
+    }
+    return inputtors;
+  },
+  // 开启卡监听
+  organizeData (fromSystem) {
+    if(Vue.android){
+      console.log('接受System中返回的参数进行组织', fromSystem)
+      fromSystem.gasbrands.forEach((item, index) => {
+        MagGetSaleParam.gasbrands[index] = {}
+        MagGetSaleParam.gasbrands[index].label = item.f_meter_brand
+        let gasmodel = []
+        item.gasmodel.forEach((item, index) => {
+          gasmodel[index] = {}
+          gasmodel[index].label = item.f_meter_style + item.f_type
+          gasmodel[index].value = item
+        })
+        item.gasmodel = gasmodel
+      MagGetSaleParam.gasbrands[index].value = item
+      })
+      fromSystem.adjustable.forEach((item, index) => {
+        MagGetSaleParam.adjustables[index] = {}
+      MagGetSaleParam.adjustables[index].label = item.f_adjustable_name
+      MagGetSaleParam.adjustables[index].value = item
+      })
+      MagGetSaleParam.prices = [...MagGetSaleParam.prices, ...fromSystem.price]
+      console.log('参数组织完毕', MagGetSaleParam)
+    }
+  },
+  getAdjustable (val) {
+    // 数组去重
+    let arr = []
+    console.log("调压箱调压箱调压箱调压箱调压箱调压箱调压箱调压箱调压箱")
+    console.log(Vue.$appdata.saleParams)
+    console.log(MagGetSaleParam.adjustables)
+    if (val) {
+      MagGetSaleParam.adjustables.forEach((item, next) => {
+        if (item.value.f_orgid === val) {
+        arr.push(item)
+      }
+    })
+    } else {
+      MagGetSaleParam.adjustables.forEach((item, next) => {
+        arr.push(item)
+    })
+    }
+    let hash = {}
+    let result = arr.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+  },
+  getGasbrand () {
+    if (MagGetSaleParam.gasbrands.length === 0) {
+      MagGetSaleParam.organizeData(Vue.$appdata.saleParams)
+    }
+    return MagGetSaleParam.gasbrands
+  },
+  getPrices() {
+    return MagGetSaleParam.prices
+  },
+  getPrice (object) {
+    if (MagGetSaleParam.prices.length === 0) {
+      MagGetSaleParam.organizeData(Vue.$appdata.saleParams)
+    }
+    let result = []
+    console.log('获取价格。。。', MagGetSaleParam.prices)
+    if (object){
+      // 做筛选
+      MagGetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' &&
+          item.f_price_type === object.f_price_type &&
+          item.f_filialeid === object.filter) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          result.push(value)
+        }
+      })
+    }else{
+      // 做筛选
+      MagGetSaleParam.prices.forEach((item) => {
+        if (item.f_state === '有效' &&
+          item.f_price_type === object.f_price_type) {
+          let value = {
+            label: item.f_price_name,
+            value: item
+          }
+          result.push(value)
+        }
+      })
+    }
+    // 数组去重
+    let hash = {}
+    result = result.reduce((item, next) => {
+      hash[next.label] ? '' : hash[next.label] = true && item.push(next)
+      return item
+    }, [])
+    return Array.from(new Set(result))
+}
+}
+
+export default MagGetSaleParam

package/src/stores/MagLoadParams.js

@@ -1,63 +1,63 @@
-import Vue from 'vue'
-import {HttpResetClass} from 'vue-client'
-import GetSaleParam from './MagGetSaleParams'
-
-let loadParamGen = async function (f_filialeid) {
-
-  let http = new HttpResetClass()
-
-  if (GetSaleParam.gasbrands.length === 0 && GetSaleParam.prices.length === 0 && GetSaleParam.adjustables.length === 0 ) {
-    let getParams = await http.load('POST','rs/logic/getSaleInitData', {data: {f_orgid: f_filialeid?f_filialeid: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-    if (getParams.data) {
-      MagLoadParams.organizeData(getParams.data)
-    }
-  } else {
-      GetSaleParam.gasbrands = []
-      GetSaleParam.prices = []
-      GetSaleParam.adjustables = []
-      let getParams = await http.load('POST','rs/logic/getSaleInitData', {data: {f_orgid: f_filialeid ? f_filialeid : Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
-      if (getParams.data) {
-        MagLoadParams.organizeData(getParams.data)
-      }
-  }
-}
-
-let MagLoadParams = {
-
-  install (Vue, options) {
-    // 给vue增添对话框显示方法
-    Vue.MagLoadParams = Vue.prototype.$MagLoadParams = MagLoadParams
-  },
-
-  async loadParam (f_filialeid) {
-    await loadParamGen(f_filialeid)
-  },
-
-  // 开启卡监听
-  organizeData (fromSystem) {
-    fromSystem.gasbrands.forEach((item, index) => {
-      GetSaleParam.gasbrands[index] = {}
-      GetSaleParam.gasbrands[index].label = item.f_meter_brand
-      let gasmodel = []
-      item.gasmodel.forEach((item, index) => {
-        gasmodel[index] = {}
-        gasmodel[index].label = item.f_meter_style + item.f_type
-        gasmodel[index].value = item
-      })
-      item.gasmodel = gasmodel
-      GetSaleParam.gasbrands[index].value = item
-    })
-
-    fromSystem.adjustable.forEach((item, index) => {
-      GetSaleParam.adjustables[index] = {}
-      GetSaleParam.adjustables[index].label = item.f_adjustable_name
-      GetSaleParam.adjustables[index].value = item
-    })
-    GetSaleParam.prices = [...GetSaleParam.prices, ...fromSystem.price]
-    console.log('参数组织完毕', GetSaleParam)
-  },
-
-
-}
-
-export default MagLoadParams
+import Vue from 'vue'
+import {HttpResetClass} from 'vue-client'
+import GetSaleParam from './MagGetSaleParams'
+
+let loadParamGen = async function (f_filialeid) {
+
+  let http = new HttpResetClass()
+
+  if (GetSaleParam.gasbrands.length === 0 && GetSaleParam.prices.length === 0 && GetSaleParam.adjustables.length === 0 ) {
+    let getParams = await http.load('POST','rs/logic/getSaleInitData', {data: {f_orgid: f_filialeid?f_filialeid: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+    if (getParams.data) {
+      MagLoadParams.organizeData(getParams.data)
+    }
+  } else {
+      GetSaleParam.gasbrands = []
+      GetSaleParam.prices = []
+      GetSaleParam.adjustables = []
+      let getParams = await http.load('POST','rs/logic/getSaleInitData', {data: {f_orgid: f_filialeid ? f_filialeid : Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: '获取营收参数出错！！！'})
+      if (getParams.data) {
+        MagLoadParams.organizeData(getParams.data)
+      }
+  }
+}
+
+let MagLoadParams = {
+
+  install (Vue, options) {
+    // 给vue增添对话框显示方法
+    Vue.MagLoadParams = Vue.prototype.$MagLoadParams = MagLoadParams
+  },
+
+  async loadParam (f_filialeid) {
+    await loadParamGen(f_filialeid)
+  },
+
+  // 开启卡监听
+  organizeData (fromSystem) {
+    fromSystem.gasbrands.forEach((item, index) => {
+      GetSaleParam.gasbrands[index] = {}
+      GetSaleParam.gasbrands[index].label = item.f_meter_brand
+      let gasmodel = []
+      item.gasmodel.forEach((item, index) => {
+        gasmodel[index] = {}
+        gasmodel[index].label = item.f_meter_style + item.f_type
+        gasmodel[index].value = item
+      })
+      item.gasmodel = gasmodel
+      GetSaleParam.gasbrands[index].value = item
+    })
+
+    fromSystem.adjustable.forEach((item, index) => {
+      GetSaleParam.adjustables[index] = {}
+      GetSaleParam.adjustables[index].label = item.f_adjustable_name
+      GetSaleParam.adjustables[index].value = item
+    })
+    GetSaleParam.prices = [...GetSaleParam.prices, ...fromSystem.price]
+    console.log('参数组织完毕', GetSaleParam)
+  },
+
+
+}
+
+export default MagLoadParams

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -1 +0,0 @@
-