sale-client 4.1.97 → 4.1.99-ronghao

package/build/dev-server.js

@@ -1,7 +1,7 @@
 var path = require('path')
 var checkVersion = require('./versionCheck.js')
 checkVersion()
-const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://192.168.50.67:31467/']
+const [ serverRul, localUrl ] = ['http://218.93.226.210:31467/', 'http://218.93.226.210:31467/']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {

package/package.json

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

package/src/filiale/meihekou/icTable.vue

@@ -0,0 +1,233 @@
+<template>
+  <div class="flex-row">
+    <div class="span">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row" v-if="isGas">
+            <div class="col-sm-4" :class="[$v.f_pregas.dctest ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">赠气</label>
+              <input class="input_search" style="width:60%" type="number" @blur="pregas"
+                     v-validate:f_pregas='{ dctest: [0, ">=" ]}' v-model="model.f_pregas" placeholder="赠气量" v-ref:f_pregas>
+            </div>
+          </div>
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+            <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+            <v-select :value.sync="model.f_add_gas" value-single
+                      :options='addGas' placeholder='请选择'
+
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
+          <div class="row" v-if="!isGas">
+            <div class="col-sm-4">
+              <label for="f_preamount" class=" font_normal_body">金额:</label>
+              <input  class="input_search" style="width:60%" type="number" min = "0.01" v-model="model.f_preamount" placeholder="金额">
+            </div>
+<!--            <div class="col-sm-4">-->
+<!--              <label for="f_add_gas" class="font_normal_body">是否入累计:</label>-->
+<!--              <v-select v-model="model.f_add_gas"-->
+<!--                        placeholder='请选择'-->
+<!--                        :value.sync="model.f_add_gas"-->
+<!--                        :options='addGas'-->
+<!--                        close-on-select clear-button>-->
+<!--              </v-select>-->
+<!--            </div>-->
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <label for="f_reason" class=" font_normal_body">备&emsp;&emsp;注</label>
+            <input  class="input_search" style="width:55%" rows="1" v-model="model.f_reason" placeholder="备注">
+          </div>
+        </form>
+        <div style="text-align:right;margin-top: 2%">
+
+          <button class="button_search" @click="confirm()"  :disabled='!$v.valid' >确认</button>
+          <button class="button_clear" @click="clean()" >取消</button>
+        </div>
+      </validator>
+      <print-bill :show="print" :bill-config='config' :bill-data='billData' :data='row' @toggle="close" @printok="printok"  v-ref:printbill></print-bill>
+    </div>
+  </div>
+  <upload :blodid="row.f_userinfo_id" :businessid="randomBusinessId" isremark="true" fusetype="赠气"></upload>
+</template>
+<script>
+  let otherGasGen = async function (self) {
+    let data = self.getSell()
+    data.f_total_gas = data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0)
+    data.f_total_fee = data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0)
+    if (self.isGas) {
+      data.f_pregas = self.model.f_pregas
+    } else {
+      data.f_preamount = self.model.f_preamount
+    }
+    data.f_userfiles_id = {
+      f_userfiles_id: self.row.f_userfiles_id,
+      f_userinfo_id: self.row.f_userinfo_id,
+      f_user_id: self.row.f_user_id,
+      version: self.row.version,
+      f_times: self.row.cardInfo.Times + 1,
+      f_total_gas: data.f_add_gas === '计入' ? (self.row.f_total_gas - 0) + (self.model.f_pregas - 0) : (self.row.f_total_gas - 0),
+      f_total_fee: data.f_add_gas === '计入' ? (self.row.f_total_fee - 0) + (self.model.f_preamount - 0) : (self.row.f_total_fee - 0),
+      f_balance_gas: 0,
+      f_balance_amount: 0
+    }
+
+
+
+    // 保存表类型
+    data.f_meter_type = self.row.f_meter_type
+    data.f_times = self.row.cardInfo.Times + 1
+
+    await self.$resetpost('api/af-revenue/logic/fedWithgaIc', data, {resolveMsg: null, rejectMsg: '补气报错！！！'})
+  }
+  let asyncIcTable = async function (self) {
+    await self.$getConfig(self, 'icTable')
+    console.log('卡表赠气赠费config', self.config)
+    this.model.f_add_gas = self.config.f_add_gas
+  }
+
+  export default {
+    title: '卡表赠气赠费',
+    data () {
+      return {
+        isGas: false,
+        acceptprint: false,
+        acceptUrl: '',
+        printData: {
+          reason: '',
+          fillgas: '',
+          fillamount: ''
+        },
+        randomBusinessId: '',
+        resid: [],  // 存放新增的f_files表中id
+        model: {
+          f_pregas: 0,
+          f_preamount: 1,
+          f_reason: '',
+          f_add_gas: '计入'
+        },
+        config: {
+          hasPrint: false,
+          f_add_gas: '计入'
+        },
+        billData: {
+          url: 'api/af-revenue/report/icGiftGas',
+          operator: this.$login.f.name,
+          billnumber: ''
+        },
+        print: false
+      }
+    },
+    props: ['row', 'cardData'],
+    ready () {
+      this.isGas = this.row.f_meter_type = false
+      this.row.cardInfo = this.cardData
+      console.log('卡信息', this.row.cardInfo)
+      this.getRandomId()
+      asyncIcTable(this)
+      if (this.isGas) {
+        this.billData.url = 'api/af-revenue/report/icGiftGas'
+      } else {
+        this.billData.url = 'api/af-revenue/report/icGiftFee'
+      }
+    },
+    events: {
+      // 删除Resid数组元素
+      'delResid' (val) {
+        this.resid.$remove({id: val, f_biobid: ''})
+        // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+      },
+      // 增加Resid数组元素
+      'resid' (val) {
+        this.resid.push({id: val, f_biobid: ''})
+      }
+    },
+    methods: {
+      getRandomId () {
+        this.randomBusinessId = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+          let res = Math.random() * 16 | 0
+          let v = c == 'x' ? res : (res & 0x3 | 0x8)
+          return v.toString(16)
+        })
+      },
+      confirm () {
+        otherGasGen(this).then((res) => {
+          let param1 = []
+          for (let row of this.resid) {
+            param1.push({id: row.id})
+          }
+          let data = {
+            param: param1,
+            f_blobid: res
+          }
+          this.$resetpost('api/af-revenue/logic/updatefiles', data)
+
+          if (this.config.hasPrint) {
+            this.row.id = res
+            this.row.f_bill_type = this.isGas ? '卡表赠气' : '卡表赠费'
+            this.row.f_bill_style = '普通收据'
+            this.print = true
+          } else {
+            this.$dispatch('success')
+          }
+        })
+      },
+      pregas () {
+        // 对气量进行验证
+        if ((this.row.f_topup_ceil - 0) > 0 && (this.model.f_pregas - 0) > (this.row.f_topup_ceil - 0)) {
+          this.$showAlert(`您输入的气量不能大于该表的充值上限: ${this.row.f_topup_ceil}`, 'warning', 5000)
+          this.model.f_pregas = null
+        }
+      },
+      getSell () {
+        return {
+          f_balance: this.row.f_balance,
+          f_curbalance: this.row.f_balance,
+          f_card_id: this.row.f_card_id,
+          f_comments: this.model.f_reason,
+          f_type: this.model.f_pregas != 0 ? '卡表赠气' : '卡表赠费',
+          f_user_id: this.row.f_user_id,
+          f_userfiles_id: this.row.f_userfiles_id,
+          f_add_gas: this.model.f_add_gas,
+          f_userinfo_id: this.row.f_userinfo_id,
+          f_user_name: this.row.f_user_name,
+          f_user_type: this.row.f_user_type,
+          f_gasproperties: this.row.f_gasproperties,
+          f_address: this.row.f_address,
+          f_meter_brand: this.row.f_meter_brand,
+          f_operat_type: '其他补气',
+          f_describe: `${this.$login.f.name}对客户${this.row.f_user_name}进行${this.model.f_pregas != 0 ? '卡表赠气' : '卡表赠费'}操作`,
+          f_state: '有效',
+          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_zoneid: this.$login.f.zoneid,
+          f_zones: this.$login.f.zones
+        }
+      },
+      close () {
+        this.print = false
+        this.clean()
+      },
+      clean () {
+        this.$info('取消操作')
+        this.$dispatch('cancelclean', this.row)
+      },
+      printok () {
+        this.$dispatch('success')
+      }
+    },
+    computed: {
+      addGas () {
+        return [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}]
+      }
+    }
+  }
+</script>
+
+<style>
+</style>

package/src/filiale/meihekou/sale.js

@@ -65,4 +65,6 @@ export default function () {
   Vue.component('machine-hand', (resolve) => { require(['./machineHand'], resolve) })
   Vue.component('charge-oper', (resolve) => { require(['./ChargeOper'], resolve) })
   Vue.component('meterTable', (resolve) => { require(['./meterTable'], resolve) })
+  // 卡表赠气
+  Vue.component('icTable', (resolve) => { require(['./icTable'], resolve) })
 }

package/src/filiale/ronghao/HandplanQuery.vue

@@ -642,17 +642,16 @@
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
-            <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-            <!--              用气量合计:&emsp;{{sumsmodel.f_oughtamount}}-->
-            <!--            </td>-->
-            <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-            <!--              气费合计:&emsp;{{sumsmodel.f_oughtfee}}-->
-            <!--            </td>-->
-            <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
-            <!--              已交金额合计:&emsp;{{sumsmodel.f_debt_money}}-->
-            <!--            </td>-->
-            <td
-              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              用气量合计:&emsp;{{sumsmodel.f_oughtamount}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              气费合计:&emsp;{{sumsmodel.f_oughtfee}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              已交金额合计:&emsp;{{sumsmodel.f_debt_money}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
               欠费金额合计:&emsp;{{ sumsmodel.f_actual_arrears }}
             </td>
             <!--            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">-->
@@ -777,9 +776,9 @@ export default {
       footer: [],
       data: {},
       model: new PagedList('api/af-revenue/sql/salehandplanQuery', 20, {}, {
-        // f_oughtamount: 0,
-        // f_oughtfee: 0,
-        // f_debt_money: 0,
+        f_oughtamount: 0,
+        f_oughtfee: 0,
+        f_debt_money: 0,
         f_actual_arrears: 0
         // f_stair1amount: 0,
         // f_stair1fee: 0,

package/src/filiale/ronghao/uploadFilesHistory.vue

@@ -51,7 +51,7 @@
                   <div class="showtext">分类:&nbsp;<span>{{file.fusetype}}</span></div>
                   <div class="showtext">文件说明:&nbsp;{{file.fremarks}}</div>
                   <div class="flex-row showtext">
-                    <a   target="_blank" :href="file.f_downloadURL">预览</a>
+                    <button  class="btn btn-link" @click.stop="imgShow(file.f_downloadURL)">预览</button>
                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                     <a   v-show="isDelete == '1'" @click="delet($index,file)">删除</a>
                   </div>
@@ -64,6 +64,19 @@
       </div>
     </div>
   </div>
+  <modal :show.sync="imgshow" v-ref:modal backdrop="true" coverstyle="modalContentRight">
+    <header slot="modal-header" class="modal-header">
+      预览
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="from-group">
+        <img-self-sale-plus :src="imgfilename"  :list="imgfilename" :width="750" :height="750"></img-self-sale-plus>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button type="button" class="btn btn-success" @click='imgclose'>关闭</button>
+    </footer>
+  </modal>
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
@@ -78,6 +91,8 @@ export default {
 
         upload_date: '',
         fusetype: [],
+        imgfilename: '',
+        imgshow: false,
         files: [],
         fusetypes: [],
         isDelete: '0', // 删除按钮，可以进行控制（权限等）
@@ -111,6 +126,14 @@ export default {
           this.selfSearch()
         })
       },
+      imgShow (val) {
+        // this.imgfilename = `api/af-revenue/file/image/` + val
+        this.imgfilename = val
+        this.imgshow = true
+      },
+      imgclose () {
+        this.imgshow = false
+      },
       getFiles () {
         this.files = []
         this.userinfo_id = this.row.f_userinfo_id
@@ -185,4 +208,7 @@ export default {
   .showtext{
     height:20px;
   }
+  .modalContentRight {
+    float:right;
+  }
 </style>

package/src/filiale/yuncheng/IndustryCommerceHand.vue

@@ -148,6 +148,34 @@
                          condition="f_oughtamount <= {} " placeholder="">
                 </div>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气表品牌</label>
+                <v-select :value.sync="model.f_meter_brand" v-model="model.f_meter_brand"
+                          :options='$parent.$parent.meterbrands' placeholder='请选择' condition="f_meter_brand = '{}'"
+                          close-on-select></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">气表型号</label>
+                <v-select :value.sync="model.f_meter_style" v-model="model.f_meter_style"
+                          :options='$parent.$parent.meterstyle[model.f_meter_brand]' placeholder='请选择'
+                          condition="f_meter_style = '{}'" close-on-select></v-select>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">防盗卡号</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_defendcard"
+                       condition="f_defendcard = '{}'" placeholder='防盗卡号'>
+              </div>
+              <div class="col-sm-2 form-group" style="white-space: nowrap">
+                <label class="font_normal_body">累购气量</label>
+                <div class="row">
+                  <input type="text" style="width:30%" class="input_search" v-model="model.totalgasmin"
+                         condition="f_total_gas >= {} " placeholder="">
+                  <label class="font_normal_body"> ≤ x ≤ </label>
+                  <input type="text" style="width:30%" class="input_search" v-model="model.totalgasmax"
+                         condition="f_total_gas <= {} " placeholder="">
+                </div>
+              </div>
+
               <res-select-group :initres="$parent.$parent.initres"
                                 @re-res="$parent.$parent.getRes"
                                 :show-component="['company']"
@@ -219,6 +247,18 @@
               <th>
                 <nobr>下发人员</nobr>
               </th>
+              <th>
+                <nobr>气表品牌</nobr>
+              </th>
+              <th>
+                <nobr>气表型号</nobr>
+              </th>
+              <th>
+                <nobr>防盗卡号</nobr>
+              </th>
+              <th>
+                <nobr>累购气量</nobr>
+              </th>
               <th>
                 <nobr>审核状态</nobr>
               </th>
@@ -292,6 +332,10 @@
             <td style="text-align: center;">{{ row.f_inputtor }}</td>
             <td style="text-align: center;">{{ row.f_input_person }}</td>
             <td style="text-align: center;">{{ row.f_operator }}</td>
+            <td style="text-align: center;">{{ row.f_meter_brand }}</td>
+            <td style="text-align: center;">{{ row.f_meter_style }}</td>
+            <td style="text-align: center;">{{ row.f_defendcard }}</td>
+            <td style="text-align: center;">{{ row.f_total_gas }}</td>
             <td style="text-align: center;">{{ row.f_audit_state }}</td>
             <td style="text-align: center;">{{ row.f_audit_person }}</td>
             <td style="text-align: center;">{{ row.f_audit_date }}</td>
@@ -386,7 +430,10 @@
 <script>
 import {PagedList, HttpResetClass} from 'vue-client'
 import Vue from 'vue'
-
+let readySomething = async function (self) {
+  await self.$LoadParams.loadParam()
+  self.initParams()
+}
 let readyGen = async function (self) {
   self.getfield = self.config.excelHeaders
   self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
@@ -405,6 +452,9 @@ export default {
       },
       f_audit_state: [{label: '全部', value: ''}, {label: '审核通过', value: `= '审核通过'`}, {label: '审核不通过', value: `= '审核不通过'`}],
       sumsmodel: [],
+      meterbrands: [],
+      // 气表型号
+      meterstyle: {},
       orgCondtionStr: '',
       deletestate: false,
       criteriaShow: false,
@@ -431,13 +481,16 @@ export default {
           'f_oughtamount': '应交气量',
           'f_input_person': '录入人员',
           'f_meter_classify': '气表分类',
+          'f_meter_brand': '气表品牌',
           'f_meter_style': '气表型号',
           'f_user_phone': '客户电话',
           'f_comments': '备注',
           'f_audit_state': '审核状态',
           'f_audit_person': '审核人员',
           'f_audit_date': '审核时间',
-          'f_examinereason': '审核未通过原因'
+          'f_examinereason': '审核未通过原因',
+          'f_defendcard': '防盗卡号',
+          'f_total_gas': '累购气量'
         },
         examine: true,
         customCal: false
@@ -515,6 +568,11 @@ export default {
     }
   },
   ready () {
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
     this.getaddress()
     readyGen(this)
   },
@@ -523,6 +581,25 @@ export default {
     document.getElementById(this.inputid).focus()
   },
   methods: {
+    initParams() {
+      // 初始化气表品牌
+      let brandArr = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        brandArr.push(temp)
+        // 取出对应气表型号
+        let styleArr = []
+        for (let row of item.value.gasmodel) {
+          styleArr.push({label: row.label, value: row.value.f_meter_style})
+        }
+        this.meterstyle[temp.value] = styleArr
+      })
+      this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      //初始化气表价格
+      this.prices = this.$GetSaleParam.getPrices();
+    },
     tableBaseBlur () {
       if (this.danhu.f_new_tablebase) {
         this.f_current_usage = (this.danhu.f_new_tablebase -0) - (this.danhu.info.f_last_tablebase -0)

package/src/filiale/yuncheng/IndustryCommerceHandManager.vue

@@ -1,5 +1,8 @@
 <template>
   <tab-button v-ref:list>
+    <tabs header="计划下发" v-if="permission('计划下发')">
+      <industry-down v-if="show.includes('计划下发')"></industry-down>
+    </tabs>
     <tabs header="工商业抄表" v-if="permission('工商业抄表')">
       <industry-commerce-hand v-if="show.includes('工商业抄表')"></industry-commerce-hand>
     </tabs>
@@ -26,7 +29,7 @@
         showupload: false,
         // searchNumber:'',
         rowData: {},
-        show: ['工商业抄表']
+        show: ['计划下发']
       }
     },
     components: {Tabs, TabButton},