manage-client 3.1.55 → 3.1.59

package/build/dev-server.js

@@ -11,25 +11,17 @@ var compiler = webpack(config)
 // Define HTTP proxies to your custom API backend
 // https://github.com/chimurai/http-proxy-middleware
 // var bendi = 'http://127.0.0.1:8089/manage', fuwu = 'http://36.103.224.217:6300/'
-//韶关
-var fuwu='http://119.146.1.106:8300/'
+var shaoguan='http://119.146.1.106:8300/'
 var qtx='http://36.103.222.144:6300/'
-var bendi = 'http://127.0.0.1:8083/'
-var fuwu_login = 'http://192.168.50.4:8400'
-//公司
-// var fuwu='http://192.168.50.4:8400/'
-// var fuwu='http://172.168.1.11:9001/'
-//经纬
-// var fuwu='http://60.222.250.39:8300/'
+var bendi = 'http://127.0.0.1:8084/', fuwu_login = 'http://192.168.50.4:8400'
+var fuwu = 'http://61.134.55.234:8600'
+var system = 'http://192.168.50.4:8400'
 //192.168.
 //  var str = 'http://127.0.0.1:8080/manage', str2 = 'http://192.168.50.199:8300'
 // var str = 'http://192.168.10.233:8300', str2 = 'http://192.168.10.14:8300'
 var proxyTable = {
   '/rs/logic/exportfile': {
-    target: bendi
-  },
-  '/rs/entity':{
-    target:'http://127.0.0.1:8080'
+    target: fuwu
   },
   '/files': {
     target: fuwu
@@ -75,7 +67,7 @@ var proxyTable = {
     target: fuwu
   },
   '/rs/report': {
-    target: bendi
+    target: fuwu
   },
   '/rs/vue': {
     target: fuwu
@@ -86,15 +78,8 @@ var proxyTable = {
   '/rs/logic/SumSettleFileImport': {
     target: 'http://127.0.0.1:8080'
   },
-  '/rs/logic/getBatchOperaPro':{
-    target:  'http://127.0.0.1:8080'
-  },
-  '/rs/logic/machineChargePay':{
-    target:  'http://127.0.0.1:8080'
-  },
   '/rs': {
-    // target: 'http://127.0.0.1:8079/'
-    target: fuwu
+    target: bendi
   }
 }
 

package/package.json

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

package/src/components/SellReport/OperatorCheckoutTwo.vue

@@ -142,12 +142,25 @@
         depid: [],
         orgname: '',
         depname: '',
+        qishiDate:'',
+        jieshuDate:'',
+        startDate:'',
+        endDate:'',
         operatorname: '',
         f_inputtor:[],
         f_user_type:'',
         orgCondtionStr: '1=1',
-        model: new DataModel('rs/report/checkoutReportTwo', {startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-          f_orgid: 'this.model.f_orgid'}),
+        model: new DataModel('rs/report/checkoutReportTwo',
+          {startDate: 'this.model.startDate',
+                  endDate: 'this.model.endDate',
+                  f_orgid: 'this.model.f_orgid',
+                  depname:'this.model.depname',
+                  operatorname:'this.model.operatorname',
+                  qishiDate:'this.model.startDate.substring(0,10)',
+                  jieshuDate:'this.model.endDate.substring(0,10)'
+          },
+        ),
+
         reportStr: null,
         show: false
       }
@@ -158,7 +171,9 @@
       this.$refs.paged.$refs.criteria.search()
       console.log(this.$login.f)
     },
+
     methods: {
+
       searchData () {
         this.$refs.paged.$refs.criteria.search()
       },
@@ -174,6 +189,17 @@
         if(this.f_operatorid[0]) {
           orgcondition += ' and f_operatorid in ( ' + this.f_operatorid + ')'
         }
+        if(this.depname){
+          this.$refs.paged.$refs.criteria.model.depname = this.depname
+        }else{
+          this.$refs.paged.$refs.criteria.model.depname = '无'
+        }
+
+        if(this.operatorname){
+          this.$refs.paged.$refs.criteria.model.operatorname = this.operatorname
+        }else{
+          this.$refs.paged.$refs.criteria.model.operatorname = '无'
+        }
         this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
         this.$refs.paged.search(args)
       },

package/src/components/sale/businessquery/AccountQuery/ExpectGasList.vue

@@ -296,7 +296,7 @@ import {HttpResetClass, PagedList} from 'vue-client'
           defaultPrint: ['f_gy_gas', 'f_sum_gas', 'f_sum_num', 'f_my_gas']
         },
         footer:[],
-        model: new PagedList('rs/sql/getExpectGasListExcel', 20,{},{
+        model: new PagedList('rs/sql/getExpectGasListExcel', 20,{id: 'this.model.id'},{
           f_gy_num:0,f_my_num:0,f_jt_num:0,f_sy_num:0,f_old_num:0,f_sum_num:0,
           f_gy_gas:0,f_my_gas:0,f_jt_gas:0,f_sy_gas:0,f_old_gas:0,f_sum_gas:0,
           f_gy_account:0,f_my_account:0,f_jt_account:0,f_sy_account:0,f_old_fee:0,f_sum_account:0
@@ -351,7 +351,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
 
       selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
-        new HttpResetClass().load('POST','rs/logic/getExpectGasListLogic',{condition:args.condition,isPage:true}).then(res =>{
+        args.model.id = this.$login.f.id
+        new HttpResetClass().load('POST','rs/logic/getExpectGasListLogic',{condition: args.condition,id: args.model.id}).then(res =>{
           this.model.search(args.condition, args.model)
           this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         })
@@ -489,7 +490,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          id: this.$refs.paged.$refs.cri.model.id
+        }
       },
       getfield() {
         return exportConfig.expectgasConfig

package/src/components/sale/businessquery/AccountQuery/PreGasList.vue

@@ -197,7 +197,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
         config: {
           defaultPrint: ['f_wechat_pay', 'f_bank_pay', 'f_pre_deduct_money']
         },
-        model: new PagedList('rs/sql/getPreGasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate'},{
+        model: new PagedList('rs/sql/getPreGasListNew', 20,{
+          startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+          id: 'this.model.id'
+        },{
           f_last_balance:0,
           f_wechat_pay:0,
           f_money_pay:0,
@@ -255,11 +258,13 @@ import {HttpResetClass, PagedList} from 'vue-client'
 
       selfSearch(args) {
         args.condition = `${args.condition}` + this.orgCondtionStr
+        args.model.id = this.$login.f.id
         new HttpResetClass().load('POST','rs/logic/getPreGasListNewLogic',
           {
             condition:args.condition,
             startDate:args.model.startDate,
-            endDate:args.model.endDate
+            endDate:args.model.endDate,
+            id: args.model.id
           }).then(res =>{
           this.model.search(args.condition, args.model)
           this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
@@ -352,7 +357,10 @@ import {HttpResetClass, PagedList} from 'vue-client'
           return {
             startDate: this.$refs.paged.$refs.cri.model.startDate,
             endDate: this.$refs.paged.$refs.cri.model.endDate,
-            condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+            condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+            id: this.$refs.paged.$refs.cri.model.id
+          }
+
       },
       getfield() {
         return exportConfig.pregaslistConfig

package/src/components/sale/businessquery/AccountQuery/SellingGasList.vue

@@ -211,7 +211,9 @@ import {HttpResetClass, PagedList} from 'vue-client'
           defaultPrint: ['f_account', 'f_pre_pay', 'f_month']
         },
         footer:[],
-        model: new PagedList('rs/sql/getSellinggasListNew', 20,{startDate: 'this.model.startDate', endDate: 'this.model.endDate', temp: 'this.model.temp'},{
+        model: new PagedList('rs/sql/getSellinggasListNew', 20,
+          {startDate: 'this.model.startDate', endDate: 'this.model.endDate', temp: 'this.model.temp',id: 'this.model.id'},
+          {
           f_last_balance:0,
           f_account:0,
           f_wechat_pay:0,
@@ -276,23 +278,26 @@ import {HttpResetClass, PagedList} from 'vue-client'
           orgcondition += ' and f_orgid in (' + this.f_orgid + ')'
         }
         args.condition = orgcondition
+        args.model.id = this.$login.f.id
         let s = new Date(new Date().getFullYear(), new Date().getMonth(), 1)
         let e = new Date(args.model.endDate)
         if (s <= e) {
           args.model.temp = true
+          new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
+            {
+              condition:args.condition,
+              startDate:args.model.startDate,
+              endDate:args.model.endDate,
+              id: args.model.id
+            }).then(res =>{
+            this.model.search(args.condition, args.model)
+          })
         }else {
           args.model.temp = false
+          this.model.search(args.condition, args.model)
         }
-        this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-        // new HttpResetClass().load('POST','rs/logic/getSellinggasListNewLogic',
-        //   {
-        //     condition:args.condition,
-        //     startDate:args.model.startDate,
-        //     endDate:args.model.endDate
-        //   }).then(res =>{
-        //
-        // })
+
       },
       clear() {
         //清空部门和人员
@@ -386,7 +391,8 @@ import {HttpResetClass, PagedList} from 'vue-client'
           startDate: this.$refs.paged.$refs.cri.model.startDate,
           endDate: this.$refs.paged.$refs.cri.model.endDate,
           condition: this.$refs.paged.model.condition,
-          temp: this.$refs.paged.$refs.cri.model.temp
+          temp: this.$refs.paged.$refs.cri.model.temp,
+          id: this.$refs.paged.$refs.cri.model.id
         }
       },
       getfield() {

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

@@ -1,168 +1,168 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
-      <div class="flex" >
-
-        <criteria-paged :model="model" v-ref:paged>
-          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-              <div class="row">
-                <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body" >开始日期</label>
-                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
-                              v-model="model.startDate"
-                              :value.sync="model.startDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                              >
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body" >结束日期</label>
-                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd HH:mm:ss'"
-                              :show-reset-button="true"
-                             >
-                  </datepicker>
-                </div>
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" @click="search()">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-
-<!--                  <export-excel :data="$parent.$parent.getCondition"-->
-<!--                                :field="$parent.$parent.getfield"-->
-<!--                                :header="$parent.$parent.other"-->
-<!--                                sqlurl="rs/logic/exportfile" sql-name="salesgasclassification" template-name='销售量分类'-->
-<!--                                :choose-col="true"></export-excel>-->
-<!--                  &lt;!&ndash;                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>&ndash;&gt;-->
-<!--                </div>-->
-              </div>
-            </div>
-            </div>
-          </criteria>
-
-          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-            <template partial='head'>
-              <tr>
-                <th>
-                  <nobr>用气性质</nobr>
-                </th>
-                <th>
-                  <nobr>区域</nobr>
-                </th>
-                <th>
-                  <nobr>用户类型</nobr>
-                </th>
-                <th>
-                  <nobr>本月开户</nobr>
-                </th>
-                <th>
-                  <nobr>本年开户</nobr>
-                </th>
-                <th>
-                  <nobr>开工累计</nobr>
-                </th>
-                <th>
-                  <nobr>本月售气量</nobr>
-                </th>
-                <th>
-                  <nobr>本年售气量</nobr>
-                </th>
-                <th>
-                  <nobr>本月售气金额</nobr>
-                </th>
-                <th>
-                  <nobr>本年售气金额</nobr>
-                </th>
-              </tr>
-            </template>
-            <template partial='body'>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gasproperties}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_residential_area}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_usertype}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.yuekaihu}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.niankaihu}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.kgleij}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_yuepregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_yuepreamount}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_pregas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_preamount}}</nobr>
-              </td>
-            </template>
-            <template partial='foot'></template>
-          </data-grid>
-        </criteria-paged>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import defaultPrint from '../config/DefaultPrint'
-  import exportConfig from '../config/exportConfig'
-  let readySomething = async function (self) {
-
-    console.log("self.login",self.$login)
-    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.search()
-  }
-  export default {
-    title: '销售量分类',
-    data() {
-      return {
-        model: new PagedList('rs/sql/salesgasclassification', 20, {f_start_date: 'this.model.startDate', f_end_date: 'this.model.endDate'}),
-        orgCondtionStr: '',
-      }
-    },
-    ready() {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
-    },
-    methods: {
-      search(){
-        this.$refs.paged.$refs.cri.search()
-      },
-      selfSearch(args) {
-        debugger
-        args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
-      }
-    },
-    watch: {
-    },
-    computed: {
-      // getCondition() {
-      //   return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
-      // },
-      // getfield() {
-      //   return exportConfig.exemptquery
-      // },
-    }
-  }
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" >
+
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body" >开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              >
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body" >结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                             >
+                  </datepicker>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+
+<!--                  <export-excel :data="$parent.$parent.getCondition"-->
+<!--                                :field="$parent.$parent.getfield"-->
+<!--                                :header="$parent.$parent.other"-->
+<!--                                sqlurl="rs/logic/exportfile" sql-name="salesgasclassification" template-name='销售量分类'-->
+<!--                                :choose-col="true"></export-excel>-->
+<!--                  &lt;!&ndash;                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>&ndash;&gt;-->
+<!--                </div>-->
+              </div>
+            </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <nobr>用气性质</nobr>
+                </th>
+                <th>
+                  <nobr>区域</nobr>
+                </th>
+                <th>
+                  <nobr>用户类型</nobr>
+                </th>
+                <th>
+                  <nobr>本月开户</nobr>
+                </th>
+                <th>
+                  <nobr>本年开户</nobr>
+                </th>
+                <th>
+                  <nobr>开工累计</nobr>
+                </th>
+                <th>
+                  <nobr>本月售气量</nobr>
+                </th>
+                <th>
+                  <nobr>本年售气量</nobr>
+                </th>
+                <th>
+                  <nobr>本月售气金额</nobr>
+                </th>
+                <th>
+                  <nobr>本年售气金额</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_residential_area}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_usertype}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.yuekaihu}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.niankaihu}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.kgleij}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_yuepregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_yuepreamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_pregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_preamount}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+  let readySomething = async function (self) {
+
+    console.log("self.login",self.$login)
+    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.search()
+  }
+  export default {
+    title: '销售量分类',
+    data() {
+      return {
+        model: new PagedList('rs/sql/salesgasclassification', 20, {f_start_date: 'this.model.startDate', f_end_date: 'this.model.endDate'}),
+        orgCondtionStr: '',
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        debugger
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      }
+    },
+    watch: {
+    },
+    computed: {
+      // getCondition() {
+      //   return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      // },
+      // getfield() {
+      //   return exportConfig.exemptquery
+      // },
+    }
+  }
+</script>