manage-client 3.3.120 → 3.3.121-cs

package/src/filiale/lixianV3/sale.js

@@ -1,19 +1,21 @@
-// 分公司特殊组件页面注册
-import Vue from 'vue'
-
-export default function () {
-  // 气量年比
-  Vue.component('use-gas-year-ratio', (resolve) => { require(['./useGasYearRatioQuery'], resolve) })
-  // 发票查询
-  Vue.component('invoice-details-query', (resolve) => { require(['./InvoiceDetailsQuery.vue'], resolve) })
-  // 业务查询
-  Vue.component('business-manage', (resolve) => {require(['./BusinessManage'], resolve)})
-  // 换表查询
-  Vue.component('change-meter-query', (resolve) => {
-    require(['./ChangeMeterQuery'], resolve)
-  })
-  // 用气分析
-  Vue.component('gas-analysis-query', (resolve) => { require(['./GasAnalysisQuery'], resolve) })
-  // 用户缴费抄表查询
-  Vue.component('manage-payment-query', (resolve) => { require(['./paymentQuery'], resolve) })
-}
+// 分公司特殊组件页面注册
+import Vue from 'vue'
+
+export default function () {
+  // 气量年比
+  Vue.component('use-gas-year-ratio', (resolve) => { require(['./useGasYearRatioQuery'], resolve) })
+  // 发票查询
+  Vue.component('invoice-details-query', (resolve) => { require(['./InvoiceDetailsQuery.vue'], resolve) })
+  // 业务查询
+  Vue.component('business-manage', (resolve) => { require(['./BusinessManage'], resolve)})
+  // 换表查询
+  Vue.component('change-meter-query', (resolve) => {
+    require(['./ChangeMeterQuery'], resolve)
+  })
+  // 用气分析
+  Vue.component('gas-analysis-query', (resolve) => { require(['./GasAnalysisQuery'], resolve) })
+  // 用户缴费抄表查询
+  Vue.component('manage-payment-query', (resolve) => { require(['./paymentQuery'], resolve) })
+  // 综合档案信息查询
+  Vue.component('record-info-query', (resolve) => { require(['./RecordInfoQuery'], resolve) })
+}

package/src/filiale/lixianV3/useGasYearRatioQuery.vue

@@ -137,7 +137,7 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_createfile_date >= '{} 00:00:00'">
+                              condition="f_gas_date >= '{} 00:00:00'">
                   </datepicker>
                 </div>
                 <div class="col-sm-2 form-group" >
@@ -147,9 +147,27 @@
                               :value.sync="model.endDate"
                               :format="'yyyy-MM-dd'"
                               :show-reset-button="true"
-                              condition="f_createfile_date <= '{} 23:59:59'">
+                              condition="f_gas_date <= '{} 23:59:59'">
                   </datepicker>
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气量百分比</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_gasprec_small"
+                         condition="f_gasprec >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_gasprec_big"
+                         condition="f_gasprec <= '{}' " placeholder="小于等于">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;增量&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <input type="text" style="width:30%" class="input_search" title="大于等于"
+                         v-model="model.f_gasdiff_small"
+                         condition="f_gasdiff >= '{}' " placeholder="大于等于">
+                  <input type="text" style="width:30%" class="input_search" title="小于等于"
+                         v-model="model.f_gasdiff_big"
+                         condition="f_gasdiff <= '{}' " placeholder="小于等于">
+                </div>
               </div>
             </div>
           </criteria>
@@ -157,7 +175,7 @@
           <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" v-ref:grid>
             <template partial='head'>
               <tr>
-                <th colspan="11" style="text-align: center;"><nobr>用户信息</nobr></th>
+                <th colspan="13" style="text-align: center;"><nobr>用户信息</nobr></th>
                 <th colspan="13" style="text-align: center;"><nobr>查询年份</nobr></th>
                 <th colspan="13" style="text-align: center;"><nobr>对比年份</nobr></th>
               </tr>
@@ -195,6 +213,12 @@
                 <th style="text-align: center;">
                   <nobr>抄表册</nobr>
                 </th>
+                <th style="text-align: center;">
+                  <nobr>增量</nobr>
+                </th>
+                <th style="text-align: center;">
+                  <nobr>百分比</nobr>
+                </th>
                 <th style="text-align: center;">
                   <nobr>一月</nobr>
                 </th>
@@ -289,6 +313,8 @@
                 <td style="text-align: center;">{{ row.f_meternumber }}</td>
                 <td style="text-align: center;">{{ row.f_inputtor }}</td>
                 <td style="text-align: center;">{{ row.f_book_name }}</td>
+                <td style="text-align: center;">{{ row.f_gasdiff }}</td>
+                <td style="text-align: center;">{{ row.f_gasprec }}%</td>
                 <td style="text-align: center;">{{ row.jan }}</td>
                 <td style="text-align: center;">{{ row.feb }}</td>
                 <td style="text-align: center;">{{ row.mar }}</td>
@@ -332,6 +358,11 @@ import exportConfig from './config/exportConfig'
 let readySomething = async function (self) {
   await self.$MagLoadParams.loadParam()
   self.initParams()
+  //获取新的抄表册,先去清理所有的抄表册
+  self.$GetSaleParam.meterbooks = [];
+  //开始加载新的抄表册
+  await self.$LoadParams.loadMeterBook(self.f_filialeid)
+  self.initmeterbook()
 }
 export default {
   props: ['data'],
@@ -350,6 +381,7 @@ export default {
         org: [this.$login.f.orgid]
       },
       meterbrands: [],
+      meterbooks:[],
       gasproperties:[],
       inputtores: [{label: '全部',value: ''}],
       criteriaShow: false,
@@ -381,6 +413,9 @@ export default {
     })
   },
   methods: {
+    async initmeterbook(){
+      this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
+    },
     async downloadFiles() {
       if (this.getCondition) {
         let data = {
@@ -504,9 +539,7 @@ export default {
     meterStyle () {
       return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('燃气表型号')]
     },
-    meterbooks(){
-      return [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
-    },
+
 
 
   }

package/src/filiale/ningjin/GasStatistics.vue

@@ -24,7 +24,7 @@
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户名称</label>
                   <input @keyup.enter="search"  style="width:60%"  type="text" class="input_search" v-model="model.f_username" placeholder='客户名称'
-                         condition="ss.f_user_name = '{}'" v-next-el='userid' v-el:username>
+                         condition="ss.f_user_name like '%{}%'" v-next-el='userid' v-el:username>
                 </div>
                 <div class="col-sm-2">
                   <label class="font_normal_body">客户地址</label>

package/src/filiale/shanxian/Paymentpie.vue

@@ -14,35 +14,20 @@ import {HttpResetClass} from 'vue-client'
 let getData = function* (self) {
   let load = new HttpResetClass()
   load.load('POST', 'rs/sql/sellinggasvalue',
-    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid: self.orgid}},
+    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_gasproperties', f_orgid: self.orgid}},
     {resolveMsg: null, rejectMsg: null})
     .then((res) => {
-      let arrparams1 = ''
-      let moneydata1 = ''
-      let arrparams2 = ''
-      let moneydata2 = null
-      let arrparams3 = null
-      let moneydata3 = null
-      let color1 = null
-      let color2 = null
-      let color3 = null
+      let arrparams = []
+      let gasdata = []
       for (var i = 0; i < res.data.length; i++) {
-        if (res.data[i].name == '民用') {
-          arrparams1 = res.data[i].name
-          moneydata1 = res.data[i].money_value
-          color1 = res.data[i].color
-        } else if (res.data[i].name == '工业') {
-          arrparams2 = res.data[i].name
-          moneydata2 = res.data[i].money_value
-          color2 = res.data[i].color
-        } else if (res.data[i].name == '商业') {
-          arrparams3 = res.data[i].name
-          moneydata3 = res.data[i].money_value
-          color3 = res.data[i].color
-        }
+        let item = {}
+        arrparams[i] = res.data[i].name
+        item.name = res.data[i].name
+        item.value = res.data[i].money_value
+        gasdata.push(item)
       }
       console.log('加载echars组件')
-      self.setGas(arrparams1, moneydata1, arrparams2, moneydata2, arrparams3, moneydata3, color1, color2, color3)
+      self.setGas(arrparams, gasdata)
     })
   let load1 = new HttpResetClass()
   load1.load('POST', 'rs/sql/sellinggasvalueroute',
@@ -56,9 +41,6 @@ let getData = function* (self) {
         arrparams[i] = res.data[i].name
         item1.name = res.data[i].name
         item1.value = res.data[i].money_value
-        item1.itemStyle = {
-          color: res.data[i].color
-        }
         moneydata.push(item1)
       }
       console.log('加载echars组件')
@@ -87,9 +69,13 @@ export default {
   },
   methods: {
 
-    setGas (arrparams1, moneydata1, arrparams2, moneydata2, arrparams3, moneydata3, color1, color2, color3) {
+    setGas (arrparams, gasdata) {
       console.log('进入组件')
       let option1 = {
+        color: ['#ed7d31', '#FFE400',
+          '#ff0000', '#00b050',
+          '#5b9bd5', '#7030a0',
+          '#165DFF'],
         title: [
           {
             text: '售气金额饼状图',
@@ -122,7 +108,7 @@ export default {
             padding: [0, 0, 0, 4],
             color: '#010606'
           },
-          data: [arrparams1, arrparams2, arrparams3]
+          data: arrparams
         },
         series: [
           {
@@ -135,11 +121,7 @@ export default {
             startAngle: 60, // 起始角度
             label: {normal: {show: true}},
             labelLine: {normal: {show: true}},
-            data: [
-              {value: moneydata1, name: arrparams1, itemStyle: {color: color1}},
-              {value: moneydata2, name: arrparams2, itemStyle: {color: color2}},
-              {value: moneydata3, name: arrparams3, itemStyle: {color: color3}}
-            ]
+            data: gasdata
           }
         ]
 

package/src/filiale/shanxian/SiteManager.vue

@@ -14,42 +14,26 @@ import {HttpResetClass} from 'vue-client'
 let getData = function* (self) {
   let load = new HttpResetClass()
   load.load('POST', 'rs/sql/sellinggasvalue',
-    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_user_nature', f_orgid: self.orgid}},
+    {data: {startDate: self.startdate, endDate: self.enddate, key: 'f_gasproperties', f_orgid: self.orgid}},
     {resolveMsg: null, rejectMsg: null})
     .then((res) => {
-      let arrparams1 = ''
-      let gasdata1 = null
-      let numdata1 = null
-      let arrparams2 = ''
-      let gasdata2 = null
-      let numdata2 = null
-      let arrparams3 = ''
-      let gasdata3 = null
-      let numdata3 = null
-      let color1 = null
-      let color2 = null
-      let color3 = null
+      let arrparams = []
+      let gasdata = []
+      let numdata = []
       for (var i = 0; i < res.data.length; i++) {
-        if (res.data[i].name == '民用') {
-          arrparams1 = res.data[i].name
-          numdata1 = res.data[i].num_value
-          gasdata1 = res.data[i].gas_value
-          color1 = res.data[i].color
-        } else if (res.data[i].name == '工业') {
-          arrparams2 = res.data[i].name
-          numdata2 = res.data[i].num_value
-          gasdata2 = res.data[i].gas_value
-          color2 = res.data[i].color
-        } else if (res.data[i].name == '商业') {
-          arrparams3 = res.data[i].name
-          numdata3 = res.data[i].num_value
-          gasdata3 = res.data[i].gas_value
-          color3 = res.data[i].color
-        }
+        let item = {}
+        let item2 = {}
+        arrparams[i] = res.data[i].name
+        item.name = res.data[i].name
+        item.value = res.data[i].gas_value
+        item2.name = res.data[i].name
+        item2.value = res.data[i].num_value
+        gasdata.push(item)
+        numdata.push(item2)
       }
       console.log('加载echars组件')
-      self.setGas(arrparams1, gasdata1, arrparams2, gasdata2, arrparams3, gasdata3, color1, color2, color3)
-      self.setNum(arrparams1, numdata1, arrparams2, numdata2, arrparams3, numdata3, color1, color2, color3)
+      self.setNum(arrparams, numdata)
+      self.setGas(arrparams, gasdata)
     })
 }
 export default {
@@ -74,10 +58,13 @@ export default {
   },
   methods: {
 
-    setNum (arrparams1, numdata1, arrparams2, numdata2, arrparams3, numdata3, color1, color2, color3) {
+    setNum (arrparams, gasdata) {
       console.log('进入组件')
       let option1 = {
-        color: ['#00b050', '#ed7d31', '#5b9bd5'],
+        color: ['#ed7d31', '#FFE400',
+          '#ff0000', '#00b050',
+          '#5b9bd5', '#7030a0',
+          '#165DFF'],
         title: [
           {
             text: '销售气量饼状图',
@@ -110,7 +97,7 @@ export default {
             padding: [0, 0, 0, 4],
             color: '#010606'
           },
-          data: [arrparams1, arrparams2, arrparams3]
+          data: arrparams
         },
         series: [
           {
@@ -123,11 +110,7 @@ export default {
             startAngle: 60, // 起始角度
             label: {normal: {show: true}},
             labelLine: {normal: {show: true}},
-            data: [
-              {value: numdata1, name: arrparams1, itemStyle: {color: color1}},
-              {value: numdata2, name: arrparams2, itemStyle: {color: color2}},
-              {value: numdata3, name: arrparams3, itemStyle: {color: color3}}
-            ],
+            data: gasdata,
             percentPrecision: 4
           }
         ]
@@ -136,10 +119,13 @@ export default {
       this.xd = echarts.init(document.getElementById('num'))
       this.xd.setOption(option1, true)
     },
-    setGas (arrparams1, gasdata1, arrparams2, gasdata2, arrparams3, gasdata3, color1, color2, color3) {
+    setGas (arrparams, moneydata) {
       console.log('进入组件')
       let option = {
-        color: ['#7dabbf', '#9ac57d', '#cfcbbf'],
+        color: ['#ed7d31', '#FFE400',
+          '#ff0000', '#00b050',
+          '#5b9bd5', '#7030a0',
+          '#165DFF'],
         title: [
           {
             text: '',
@@ -172,7 +158,7 @@ export default {
             padding: [0, 0, 0, 4],
             color: '#010606'
           },
-          data: [arrparams1, arrparams2, arrparams3]
+          data: arrparams
         },
         series: [
           {
@@ -185,11 +171,7 @@ export default {
             startAngle: 60, // 起始角度
             label: {normal: {show: true}},
             labelLine: {normal: {show: true}},
-            data: [
-              {value: gasdata1, name: arrparams1, itemStyle: {color: color1}},
-              {value: gasdata2, name: arrparams2, itemStyle: {color: color2}},
-              {value: gasdata3, name: arrparams3, itemStyle: {color: color3}}
-            ],
+            data: moneydata,
             percentPrecision: 4
           }
         ]