sale-client 4.1.230 → 4.2.1-ronghao

package/src/filiale/meihekou/ChargeManage.vue

@@ -118,8 +118,9 @@ export default {
           {data: {
             f_userfiles_id: obj.f_userfiles_id,
             f_userinfo_code: obj.f_userinfo_code,
-            f_userinfo_id: obj.f_userinfo_id
-          }
+            f_userinfo_id: obj.f_userinfo_id,
+            f_end_day: this.$appdata.getSingleValue('表具临期时间') ? this.$appdata.getSingleValue('表具临期时间') : '7'
+            }
           }
           , {resolveMsg: '', rejectMsg: '获取提示失败'})
         return warningInfo

package/src/filiale/meihekou/ChargeOper.vue

@@ -1,218 +1,328 @@
 <template>
-    <div class="form-inline" style="height: auto">
-      <div class="form-group" v-for="btn in operBtns">
-        <button :id="btn.name" type="button" :class="[($index === 0) ? 'btn btn-click' : 'btn btn-un-click']" @click="business(btn)" :disabled="noButton" >{{btn.name}}</button>
-      </div>
-    </div>
-    <div v-show="isBusiness" style="height: auto" class="select-overspread">
-      <route v-ref:route></route>
+  <div class="form-inline" style="height: auto">
+    <div class="form-group" v-for="btn in operBtns">
+      <button :id="btn.name" type="button"
+              :style="['其他欠费','调价补差'].includes(btn.name) ?'color:#CA2C16':'color:black'"
+              :class="[($index === 0) ? 'btn btn-click' : 'btn btn-un-click']" @click="business(btn)"
+              :disabled="noButton"><span
+        :style="['其他欠费','调价补差'].includes(btn.name) ?'color:#CA2C16':'color:black'">{{ btn.name }}</span>
+      </button>
+
     </div>
+  </div>
+  <div v-show="isBusiness" style="height: auto" class="select-overspread">
+    <route v-ref:route></route>
+  </div>
 </template>
 
 <script>
-  import { HttpResetClass } from 'vue-client'
-  let getNewmetermsg = async function (self, row) {
-    self.cardInfo = undefined
-    if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
-      // 获取用户信息
-      let getUser = await self.$resetpost('api/af-revenue/sql/sale_getUser', {
-        data: {
-          condition: `u.f_userfiles_id='${row.f_userfiles_id}' `,
-          orderitem: `u.f_userfiles_id Desc`
-        }
-      }, {resolveMsg: '读卡新的用户成功', rejectMsg: '读卡新的用户失败'})
-      if (getUser.data.length > 0) {
-        await self.$showAlert('换表成功', 'success', 200)
-        self.data = getUser.data[0]
+import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
+
+let getNewmetermsg = async function (self, row) {
+  // self.cardInfo = undefined
+  if (row.f_userfiles_id && row.f_userfiles_id.length > 0) {
+    // 获取用户信息
+    let getUser = await self.$resetpost('api/af-revenue/sql/sale_getUser', {
+      data: {
+        condition: `u.f_userfiles_id='${row.f_userfiles_id}' `,
+        orderitem: `u.f_userfiles_id Desc`
       }
+    }, {resolveMsg: '读卡新的用户成功', rejectMsg: '读卡新的用户失败'})
+    if (getUser.data.length > 0) {
+      await self.$showAlert('换表成功', 'success', 200)
+      self.data = getUser.data[0]
     }
   }
-  let getBtnsGen = async function (self) {
-    let http = new HttpResetClass()
-    let param = {
-      f_userfiles_id: self.data.f_userfiles_id
-    }
-    if (self.cardInfo) {
-      param.cardInfo = self.cardInfo
+}
+let getBtnsGen = async function (self) {
+  let http = new HttpResetClass()
+  let param = {
+    f_userfiles_id: self.data.f_userfiles_id
+  }
+  if (self.cardInfo) {
+    param.cardInfo = self.cardInfo
+  }
+  let res = await http.load('POST', 'api/af-revenue/logic/getOperBtns', {
+    data: param
+  }, {
+    resolveMsg: null,
+    rejectMsg: '获取业务按钮失败!!'
+  })
+  let http2 = new HttpResetClass()
+  let getWriteError = await http2.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
+    data: {
+      condition: `f_state = '有效' and (f_write_card = '写卡失败' and f_operate_date >= DATEADD(HOUR, -3, GETDATE())) and f_userfiles_id = '${self.data.f_userfiles_id}'`,
+      tablename: 't_fillcard',
+      items: '*',
+      orderitem: 'id desc'
     }
-    let res = await http.load('POST', 'api/af-revenue/logic/getOperBtns', {
-      data: param
-    }, {
-      resolveMsg: null,
-      rejectMsg: '获取业务按钮失败!!'
-    })
-    let getBtns = res.data
-    console.log('获取的业务按钮', getBtns)
-    console.log('有没有用户信息', self.data)
-    if (self.$login.r.length === 0) {
-      self.$showAlert('您没有相关的业务操作权限, 请联系管理员！！', 'warning', 2000)
-    } else {
-      self.temp = []
-      for (let i = 0; i < getBtns.length; i++) {
-        if (self.$login.r.includes(getBtns[i].name)) {
-          // 进行权限验证
-          self.temp.push(getBtns[i])
+  }, {resolveMsg: null, rejectMsg: '获取写卡失败的补卡记录失败'})
+  console.log('获取写卡失败的补卡记录', getWriteError)
+  let getBtns = res.data
+  console.log('获取的业务按钮', getBtns)
+  console.log('有没有用户信息', self.data)
+  for(let i = 0; i < getBtns.length; i++){
+    if(getBtns[i].name === '其他欠费'){
+      self.$showMessage('请先完成待缴费的材料费',["confirm","cancel"]).then(res =>{
+        if(res === 'confirm'){
+          self.business(getBtns[i])
         }
-      }
-      // 如果有未写卡记录，添加线下写卡按钮
-      if (self.data.unWriteSell) {
-        if (self.data.unWriteSell.length > 0) {
-          self.temp.push({name: '线下写卡',
-            value: {
-              'weight': 0,
-              'routeName': 'un-write-card-center'
-  }})
-        }
-      }
-      if (self.data.f_user_nature == '单位') {
-        self.temp.push({name: '维管收费',
-          value: {
-            'weight': 5,
-            'routeName': 'repair-charge'
-  }})
-      }
-      if (self.data.f_meter_type == '物联网表') {
-        if (self.data.f_hascard == '是') {
-          if (self.data.f_whether_hairpin == '未发') {
+      })
+    }
+  }
+  if (self.$login.r.length === 0) {
+    self.$showAlert('您没有相关的业务操作权限, 请联系管理员！！', 'warning', 2000)
+  } else {
+    self.temp = []
+    for (let i = 0; i < getBtns.length; i++) {
+      // 不需要权限的按钮
+      let noInclude = getBtns[i].name === '垃圾费收费'
+      if (noInclude || self.$login.r.includes(getBtns[i].name)) {
+        // 进行权限验证
+        if (getBtns[i].name === '换表&清零') {
+          self.temp.push({
+            name: '换表',
+            value: getBtns[i].value
+          })
+          if (self.data.f_totalsplit_type !== '总表') {
             self.temp.push({
-              name: '发卡售气',
+              name: '清零',
               value: {
-                'weight': 8,
-                'routeName': 'show-card-sell-gas'
-  }
-            })
-          } else {
-            /* self.temp.push({
-              name: '补气', value: {
-                "weight": 8,
-                "routeName": "replace-card-manage"
+                'weight': getBtns[i].value.weight,
+                'routeName': 'reset-meter'
               }
-            }) */
+            })
           }
+        } else {
+          self.temp.push(getBtns[i])
         }
+        console.log(self.temp[i])
       }
-      // 如果卡上有气，添加购气撤销按钮
-      if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
+    }
+    // // 检查是否需要展示限制购气按钮
+    // if (self.$login.r.includes('限制购气')) {
+    //   let limitGasButton = getBtns.find(btn => btn.name === '限制购气')
+    //   if (limitGasButton) {
+    //     self.temp.push(limitGasButton)
+    //   }
+    // }
+    // 如果有未写卡记录，添加线下写卡按钮
+    if (self.data.unWriteSell) {
+      if (self.data.unWriteSell.length > 0) {
         self.temp.push({
-          name: '购气撤销',
+          name: '线下写卡',
           value: {
             'weight': 0,
-            'routeName': 'card-meter-charge-cancel'
+            'routeName': 'un-write-card-center'
           }
         })
-        if (self.data.unWriteSell && self.data.unWriteSell.length > 0) {
-          // 过滤掉线下写卡
-          self.temp = self.temp.filter((item) => {
-            return item.name !== '线下写卡'
-          })
-          self.data.unWriteSell.forEach(
-            async (item) => {
-              let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
-              await self.$resetpost('api/af-revenue/logic/runSQL', { sql: sql })
-            }
-          )
+      }
+    }
+    if (self.data.f_user_nature === '单位') {
+      self.temp.push({
+        name: '维管收费',
+        value: {
+          'weight': 5,
+          'routeName': 'repair-charge'
+        }
+      })
+    }
+    if (self.data.f_meter_type === '物联网表') {
+      if (self.data.f_hascard === '是') {
+        if (self.data.f_whether_hairpin === '未发') {
+          if (self.data.f_share_times !== '' && self.data.f_share_times === '是' && self.data.f_times > 0) {
+            self.temp.push({
+              name: '补卡',
+              value: {
+                'weight': 2,
+                'routeName': 'replace-card-manage'
+              }
+            })
+          } else {
+          }
         }
       }
-      // 如果是预备户,删除发卡售气按钮
-      if (self.data.f_user_state == '预备') {
-        self.temp.splice(self.temp.findIndex(item => item.name === '发卡售气'), 1)
+    }
+    // 如果卡上有气，添加购气撤销按钮
+    if (self.cardInfo && (self.cardInfo.Gas > 0 || self.cardInfo.Money > 0 || (self.cardInfo.TotalMoney > 0 && self.data.f_support_purchase === '是'))) {
+      self.temp.push({
+        name: '购气撤销',
+        value: {
+          'weight': 0,
+          'routeName': 'card-meter-charge-cancel'
+        }
+      })
+      if (self.data.unWriteSell && self.data.unWriteSell.length > 0) {
+        // 过滤掉线下写卡
+        self.temp = self.temp.filter((item) => {
+          return item.name !== '线下写卡'
+        })
+        self.data.unWriteSell.forEach(
+          async (item) => {
+            let sql = `update t_sellinggas set f_write_card = null where id = '${item.id}' and f_write_card ='写卡失败'`
+            await self.$resetpost('api/af-revenue/logic/runSQL', { sql: sql })
+          }
+        )
       }
+    }
+    /*      // 如果是预备户,删除发卡售气按钮
+          if (self.data.f_user_state == '预备') {
+            self.temp.splice(self.temp.findIndex(item => item.name === '发卡售气'), 1)
+          } */
 
-      // 根据权重将业务按钮排序
-      self.operBtns = self.temp.sort((a, b) => {
-        return a.value.weight - b.value.weight
-      })
+    // 根据权重将业务按钮排序
+    self.operBtns = self.temp.sort((a, b) => {
+      return a.value.weight - b.value.weight
+    })
 
-      if (self.operBtns.length > 0) {
-        self.isBusiness = true
-        self.$refs.route.init(self.operBtns[0].value.routeName, {row: self.data, cardData: self.cardInfo})
-        self.styleChange(self.operBtns[0])
-      }
+    // 当有调价补差时,只展示调价补差按钮
+    let adjustSenders = self.operBtns.find((row) => {
+      return row.name == '调价补差'
+    })
+    if (adjustSenders) {
+      self.operBtns = []
+      self.operBtns.push(adjustSenders)
+    }
+    if (getWriteError.data.length > 0) {
+      self.operBtns = [{
+        name: '补卡',
+        value: {
+          'weight': 0,
+          'routeName': 'replace-card-manage'
+        }
+      }]
+    }
+
+    if (self.operBtns.length > 0) {
+      self.isBusiness = true
+      self.$refs.route.init(self.operBtns[0].value.routeName, {row: self.data, cardData: self.cardInfo, writeError: getWriteError.data})
+      self.styleChange(self.operBtns[0])
     }
   }
+  // // 添加“限制购气”按钮
+  // self.operBtns.push({
+  //   name: '限制购气',
+  //   value: {
+  //     'weight': 0,
+  //     'routeName': 'limit-gas-manages'
+  //   }
+  // })
+}
 
-  export default {
-    title: '业务操作',
-    data () {
-      return {
-        operBtns: [],
-        isBusiness: false,
+export default {
+  title: '业务操作',
+  data () {
+    return {
+      operBtns: [],
+      isBusiness: false,
+      noButton: false // 业务请求时禁止按钮点击
+    }
+  },
+  props: ['data', 'cardInfo'],
+  ready () {
+    getBtnsGen(this)
+    console.log('data,cardInfo', this.data, this.cardInfo)
+  },
+  methods: {
+    business (btn) {
+      // // 处理按钮样式
+      // this.styleChange(btn.name)
+      // this.isBusiness = true
+      // this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+      if (this.$refs.route.cards.length > 0) {
+        if (this.$refs.route.cards[0].title == '增值服务管理') {
+          this.$showMessage('切换页面后,当前页面数据会丢失,是否切换?', ['confirm', 'cancel']).then(res => {
+            if (res == 'cancel') {
 
-        noButton: false // 业务请求时禁止按钮点击
+            } else {
+              // 处理按钮样式
+              this.styleChange(btn.name)
+              this.isBusiness = true
+              this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+            }
+          })
+        } else {
+          // 处理按钮样式
+          this.styleChange(btn.name)
+          this.isBusiness = true
+          this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
+        }
       }
     },
-    props: ['data', 'cardInfo'],
-    ready () {
-      getBtnsGen(this)
-    },
-    methods: {
-      business (btn) {
-        // 处理按钮样式
-        this.styleChange(btn.name)
-        this.isBusiness = true
-        this.$refs.route.init(btn.value.routeName, {row: this.data, cardData: this.cardInfo})
-      },
 
-      styleChange (name) {
-        this.operBtns.forEach((res) => {
-          if (res.name === name) {
-            if (document.getElementById(res.name)) {
-              document.getElementById(res.name).style.backgroundColor = '#6aa6e2'
-              document.getElementById(res.name).style.color = 'white'
-            }
-          } else {
-            if (document.getElementById(res.name)) {
-              document.getElementById(res.name).style.backgroundColor = 'white'
-              document.getElementById(res.name).style.color = 'black'
-            }
+    styleChange (name) {
+      this.operBtns.forEach((res) => {
+        if (res.name === name) {
+          if (document.getElementById(res.name)) {
+            document.getElementById(res.name).style.backgroundColor = '#6aa6e2'
+            document.getElementById(res.name).style.color = 'white'
           }
-        })
-      }
+        } else {
+          if (document.getElementById(res.name)) {
+            document.getElementById(res.name).style.backgroundColor = 'white'
+            document.getElementById(res.name).style.color = 'black'
+          }
+        }
+      })
+    }
+  },
+  watch: {
+    'data' () {
+      getBtnsGen(this)
+    }
+  },
+  events: {
+    'no-button' () {
+      this.noButton = true
     },
-    watch: {
-      'data' () {
-        getBtnsGen(this)
-      }
+    'has-button' () {
+      this.noButton = false
     },
-    events: {
-      'no-button' () {
-        this.noButton = true
-      },
-      'has-button' () {
-        this.noButton = false
-      },
-      'get-new-row' (row) {
-        console.log('xxxxxx', row)
+    'get-new-row' (row) {
+      console.log('xxxxxx', row)
       // 发生换表成功
-        getNewmetermsg(this, row)
-      },
-      'button-specifies' (buttonObj, data) {
-        console.log('指定按钮。。', buttonObj)
-        // buttonObj  格式：  {name:'机表收费', value: 'machine-meter-center'}
+      getNewmetermsg(this, row)
+    },
+    'toroute' (buttonObj, data) {
+      console.log('指定按钮。。', buttonObj)
+      this.$resetpost('api/af-revenue/sql/sale_getUser', {
+        data: {condition: `i.f_userinfo_code='${data.f_userinfo_code}' and u.f_filialeid = '${data.f_filialeid}'`, orderitem: `f_userinfo_id Desc`}
+      }, {resolveMsg: null, rejectMsg: '获取用户信息失败'}).then((res) => {
         if (buttonObj) {
+          this.$dispatch('resflushdata', res.data[0])
           this.styleChange(buttonObj.name)
-          this.$refs.route.init(buttonObj.value, {row: data})
+          this.$refs.route.init(buttonObj.value, {row: res.data[0]})
         }
+      })
+    },
+    'button-specifies' (buttonObj, data) {
+      console.log('指定按钮。。', buttonObj)
+      // buttonObj  格式：  {name:'机表收费', value: 'machine-meter-center'}
+      if (buttonObj) {
+        this.styleChange(buttonObj.name)
+        this.$refs.route.init(buttonObj.value, {row: data})
       }
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .btn-click{
-    background-color: #6aa6e2;
-    border-radius: 5px;
-    color: white;
-    /*border-color: black;*/
-    border: solid 1px #c7c7c7;
-  }
+.btn-click {
+  background-color: #6aa6e2;
+  border-radius: 5px;
+  color: white;
+  /*border-color: black;*/
+  border: solid 1px #c7c7c7;
+}
 
-  .btn-un-click{
-    background-color: white;
-    border-radius: 5px;
-    color: black;
-    /*border-color: black;*/
-    border: solid 1px #c7c7c7;
-  }
+.btn-un-click {
+  background-color: white;
+  border-radius: 5px;
+  color: black;
+  /*border-color: black;*/
+  border: solid 1px #c7c7c7;
+}
 </style>

package/src/filiale/meihekou/HandManager.vue

@@ -42,7 +42,7 @@
               </div>
 
               <div class="span" style="float:right;">
-                <button class="button_search button_spacing" style="width:90px"  @click="$parent.$parent.danhuShow()">单户抄表</button>
+                <button class="button_search button_spacing" style="width:90px"  @click="$parent.$parent.danhuShow()">4单户抄表</button>
 
                 <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
                 <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
@@ -924,6 +924,21 @@
           this.$showAlert(`输入表底数信息有误上期底数为  ${this.danhu.info.f_tablebase}`, 'warning', 2000)
           return
         }
+
+        // 检查是否跨阶梯
+        let gasAmount = this.danhu.f_tablebase - this.danhu.info.f_tablebase
+        if (gasAmount > 0) {
+          // 计算阶梯信息
+          let calculatedetail = await this.calculateStairDetail(gasAmount)
+          if (calculatedetail && calculatedetail.num > 1) {
+            // 跨阶梯，显示提示
+            let result = await this.$showMessage('友好提示：本次抄表已跨阶梯 计算公式:' + (calculatedetail.str ? calculatedetail.str : ' 暂无'), ['confirm', 'cancel'])
+            if (result !== 'confirm') {
+              return // 用户取消
+            }
+          }
+        }
+
         let param = {
           downDate: this.downModel.downDate,
           startDate: this.model.params.startDate,
@@ -1611,7 +1626,47 @@
           this.model.paramSource.orderitem = `'${field} ${rule}'`
         }
         this.search()
-      }
+      },
+      // 计算阶梯信息和生成计算公式
+      async calculateStairDetail (gasAmount) {
+        try {
+          // 构建计算参数
+          let model = {
+            f_userinfo_id: this.danhu.info.f_userinfo_id,
+            f_user_id: this.danhu.info.f_user_id,
+            f_userfiles_id: this.danhu.info.f_userfiles_id,
+            f_price_id: this.danhu.info.f_price_id,
+            f_stairprice_id: this.danhu.info.f_stairprice_id,
+            f_pregas: gasAmount
+          }
+
+          // 调用气量计算接口获取阶梯信息
+          let getAmount = await this.$CommonService.gasCalculate(model, gasAmount)
+          if (getAmount.data && getAmount.data.chargeprice) {
+            let chargeprice = getAmount.data.chargeprice
+            let str = ''
+            let num = 0
+
+            chargeprice.forEach((item) => {
+              if (item.f_gas > 0) {
+                num = num + 1
+              }
+              if (this.danhu.info.f_isdecimal === '是') {
+                str = str + item.f_price + ' x ' + item.f_gas + '+'
+              } else {
+                str = str + item.f_price + ' x ' + Math.floor(item.f_gas) + '+'
+              }
+            })
+
+            str = str.slice(0, str.length - 1)
+            return { str: str, num: num }
+          }
+          return null
+        } catch (error) {
+          console.log('计算阶梯信息失败:', error)
+          return null
+        }
+      },
     },
     watch: {
       'downModel.downWay' (val) {