sale-client 4.4.6 → 4.4.8

package/package.json

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

package/src/components/charge/business/CardMeterCenter.vue

@@ -273,7 +273,7 @@
           // 如果不支持小数,将划价出的多余非整数气量进行划价为金额
         let tempnum = Math.floor(getGas.data.gas - 0)
         let dymoney1 = await self.$CommonService.gasCalculate(self.model, (tempnum).toFixed(self.row.f_fee_decimal || 4))
-        self.dymoney = (getGas.data.chargenum - 0).toFixed(2) - (dymoney1.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
+        self.dymoney = (getGas.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4) - (dymoney1.data.chargenum - 0).toFixed(self.row.f_fee_decimal || 4)
         self.model.f_pregas = Math.floor(getGas.data.gas - 0)
       }
     }

package/src/filiale/yangchun/CardList.vue

@@ -163,224 +163,239 @@
   </div>
 </template>
 <script>
-  /**
-   *操作记录信息
-   */
-  import {PagedList} from 'vue-client'
-  import co from 'co'
+/**
+ *操作记录信息
+ */
+import {PagedList} from 'vue-client'
+import co from 'co'
 
-  let cancelGen = function *(self, data) {
-    let msgRet = yield self.$showMessage('撤销后数据不可恢复，确认撤销录入吗？', ['confirm', 'cancel'])
-    if (msgRet === 'cancel') return
-    // 撤销操作完成，刷新界面
-    self.search()
-  }
+let cancelGen = function* (self, data) {
+  let msgRet = yield self.$showMessage('撤销后数据不可恢复，确认撤销录入吗？', ['confirm', 'cancel'])
+  if (msgRet === 'cancel') return
+  // 撤销操作完成，刷新界面
+  self.search()
+}
 
-  /**
-   * 发票补打
-   */
-  let reprintGen = async function (self, row) {
-    try {
-      row.billUrl = self.getBillUrl(row)
-      if (!row.billUrl) {
-        self.$showMessage('当前操作类型暂时没有票据')
-        return
-      }
-      row.f_bill_type = row.type
-      row.f_bill_style = '普通收据'
-      row.f_operator = self.$login.f.name
-      row.f_operatorid = self.$login.f.id
-      row.f_orgid = self.$login.f.orgid
-      row.f_orgname = self.$login.f.orgs
-      row.f_depid = self.$login.f.depids
-      row.f_depname = self.$login.f.deps
-      self.reissue_data = JSON.parse(JSON.stringify(row))
-      if (row.type === '调价预存') {
-        let id = await self.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
-          data: {
-            items: 'f_surplus_id',
-            tablename: 't_sellinggas',
-            condition: `id = '${row.id}'`,
-            orderitem: 'id'
-          }
-        }, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
-        self.reissue_data.id = id.data[0].f_surplus_id
-      }
-      self.reissue_show = true
-    } catch (error) {
-      if (error.status) {
-        self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
-      }
-      throw error
+/**
+ * 发票补打
+ */
+let reprintGen = async function (self, row) {
+  try {
+    row.billUrl = self.getBillUrl(row)
+    if (!row.billUrl) {
+      self.$showMessage('当前操作类型暂时没有票据')
+      return
     }
+    row.f_bill_type = row.type
+    row.f_bill_style = '普通收据'
+    row.f_operator = self.$login.f.name
+    row.f_operatorid = self.$login.f.id
+    row.f_orgid = self.$login.f.orgid
+    row.f_orgname = self.$login.f.orgs
+    row.f_depid = self.$login.f.depids
+    row.f_depname = self.$login.f.deps
+    self.reissue_data = JSON.parse(JSON.stringify(row))
+    if (row.type === '调价预存') {
+      let id = await self.$resetpost('api/af-revenue/sql/singleTable_OrderBy', {
+        data: {
+          items: 'f_surplus_id',
+          tablename: 't_sellinggas',
+          condition: `id = '${row.id}'`,
+          orderitem: 'id'
+        }
+      }, {resolveMsg: null, rejectMsg: '查询优惠信息失败'})
+      self.reissue_data.id = id.data[0].f_surplus_id
+    }
+    self.reissue_show = true
+  } catch (error) {
+    if (error.status) {
+      self.$warn(`加载数据出错, ${JSON.stringify(error)}`, 'CardList')
+    }
+    throw error
   }
-  let asyncCardList = async function (self) {
-    await self.$getConfig(self, 'CardList')
-    console.log('操作汇总config', self.config)
-  }
-  export default {
-    title: '操作汇总',
-    data () {
-      return {
-        config: {
-          cancleother: true,  // 默认可以撤销别人的操作
-          cancletime: true  // 默认可以冲正今天以前的操作
-        },
-        model: new PagedList(`${this.sqlurl}`, 9999,
-          {
-            items: '"' + this.items + '"',
-            tablename: '"' + this.tablename + '"',
-            orderitem: '"' + this.orderitem + '"'
-          }),
-        show: false,
-        asideTitle: '用户操作',
-        row: Object,
-        comp: null,
-        operationtypes: this.$appdata.getParam('操作类型') ? [{
-          label: '全部',
-          value: ''
-        }, ...this.$appdata.getParam('操作类型')] : [],
+}
+let asyncCardList = async function (self) {
+  await self.$getConfig(self, 'CardList')
+  console.log('操作汇总config', self.config)
+}
+export default {
+  title: '操作汇总',
+  data() {
+    return {
+      config: {
+        cancleother: true,  // 默认可以撤销别人的操作
+        cancletime: true  // 默认可以冲正今天以前的操作
+      },
+      model: new PagedList(`${this.sqlurl}`, 9999,
+        {
+          items: '"' + this.items + '"',
+          tablename: '"' + this.tablename + '"',
+          orderitem: '"' + this.orderitem + '"'
+        }),
+      show: false,
+      asideTitle: '用户操作',
+      row: Object,
+      comp: null,
+      operationtypes: this.$appdata.getParam('操作类型') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('操作类型')] : [],
 
-        cancel_show: false,
-        cancel_data: null,
-        criteriaShow: false,
-        reissue_show: false,
-        reissue_data: null,
-        authArr: this.$login.r ? this.$login.r : []
+      cancel_show: false,
+      cancel_data: null,
+      criteriaShow: false,
+      reissue_show: false,
+      reissue_data: null,
+      authArr: this.$login.r ? this.$login.r : []
+    }
+  },
+  props: {
+    sqlurl: {
+      type: String,
+      default: 'api/af-revenue/sql/getRecord'
+    },
+    items: {
+      type: String,
+      default: '*'
+    },
+    tablename: {
+      type: String,
+      default: 't_record'
+    },
+    orderitem: {
+      type: String,
+      default: 'f_operate_date desc'
+    },
+    btns: {
+      type: Array
+    },
+    operationtype: {
+      type: String,
+      default: ''
+    },
+    userinfoid: {},
+    isOperate: {
+      type: Boolean,
+      default: true
+    },
+    f_orgid: ''
+  },
+  ready() {
+    this.$refs.paged.$refs.cri.model.f_operat_type = [this.operationtype]
+    asyncCardList(this)
+    // this.search()
+  },
+  methods: {
+    dateDes(date) {
+      return this.$login.dateDescripte(date)
+    },
+    isToday(dateStr) {
+      const today = this.$login.toStandardDateString()
+      return dateStr && dateStr.startsWith(today)
+    },
+    selected(row) {
+      if (this.row === row) {
+        this.row = null
+      } else {
+        this.row = row
       }
     },
-    props: {
-      sqlurl: {
-        type: String,
-        default: 'api/af-revenue/sql/getRecord'
-      },
-      items: {
-        type: String,
-        default: '*'
-      },
-      tablename: {
-        type: String,
-        default: 't_record'
-      },
-      orderitem: {
-        type: String,
-        default: 'f_operate_date desc'
-      },
-      btns: {
-        type: Array
-      },
-      operationtype: {
-        type: String,
-        default: ''
-      },
-      userinfoid: {},
-      isOperate: {
-        type: Boolean,
-        default: true
-      },
-      f_orgid: ''
+    isSelected(row) {
+      return this.row === row
+    },
+    search() {
+      let condition = '1=1'
+      if (this.f_orgid) {
+        condition += `and (u.f_filialeid in ${this.f_orgid} or g.f_orgid in ${this.f_orgid}) `
+      } else {
+        condition += `and (u.f_filialeid = '${this.$login.f.orgid}' or g.f_orgid ='${this.$login.f.orgid}')`
+      }
+      this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
+        if (a.data.length === 0) {
+          this.model.rows = []
+          this.model.state = '错误'
+          this.model.error = '没有符合条件的记录'
+          return
+        }
+        this.model.state = '正确'
+        this.model.rows = a.data
+      })
     },
-    ready () {
-      this.$refs.paged.$refs.cri.model.f_operat_type = [this.operationtype]
-      asyncCardList(this)
-      // this.search()
+    disEvent(btn) {
+      this.$dispatch(`${btn.eventName}`)
     },
-    methods:{
-      dateDes (date) {
-        return this.$login.dateDescripte(date)
-      },
-      selected (row) {
-        if (this.row === row) {
-          this.row = null
-        } else {
-          this.row = row
+    async operate(title, row) {
+      console.log('撤销的这条数据的信息11111', row)
+      if (title === '撤销') {
+        // 验证是否能撤销
+        let res = await this.$resetpost('api/af-revenue/logic/recordRepealJudge', {data: row}, {
+          resolveMsg: null,
+          rejectMsg: '验证权限错误！！'
+        })
+        if (!res.data.pass) {
+          this.$showMessage(res.data.msg)
+          return
         }
-      },
-      isSelected (row) {
-        return this.row === row
-      },
-      search () {
-        let condition = '1=1'
-        if (this.f_orgid) {
-          condition += `and (u.f_filialeid in ${this.f_orgid} or g.f_orgid in ${this.f_orgid}) `
-        } else {
-          condition += `and (u.f_filialeid = '${this.$login.f.orgid}' or g.f_orgid ='${this.$login.f.orgid}')`
+        if (row.type === '卡表收费') {
+          if (!this.authArr.includes('无卡收费撤销权限')) {
+            this.$showAlert('当前用户没有【无卡收费撤销权限】，请联系管理员获取此权限后再进行该操作！', 'warning', 3000)
+            return
+          }
         }
-        this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
-          if (a.data.length === 0) {
-            this.model.rows = []
-            this.model.state = '错误'
-            this.model.error = '没有符合条件的记录'
+        if (row.type === '物联网收费' || row.type === '卡表赠气' || row.type === '物联网赠费' || row.type === '卡表赠费' || row.type === '物联网赠气') {
+          let table_name = this.$appdata.getSingleValue('新抄表') ? 't_web_handplan' : 't_handplan'
+          let getWebHand = await this.$SqlService.singleTable(table_name, `f_hand_state = '有效' and f_input_date > '${row.f_operate_date}' and f_userfiles_id = '${row.f_userfiles_id}'`)
+          console.log('长度', getWebHand)
+          if (getWebHand.data.length > 0) {
+            this.$showAlert('此次物联网收费之后有结算，不能撤销此纪录', 'warning', 1500)
             return
           }
-          this.model.state = '正确'
-          this.model.rows = a.data
-        })
-      },
-      disEvent (btn) {
-        this.$dispatch(`${btn.eventName}`)
-      },
-      async operate (title, row) {
-        console.log('撤销的这条数据的信息11111', row)
-        if (title === '撤销') {
-          // 验证是否能撤销
-          let res = await this.$resetpost('api/af-revenue/logic/recordRepealJudge', {data: row}, {
+        } else if (row.type === '机表收费') {
+          let getWebHand = await this.$SqlService.singleTable('t_handplan', `f_hand_state = '有效' and f_input_date > '${row.f_operate_date}' and f_whether_pay = '是' and f_userfiles_id = '${row.f_userfiles_id}'`)
+
+          console.log('长度', getWebHand)
+          if (getWebHand.data.length > 0) {
+            this.$showAlert('此次机表收费之后有自动下账，不能撤销此纪录', 'warning', 1500)
+            return
+          }
+          let sql = `select th.*
+                     from t_handplan th
+                            left join t_sellinghand tsh on th.id = tsh.f_hand_id
+                     where th.f_hand_state = '有效'
+                       and th.f_input_date > '${row.f_operate_date}'
+                       and tsh.f_debt_money > 0
+                       and th.f_userfiles_id = '${row.f_userfiles_id}'
+                       and tsh.f_state = '有效'`
+          let getwate = await this.$resetpost('api/af-revenue/logic/sqlquery', {data: {sql: sql}}, {
             resolveMsg: null,
-            rejectMsg: '验证权限错误！！'
+            rejectMsg: '获取记录详情出错！！'
           })
-          if (!res.data.pass) {
-            this.$showMessage(res.data.msg)
+          if (getwate.data.length > 0) {
+            this.$showAlert('此次机表收费之后有自动下账，不能撤销此纪录', 'warning', 1500)
             return
           }
-          if (row.type === '卡表收费') {
-            if (!this.authArr.includes('无卡收费撤销权限')) {
-              this.$showAlert('当前用户没有【无卡收费撤销权限】，请联系管理员获取此权限后再进行该操作！', 'warning', 3000)
-              return
-            }
-          }
-          if (row.type === '物联网收费' || row.type === '卡表赠气' || row.type === '物联网赠费' || row.type === '卡表赠费' || row.type === '物联网赠气') {
-            let table_name = this.$appdata.getSingleValue('新抄表') ? 't_web_handplan' : 't_handplan'
-            let getWebHand = await this.$SqlService.singleTable(table_name, `f_hand_state = '有效' and f_input_date > '${row.f_operate_date}' and f_userfiles_id = '${row.f_userfiles_id}'`)
-            console.log('长度', getWebHand)
-            if (getWebHand.data.length > 0) {
-              this.$showAlert('此次物联网收费之后有结算，不能撤销此纪录', 'warning', 1500)
-              return
-            }
-          } else if (row.type === '机表收费') {
-            let getWebHand = await this.$SqlService.singleTable('t_handplan', `f_hand_state = '有效' and f_input_date > '${row.f_operate_date}' and f_whether_pay = '是' and f_userfiles_id = '${row.f_userfiles_id}'`)
+        }
+        if (this.authArr.includes('冲正权限')) {
+          const isFinance = this.$login.f.rolesnames.includes('财务退款')
+          const isTodayRecord = this.isToday(row.f_operate_date)
+          const isOwnRecord = row.f_operator === this.$login.f.name
 
-            console.log('长度', getWebHand)
-            if (getWebHand.data.length > 0) {
-              this.$showAlert('此次机表收费之后有自动下账，不能撤销此纪录', 'warning', 1500)
-              return
-            }
-            let sql = `select th.*from t_handplan th
-            left join t_sellinghand tsh on th.id=tsh.f_hand_id
-            where th.f_hand_state = '有效' and th.f_input_date > '${row.f_operate_date}' and tsh.f_debt_money>0
-            and  th.f_userfiles_id = '${row.f_userfiles_id}' and tsh.f_state='有效'`
-            let getwate = await this.$resetpost('api/af-revenue/logic/sqlquery', {data: {sql: sql}}, {
-              resolveMsg: null,
-              rejectMsg: '获取记录详情出错！！'
-            })
-            if (getwate.data.length > 0) {
-              this.$showAlert('此次机表收费之后有自动下账，不能撤销此纪录', 'warning', 1500)
-              return
-            }
-          }
-          if (this.authArr.includes('冲正权限')) {
-            const canCancelOther = this.config.cancleother || this.authArr.includes('撤销他人记录') || this.$login.f.rolesnames.includes('财务退款')
-            if (canCancelOther && row.f_operator !== this.$login.f.name) {
+          // 财务角色：可以撤销任何人的任何记录
+          if (isFinance) {
+            // 财务可以做任何撤销操作，无需额外检查
+          } else {
+            // 非财务角色
+            if (isOwnRecord) {
+              // 本人记录：只有当天可以撤销，跨天不允许
+              if (!isTodayRecord) {
+                this.$showAlert('跨天的本人记录只能由财务人员撤销', 'warning', 1500)
+                return
+              }
+            } else {
+              // 他人记录：不允许撤销
               this.$showAlert('不能撤销不是自己进行的操作', 'warning', 1500)
               return
             }
-            const canCancelNonToday = this.config.cancletime || this.$login.f.rolesnames.includes('财务退款')
-            if (!canCancelNonToday) {
-              const todayStart = this.$login.toStandardDateString() + ' 00:00:00'
-              if (row.f_operate_date < todayStart) {
-                this.$showAlert('不能撤销不是当天的操作', 'warning', 1500)
-                return
-              }
-            // }
           }
         } else {
           this.$showAlert('当前用户没有【冲正权限】', 'warning', 1500)
@@ -388,169 +403,169 @@
         }
       }
 
-        if (title === '撤销') {
-          this.cancel_show = true
-          this.cancel_data = row
+      if (title === '撤销') {
+        this.cancel_show = true
+        this.cancel_data = row
+      } else {
+        let reprint = reprintGen(this, row)
+        return co(reprint)
+      }
+    },
+    cancelOper() {
+      this.cancel_data = null
+      this.cancel_show = false
+    },
+    cancelSucc() {
+      console.log('-----------------------------撤销成功了，隐藏掉')
+      this.cancel_show = false
+      this.$dispatch('refresh')
+    },
+    reissueOper() {
+      this.reissue_data = null
+      this.reissue_show = false
+    },
+    reissueSucc() {
+      this.reissue_show = false
+      this.$dispatch('refresh')
+    },
+
+    getBillUrl(row) {
+      let type = row.type
+      let name = ''
+      // 根据type数据 选择调用的Logic
+      if (type === '过户') {
+        name = 'api/af-revenue/report/transfer_bill'
+      } else if (type === '换新表' || type === '气表清零') {
+        name = 'api/af-revenue/report/change_meter'
+      } else if (type === '机表收费' || type === '机表收费撤销') {
+        if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
+          name = 'api/af-revenue/report/fmy_machine_bill'
         } else {
-          let reprint = reprintGen(this, row)
-          return co(reprint)
+          name = 'api/af-revenue/report/machine_bill'
         }
-      },
-      cancelOper () {
-        this.cancel_data = null
-        this.cancel_show = false
-      },
-      cancelSucc () {
-        console.log('-----------------------------撤销成功了，隐藏掉')
-        this.cancel_show = false
-        this.$dispatch('refresh')
-      },
-      reissueOper () {
-        this.reissue_data = null
-        this.reissue_show = false
-      },
-      reissueSucc () {
-        this.reissue_show = false
-        this.$dispatch('refresh')
-      },
-
-      getBillUrl (row) {
-        let type = row.type
-        let name = ''
-        // 根据type数据 选择调用的Logic
-        if (type === '过户') {
-          name = 'api/af-revenue/report/transfer_bill'
-        } else if (type === '换新表' || type === '气表清零') {
-          name = 'api/af-revenue/report/change_meter'
-        } else if (type === '机表收费' || type === '机表收费撤销') {
-          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
-            name = 'api/af-revenue/report/fmy_machine_bill'
-          } else {
-            name = 'api/af-revenue/report/machine_bill'
-          }
-        } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户' || type === '物联网赠气') {
-          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
-            name = 'api/af-revenue/report/fmy_iot_bill'
-          } else {
-            name = 'api/af-revenue/report/iot_bill'
-          }
-        } else if (type === '物联网补费' || type === '物联网扣费' || type === '物联网补气' || type === '物联网扣气' || type === '机表补费' || type === '机表扣费') {
-          name = 'api/af-revenue/report/MakeUp'
-        } else if (type === '超用收费') {
-          name = 'api/af-revenue/report/overuse_bill'
-        } else if (type === '超用收费') {
-          name = 'api/af-revenue/report/gascharge_bill'
-        } else if (type === '其他收费' || type === '其他收费撤销' || type === '维修收费') {
-          name = 'api/af-revenue/report/otherCharge_bill'
-        } else if (type === '补卡') {
-          name = 'api/af-revenue/report/replace_sell'
-        } else if (type === '发卡售气') {
-          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
-            name = 'api/af-revenue/report/fmy_sendCard_bill'
-          } else {
-            if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
-              name = 'api/af-revenue/report/fee_sendCard_bill'
-            } else {
-              name = 'api/af-revenue/report/sendCard_bill'
-            }
-          }
-        } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表赠气' || type === '卡表收费撤销') {
-          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
-            name = 'api/af-revenue/report/fmy_card_bill'
+      } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户' || type === '物联网赠气') {
+        if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
+          name = 'api/af-revenue/report/fmy_iot_bill'
+        } else {
+          name = 'api/af-revenue/report/iot_bill'
+        }
+      } else if (type === '物联网补费' || type === '物联网扣费' || type === '物联网补气' || type === '物联网扣气' || type === '机表补费' || type === '机表扣费') {
+        name = 'api/af-revenue/report/MakeUp'
+      } else if (type === '超用收费') {
+        name = 'api/af-revenue/report/overuse_bill'
+      } else if (type === '超用收费') {
+        name = 'api/af-revenue/report/gascharge_bill'
+      } else if (type === '其他收费' || type === '其他收费撤销' || type === '维修收费') {
+        name = 'api/af-revenue/report/otherCharge_bill'
+      } else if (type === '补卡') {
+        name = 'api/af-revenue/report/replace_sell'
+      } else if (type === '发卡售气') {
+        if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
+          name = 'api/af-revenue/report/fmy_sendCard_bill'
+        } else {
+          if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
+            name = 'api/af-revenue/report/fee_sendCard_bill'
           } else {
-            if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
-              name = 'api/af-revenue/report/fee_card_bill'
-            } else {
-              name = 'api/af-revenue/report/card_bill'
-            }
+            name = 'api/af-revenue/report/sendCard_bill'
           }
-        } else if (type === '预存缴费') {
-          name = 'api/af-revenue/report/pre_sell'
-        } else if (type === '加成气费收费') {
-          name = 'api/af-revenue/report/gascharge_bill'
-        } else if (type === '调价预存') {
-          name = 'api/af-revenue/report/refund_sell'
-        } else if (type === '退费') {
-          name = 'api/af-revenue/report/refund_sell'
-        } else if (type === '调价补费') {
-          name = 'api/af-revenue/report/compensation_bill'
-        } else if (type === '数码表收费') {
-          name = 'api/af-revenue/report/digtial_bill'
-        } else if (type === '气损收费' || type === '气损收费撤销') {
-          name = 'api/af-revenue/report/gasloss_bill'
-        } else if (type === '掉气补气') {
-          name = 'api/af-revenue/report/acceptOffGasAddGas_bill'
-        } else if (type === '其他补气') {
-          name = 'api/af-revenue/report/acceptOtherGas_bill'
-        } else if (type === '清零补气' || type === '换表补气') {
-          if (row.f_meter_classify.indexOf('卡表') > -1) {
-            name = 'api/af-revenue/report/card_gas_bill'
+        }
+      } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表赠气' || type === '卡表收费撤销') {
+        if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
+          name = 'api/af-revenue/report/fmy_card_bill'
+        } else {
+          if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
+            name = 'api/af-revenue/report/fee_card_bill'
           } else {
-            name = 'api/af-revenue/report/iot_sell'
+            name = 'api/af-revenue/report/card_bill'
           }
-        } else if (type === '垃圾费收费') {
-          name = 'api/af-revenue/report/garbageChargeReport'
         }
-        return name
-      },
-      // 撤销为统一操作，所以写到基础组件中
-      operateCancel (row) {
-        let cancel = cancelGen(this, row)
-        co(cancel)
-      },
-      selfSearch (args) {
-        // if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
-        //   args.condition += `and f_filialeids = '${this.$login.f.f_orgids}'`
-        // }
-        if (this.f_orgid) {
-          args.condition += `and r.f_orgid in ${this.f_orgid}`
+      } else if (type === '预存缴费') {
+        name = 'api/af-revenue/report/pre_sell'
+      } else if (type === '加成气费收费') {
+        name = 'api/af-revenue/report/gascharge_bill'
+      } else if (type === '调价预存') {
+        name = 'api/af-revenue/report/refund_sell'
+      } else if (type === '退费') {
+        name = 'api/af-revenue/report/refund_sell'
+      } else if (type === '调价补费') {
+        name = 'api/af-revenue/report/compensation_bill'
+      } else if (type === '数码表收费') {
+        name = 'api/af-revenue/report/digtial_bill'
+      } else if (type === '气损收费' || type === '气损收费撤销') {
+        name = 'api/af-revenue/report/gasloss_bill'
+      } else if (type === '掉气补气') {
+        name = 'api/af-revenue/report/acceptOffGasAddGas_bill'
+      } else if (type === '其他补气') {
+        name = 'api/af-revenue/report/acceptOtherGas_bill'
+      } else if (type === '清零补气' || type === '换表补气') {
+        if (row.f_meter_classify.indexOf('卡表') > -1) {
+          name = 'api/af-revenue/report/card_gas_bill'
         } else {
-          args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
+          name = 'api/af-revenue/report/iot_sell'
         }
-        if (this.authArr.includes('操作记录查询限定')) {
-          args.condition += ` and r.f_operatorid = '${this.$login.f.id}'`
-        }
-        this.model.search(args.condition, args.model)
+      } else if (type === '垃圾费收费') {
+        name = 'api/af-revenue/report/garbageChargeReport'
       }
+      return name
+    },
+    // 撤销为统一操作，所以写到基础组件中
+    operateCancel(row) {
+      let cancel = cancelGen(this, row)
+      co(cancel)
     },
-    watch: {
-      // 'userinfoid' (newVal) {
-      //   this.model.rows={}
-      //   if (newVal && newVal !== '') {
-      //     this.$nextTick(function () {
-      //       this.$refs.paged.$refs.cri.model.f_userinfo_code = newVal
-      //     }.bind(this))
-      //   }else{
-      //     this.$nextTick(function () {
-      //       this.$refs.paged.$refs.cri.model.f_userinfo_code = ""
-      //     }.bind(this))
-      //   }
-      //   this.$refs.paged.$refs.cri.model.f_operat_type = ''
+    selfSearch(args) {
+      // if (!this.$login.f.parent.parent.name.includes('统一资源管理')) {
+      //   args.condition += `and f_filialeids = '${this.$login.f.f_orgids}'`
       // }
-      'userinfoid' (newVal) {
-        if (newVal && newVal !== '') {
-          this.$nextTick(function () {
-            this.$refs.paged.$refs.cri.model.f_userinfo_code = newVal
-          }.bind(this))
-          this.$refs.paged.$refs.cri.model.f_operat_type = ''
-          let condition = `f_userinfo_code = '${newVal}' and u.f_filialeid = '${this.$login.f.orgid}'`
-          this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
-            if (a.data.length === 0) {
-              this.model.rows = []
-              this.model.state = '错误'
-              this.model.error = '没有符合条件的记录'
-              return
-            }
-            this.model.state = '正确'
-            this.model.rows = a.data
-          })
-        } else {
-          this.model.rows = {}
-          this.$nextTick(function () {
-            this.$refs.paged.$refs.cri.model.f_userinfo_code = ''
-          }.bind(this))
-        }
+      if (this.f_orgid) {
+        args.condition += `and r.f_orgid in ${this.f_orgid}`
+      } else {
+        args.condition += `and r.f_orgid = '${this.$login.f.orgid}'`
+      }
+      if (this.authArr.includes('操作记录查询限定')) {
+        args.condition += ` and r.f_operatorid = '${this.$login.f.id}'`
+      }
+      this.model.search(args.condition, args.model)
+    }
+  },
+  watch: {
+    // 'userinfoid' (newVal) {
+    //   this.model.rows={}
+    //   if (newVal && newVal !== '') {
+    //     this.$nextTick(function () {
+    //       this.$refs.paged.$refs.cri.model.f_userinfo_code = newVal
+    //     }.bind(this))
+    //   }else{
+    //     this.$nextTick(function () {
+    //       this.$refs.paged.$refs.cri.model.f_userinfo_code = ""
+    //     }.bind(this))
+    //   }
+    //   this.$refs.paged.$refs.cri.model.f_operat_type = ''
+    // }
+    'userinfoid'(newVal) {
+      if (newVal && newVal !== '') {
+        this.$nextTick(function () {
+          this.$refs.paged.$refs.cri.model.f_userinfo_code = newVal
+        }.bind(this))
+        this.$refs.paged.$refs.cri.model.f_operat_type = ''
+        let condition = `f_userinfo_code = '${newVal}' and u.f_filialeid = '${this.$login.f.orgid}'`
+        this.$refs.pv.load(this.sqlurl, {data: {condition: condition}}).then((a) => {
+          if (a.data.length === 0) {
+            this.model.rows = []
+            this.model.state = '错误'
+            this.model.error = '没有符合条件的记录'
+            return
+          }
+          this.model.state = '正确'
+          this.model.rows = a.data
+        })
+      } else {
+        this.model.rows = {}
+        this.$nextTick(function () {
+          this.$refs.paged.$refs.cri.model.f_userinfo_code = ''
+        }.bind(this))
       }
     }
   }
+}
 </script>

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Thu Jul 02 11:05:57 CST 2026
-gradle.version=5.2.1