sale-client 3.6.379 → 3.6.380

package/package.json

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

package/src/components/FilesManage/UserMeterInfoTest.vue

@@ -35,7 +35,7 @@ export default {
         devicesinfo: [],
         show_devices: false,
         fireinfo: {},
-        f_input_person: '',
+        f_input_person: [],
         show_fire: false,
         imgdelete: '/images/mainicon/deletedevice.png',
         imgsrc: '/images/mainicon/biaopan.png',

package/src/components/charge/ChargeManage.vue

@@ -202,13 +202,21 @@ export default {
         this.$refs.list.searchNoData()
         this.$refs.card.search()
       },
-      modalsuccess (obj) {
+      async modalsuccess (obj) {
         this.showModal = false
-        this.$refs.list.criteriaShow = false
-        this.row = obj
-        this.cardInfo = this.$refs.list.cardInfo
-        // 将列表只显示该条数据
-        this.$refs.list.refreshRow(obj)
+        let getUnWriteSell = await this.$SqlService.singleTable('t_sellinggas', `f_state = '有效' and (f_write_card = '未写卡' or (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE()))) and f_userfiles_id = '${obj.f_userfiles_id}'`)
+        console.log('获取未写卡记录', getUnWriteSell)
+        if (getUnWriteSell.data.length > 1) {
+          this.$showAlert('此卡已缴费多次未写卡。请核实后处理！！', 'warning', 5000)
+        } else {
+          this.$refs.list.criteriaShow = false
+          this.row = obj
+          this.row.unWriteSell = getUnWriteSell.data
+          this.cardInfo = this.$refs.list.cardInfo
+          this.$refs.list.criteriaShow = false
+          // 将列表只显示该条数据
+          this.$refs.list.refreshRow(obj)
+        }
       },
       async serRow (obj) {
         let newdata = await this.$resetpost('rs/sql/sale_getUser', {

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

@@ -27,6 +27,16 @@
                         close-on-select clear-button>
               </v-select>
             </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='请选择'
+                      disabled
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
           <div class="col-sm-4 form-group" v-if="data.f_collection_type === '按气量'">
             <label class="font_normal_body">剩余气量</label>
             <input class="input_search" style="width:60%" type="number" v-model="data.f_balance_gas" readonly>
@@ -99,7 +109,11 @@
     // 默认打印格式
     self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
     self.model.f_payment = [self.config.payment]
-
+    if (self.config.addgas) {
+      self.model.f_add_gas = '计入'
+    } else {
+      self.model.f_add_gas = '计入'
+    }
     self.model.f_use_type = self.config.billType
     self.model.f_bill_type = self.model.f_print
     self.hasValidateBill = self.config.hasBillManage
@@ -110,6 +124,7 @@
     data () {
       return {
         config: {
+          addgas:true,
           showupload: false, // 默认不上传附件
           hasPrint: false,  // 默认打票
           hasBillManage: false,  // 默认不启用发票管理
@@ -119,6 +134,7 @@
           billType: '燃气费'
         },
         model: {
+          f_add_gas: '计入',
           f_refund_fee: '',
           f_refund_gas: '',
           f_comments: '',
@@ -185,6 +201,7 @@
           f_userfiles_id: this.data.f_userfiles_id,
           version: this.data.version,
           f_price: this.model.f_price,
+          f_add_gas: this.model.f_add_gas,
           f_refund_gas: this.model.f_refund_gas,
           f_refund_fee: this.model.f_refund_fee,
           f_comments: this.model.f_comments,

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

@@ -26,7 +26,16 @@
                                   close-on-select clear-button>
                         </v-select>
                     </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='请选择'
+                              disabled
+                              selected="是否计入累购"
+                              style="width:60%"
+                              close-on-select></v-select>
+                  </div>
                     <div class="col-sm-4 form-group">
                         <label class="font_normal_body">剩余金额</label>
                         <input class="input_search" style="width:60%" type="number" v-model="data.f_balance" readonly>
@@ -76,7 +85,11 @@
       self.blodid = self.data.f_userinfo_id
       self.model.f_print = self.config.printType instanceof Array ? self.config.printType : [self.config.printType]
       self.model.f_payment = [self.config.payment]
-
+      if (self.config.addgas) {
+        self.model.f_add_gas = '计入'
+      } else {
+        self.model.f_add_gas = '计入'
+      }
       self.model.f_use_type = self.config.billType
       self.model.f_bill_type = self.model.f_print
       self.hasValidateBill = self.config.hasBillManage
@@ -87,6 +100,7 @@
       data () {
         return {
           config: {
+            addgas:true,
             showupload: false, // 默认不上传附件
             hasPrint: false,  // 默认打票
             hasBillManage: false,  // 默认不启用发票管理
@@ -96,6 +110,7 @@
             billType: '燃气费'
           },
           model: {
+            f_add_gas: '计入',
             f_refund_fee: '',
             f_comments: '',
             f_payment: '',
@@ -160,7 +175,7 @@
             f_payment: this.model.f_payment[0],
             f_print: this.model.f_print[0],
             f_price_id: this.data.f_price_id,
-
+            f_add_gas: this.model.f_add_gas,
             f_total_fee: this.data.f_total_fee,
             f_stairprice_id: this.data.f_stairprice_id,
             operInfo: {

package/src/filiale/tongchuan/EditWebMeterInfo.vue

@@ -0,0 +1,282 @@
+<template>
+  <div class="span">
+    <validator name='v' style="overflow-y: auto" @valid="confirmEditcheck = true" @invalid="confirmEditcheck = false">
+      <form novalidate class="form-horizontal select-overspread" >
+        <div class="row auto">
+          <div style="margin-top: 2%">
+            <img style="margin-top: -2px;margin-left: 2px" src="./../../../static/images/lefticon/矩形1183.png">
+            <a style="font-size: 16px;font-weight: 500;">表计信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
+          </div>
+          <div class="col-sm-6" :class="[$v.f_meternumber.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;表号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_meternumber" @blur="onbulrbunmber($event)" class="input_search" style="width:60%" v-validate:f_meternumber='{required: true }' placeholder="表号">
+          </div>
+
+          <div class="col-sm-6" :class="[$v.f_imei.required ? 'has-error' : '']" v-show="!(this.newmeterinfo.f_meter_brand==='真兰流量计' || this.newmeterinfo.f_meter_brand==='苍南物联网表')" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;IMEI码&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_imei" class="input_search" style="width:60%" v-validate:f_imei='{required: true }' placeholder="IMEI码">
+          </div>
+<!--          <div class="col-sm-6" v-if="this.newmeterinfo.f_meter_brand==='真兰流量计' || this.newmeterinfo.f_meter_brand==='苍南物联网表'">-->
+<!--            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;IMEI码&nbsp;&nbsp;&nbsp;</label>-->
+<!--            <input type="text" v-model="newmeterinfo.f_imei" class="input_search" style="width:60%"  placeholder="IMEI码">-->
+<!--          </div>-->
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;IMSI码&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_imsi" class="input_search" style="width:60%" placeholder="IMSI码">
+          </div>
+          <div class="col-sm-6" :class="[$v.brand.required ? 'has-error' : '']" v-show="!(this.newmeterinfo.f_meter_brand==='真兰流量计' || this.newmeterinfo.f_meter_brand==='苍南物联网表')">
+            <label class="font_normal_body" title="参数:气表类型2">&nbsp;&nbsp;&nbsp;气表类型</label>
+            <input type="text" v-show="false" v-model="$refs.brand.selectedItems" v-validate:brand='{required: true }'>
+            <v-select style="width:60%" title="气表类型2"
+                      placeholder='气表类型'
+                      :value.sync="newmeterinfo.f_metertype"
+                      v-model="newmeterinfo.f_metertype"
+                      :options='metertype'
+                      close-on-select
+                      :value-single="true" v-ref:brand>  </v-select>
+          </div>
+          <div class="col-sm-6" :class="[$v.f_meter_brand.required ? 'has-error' : '']">
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;气表品牌</label>
+            <input type="text" v-show="false" v-model="newmeterinfo.f_meter_brand"
+                   v-validate:f_meter_brand='{required: true }'>
+            <v-select
+              placeholder='气表品牌'
+              :value.sync="newmeterinfo.f_meter_brand"
+              style="width:60%"
+              :value-single="true"
+              v-model="newmeterinfo.f_meter_brand"
+              :options='meterbrand'
+              close-on-select>
+            </v-select>
+          </div>
+          <div class="col-sm-6" :class="[$v.f_meter_style.required ? 'has-error' : '']" v-show="!(this.newmeterinfo.f_meter_brand==='真兰流量计' || this.newmeterinfo.f_meter_brand==='苍南物联网表')">
+            <label class="font_normal_body" >&nbsp;&nbsp;&nbsp;气表型号</label>
+            <input type="text" v-show="false" v-model="newmeterinfo.f_meter_style"
+                   v-validate:f_meter_style='{required: true }'>
+            <v-select style="width:60%"
+                      placeholder='气表型号'
+                      :value.sync="newmeterinfo.f_meter_style"
+                      v-model="newmeterinfo.f_meter_style"
+                      :options='meterstyle'
+                      close-on-select
+                      :value-single="true">  </v-select>
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;表计电话</label>
+            <input type="text" v-model="newmeterinfo.f_meter_phone" class="input_search" style="width:60%" placeholder="表计电话">
+          </div>
+          <div class="col-sm-12" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;设备地址</label>
+            <input type="text" v-model="newmeterinfo.f_device_address" class="input_search" style="width:80%" placeholder="设备地址">
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;是否领用</label>
+            <v-select style="width:60%"
+                      placeholder='是否领用'
+                      :value.sync="newmeterinfo.f_is_receive"
+                      v-model="newmeterinfo.f_is_receive"
+                      :options='isReceive'
+                      disabled
+                      close-on-select
+                      :value-single="true">  </v-select>
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;气表年限</label>
+            <input type="text" v-model="newmeterinfo.f_years" class="input_search" style="width:60%" placeholder="气表年限">
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;生产日期</label>
+            <datepicker  placeholder="生产日期" style="width: 60%"
+                         v-model="newmeterinfo.f_manufacture_date"
+                         :value.sync="newmeterinfo.f_manufacture_date"
+                         :format="'yyyy-MM-dd HH:mm:ss'">
+            </datepicker>
+            <!--          <input type="text" v-model="newmeterinfo.f_manufacture_date" class="input_search" style="width:60%" placeholder="生产日期">-->
+          </div>
+
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;批次号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_batch_number" class="input_search" style="width:60%" placeholder="批次号">
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;终端名称</label>
+            <input type="text" v-model="newmeterinfo.f_terminal_id" class="input_search" style="width:60%" placeholder="终端名称">
+          </div>
+
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;设备号&nbsp;&nbsp;&nbsp;</label>
+            <input type="text" v-model="newmeterinfo.f_device_id" class="input_search" style="width:60%" placeholder="设备号">
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;阀控标识</label>
+            <input type="text" v-model="newmeterinfo.f_valvemark" class="input_search" style="width:60%" placeholder="阀控标识">
+          </div>
+          <div class="col-sm-6" v-show="!(this.newmeterinfo.f_meter_brand==='真兰流量计' || this.newmeterinfo.f_meter_brand==='苍南物联网表')">
+            <label class="font_normal_body" style="color: red" title="参数:表通道类型">表通道类型</label>
+            <!--  <input type="text" v-model="newmeterinfo.f_iot_type" class="input_search" style="width:60%"  placeholder="表通道类型">-->
+            <v-select style="width:60%"
+                      placeholder='表通道类型'
+                      :value.sync="newmeterinfo.f_iot_type"
+                      v-model="newmeterinfo.f_iot_type"
+                      :options='iottype'
+                      close-on-select
+                      :value-single="true">  </v-select>
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">表通讯序号</label>
+            <input type="text" v-model="newmeterinfo.f_telecomm_no" class="input_search" style="width:60%" placeholder="表通讯序号">
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;采购人</label>
+            <input type="text" v-model="newmeterinfo.f_purchaser" class="input_search" style="width:60%" placeholder="采购人">
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;采购时间</label>
+            <datepicker  placeholder="采购时间" style="width: 60%"
+                         v-model="newmeterinfo.f_purchase_date"
+                         :value.sync="newmeterinfo.f_purchase_date"
+                         :format="'yyyy-MM-dd HH:mm:ss'">
+            </datepicker>
+          </div>
+        </div>
+        <div class="auto row">
+          <div style="margin-top: 2%">
+            <img style="margin-top: -2px;margin-left: 2px" src="./../../../static/images/lefticon/矩形1183.png">
+            <a style="font-size: 16px;font-weight: 500;">厂商信息</a>&nbsp;<a style="color: #999999;text-decoration: none"></a>
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;气表厂家</label>
+            <input type="text" v-model="newmeterinfo.f_manufacturers" class="input_search" style="width:60%" placeholder="气表厂家">
+          </div>
+          <div class="col-sm-6" >
+            <label class="font_normal_body">&nbsp;&nbsp;&nbsp;厂商代码</label>
+            <input type="text" v-model="newmeterinfo.f_vender" class="input_search" style="width:60%" placeholder="厂商代码">
+          </div>
+        </div>
+        <div class="col-sm-12" style="text-align:right;height:auto;margin-top:6px;">
+          <button class="button_search" type="button" @click="confirmEdit()" :disabled="!confirmEditcheck">确认</button>
+          <button class="button_clear" type="button" @click="close()">取消</button>
+        </div>
+      </form>
+    </validator>
+  </div>
+</template>
+
+
+<script>
+let readyGen = async function (self) {
+  await self.$LoadParams.loadParam()
+  self.initQueryParam()
+  // self.reflash()
+}
+export default {
+  title: '表计信息修改',
+  props: ['oldmeter', 'f_filialeid'],
+  data () {
+    return {
+      row: {},
+      meterbrand: [],
+      newmeterinfo: {},
+      confirmEditcheck: false,
+      meterstyle: [],
+    }
+  },
+  ready () {
+    this.newmeterinfo = Object.assign({}, {}, this.oldmeter)
+    this.newmeterinfo.f_is_receive = this.newmeterinfo.f_is_receive !== '是' ? '否' : '是'
+    readyGen(this)
+  },
+  watch: {
+    'oldmeter' () {
+      this.newmeterinfo = Object.assign({}, {}, this.oldmeter)
+    },
+    'newmeterinfo.f_meter_brand' () {
+      if (this.newmeterinfo.f_meter_brand == null || this.newmeterinfo.f_meter_brand == '') return
+      let gasmodels = []
+      let gastype = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        if (item.label == this.newmeterinfo.f_meter_brand) {
+          gasmodels = item.value.gasmodel
+        }
+      })
+      gasmodels.forEach((items) => {
+        let temp = {}
+        temp.label = items.label
+        temp.value = items.value.f_meter_style + items.value.f_type
+        gastype.push(temp)
+      })
+      this.meterstyle = gastype
+    }
+  },
+  methods: {
+
+    initQueryParam () {
+      let arr = []
+      this.$GetSaleParam.getGasbrand().forEach((item) => {
+        let temp = {}
+        temp.label = item.label
+        temp.value = item.value.f_meter_brand
+        arr.push(temp)
+      })
+      console.log(arr)
+      this.meterbrand = [{label: '全部', value: ''}, ...arr]
+    },
+    async onbulrbunmber ($event) {
+      if ($event.target.value === '') {
+        return
+      }
+      let expiration = await this.$resetpost('rs/sql/singleTable_OrderBy', {data:
+          {orderitem: 'id',
+            items: 'f_meternumber',
+            tablename: 't_meterinfo',
+            condition: 'f_meternumber = \'' + $event.target.value + '\''}}, {resolveMsg: '', rejectMsg: ''})
+
+      console.log(expiration)
+      if (expiration.data.length !== 0) {
+        this.$showMessage('表号已经存在')
+      }
+    },
+    close () {
+      this.$parent.meterinfos = []
+      this.$dispatch('close')
+    },
+    confirmEdit () {
+      this.newmeterinfo.f_diameter = ''
+      this.newmeterinfo.f_orgid = this.$login.f.orgid
+      // this.newmeterinfo.f_metertype='威星民用表'
+      this.newmeterinfo.f_orgname = this.$login.f.orgs
+      this.newmeterinfo.f_depid = this.$login.f.depids
+      this.newmeterinfo.f_depname = this.$login.f.deps
+      this.newmeterinfo.f_operator = this.$login.f.name
+      this.newmeterinfo.f_operatorid = this.$login.f.id
+      if (JSON.stringify(this.oldmeter) != '{}') {
+        if (this.newmeterinfo.f_meternumber && this.newmeterinfo.f_imei && this.newmeterinfo.f_iot_type && this.newmeterinfo.f_meternumber !== '' && this.newmeterinfo.f_imei !== '' && this.newmeterinfo.f_iot_type !== '') {
+          this.$resetpost('rs/entity/t_meterinfo', this.newmeterinfo, {resolveMsg: '修改成功。', rejectMsg: '修改失败!!!请核对表号/IMSI码是否重复!'})
+        } else {
+          this.$showMessage('表号/IMEI码/表通道类型 不能为空!')
+        }
+      } else {
+        // 是新增
+        this.newmeterinfo.f_state = '待安装'
+        this.newmeterinfo.f_filialeid = this.f_filialeid ? this.f_filialeid : this.$login.f.orgid
+        this.$resetpost('rs/entity/t_meterinfo', this.newmeterinfo, {resolveMsg: '添加成功。', rejectMsg: '添加失败!!!请核对表号/IMSI码是否重复'})
+      }
+      this.$dispatch('close')
+    }
+  },
+  computed: {
+    meterbrands () {
+      return this.$GetSaleParam.getGasbrand()
+    },
+    iottype () {
+      return this.$appdata.getParam('表通道类型')
+    },
+    metertype () {
+      return this.$appdata.getParam('气表类型2')
+    },
+    isReceive () {
+      return [{label: '否', value: '否'}, {label: '是', value: '是'}]
+    }
+  }
+}
+</script>

package/src/filiale/tongchuan/sale.js

@@ -151,4 +151,5 @@ export default function () {
   Vue.component('paper-audit', (resolve) => { require(['./paperaudit'], resolve) })
   // 电子发票管理
   Vue.component('e-ticket-manage', (resolve) => { require(['./EticketManage'], resolve) })
+  Vue.component('edit-meter-info', (resolve) => { require(['./EditWebMeterInfo'], resolve) })
 }

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/dexin/sale'
+import FilialeSale from './filiale/qingjian/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'

package/src/plugins/CommonService.js

@@ -176,12 +176,10 @@ let CommonService = {
   async updatePassword (row, cardRes) {
     if (cardRes.data.Kmm) {
       if (row.f_card_password != cardRes.data.Kmm) {
-        let updateFiles = {
-          f_userfiles_id: row.f_userfiles_id,
-          version: row.version + 1,
-          f_card_password: cardRes.data.Kmm
-        }
-        await Vue.resetpost('rs/entity/t_userfiles', updateFiles, {resolveMsg: null, rejectMsg: '更新卡密码出错!!请联系开发人员处理！！'})
+        let sql = `update t_userfiles set
+          f_card_password = '${cardRes.data.Kmm}'
+                   where f_userfiles_id = '${row.f_userfiles_id}'`
+        await Vue.resetpost('rs/logic/runSQL', {sql: sql})
       }
     }
   },