sale-client 3.6.56 → 3.6.58

package/build/dev-server.js

@@ -1,85 +1,85 @@
-var path = require('path')
-const [localUrl, serverRul] = ['http://121.36.106.17:8400', 'http://121.36.106.17:8400']
-var merge = require('webpack-merge')
-var baseConfig = require('./webpack.dev.conf')
-var devConfig = {
-  devServer: {
-    contentBase: path.join(__dirname, 'src'),
-    hot: true,
-    publicPath: baseConfig.output.publicPath,
-    historyApiFallback: true,
-    host: '127.0.0.1',
-    port: 8089,
-    open: true,
-    stats: {
-      colors: false, // 配置控制台输出彩色日志
-      chunks: false, // 不输出构建 chunk 信息
-      children: false // 不输出子模块构建信息
-    },
-    proxy: {
-      '/rs/file': {
-        target: serverRul
-      },
-      '/invoice': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/search': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getLogin': {
-        target: serverRul
-      },
-      // 查找资源服务数据
-      '/rs/logic/getInitData': {
-        target: serverRul
-      },
-      '/rs/logic/getSaleInitData': {
-        target: serverRul
-      },
-      // 用户登录服务地址
-      '/rs/user': {
-        target: serverRul
-      },
-      '/rs/path': {
-        target: serverRul
-      },
-      '/rs/data': {
-        target: serverRul
-      },
-      '/rs/license': {
-        target: serverRul
-      },
-      '/rs/db': {
-        target: serverRul
-      },
-      '/excel': {
-        target: serverRul
-      },
-      '/rs/config': {
-        target: serverRul
-      },
-      '/rs/report': {
-        target: serverRul
-      },
-      '/rs/vue': {
-        target: serverRul
-      },
-      '/rs/logic': {
-        target: localUrl
-      },
-      '/rs/sql': {
-        target: localUrl
-      },
-      '/webmeter': {
-        target: serverRul
-      },
-      '/rs': {
-        target: serverRul
-        // changeOrigin: true
-      }
-    }
-  }
-}
-module.exports = merge(baseConfig, devConfig)
+var path = require('path')
+const [localUrl, serverRul] = ['http://121.36.106.17:8400', 'http://121.36.106.17:8400']
+var merge = require('webpack-merge')
+var baseConfig = require('./webpack.dev.conf')
+var devConfig = {
+  devServer: {
+    contentBase: path.join(__dirname, 'src'),
+    hot: true,
+    publicPath: baseConfig.output.publicPath,
+    historyApiFallback: true,
+    host: '127.0.0.1',
+    port: 8089,
+    open: true,
+    stats: {
+      colors: false, // 配置控制台输出彩色日志
+      chunks: false, // 不输出构建 chunk 信息
+      children: false // 不输出子模块构建信息
+    },
+    proxy: {
+      '/rs/file': {
+        target: serverRul
+      },
+      '/invoice': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/search': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getLogin': {
+        target: serverRul
+      },
+      // 查找资源服务数据
+      '/rs/logic/getInitData': {
+        target: serverRul
+      },
+      '/rs/logic/getSaleInitData': {
+        target: serverRul
+      },
+      // 用户登录服务地址
+      '/rs/user': {
+        target: serverRul
+      },
+      '/rs/path': {
+        target: serverRul
+      },
+      '/rs/data': {
+        target: serverRul
+      },
+      '/rs/license': {
+        target: serverRul
+      },
+      '/rs/db': {
+        target: serverRul
+      },
+      '/excel': {
+        target: serverRul
+      },
+      '/rs/config': {
+        target: serverRul
+      },
+      '/rs/report': {
+        target: serverRul
+      },
+      '/rs/vue': {
+        target: serverRul
+      },
+      '/rs/logic': {
+        target: localUrl
+      },
+      '/rs/sql': {
+        target: localUrl
+      },
+      '/webmeter': {
+        target: serverRul
+      },
+      '/rs': {
+        target: serverRul
+        // changeOrigin: true
+      }
+    }
+  }
+}
+module.exports = merge(baseConfig, devConfig)

package/package.json

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

package/src/components/FilesManage/UserEssentialInfoTest.vue

@@ -76,9 +76,16 @@
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
             <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
-            <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
+            <input type="number" v-model="baseinfo.base.f_people_num" v-show="!peopleMax" v-validate:f_people_num='{dctest: [0, ">=" ]}'
                    :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
                    placeholder="家庭人口数">
+            <v-select id="f_people_num" :value.sync="baseinfo.base.f_people_num"
+                      v-if="peopleMax"
+                      v-model="baseinfo.base.f_people_num"
+                      :value-single="true"
+                      :options='peoplenums' placeholder='家庭人口数'
+                      style="width: 65%"
+                      close-on-select></v-select>
           </div>
         </div>
         <div class="row">
@@ -249,6 +256,7 @@
         banknames: this.$appdata.getParam('银行名称'),
         userstates: this.$appdata.getParam('用户状态'),
         mgq: this.$appdata.getParam('是否煤改气'),
+        peopleMax: this.$appdata.getSingleValue('最大人口数'),
         costtype: this.$appdata.getParam('付款类型'),
         usernature: this.$appdata.getParam('用户性质'),
         userlevel: this.$appdata.getParam('用户等级'),
@@ -322,7 +330,19 @@
       //     // }
       // }
     },
-    computed: {},
+    computed: {
+      peoplenums () {
+        let peopleMax = this.$appdata.getSingleValue('最大人口数') ? this.$appdata.getSingleValue('最大人口数') : 0
+        let nums = []
+        for (let i = 1; i <= peopleMax; i++) {
+          let temp = {}
+          temp.label = i
+          temp.value = i
+          nums.push(temp)
+        }
+        return nums
+      }
+    },
     events: {
       'confirmaddress' (res) {
         console.log('选定地址', res)

package/src/components/FilesManageNew/UserEssentialInfoTest.vue

@@ -74,9 +74,16 @@
           </div>
           <div class="col-sm-4 form-group" :class="[$v.f_people_num.dctest ? 'has-error' : '']">
             <label for="f_people_num" class="font_normal_body">&ensp;人&ensp;口&ensp;数</label>
-            <input type="number" v-model="baseinfo.base.f_people_num" v-validate:f_people_num='{dctest: [0, ">=" ]}'
+            <input type="number" v-model="baseinfo.base.f_people_num" v-show="!peopleMax"  v-validate:f_people_num='{dctest: [0, ">=" ]}'
                    :disabled="!jurisdiction.includes('修改人口数')" class="input_search" style="width:60%"
                    placeholder="家庭人口数">
+            <v-select id="f_people_num" :value.sync="baseinfo.base.f_people_num"
+                      v-if="peopleMax"
+                      v-model="baseinfo.base.f_people_num"
+                      :value-single="true"
+                      :options='peoplenums' placeholder='家庭人口数'
+                      style="width: 65%"
+                      close-on-select></v-select>
           </div>
         </div>
         <div class="row">
@@ -240,6 +247,7 @@
           mgq: this.$appdata.getParam('是否煤改气'),
           costtype: this.$appdata.getParam('付款类型'),
           printstate: this.$appdata.getParam('建档打印类型') ? [{label: '暂不选择', value: '暂不选择'}, ...this.$appdata.getParam('建档打印类型')]:[{label: '暂不选择', value: '暂不选择'}],
+          peopleMax: this.$appdata.getSingleValue('最大人口数'),
           jurisdiction: this.$login.r,
           edituserstate: false,
             // highMeterPlugin: {},
@@ -310,7 +318,19 @@
           }
         }
       },
-      computed: {},
+      computed: {
+        peoplenums () {
+          let peopleMax = this.$appdata.getSingleValue('最大人口数') ? this.$appdata.getSingleValue('最大人口数') : 0
+          let nums = []
+          for (let i = 1; i <= peopleMax; i++) {
+            let temp = {}
+            temp.label = i
+            temp.value = i
+            nums.push(temp)
+          }
+          return nums
+        }
+      },
       events: {
         'confirmaddress' (res) {
             //  console.log('选定地址', res)

package/src/components/charge/business/refund/RefundManage.vue

@@ -1,20 +1,13 @@
 <template>
   <div class="auto">
     <iot-refund v-if="row.f_meter_type === '物联网表'" :data="row"></iot-refund>
-    <machine-Refund v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-Refund>
+    <machine-refund v-if="row.f_meter_type !== '物联网表'" :data="row"></machine-refund>
   </div>
 
 </template>
 <script>
-  import IotRefund from './IOTRefund'
-  import machineRefund from './machineRefund'
-
   export default {
     title: '退费管理',
-    components: {
-      IotRefund,
-      machineRefund
-    },
     data () {
       return {
 

package/src/components/revenue/base/leftview/SafeCheck.vue

@@ -111,12 +111,23 @@
       <tr >
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">用户满意度:</td>
         <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.f_client_evaluation }}</td>
-        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
-        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.ajresult }}</td>
+        <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;">安检结果:</td>
+        <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >= 0))"  style="text-align: center;border: #E9E9E9 solid 1px;">{{ model.ajresult }}</td>
+        <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)"  style="text-align: center;border: #E9E9E9 solid 1px;color:red;">安检结果:</td>
+        <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)"  style="text-align: center;border: #E9E9E9 solid 1px;color:red;">{{ model.ajresult }}</td>
       </tr>
       <tr>
-        <td  colspan="1" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
-        <td  colspan="3" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
+        <td  colspan="1" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;color:red;">隐患详情:</td>
+        <td  colspan="3" v-if="model.ajresult && (model.ajresult.indexOf('有隐患') >= 0)" style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%;color:red;">
+             <span  v-for="deviceCollect in model.deviceCollects">
+                      <span class="li-font">
+                        {{deviceCollect.name}}:{{deviceCollect.value}}&nbsp;&nbsp;&nbsp;
+                      </span>
+                <br>
+           </span>
+        </td>
+        <td  colspan="1" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))" style="text-align: center;border: #E9E9E9 solid 1px;">隐患详情:</td>
+        <td  colspan="3" v-if="!(model.ajresult && (model.ajresult.indexOf('有隐患') >=0))"  style="text-align: center;border: #E9E9E9 solid 1px;word-wrap:break-word;word-break:break-all;width:87%">
              <span  v-for="deviceCollect in model.deviceCollects">
                       <span class="li-font">
                         {{deviceCollect.name}}:{{deviceCollect.value}}&nbsp;&nbsp;&nbsp;

package/src/components/revenue/base/rightview/CardList.vue

@@ -71,7 +71,7 @@
                           row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||
                           row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ||
                           row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气'  || row.type === '清零补气' ||
-                          row.type === '换表补气' || row.type === '过户') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
+                          row.type === '换表补气' || row.type === '过户'|| row.type ==='价格补差' || row.type ==='价格补差撤销') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
                   <button data-toggle="dropdown" style="border: 0px;background: none;" type="button"
                           v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
                     <span class="glyphicon glyphicon-th-list"></span>
@@ -144,6 +144,7 @@
                 <blacklist-detail :data="row" v-if="row.type ==='拉黑' ||row.type === '取消拉黑' "></blacklist-detail>
                 <advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
                 <machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'||row.type == '调价预存'"></machinemetercenter-detail>
+                <price-adjustment-detail :data="row" v-if="row.type === '价格补差'"></price-adjustment-detail>
                 <gasloss-detail :data="row" v-if="row.type === '气损收费' || row.type === '气损收费撤销'"></gasloss-detail>
                 <garbage-detail :data="row" v-if="row.type === '垃圾费收费'"></garbage-detail>
               </div>

package/src/components/revenue/base/rightview/carddetail/PriceAdjustmentDetail.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="auto">
+    <partial-view v-ref:pv>
+      <div class="row">
+        <label class = "col-sm-4">客户名称:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.f_user_name}}</span>
+      </div>
+      <div class="row" >
+        <label class = "col-sm-4">上期结余:</label>
+        <span class = "col-sm-2" style="text-align:left">{{model.f_balance}}</span>
+        <label class = "col-sm-4">本期结余:</label>
+        <span class = "col-sm-2" style="text-align:left">{{model.f_curbalance}}</span>
+      </div>
+<!--      <div class="row" v-if="model.f_meter_type == '物联网表'">-->
+<!--        <label class = "col-sm-4">上期结余:</label>-->
+<!--        <span class = "col-sm-2" style="text-align:left">{{model.f_balance_amount}}</span>-->
+<!--        <label class = "col-sm-4">本期结余:</label>-->
+<!--        <span class = "col-sm-2" style="text-align:left">{{model.f_curbalance_amount}}</span>-->
+<!--      </div>-->
+      <div class="row">
+        <label class = "col-sm-4">气量:</label>
+        <span class = "col-sm-2" style="text-align:left">{{model.f_pregas}}</span>
+        <label class = "col-sm-4">金额:</label>
+        <span class = "col-sm-2" style="text-align:left">{{model.f_preamount}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">单价:</label>
+        <span class = "col-sm-2" style="text-align:left">{{model.f_stair_price1}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">备注:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.f_comments}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作人:</label>
+        <span class = "col-sm-8" style="text-align:left">{{model.f_operator}}</span>
+      </div>
+      <div class="row">
+        <label class = "col-sm-4">操作时间:</label>
+        <span class = "col-sm-8" style="text-align:left">{{data.f_operate_date}}</span>
+      </div>
+    </partial-view>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '价格补差详情',
+  props: ['data'],
+  data () {
+    return {
+      model: {}
+    }
+  },
+  ready () {
+    let sql = 'singleTable_OrderBy'
+    let param = {
+      items: '*',
+      tablename: 't_sellinggas',
+      condition: `id = ${this.data.id}`,
+      orderitem: 'id'
+    }
+    this.$info(`加载数据中..., sql:${sql}`)
+    this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: param}}).then((a) => {
+      console.log('获取到的数据', a.data)
+      this.model = a.data
+    }).catch((error) => {
+      if (error.status) {
+        this.$warn(`加载数据出错, ${JSON.stringify(error)}`)
+        return
+      }
+      throw error
+    })
+  }
+}
+</script>

package/src/components/revenue/comprehen/ComprehenOperation/PriceJustment/priceJustment.vue

@@ -0,0 +1,124 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div  class="row">
+          <div  class="col-sm-4 form-group"
+                :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">&nbsp;气量&nbsp;</label>
+            <input class="input_search" type="number" v-model="model.f_pregas" style="width:60%"
+                   v-validate:f_pregas='{required: true}' placeholder="气量">
+          </div>
+          <div  class="col-sm-4 form-group"
+                :class="[$v.f_price.required || $v.f_price.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">&nbsp;单价&nbsp;</label>
+            <input class="input_search" type="number" v-model="model.f_price" style="width:60%"
+                   v-validate:f_price='{required: true,  dctest: [0, ">" ]}' placeholder="单价">
+          </div>
+          <div  class="col-sm-4 form-group"
+               :class="[$v.f_preamount.required || $v.f_preamount.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">&nbsp;金额&nbsp;</label>
+            <input class="input_search" type="number" v-model="model.f_preamount" style="width:60%"
+                   v-validate:f_preamount='{required: true}' placeholder="金额">
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-12">
+            <label for="f_paper_account" class="font_normal_body ">&nbsp;备注&nbsp;</label>
+            <input class="input_search" style="width:87%" rows="1" v-model="model.f_comments"></input>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="btn button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+        <button class="btn button_clear btn-gn" @click="clean()">取消</button>
+      </div>
+    </validator>
+    <!--<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>-->
+    <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>-->
+  </div>
+  <upload :blodid="row.f_userinfo_id"  v-ref:upload    :isremark="true" fusetype="价格补差"></upload>
+
+</template>
+
+
+<script>
+  import Vue from 'vue'
+
+export default {
+    title: '价格补差',
+    data () {
+      return {
+        blodid: '',
+        showupload: false,
+        model: {
+          f_comments: ''
+        }
+
+      }
+    },
+    props: ['row'],
+    ready () {
+
+    },
+    methods: {
+      async confirm () {
+        console.log('价格补差：', this.row)
+        if((this.model.f_preamount>0 && this.model.f_pregas<0) || (this.model.f_preamount<0 && this.model.f_pregas>0)){
+          this.$showAlert('输入气量与金额必须同为负数或正数，您的输入有误！','warning',3000)
+          return
+        }
+
+        if((this.model.f_pregas*this.model.f_price).toFixed(2) !== (this.model.f_preamount - 0).toFixed(2)){
+          this.$showAlert('输入气量乘单价不等于金额，请重新输入！','warning',3000)
+          return
+        }
+        let param = {
+          sellinggas: {
+            f_userfiles_id: this.row.f_userfiles_id,
+            f_userinfo_id: this.row.f_userinfo_id,
+            f_user_id: this.row.f_user_id,
+            f_user_name: this.row.f_user_name,
+            f_user_type: this.row.f_user_type,
+            f_gasproperties: this.row.f_gasproperties,
+            f_meternumber: this.row.f_meternumber,
+            f_card_id: this.row.f_card_id,
+            f_payment: '现金缴费',
+            f_price_id: this.row.f_price_id,
+            f_last_tablebase: this.row.f_meter_base,
+            f_tablebase: this.row.f_meter_base,
+            f_meter_type: this.row.f_meter_type,
+            f_collection_type: this.row.f_collection_type,
+            f_pregas: this.model.f_pregas,
+            f_address: this.row.f_address,
+            f_meter_brand: this.row.f_meter_brand,
+            f_preamount: this.model.f_preamount,
+            f_charge_type: '价格补差',
+            f_comments: this.model.f_comments,
+            f_billing: this.row.f_billing,
+            f_operator: Vue.$login.f.name,
+            f_operatorid: Vue.$login.f.id,
+            f_orgid: Vue.$login.f.orgid,
+            f_orgname: Vue.$login.f.orgs,
+            f_depid: Vue.$login.f.depids,
+            f_depname: Vue.$login.f.deps,
+            f_operat_type: '价格补差',
+            f_stair_price1: this.model.f_price,
+            f_describe: `${this.$login.f.name}对用户${this.row.f_user_name}进行价格补差操作`,
+            f_state: '有效'
+            // f_table_state:'有效'
+          }
+        }
+        console.log(param)
+        this.$resetpost('rs/logic/priceJustment', {data: param}, {warnMsg: `确定要对用户${this.row.f_user_name}进行价格补差吗？`, resolveMsg: `价格补差成功！！`, rejectMsg: `价格补差失败！！请重试！！`}).then((res) => {
+          this.clean()
+        })
+      },
+      clean () {
+        this.$dispatch('refresh')
+      }
+    }
+  }
+</script>