sale-client 3.5.252 → 3.5.254

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://127.0.0.1:8080', 'http://192.168.50.4:8400']
+const [localUrl, serverRul] = ['http://203.57.101.233:8400/', 'http://203.57.101.233:8400/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sale-client",
-  "version": "3.5.252",
+  "version": "3.5.254",
   "description": "收费模块前台组件",
   "main": "src/index.js",
   "scripts": {

package/src/components/common/userinfo_detail/ic_detail/ChargeQueryUser.vue

@@ -91,8 +91,8 @@
               <th>
                 <nobr>上期结余</nobr>
               </th>
-              <th>
-                <nobr v-if="!$parent.$parent.$parent.isIot">应交金额</nobr>
+              <th v-if="!$parent.$parent.$parent.isIot">
+                <nobr>应交金额</nobr>
               </th>
               <th>
                 <nobr>实收金额</nobr>

package/src/filiale/rongcheng/MeterinfoTest.vue

@@ -14,10 +14,28 @@
 <!--            <input type="text" class="input_search" style="width:60%" v-model="row.f_metertitles" placeholder='表封号'-->
 <!--                   v-next-el="{id: 'meterbase'}">-->
 <!--          </div>-->
-          <div class="col-sm-4 form-group">
-            <label for="f_llj_brand" class="font_normal_body">流量计品牌</label>
-            <input type="text" class="input_search" style="width:60%" v-model="row.f_llj_brand" placeholder='流量计品牌'
-                   v-next-el="{id: 'meterbase'}">
+<!--          <div class="col-sm-4 form-group">-->
+<!--            <label for="f_llj_brand" class="font_normal_body">流量计品牌</label>-->
+<!--            <input type="text" class="input_search" style="width:60%" v-model="row.f_llj_brand" placeholder='流量计品牌'-->
+<!--                   v-next-el="{id: 'meterbase'}">-->
+<!--          </div>-->
+          <div class="col-sm-4 form-group" >
+            <label for="f_llj_brand" class="font_normal_body"  title="参数:流量计品牌">&ensp;流量计品牌</label>
+            <v-select :value.sync="row.f_llj_brand" v-model="row.f_llj_brand"
+                      :options='lljbrand' placeholder='流量计品牌'
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group" >
+            <label for="f_llj_type" class="font_normal_body"  title="参数:流量计类型">&ensp;流量计类型</label>
+            <v-select :value.sync="row.f_llj_type" v-model="row.f_llj_type"
+                      :options='lljtype' placeholder='流量计类型'
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group" >
+            <label for="f_meter_flow" class="font_normal_body"  title="参数:气表流量">&ensp;气表流量</label>
+            <v-select :value.sync="row.f_meter_flow" v-model="row.f_meter_flow"
+                      :options='meterflow' placeholder='气表流量'
+                      close-on-select></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_llj_model" class="font_normal_body">流量计型号</label>
@@ -381,6 +399,9 @@ let meterBookGen = function * (self) {
         showParame: false,
         selectUserFiles: '', // 选中的 userfiles
         jurisdiction: this.$login.r,
+        lljbrand: this.$appdata.getParam('流量计品牌'),
+        lljtype: this.$appdata.getParam('流量计类型'),
+        meterflow: this.$appdata.getParam('气表流量'),
         positions: this.$appdata.getParam('安装位置'),
         usetype: this.$appdata.getParam('使用类型'),
         usestate: this.$appdata.getParam('使用状态'),
@@ -610,9 +631,9 @@ let meterBookGen = function * (self) {
       aroundmeters () {
         return this.$appdata.getParam('左右表')
       },
-      positions () {
-        return this.$appdata.getParam('安装位置')
-      },
+      // positions () {
+      //   return this.$appdata.getParam('安装位置')
+      // },
       bqftype(){
         return this.$appdata.getParam('表前阀型号')
       },

package/src/filiale/rongcheng/PriceAdjustment.vue

@@ -0,0 +1,386 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch">
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" class="input_search" style="width:60%"
+                         v-model="model.f_userinfo_code" placeholder='客户编号'
+                         condition="f_userinfo_code = '{}'" >
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" class="input_search" style="width:60%"
+                         v-model="model.f_user_name" placeholder='客户名称'
+                         condition="f_user_name like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期"
+                              style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
+                <div class="form-group col-sm-2" >
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期"
+                              style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd'"
+                  ></datepicker>
+                </div>
+                <div class="span" style="float:right;">&nbsp;&nbsp;
+                  <button class="button_new" style="width: max-content" v-show="$parent.$parent.pricechange" @click="$parent.$parent.priceshow()">批量调价</button>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                  <button class="button_search" @click="search()" v-el:cx>查询</button>
+                  <button class="button_clear" @click="$parent.$parent.clear()">清空</button>
+                  <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>
+                </div>
+              </div>
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">客户地址</label>
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_address" placeholder='客户地址'
+                         condition="u3.f_address like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">电&emsp;&emsp;话</label>
+                  <input type="text" class="input_search" style="width:60%"  v-model="model.f_user_phone" placeholder='电话'
+                         condition="f_user_phone like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" class="input_search" style="width:60%" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
+                         condition="f_meternumber like '%{}%'">
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">状&emsp;&emsp;态</label>
+                  <v-select id="price_states"
+                            v-model="model.price_states"
+                            placeholder='未调价'
+                            style="width: 60%"
+                            :value.sync="model.price_states"
+                            :options='$parent.$parent.price_states'
+                            condition="f_new_price {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">用户类型</label>
+                  <v-select id="f_user_tye"
+                            v-model="model.f_user_type"
+                            placeholder='用户类型'
+                            style="width: 60%"
+                            @change="$parent.$parent.userTypeChange"
+                            :value.sync="model.f_user_type"
+                            :options='$parent.$parent.userTypes'
+                            condition="u2.f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="form-group col-sm-2">
+                  <label class="font_normal_body">气&emsp;&emsp;价</label>
+                  <v-select id="f_price_name"
+                            v-model="model.price_name"
+                            placeholder='气价名称'
+                            style="width: 60%"
+                            :value.sync="model.price_name"
+                            :options='$parent.$parent.price_name'
+                            condition="sp.id = '{}'"
+                            close-on-select></v-select>
+                </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>
+                <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;">{{$index+1}}</td>
+              <th style="text-align: center;">{{row.f_userinfo_code}}</th>
+              <th style="text-align: center;">{{row.f_meternumber}}</th>
+              <th style="text-align: center;">{{row.f_user_name}}</th>
+              <th style="text-align: center;">{{row.f_user_type}}</th>
+              <th style="text-align: center;">{{row.f_meter_type}}</th>
+              <th style="text-align: center;">{{row.f_price_name}}</th>
+<!--              <th style="text-align: center;">{{row.f_address}}</th>-->
+              <th style="text-align: center;">{{row.f_old_price?row.f_old_price:row.f_price}}</th>
+              <th style="text-align: center;">
+                <div class="form-group" style="margin-bottom:0px;"
+                     v-if="!row.f_new_price>0">
+                  <input type="text" class="form-control" v-model="row.newprice"  @blur="$parent.$parent.$parent.enter(row)"
+                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">
+                </div>
+                <div v-else>{{row.f_new_price}}</div>
+                </th>
+              <th style="text-align: center;">{{row.f_change_price}}</th>
+              <th style="text-align: center;">{{row.f_last_tablebase}}</th>
+              <th style="text-align: center;">{{row.f_tablebase}}</th>
+              <th style="text-align: center;">
+                <div class="form-group" style="margin-bottom:0px;"
+                     v-if="!row.f_new_price>0">
+                  <input type="text" class="form-control" v-model="f_new_pregas"  @blur="$parent.$parent.$parent.enter(row)"
+                         v-next-el="{id: $index+1}"  :id="$index" style="width: 100px;padding: 6px;" :disabled="row.state === '开始'">
+                </div>
+                <div v-else>{{row.pregas}}</div>
+              </th>
+              <th style="text-align: center;">{{row.f_surplus_fee}}</th>
+              <th style="text-align: center;">{{row.f_source}}</th>
+              <th style="text-align: center;">{{row.f_input_date}}</th>
+              <th style="text-align: center;">
+                <button type="button" name="button" class="btn btn-link" v-if="row.f_new_price"
+                        @click.stop="$parent.$parent.$parent.delectHand(row)  && row.states === 1">冲正
+                </button>
+              </th>
+            </template>
+          </data-grid>
+        </criteria-paged>
+        <modal :show.sync="show" >
+          <header slot="modal-header" class="modal-header">
+            <h4 class="modal-title">调 价 补 差</h4>
+          </header>
+          <article slot="modal-body" class="modal-body">
+            <div class="form-group">
+              <p>价格：</p>
+              <input type="text" class="form-control" v-model="f_new_price" >
+            </div>
+          </article>
+          <footer slot="modal-footer" class="modal-footer">
+            <button class="button_search" @click="priceadjustment">生成调价补差表</button>
+            <button type="button" class="btn btn-default" @click='close'>取消</button>
+          </footer>
+        </modal>
+        <work-busy :is-busy="locking" v-show="locking"></work-busy>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { HttpResetClass } from 'vue-client'
+import { PagedList } from 'vue-client'
+import Vue from 'vue'
+let readySomething = async function (self) {
+  self.$refs.paged.$refs.criteria.model.startDate = self.$login.toStandardDateString()
+  self.$refs.paged.$refs.criteria.model.endDate = self.$login.toStandardDateString()
+  self.$resetpost('rs/sql/getpriceid', {data: {f_filialeids: self.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
+    console.log(res.data)
+    let rs = []
+    for (let i = 0; i < res.data.length; i++) {
+      if (res.data[i].f_price_type === '固定气价') {
+        let temp = {
+          label: res.data[i].f_price_name,
+          flage: res.data[i].f_user_type,
+          value: res.data[i].id
+        }
+        rs.push(temp)
+      }
+    }
+    console.log(rs)
+    self.pricers = [{label: '全部', value: '', flage: ''}, ...rs]
+    self.$refs.paged.$refs.criteria.search()
+  })
+}
+
+  export default {
+    title: '调价补差',
+    data () {
+      return {
+        pricechange: true,
+        criteriaShow: false,
+        pricers: [{label: '全部', value: '', flage: ''}],
+        price_name: [{label: '全部', value: ''}],
+        price_states: [{label: '全部', value: ''}, {label: '已调价', value: ' >0'}, {label: '未调价', value: ' <=0'}],
+        source: [{label: '卡表抄表', value: '卡表抄表'}, {label: '机表抄表', value: '机表抄表'}],
+        userTypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+        condition: '',
+        locking: false,
+        model: new PagedList('rs/sql/get_UserCharge', 20, {startDate: 'this.model.startDate', endDate: 'this.model.endDate', price_states: 'this.model.price_states[0]', addSelectParam: 'this.model.addSelectParam'}),
+        f_new_price: 0.0,
+        f_new_pregas:'',
+        show: false,
+        addSelectParam: ''
+        // joinTable:'',
+      }
+    },
+    ready () {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
+      // 用户类型发生改变
+      userTypeChange () {
+        this.price_name = []
+        if (this.$refs.paged.$refs.criteria.model.f_user_type) {
+          if (this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+            for (let i = 0; i < this.pricers.length; i++) {
+              if (this.pricers[i].flage === this.$refs.paged.$refs.criteria.model.f_user_type[0]) {
+                let rs = {
+                  label: this.pricers[i].label,
+                  value: this.pricers[i].value
+                }
+                this.price_name.push(rs)
+              }
+            }
+          }
+        }
+        // 选择全部时就放进去所有的气价
+        if (this.price_name.length === 0) {
+          for (let i = 0; i < this.pricers.length; i++) {
+            let rs = {
+              label: this.pricers[i].label,
+              value: this.pricers[i].value
+            }
+            this.price_name.push(rs)
+          }
+        }
+      },
+      // 冲正
+      delectHand (row) {
+        this.$showMessage('冲正后不可恢复，确定冲正吗？', ['confirm', 'cancel']).then((res) => {
+          if (res === 'confirm') {
+            row.f_operator = this.$login.f.name
+            row.f_operatorid = this.$login.f.id
+            row.f_orgid = this.$login.f.orgid
+            row.f_orgname = this.$login.f.orgs
+            row.f_depid = this.$login.f.depids
+            row.f_depname = this.$login.f.deps
+            this.$resetpost('rs/logic/priceAdjustmentOffset', {data: row}).then(() => {
+              // this.$dispatch('refresh', '正在处理', row)
+              this.selfSearch(this.model)
+            })
+          }
+        })
+      },
+      priceshow () {
+        this.show = true
+      },
+      close () {
+        this.show = false
+        this.f_new_price = 0.0
+      },
+      async priceadjustment () {
+        this.$showMessage('确认生成补差记录吗?', ['cancel', 'confirm']).then(
+          (response) => {
+            if (response === 'confirm') {
+              this.show = false
+              this.locking = true
+              this.getAdjustData()
+            }
+          })
+      },
+      async enter (row) {
+        row.pregas = this.f_new_pregas
+        let http2 = new HttpResetClass()
+        let param = {
+          f_state: '有效',
+          f_new_price: parseFloat(row.newprice),
+          f_operator: this.$login.f.name,
+          f_operatorid: this.$login.f.id,
+          f_orgid: this.$login.f.orgid,
+          f_orgname: this.$login.f.orgs,
+          f_depid: this.$login.f.depids,
+          f_depname: this.$login.f.deps,
+          f_start_date: this.model.model.startDate + ' 00:00:00',
+          f_end_date: this.model.model.endDate + ' 23:59:59',
+          row: row
+        }
+        await http2.load('POST', 'rs/logic/priceAdjustment', {data: param}, {resolveMsg: null, rejectMsg: null})
+        this.selfSearch(this.model)
+      },
+      async getAdjustData () {
+        try {
+          let http = new HttpResetClass()
+          let detail = await http.load('POST', 'rs/sql/get_UserCharge',
+            {data: {condition: this.condition, startDate: this.model.model.startDate, endDate: this.model.model.endDate, addSelectParam: '', price_states: 'not'}}, {resolveMsg: null, rejectMsg: null})
+          console.log(detail.data)
+          let param = {
+            f_state: '有效',
+            f_new_price: parseFloat(this.f_new_price),
+            f_operator: this.$login.f.name,
+            f_operatorid: this.$login.f.id,
+            f_orgid: this.$login.f.orgid,
+            f_orgname: this.$login.f.orgs,
+            f_depid: this.$login.f.depids,
+            f_depname: this.$login.f.deps,
+            f_start_date: this.model.model.startDate + ' 00:00:00',
+            f_end_date: this.model.model.endDate + ' 23:59:59',
+            condition: this.condition
+          }
+          let http2 = new HttpResetClass()
+          for (var i = 0; i < detail.data.length; i++) {
+            param.row = detail.data[i]
+            await http2.load('POST', 'rs/logic/priceAdjustment', {data: param}, {resolveMsg: null, rejectMsg: null})
+          }
+          this.close()
+          this.$showMessage('已生成了' + detail.data.length + '条调价补差记录', ['confirm'])
+          this.$refs.paged.$refs.criteria.search()
+          this.locking = false
+        } catch (error) {
+          this.$showAlert('生成调价补差表失败!!!', 'error', 3)
+          this.locking = false
+        }
+      },
+      search () {
+        this.selfSearch()
+      },
+      selfSearch (args) {
+        args.model.addSelectParam = ''
+        // args.model.joinTable =''
+        if (args.model.price_states.toString() === '') {
+          this.pricechange = false
+          // args.model.addSelectParam = 'u5.f_surplus_fee,u5.id,u5.f_state,u5.f_new_price,u5.f_old_price,u5.f_change_price,u5.f_whether_pay,u5.f_sell_id,'
+          // args.model.joinTable = 'left join t_surplus_detail u5 on u5.f_handplan_id = u1.f_handplan_id'
+        } else {
+          this.pricechange = true
+        }
+        this.condition = `${args.condition} and u2.f_orgid = '${this.$login.f.orgid}'`
+        this.model.search(this.condition, args.model)
+      },
+      clear () {
+        Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+          this.$refs.paged.$refs.criteria.model[key] = ''
+        })
+      }
+    },
+    computed: {
+    },
+    watch: {
+    }
+  }
+</script>
+
+<style >
+</style>