sale-client 3.6.76 → 3.6.78

package/build/dev-server.js

@@ -70,10 +70,10 @@ var devConfig = {
         target: serverRul
       },
       '/rs/logic': {
-        target: 'http://127.0.0.1:8080/'
+        target: localUrl
       },
       '/rs/sql': {
-        target: 'http://127.0.0.1:8080/'
+        target: localUrl
       },
       '/webmeter': {
         target: serverRul

package/package.json

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

package/src/components/FilesManage/UserGeneralInfoTest.vue

@@ -24,7 +24,12 @@
       <div style="height: auto;width: 100%">
         <div style="margin-bottom: 2%; margin-top: 2%">
           <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
+          <span   v-if="!usertype">
           <a style="font-size: 20px;font-weight: 500;">发票信息</a>&nbsp;<a style="color: #999999"></a>
+          </span>
+          <span   v-if="usertype">
+          <a style="font-size: 20px;font-weight: 500;">企业信息</a>&nbsp;<a style="color: #999999"></a>
+          </span>
         </div>
         <user-paper-info-test :baseinfo="data.baseinfo"></user-paper-info-test>
       </div>
@@ -649,6 +654,12 @@ export default {
     }
   },
   computed: {
+    usertype () {
+      if (this.row && this.row.f_user_type) {
+        return this.row.f_user_type == '非民用'
+      }
+      return this.$refs.useressential.$refs.useraddressinfile.usertype
+    },
     meterbrands () {
       return this.$GetSaleParam.getGasbrand()
     },

package/src/components/FilesManageNew/UserGeneralInfoTest.vue

@@ -20,7 +20,12 @@
       <div style="height: auto;width: 100%">
         <div style="margin-bottom: 2%; margin-top: 2%">
           <img style="margin-top: -5px" src="../../../static/images/lefticon/矩形1183.png">
+          <span   v-if="!usertype">
           <a style="font-size: 20px;font-weight: 500;">发票信息</a>&nbsp;<a style="color: #999999"></a>
+          </span>
+          <span   v-if="usertype">
+          <a style="font-size: 20px;font-weight: 500;">企业信息</a>&nbsp;<a style="color: #999999"></a>
+          </span>
         </div>
         <user-paper-info-test :baseinfo="data.baseinfo"></user-paper-info-test>
       </div>
@@ -581,6 +586,12 @@ export default {
     }
   },
   computed: {
+    usertype () {
+      if (this.row && this.row.f_user_type) {
+        return this.row.f_user_type == '非民用'
+      }
+      return this.$refs.useressential.$refs.useraddressinfile.usertype
+    },
     meterbrands () {
       return this.$GetSaleParam.getGasbrand()
     },

package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue

@@ -19,7 +19,7 @@
             <div class="form-group col-sm-2">
               <label class="font_normal_body">客户地址</label>
               <input type="text" class="form-control" v-model="model.f_buy_address_phone" style="width:60%"
-                     condition="f_buy_address_phone like '%{}%'" placeholder="用户姓名"
+                     condition="f_buy_address_phone like '%{}%'" placeholder="客户地址"
               >
             </div>
             <div class="form-group col-sm-2">
@@ -114,6 +114,10 @@
             </th>
             <th>
               <data-order field="f_total_money" name="实收金额"
+                          :order.sync="$parent.$parent.$parent.orderFields.f_collection"></data-order>
+            </th>
+            <th>
+              <data-order field="f_total_money" name="开票金额"
                           :order.sync="$parent.$parent.$parent.orderFields.f_total_money"></data-order>
             </th>
             <th>
@@ -159,6 +163,7 @@
             <th style="text-align:center">{{ row.f_userinfo_code }}</th>
             <th style="text-align:center">{{ row.f_user_name }}</th>
             <th style="text-align:center">{{ row.f_buy_address_phone }}</th>
+            <th style="text-align:center">{{ row.f_collection }}</th>
             <th style="text-align:center">{{ row.f_total_money }}</th>
             <th style="text-align:center">{{ row.f_tax_money }}</th>
             <th style="text-align:center">{{ row.f_invoice_type }}</th>
@@ -246,15 +251,18 @@ export default {
       bz: '',
       row: {},
       orderFields: {
-        f_operate_date: 'desc'
+        f_operate_date: 'desc',
+        f_collection: 'no',
+        f_total_money: 'no'
       },
       // 排序
-      orderitem: '',
+      orderitem: ' f_operate_date desc ',
       fields: {
         'f_userinfo_code': '客户编号',
         'f_user_name': '客户姓名',
         'f_buy_address_phone': '用户地址',
-        'f_total_money': '实收金额',
+        'f_collection': '实收金额',
+        'f_total_money': '开票金额',
         'f_tax_money': '不含税金额',
         'f_invoice_type': '发票类型',
         'f_bill_code': '发票代码',

package/src/components/revenue/comprehen/ComprehenOperation/MeterDisable/DisableManage.vue

@@ -74,6 +74,7 @@
                   userid: array,
                   instructtype: '阀门控制',
                   isOpen:  '关阀',
+                  reasonInfo: '表具停用自动关阀',
                   f_instruct_state: '待发送',
                   inputtor: this.$login.f.name
                 }

package/src/components/webMeter/MeterManage/WebMeterBatchOperationValve.vue

@@ -660,6 +660,7 @@ import axios from 'axios'
               userid: array,
               instructtype: f_apply_type,
               isOpen: f_apply_value,
+              reasonInfo: this.f_beizhu,
               f_instruct_state: '待发送',
               inputtor: Vue.$login.f.name
             }

package/src/filiale/gehua/MeterinfoTest.vue

@@ -45,7 +45,7 @@
 <!--            <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
                       search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发'))" v-ref:brand></v-select>-->
             <v-select :value.sync="row.gasbrand" :options='meterbrands' placeholder='气表品牌' close-on-select
-                      search @change='brandChange' v-model='row.gasbrand' :disabled="!((row.f_user_state === '预备' ||user_State === '预备') || (user_State === undefined || user_State === ''))"  v-ref:brand></v-select>
+                      search @change='brandChange' v-model='row.gasbrand' :disabled="user_State === '正常'"  v-ref:brand></v-select>
           </div>
           <div class="col-sm-4 form-group" :class="[$m.model.required ? 'has-error' : '']">
             <label for="gasmodel" class="font_normal_body">气表型号</label>
@@ -56,7 +56,7 @@
 <!--                      v-model='row.gasmodel' :disabled="!(row.gasbrand.length !== 0 && ((row.f_meter_classify.indexOf('卡表') !== -1&&row.f_user_state === '预备') || (row.f_meter_classify.indexOf('卡表') !== -1&&row.f_whether_hairpin === '未发')))" v-ref:model></v-select>-->
             <v-select :value.sync="row.gasmodel" :options='row.gasbrand[0].gasmodel' placeholder='气表型号'
                       close-on-select
-                      v-model='row.gasmodel'  :disabled="!(row.gasbrand.length !== 0 && ((row.f_user_state === '预备' || user_State === '预备') ||  (user_State === undefined || user_State === '')))"   v-ref:model></v-select>
+                      v-model='row.gasmodel'  :disabled="!(row.gasbrand.length !== 0 && (user_State !== '正常'))"   v-ref:model></v-select>
           </div>
           <div class="col-sm-4 form-group">
             <label for="f_meter_base" class="font_normal_body">&ensp;累购气量</label>
@@ -576,6 +576,7 @@
     props: ['f_filialeid', 'meter', 'isdecimal', 'valid', 'f_userinfo_id', 'overdueset', 'curuser'],
     async ready () {
       this.user_State = this.curuser.f_user_state
+      console.log(this.user_State)
       this.row = Object.assign(this.row, this.meter, {f_use_limit : this.$appdata.getSingleValue('报废年限')})
       if (this.row.f_meter_classify) {
         if (this.row.f_meter_classify === '物联网表') {
@@ -671,6 +672,11 @@
           co(brandChangeGen(this))
         }
         this.meternumberValidate()
+        console.log('---------------------------------')
+        console.log(this.curuser)
+        console.log(this.meter)
+        console.log(this.user_State)
+        console.log('---------------------------------')
       },
       userTypeChange () {
         this.gasproperties = []

package/src/filiale/rizhao/ChargeList.vue

@@ -307,7 +307,7 @@
             <p class="form-control-static">{{userAddress}}</p>
           </div>
           <label class="col-sm-2 control-label" v-if="showOrgname">所属公司</label>
-          <div class="col-sm-2" v-if="showOrgname">
+          <div class="col-sm-10" v-if="showOrgname">
             <p class="form-control-static" style="color: red">{{orgName}}</p>
           </div>
         </div>
@@ -575,6 +575,12 @@
           if (getUser.data[0].f_filialeid != self.$login.f.orgid) {
             self.showCardError = true
             self.showCardError2 = true
+            self.orgName = ''
+            let arr = []
+            for(let i=0;i < getUser.data.length;i++){
+              arr.push(getUser.data[i].f_orgname)
+            }
+            self.orgName = arr.join(", ")
             self.showOrgname = true
             return
           }

package/src/filiale/rongcheng/ChargeModal.vue

@@ -0,0 +1,178 @@
+<template>
+  <modal :show.sync="modalShow" backdrop="false" width="50%" title="提示信息">
+    <article slot="modal-body">
+      <div style="width:98%;margin: auto" v-show="showInformation">
+        <div v-show="filesNotComplete" style="font-size: 15px;padding: 10px"> 用户档案信息不全，请完善
+          <span style="float: right">
+            <button class="button_search" @click="operational('files_complete')"
+                    style="width: max-content;">完善信息</button>
+            <button class="button_search" @click="close">取消</button>
+          </span>
+        </div>
+        <div v-show="isBlackList" style="font-size: 15px;padding: 10px"> 黑名单用户,无法进行收费操作,{{ userproperties }}
+        </div>
+        <div v-show="isInvoList" style="font-size: 15px;padding: 10px"> {{ involists }}
+        </div>
+        <span v-show="isInvoList || isBlackList" style="float: right">
+            <button class="button_search" @click="close">确定</button>
+          </span>
+        <div v-show="!isBlackList&&isBasicLiving" style="font-size: 15px;padding: 10px"> {{ basicinformation }}
+          <span style="float: right">
+            <button class="button_search" @click="operational('basic-living')"
+                    style="width: max-content;">低保续保</button>
+            <button class="button_search" @click="operational('stop-basic-living')" v-if="stopBasicLiving"
+                    style="width: max-content;">停止续保</button>
+            <button class="button_search btn-gn" @click="success('isBasicLiving')" v-if="!stopBasicLiving">确认</button>
+          </span>
+        </div>
+        <p>{{ authorityInformation }}</p>
+      </div>
+      <div style="width:98%;margin: auto" v-show="!showInformation">
+        <route v-ref:route @close="close" @success="success" v-show="!showInformation" :data="row"></route>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer" style="text-align: center;border: 0">
+      <!--如果想忽略到期信息，modal的值设为null-->
+      <!--      <button class="button_clear" @click="ignore" v-if="basicLiving">忽略</button>-->
+    </footer>
+  </modal>
+</template>
+<script>
+
+let initGen = async function (self) {
+  if (!self.row.f_price_id || !self.row.f_gasmodel_id || !self.row.f_gasbrand_id) {
+    self.filesNotComplete = true
+  }
+  let _this = self
+  self.$login.f.functions[1].children.forEach(function (value) {
+    if (value.name === '特殊用户') {
+      _this.basicLivingAuthority = true
+    }
+  })
+  console.log('============================', self.data)
+  console.log('============================', self.data2)
+  if (self.data2.data.length > 0) {
+    // isInvoList  involists
+    _this.isInvoList = true
+    self.data2.data.forEach(function (value) {
+      _this.involists = '尊敬的' + (value.f_invoice_name) + '用户您好, 您有一张未领取发票, 发票金额为' + (value.f_invoice_money) +
+        ', 发票日期为' + (value.f_invoice_date) + ', 请您及时领取'
+    })
+  }
+
+  self.data.data.forEach(function (value) {
+    if (value.f_parameter_key === 'dibaohu_endDate' && _this.basicLivingAuthority) {
+      if (value.days <= 0) {
+        _this.isBasicLiving = true
+        _this.basicinformation = '低保已到期' + (-value.days) + '天'
+        _this.stopBasicLiving = true
+      } else if (value.days > 0 && value.days < self.dibao_remind) {
+        _this.isBasicLiving = true
+        _this.basicinformation = '低保还有' + (value.days) + '天到期'
+      } else {
+        console.log('低保剩余天数大于提醒天数')
+      }
+    } else if (value.f_parameter_key === 'blackList' && _this.filesCompleteAuthority) {
+      _this.isBlackList = true
+      _this.userproperties = '该用户为黑名单用户,被限制购气,原因为' + (value.f_comments)
+      if (value.f_offsite_time) {
+        _this.userproperties += '(安检日期)' + (value.f_offsite_time)
+      }
+    }
+  })
+  if (!self.filesNotComplete && !self.isBlackList && !self.isBasicLiving) {
+    self.authorityInformation = '您没有相关的业务操作权限, 请联系管理员！！'
+  }
+}
+
+export default {
+  title: '收费弹出框',
+  props: {
+    // 动态属性表数据
+    data: {
+      type: Object
+    },
+    // 动态属性表数据
+    data2: {
+      type: Object
+    },
+    // 双击用户的数据
+    row: {
+      type: Object
+    },
+    modalShow: {
+      type: Boolean
+    }
+  },
+  data() {
+    return {
+      showInformation: true,
+      informationtype: '',
+      // 档案不完善
+      filesNotComplete: false,
+      // 黑名单
+      isBlackList: false,
+      // 未领发票
+      isInvoList: false,
+      // 低保户到期
+      isBasicLiving: false,
+      // 终止低保户 必选低保户到期
+      stopBasicLiving: false,
+      // 低保户信息
+      basicinformation: '',
+      // 黑名单信息
+      userproperties: '',
+      // 发票未领取信息
+      involists: '',
+      // 低保户到期提醒时间
+      dibao_remind: this.$appdata.getSingleValue('低保快到期提醒') ? this.$appdata.getSingleValue('低保快到期提醒') : 0,
+      // 低保户权限
+      basicLivingAuthority: false,
+      // 档案完善权限
+      filesCompleteAuthority: true
+    }
+  },
+  methods: {
+    close () {
+      this.$emit('close')
+    },
+    async success(val) {
+      //
+      if (val === 'filesNotComplete') {
+        this.filesNotComplete = false
+      } else if (val === 'isBasicLiving') {
+        this.isBasicLiving = false
+      }
+      // 如果所有提示信息均处理，获取改户数据，进入收费操作
+      if (!this.filesNotComplete && !this.isBlackList && !this.isBasicLiving) {
+        this.showInformation = false
+        let data = await this.$resetpost('rs/sql/sale_getUser', {data: {condition: `1=1 and f_userinfo_code = '${this.row.f_userinfo_code}' and u.f_filialeid = ${this.$login.f.orgid}`}}, {
+          resolveMsg: '',
+          rejectMsg: ''
+        })
+        this.$emit('modalsuccess', data.data[0])
+      } else {
+        // 没有处理完，显示提示信息
+        this.showInformation = true
+      }
+    },
+    operational(val) {
+      this.showInformation = false
+      this.$refs.route.init(val, {data: this.row})
+    }
+  },
+  ready () {
+    initGen(this)
+  }
+  // watch: {
+  //   'modalShow' (val) {
+  //     this.modal = val
+  //   }
+  // }
+}
+</script>
+<style>
+.basic-main {
+  width: 79%;
+}
+</style>

package/src/filiale/rongcheng/sale.js

@@ -105,4 +105,6 @@ export default function () {
 
   // 用户表具信息test
   Vue.component('file-user-meter-info', (resolve) => { require(['./UserMeterInfoTest'], resolve) })
+  // 售气收费 --弹出框
+  Vue.component('charge-modal', (resolve) => { require(['./ChargeModal'], resolve) })
 }

package/src/filiale/shanxian/components/webMeter/WebMeterBatchOperationValve.vue

@@ -662,6 +662,7 @@ import axios from 'axios'
               instructtype: f_apply_type,
               isOpen: f_apply_value,
               f_instruct_state: '待发送',
+              reasonInfo: this.f_beizhu,
               inputtor: Vue.$login.f.name
             }
           }

package/src/filiale/yuansheng/icTable.vue

@@ -8,11 +8,13 @@
               <label class="font_normal_body">&nbsp;操作&nbsp;</label>
               <v-select v-if="this.row.f_collection_type==='按金额'" :value.sync="model.f_operat_type"
                         :options='operator_type' placeholder='请选择'
+                        :value-single="true"
                         selected="赠费"
                         style="width:60%"
                         close-on-select></v-select>
               <v-select v-if="this.row.f_collection_type==='按气量'" :value.sync="model.f_operat_type"
                         :options='operator_type2' placeholder='请选择'
+                        :value-single="true"
                         selected="赠气"
                         style="width:60%"
                         close-on-select></v-select>
@@ -118,11 +120,8 @@ let preamountGen = 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_pregas = self.model.f_pregas
+    data.f_preamount = self.model.f_preamount
     data.f_userfiles_id = {
       f_userfiles_id: self.row.f_userfiles_id,
       f_user_id: self.row.f_user_id,

package/src/filiale/yuansheng/sale.js

@@ -26,4 +26,6 @@ export default function () {
   Vue.component('iot-refund', (resolve) => { require(['./IOTRefund'], resolve) })
   // 物联网赠气
   Vue.component('iotTable', (resolve) => { require(['./iotTable'], resolve) })
+  // 物联网赠气
+  Vue.component('icTable', (resolve) => { require(['./icTable'], resolve) })
 }

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/rizhao/sale'
+import wenxi from './filiale/yuansheng/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'
@@ -11,7 +11,6 @@ import VueClipboard from 'vue-clipboard2'
 
 Vue.use(VueClipboard)
 Vue.config.silent = true
-
 all()
 system(false)
 sale()