sale-client 3.6.543 → 3.6.545

package/build/dev-server.js

@@ -45,6 +45,9 @@ var devConfig = {
         target: localUrl
       },
       '/invoice': {
+        // pathRewrite: {
+        //   '/invoice/rs/logic': '/logic'
+        // },
         target: serverRul
       },
       '/rs/batchSettlement': {

package/package.json

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

package/src/components/revenue/Common/reportPrintThermal.vue

@@ -117,8 +117,6 @@ export default {
 
     // 使用原生方式打印 - 简化版本，专注于表格格式控制
     printWithNative (content, selectPrinter) {
-      console.log('使用原生方式打印 - 资江58热敏打印机格式优化版')
-
       try {
         // 创建一个新的打印窗口
         var printWindow = window.open('', '_blank', 'height=600,width=800')
@@ -178,8 +176,6 @@ export default {
         // 关闭文档流
         printWindow.document.close()
 
-        console.log('简化版打印内容准备完成')
-
         // 等待内容完全加载后打印
         setTimeout(function () {
           try {
@@ -282,7 +278,7 @@ export default {
             if (cellText && cellText.length > 2) {
               // 不再使用零宽空格方法，而是采用直接处理原始内容
               // 确保每个中文字符作为一个整体
-              var processedContent = this.processChinese(cellText)
+              var processedContent = this.processChinese(cellText, cell)
 
               // 仅在没有HTML内容时应用文本替换
               if (cell.innerHTML === cellText) {
@@ -298,19 +294,6 @@ export default {
               cell.style.width = ratio + '%'
               // 使用更保守的最大宽度计算以防止溢出
               cell.style.maxWidth = (origWidth * 0.9) + 'px'
-
-              // 对宽度较大的单元格添加额外的换行辅助
-              if (origWidth > 40) {
-                cell.style.wordBreak = 'normal'
-                cell.style.wordWrap = 'normal'
-                cell.style.whiteSpace = 'pre-wrap'
-
-                // 添加内部空格辅助换行，但使用改进的处理方法
-                if (cell.innerHTML === cellText && cellText.length > 3) {
-                  var processedLongContent = this.processChinese(cellText)
-                  cell.textContent = processedLongContent
-                }
-              }
             }
 
             // 减小单元格高度，但保证有足够高度显示多行内容
@@ -341,74 +324,8 @@ export default {
               cell.style.textAlign = 'left'
             }
 
-            // 处理字体大小 - 添加内联CSS样式，确保在任何环境中都生效
-            var classNames = cell.className.split(' ')
-            var hasFontSize = false
-            var fontSizeClass = ''
-
-            for (var j = 0; j < classNames.length; j++) {
-              var className = classNames[j]
-              if (className.indexOf('fs') === 0) {
-                hasFontSize = true
-                fontSizeClass = className
-                var sizeNum = parseInt(className.substring(2))
-                if (!isNaN(sizeNum)) {
-                  // 根据fs类名映射到适当的pt大小
-                  switch (sizeNum) {
-                    case 9:
-                      cell.style.fontSize = '5pt'
-                      break
-                    case 10:
-                      cell.style.fontSize = '5.5pt'
-                      break
-                    case 11:
-                      cell.style.fontSize = '6pt'
-                      break
-                    case 12:
-                      cell.style.fontSize = '6.5pt'
-                      break
-                    case 13:
-                      cell.style.fontSize = '6.8pt'
-                      break
-                    case 14:
-                      cell.style.fontSize = '7.3pt'
-                      break
-                    case 15:
-                      cell.style.fontSize = '7.8pt'
-                      break
-                    case 16:
-                      cell.style.fontSize = '8.3pt'
-                      break
-                    case 17:
-                      cell.style.fontSize = '8.8pt'
-                      break
-                    case 18:
-                      cell.style.fontSize = '9.3pt'
-                      break
-                    default:
-                      if (sizeNum < 9) {
-                        cell.style.fontSize = '5pt'
-                      } else if (sizeNum > 18) {
-                        cell.style.fontSize = '9.3pt'
-                      }
-                  }
-                }
-              }
-            }
-
-            // 如果没有找到字体大小类，应用默认字体大小
-            if (!hasFontSize) {
-              cell.style.fontSize = '6.8pt'
-            } else {
-              // 增强字体大小应用方式 - 通过属性确保CSS优先级
-              cell.setAttribute('data-fontsize', fontSizeClass)
-              // 设置行内样式中的!important
-              var currentStyle = cell.getAttribute('style') || ''
-              if (!currentStyle.includes('!important')) {
-                cell.setAttribute('style', currentStyle.replace(/font-size:[^;]+;/, 'font-size:' + cell.style.fontSize + ' !important;'))
-              }
-            }
-
+            // 设置字体大小
+            cell.style.fontSize = this.getFontSize(cell)
             // 检查是否有粗体类
             var isBold = cell.className.indexOf('b') !== -1
 
@@ -417,7 +334,6 @@ export default {
             cell.style.fontWeight = isBold ? '500' : '350'
             cell.style.color = '#000'
             cell.style.padding = '0 1px'  // 添加一点点左右内边距，防止文字紧贴边缘
-
             // 为每个单元格添加唯一标识符
             var cellId = 'cell_' + i + '_' + r + '_' + c3
             cell.id = cellId
@@ -496,16 +412,60 @@ export default {
       console.log('表单数据刷新完成')
     },
 
+    // 获取元素的实际字体大小（以pt为单位）
+    getFontSize (element) {
+      var fontSize = '6.8pt' // 默认字体大小
+      var classNames = element.className.split(' ')
+      for (var i = 0; i < classNames.length; i++) {
+        var className = classNames[i]
+        if (className.indexOf('fs') === 0) {
+          var sizeNum = parseInt(className.substring(2))
+          if (!isNaN(sizeNum)) {
+            switch (sizeNum) {
+              case 9: return '5pt'
+              case 10: return '5.5pt'
+              case 11: return '6pt'
+              case 12: return '6.5pt'
+              case 13: return '6.8pt'
+              case 14: return '7.3pt'
+              case 15: return '7.8pt'
+              case 16: return '8.3pt'
+              case 17: return '8.8pt'
+              case 18: return '9.3pt'
+              default:
+                if (sizeNum < 9) return '5pt'
+                if (sizeNum > 18) return '9.3pt'
+            }
+          }
+        }
+      }
+      return fontSize
+    },
+
     // 添加一个新的方法来处理中文字符，确保它们不被截断
-    processChinese (text) {
+    processChinese (text, cell) {
       if (!text) return text
 
       var result = ''
       var inTag = false
+      var currentWidth = 0
+
+      // 创建一个临时的canvas来测量文本宽度
+      var canvas = document.createElement('canvas')
+      var context = canvas.getContext('2d')
+
+      // 设置canvas字体
+      var fontSize = this.getFontSize(cell)
+      context.font = fontSize + ' "Helvetica Neue", Helvetica, Arial, sans-serif'
+
+      // 获取单元格的实际可用宽度
+      var maxWidth = cell.hasAttribute('width')
+                    ? parseInt(cell.getAttribute('width'))
+                    : 180 // 默认宽度
 
       // 处理字符串，保持HTML标签完整
-      for (var i = 0; i < text.length; i++) {
-        var char = text.charAt(i)
+      for (var j = 0; j < text.length; j++) {
+        var char = text.charAt(j)
 
         // 检查是否在HTML标签内
         if (char === '<') {
@@ -516,30 +476,31 @@ export default {
         result += char
 
         // 如果不在标签内，处理字符
-        if (!inTag && i < text.length - 1) {
-          var nextChar = text.charAt(i + 1)
-
-          // 检查当前字符是否是中文
-          var isCurrChinese = this.isChinese(char)
-
-          // 检查下一个字符是否是中文
-          var isNextChinese = this.isChinese(nextChar)
-
-          // 如果当前是中文并且下一个不是中文，或者当前不是中文但下一个是中文
-          // 在边界处添加特殊空格以提供可能的换行点
-          if ((isCurrChinese && !isNextChinese) || (!isCurrChinese && isNextChinese)) {
-            result += '\u200A' // 窄空格
-          }
-
-          // 每3个中文字符添加窄空格，增加换行机会
-          if (isCurrChinese && (i % 3 === 2)) {
-            result += '\u200A' // 窄空格
+        if (!inTag) {
+          // 使用canvas测量当前字符的实际宽度
+          var charWidth = context.measureText(char).width + 1
+          currentWidth += charWidth
+
+          // 检查是否需要添加换行
+          if (j < text.length - 1) {
+            var nextChar = text.charAt(j + 1)
+
+            // 测量下一个字符的宽度
+            var nextCharWidth = context.measureText(nextChar).width + 1
+
+            // 如果添加下一个字符会超出最大宽度，或者在特定字符类型转换处，添加换行
+            if ((currentWidth + nextCharWidth > maxWidth)) {
+              // 添加换行符
+              result += '\n'
+              currentWidth = 0
+            }
           }
         }
 
         // 如果标签结束
         if (char === '>') {
           inTag = false
+          currentWidth = 0 // 重置宽度计数器
         }
       }
 

package/src/components/webMeter/paramSave/ParamSetForm.vue

@@ -377,19 +377,25 @@ export default {
             items: '*',
             tablename: 't_gasparammanage',
             condition: `f_gasbrand_id= ${this.gasbrandid}`,
-            orderitem: 'id'
+            orderitem: 'id desc'
           }
         }, {resolveMsg: null, rejectMsg: '获取参数历史信息信息失败'})
         if (rat.data.length > 0) {
           rat.data.forEach((item) => {
-            if (item.f_param_value === '1') {
-              item.f_param_value = '开'
-            }
-            if (item.f_param_value === '0') {
-              item.f_param_value = '关'
+            if (!this.param[item.f_param_lname]) {
+              console.log(item.f_param_value, item.f_param_content)
+              if (item.f_param_value != item.f_param_content && item.f_param_content) {
+                item.f_param_value = item.f_param_content
+              }
+              if (item.f_param_value === '1') {
+                item.f_param_value = '开'
+              }
+              if (item.f_param_value === '0') {
+                item.f_param_value = '关'
+              }
+              console.log('参数取出来了---', item.f_param_lname)
+              this.$set(`param['${item.f_param_lname}']`, item.f_param_value)
             }
-            console.log('参数取出来了---', item.f_param_lname)
-            this.$set(`param['${item.f_param_lname}']`, item.f_param_value)
             // this.param[item.f_param_lname] = item.f_param_value
           })
         }

package/src/components/webMeter/paramSaveNew/ParamSetForm.vue

@@ -478,19 +478,25 @@ export default {
           items: '*',
           tablename: 't_gasparammanage',
           condition: `f_gasbrand_id= ${this.gasbrandid}`,
-          orderitem: 'id'
+          orderitem: 'id desc'
         }
       }, {resolveMsg: null, rejectMsg: '获取参数历史信息信息失败'})
       if (rat.data.length > 0) {
         rat.data.forEach((item) => {
-          if (item.f_param_value === '1') {
-            item.f_param_value = '开'
-          }
-          if (item.f_param_value === '0') {
-            item.f_param_value = '关'
+          if (!this.param[item.f_param_lname]) {
+            console.log(item.f_param_value, item.f_param_content)
+            if (item.f_param_value != item.f_param_content) {
+              item.f_param_value = item.f_param_content
+            }
+            if (item.f_param_value === '1') {
+              item.f_param_value = '开'
+            }
+            if (item.f_param_value === '0') {
+              item.f_param_value = '关'
+            }
+            console.log('参数取出来了---', item.f_param_lname)
+            this.$set(`param['${item.f_param_lname}']`, item.f_param_value)
           }
-          console.log('参数取出来了---', item.f_param_lname)
-          this.$set(`param['${item.f_param_lname}']`, item.f_param_value)
           // this.param[item.f_param_lname] = item.f_param_value
         })
       }

package/src/filiale/jingyang/EticketV4/EticketRecordList.vue

@@ -356,11 +356,19 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     resetStatus () {
-      axios.post('/invoice/rs/logic/resetStatus', {}, {
+      console.log('>>> 发票状态重置， 登录信息：', this.$login.f)
+      let condition = ''
+      if (this.$login.f.orgid) {
+        condition = `${condition} and f_orgid = '${this.$login.f.orgid}'`
+      }
+      if (this.$login.f.depids) {
+        condition = `${condition} and f_depid = '${this.$login.f.depids}'`
+      }
+      axios.post('/invoice/rs/logic/resetStatus', { condition: condition }, {
         resolveMsg: null,
         rejectMsg: '发票状态重置失败!'
       }).then(res => {
-        this.$showAlert('2日内因未认证导致开票失败的记录状态已重置！', 'success', 5000)
+        this.$showAlert('本月因未认证导致开票失败的记录状态已重置！', 'success', 5000)
       }).catch(error => {
         this.$showAlert('操作失败！', 'error', 5000)
         console.error('>>> 发票状态重置失败：', error)

package/src/filiale/rongcheng/UserDeviceInfoTest.vue

@@ -161,7 +161,6 @@
         }
       },
       addDevice () {
-        console.log('设备信息', this.devicesinfo)
         const inputDate = this.$login.toStandardTimeString()
         this.devicesinfo.push({
           f_devices_type: '家用灶具',
@@ -171,7 +170,7 @@
       },
       updateExpireDate (device) {
         if (device.f_input_date) {
-          if (device.f_devices_type === '自闭阀') {
+          if (device.f_devices_type === '自闭阀' || device.f_devices_type === '切断阀') {
             const inputDate = new Date(device.f_input_date)
             const expireDate = new Date(inputDate)
             expireDate.setFullYear(expireDate.getFullYear() + 10)
@@ -190,6 +189,25 @@
             }
             device.f_expire_date = formatDate(expireDate)
           }
+          if (device.f_devices_type === '报警器') {
+            const inputDate = new Date(device.f_input_date)
+            const expireDate = new Date(inputDate)
+            expireDate.setFullYear(expireDate.getFullYear() + 5)
+            const now = new Date()
+            expireDate.setHours(now.getHours())
+            expireDate.setMinutes(now.getMinutes())
+            expireDate.setSeconds(now.getSeconds())
+            const formatDate = (date) => {
+              const year = date.getFullYear()
+              const month = String(date.getMonth() + 1).padStart(2, '0')
+              const day = String(date.getDate()).padStart(2, '0')
+              const hours = String(date.getHours()).padStart(2, '0')
+              const minutes = String(date.getMinutes()).padStart(2, '0')
+              const seconds = String(date.getSeconds()).padStart(2, '0')
+              return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+            }
+            device.f_expire_date = formatDate(expireDate)
+          }
         }
       }
     },

package/src/filiale/wuhai/CardList.vue

@@ -0,0 +1,609 @@
+<template>
+  <div @keyup.enter="search">
+    <partial-view v-ref:pv>
+      <criteria-paged :model="model" :pager="false" v-ref:paged>
+        <criteria @condition-changed='$parent.$parent.selfSearch' partial='criteria' v-ref:cri>
+          <div class="form-horizontal" novalidate partial>
+            <div class="row">
+              <div class="form-group col-sm-4">
+                <!-- <label>用户编号:</label> -->
+                <input class="input_search" condition="f_userinfo_code = '{}'" placeholder='客户编号' style="width: 80%"
+                       type="text"
+                       v-model="model.f_userinfo_code">
+              </div>
+              <div class="form-group  col-sm-4" style="flex: 1;width: max-content">
+                <!-- <label>操作类型:</label> -->
+                <v-select :options='$parent.$parent.$parent.operationtypes'
+
+                          :value.sync="model.f_operat_type"
+                          :width="'100%'"
+                          close-on-select
+                          condition="f_operat_type = '{}'"
+                          id="f_paytype"
+                          placeholder='操作类型'
+                          style="width: 100%"
+                          v-model="model.f_operat_type"></v-select>
+              </div>
+              <div class="form-group col-sm-2 button-range" style="padding-right: 10px">
+                <button @click="search()" class="button_search">查询</button>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.$parent.criteriaShow=!$parent.$parent.$parent.criteriaShow" class="button_spacing" style="float: right"></div>
+              </div>
+              <div class="form-group col-sm-5" v-show="$parent.$parent.$parent.criteriaShow">
+                <!-- <label>用户编号:</label> -->
+                <input class="input_search" condition="r.f_operator like '%{}%'" placeholder='操作员' style="width: 80%"
+                       type="text"
+                       v-model="model.f_operator">
+              </div>
+            </div>
+            <!-- <partial name="cardcriteria"></partial> -->
+            <!-- <div class="form-group">
+              <partial name="cardcriteria"></partial>
+            </div> -->
+          </div>
+        </criteria>
+        <div partial="list" style="overflow-y: scroll;height: 90%">
+          <accordion :one-at-atime="true" type="info"  >
+            <panel :is-click="false" :is-open="true" type="info" v-for="row in model.rows" >
+            <span @click="$parent.$parent.$parent.selected(row)" class="panel-title row" slot="header"
+                  style="cursor: pointer;">
+              <div class="col-sm-11">
+<!--                <div class="row"  v-if="row.f_state==='冲正' " style="color: red">-->
+<!--                  <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>-->
+<!--                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>-->
+<!--                  <span class="col-sm-4">{{row.type}}</span>-->
+<!--                </div>-->
+                <div class="row">
+                  <strong :title="row.f_userinfo_code" class="col-sm-4" show-overflow-tooltip="true">{{row.f_userinfo_code.length>9?''+row.f_userinfo_code.substring(0,9)+'...':row.f_userinfo_code}}</strong>
+                  <span class="col-sm-4">{{$parent.$parent.$parent.dateDes(row.f_operate_date)}}</span>
+                  <span class="col-sm-4">{{row.type}}</span>
+                </div>
+              </div>
+              <div class="col-sm-1" v-if="$parent.$parent.$parent.isOperate" title="涉及权限:冲正权限">
+                <dropdown class="auto"
+                          v-if="(row.type ==='机表收费撤销' || row.type ==='卡表收费撤销' || row.type ==='物联网收费撤销' || row.type ==='其他收费撤销'
+                          || row.type ==='气损收费撤销' || row.type ==='预存缴费' || row.type === '补卡' || row.type === '物联网收费' ||
+                          row.type === '用户退费' || row.type === '机表收费' || row.type === '数码表收费' ||
+                          row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' ||
+                          row.type === '换表' || row.state === 1 || row.type==='调价补费' || row.type==='卡表赠气' ||
+                          row.type==='物联网赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='卡表赠气'||
+                          row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||
+                          row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ||
+                          row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气'  || row.type === '清零补气' ||
+                          row.type === '换表补气' || row.type === '过户'|| row.type ==='价格补差' || row.type ==='价格补差撤销') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
+                  <button data-toggle="dropdown" style="border: 0px;background: none;" type="button"
+                          v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
+                    <span class="glyphicon glyphicon-th-list"></span>
+                  </button>
+                  <ul class="dropdown-menu dropdown-menu-right" slot="dropdown-menu" style=" min-width: 60px;" v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
+<!--                    <li-->
+<!--                      v-if="row.type === '换新表' || row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气'  || row.type === '清零补气' || row.type === '换表补气'-->
+<!--                      || row.type === '补卡' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '用户退费' || row.type === '机表收费' ||  row.type === '数码表收费' || row.type === '卡表收费' || row.type === '超用收费' || row.type === '发卡售气' || row.type === '其他收费' || row.type === '换表' || row.type === '过户'|| row.type==='预存缴费'|| row.type==='退费'|| row.type==='调价补费'  ||row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ">-->
+<!--                      <a @click.stop="$parent.$parent.$parent.operate('票据补打', row)" href="#">票据补打</a>-->
+<!--                    </li>-->
+<!--                    <li-->
+<!--                      v-if="row.state === 1 && (row.type === '其他收费欠费登记' || row.type === '迁表' || row.type === '调价预存' || row.type === '拆表' || row.type === '物联网开户' || row.type === '物联网收费'|| row.type === '卡表收费' || row.type === '其他收费'|| row.type === '气费减免'||row.type === '维修收费' || row.type === '过户' || row.type === '换新表' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '其他收费' || row.type === '补卡'|| row.type === '调价补费'|| row.type=='预存缴费' || row.type==='卡表赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='物联网赠气')">-->
+<!--                      <a @click.stop="$parent.$parent.$parent.operate('撤销', row)" href="#">撤销</a>-->
+<!--                    </li>-->
+                    <li>
+                      <a @click.stop="$parent.$parent.$parent.operate('票据补打', row)" href="#">票据补打</a>
+                    </li>
+                    <li>
+                      <a @click.stop="$parent.$parent.$parent.operate('热敏收据补打', row)" href="#">热敏收据补打</a>
+                    </li>
+                    <li>
+                      <a @click.stop="$parent.$parent.$parent.operate('撤销', row)" href="#">撤销</a>
+                    </li>
+                  </ul>
+                </dropdown>
+              </div>
+
+            </span>
+              <div class="panel-body" v-if="$parent.$parent.$parent.isSelected(row)">
+                <salecardgas-detail :data="row" v-if="row.type === '发卡售气'"></salecardgas-detail>
+                <movemeter-detail :data="row" v-if="row.type === '迁表'"></movemeter-detail>
+                <salecardgas-detail :data="row" v-if="row.type === '换表发卡'"></salecardgas-detail>
+                <cardmetercenter-detail :data="row" v-if="row.type === '卡表收费'||row.type === '数码表收费' "></cardmetercenter-detail>
+                <movegas-detail :data="row" v-if="row.type === '转气转出'"></movegas-detail>
+                <movegas-detail :data="row" v-if="row.type === '转气转入'"></movegas-detail>
+                <machinemetercenter-detail :data="row" v-if="row.type === '机表收费'"></machinemetercenter-detail>
+                <autoaccounts-detail :data="row" v-if="row.type === '自动下账'"></autoaccounts-detail>
+                <bankdk-detail :data="row" v-if="row.type === '银行代扣'"></bankdk-detail>
+                <bank-pay :data="row" v-if="row.type === '银行支付'"></bank-pay>
+                <wechat-pay :data="row" v-if="row.type === '微信支付'"></wechat-pay>
+                <disablemanage-detail :data="row" v-if="row.type === '停用'"></disablemanage-detail>
+                <enablemanage-detail :data="row" v-if="row.type === '启用'"></enablemanage-detail>
+                <replacecardmanage-detail :data="row" v-if="row.type === '补卡'"></replacecardmanage-detail>
+                <machinecard-detail :data="row" v-if="row.type === '机表补卡'"></machinecard-detail>
+                <transfermanage-detail :data="row" v-if="row.type === '过户'"></transfermanage-detail>
+                <othercharge-detail :data="row" v-if="row.type === '其他收费欠费登记'||row.type === '其他收费'||row.type === '维修收费'"></othercharge-detail>
+                <inputtorchange-detail :data="row" v-if="row.type === '抄表员变更'"></inputtorchange-detail>
+                <offgasaddgas-detail :data="row" v-if=" row.type === '换表补气' || row.type === '批量换表补气' || row.type === '其他补气' || row.type === '清零补气' || row.type === '掉气补气'||row.type==='物联网补费'||row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气' " ></offgasaddgas-detail>
+                <iotopen-detail :data="row" v-if="row.type === '开通'"></iotopen-detail>
+                <iotmetercenter-detail :data="row" v-if="row.type === '物联网收费' || row.type === '物联网开户' || row.type === '调价退费' || row.type === '调价补费'||row.type === '退押金'  "></iotmetercenter-detail>
+                <overuserchange-detail :data="row" v-if="row.type === '超用收费'"></overuserchange-detail>
+                <adduser-detail :data="row" v-if="row.type === '新增户档案'"></adduser-detail>
+                <gaspricechange-detail :data="row" v-if="row.type === '气价变更'"></gaspricechange-detail>
+                <userchange-detail :data="row" v-if="row.type === '档案变更'"></userchange-detail>
+                <changemeter-detail :data="row" v-if="row.type === '换新表' || row.type === '批量换表' || row.type === '气表清零'"></changemeter-detail>
+                <changeflowmeter-detail :data="row" v-if="row.type === '换卡控流量计'"></changeflowmeter-detail>
+                <cardoveruser-detail :data="row" v-if="row.type === '卡表超用'||row.type === '超用'"></cardoveruser-detail>
+                <cancellation-detail :data="row" v-if="row.type === '销户'"></cancellation-detail>
+                <refund-detail :data="row" v-if="row.type === '退费' || row.type == '卡表退费'"></refund-detail>
+
+                <change-meter-cancel :data="row" v-if="row.type === '换表撤销'"></change-meter-cancel>
+                <autoaccounts-cancel-detail :data="row" v-if="row.type === '自动下账撤销'"></autoaccounts-cancel-detail>
+                <transfermanage-cancel-detail :data="row" v-if="row.type === '过户撤销'"></transfermanage-cancel-detail>
+                <cardmetercenter-cancel-detail :data="row" v-if="row.type === '卡表收费撤销'"></cardmetercenter-cancel-detail>
+                <machinemetercenter-cancel-detail :data="row" v-if="row.type === '机表收费撤销'"></machinemetercenter-cancel-detail>
+                <machinemetercenter-cancel-detail :data="row" v-if="row.type == '预存缴费撤销'"></machinemetercenter-cancel-detail>
+                <othercharge-cancel-detail :data="row" v-if="row.type === '其他收费撤销'"></othercharge-cancel-detail>
+                <replacecardmanage-cancel-detail :data="row" v-if="row.type === '补卡撤销'"></replacecardmanage-cancel-detail>
+                <iotmetercenter-cancel-detail :data="row" v-if="row.type === '物联网收费撤销'"></iotmetercenter-cancel-detail>
+                <feededuction-detail :data="row" v-if="row.type === '补费' ||row.type === '扣费' ||row.type === '补气' ||row.type === '扣气'  "></feededuction-detail>
+                <with-gas :data="row" v-if="row.type==='物联网赠气' || row.type==='物联网赠费'||row.type==='卡表赠气'||row.type==='卡表赠费'"></with-gas>
+                <replace-card-manageDetail :data="row" v-if=" row.type==='物联网补费'||row.type==='物联网扣费'||row.type==='机表补费'||row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气' "></replace-card-manageDetail>
+                <blacklist-detail :data="row" v-if="row.type ==='拉黑' ||row.type === '取消拉黑' "></blacklist-detail>
+                <advance-delivery-detail :data="row" v-if="row.type ==='卡表预交' "></advance-delivery-detail>
+                <machinemetercenter-detail :data="row" v-if="row.type === '预存缴费'||row.type == '调价预存'"></machinemetercenter-detail>
+                <price-adjustment-detail :data="row" v-if="row.type === '价格补差'"></price-adjustment-detail>
+                <gasloss-detail :data="row" v-if="row.type === '气损收费' || row.type === '气损收费撤销'"></gasloss-detail>
+                <garbage-detail :data="row" v-if="row.type === '垃圾费收费'"></garbage-detail>
+              </div>
+              <div style="margin-top: 8px;background: #FFF;" v-if="!$parent.$parent.$parent.isSelected(row)">
+                <span>{{row.f_describe}}</span>
+              </div>
+            </panel>
+          </accordion>
+        </div>
+
+      </criteria-paged>
+    </partial-view>
+    <record-cancel :data="cancel_data" :show.sync="cancel_show" @cancel="cancelOper()" @cancel-success="cancelSucc()" v-if="cancel_show"></record-cancel>
+    <reissue-bill :data="reissue_data" :show.sync="reissue_show" @cancel="reissueOper()" @reissue-success="reissueSucc()" v-if="reissue_show"></reissue-bill>
+  </div>
+</template>
+<script>
+  /**
+   *操作记录信息
+   */
+  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 reprintGen = async function (self, row, title) {
+    try {
+      row.billUrl = self.getBillUrl(row, title)
+      if (!row.billUrl) {
+        self.$showMessage('当前操作类型暂时没有票据')
+        return
+      }
+      row.f_bill_type = row.type
+      row.f_bill_style = title === '热敏收据补打' ? '热敏收据' : '普通收据'
+      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('rs/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: false,  // 默认可以撤销别人的操作
+          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 : []
+      }
+    },
+    props: {
+      sqlurl: {
+        type: String,
+        default: 'rs/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)
+      },
+      selected (row) {
+        if (this.row === row) {
+          this.row = null
+        } else {
+          this.row = row
+        }
+      },
+      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
+        })
+      },
+      disEvent (btn) {
+        this.$dispatch(`${btn.eventName}`)
+      },
+      async operate (title, row) {
+        console.log('撤销的这条数据的信息', row)
+        if (title === '撤销') {
+          // 验证是否能撤销
+          let res = await this.$resetpost('rs/logic/recordRepealJudge', {data: row}, {
+            resolveMsg: null,
+            rejectMsg: '验证权限错误！！'
+          })
+          if (!res.data.pass) {
+            this.$showMessage(res.data.msg)
+            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}'`)
+
+            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('rs/logic/sqlquery', {data: {sql: sql}}, {
+              resolveMsg: null,
+              rejectMsg: '获取记录详情出错！！'
+            })
+            if (getwate.data.length > 0) {
+              this.$showAlert('此次机表收费之后有自动下账，不能撤销此纪录', 'warning', 1500)
+              return
+            }
+          }
+          if (this.authArr.includes('冲正权限')) {
+            if (this.config.cancleother) {
+              if (row.f_operator != this.$login.f.name) {
+                this.$showAlert('不能撤销不是自己进行的操作', 'warning', 1500)
+                return
+              }
+            }
+            if (this.config.cancletime && !this.$login.f.rolesnames.includes('管理员')) {
+              let a = this.$login.toStandardYearMonth()
+              console.log('当前时间', a < row.f_operate_date)
+              if (!this.authArr.includes('跨月撤销')) {
+                if (row.f_operate_date < a) {
+                  this.$showAlert('不能撤销非本月的记录，请联系管理员获取【跨月撤销】的权限。', 'warning', 1500)
+                  return
+                }
+                a = this.$login.toStandardDateString() + ' 00:00:00'
+                if (row.f_operate_date < a) {
+                  this.$showAlert('不能撤销不是当天的操作', 'warning', 1500)
+                  return
+                }
+              }
+            }
+          } else {
+            this.$showAlert('当前用户没有【冲正权限】', 'warning', 1500)
+            return
+          }
+        }
+
+        if (title === '撤销') {
+          this.cancel_show = true
+          this.cancel_data = row
+        } else {
+          let reprint = reprintGen(this, row, title)
+          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, title) {
+        let type = row.type
+        let name = ''
+        // 根据type数据 选择调用的Logic
+        if (type === '过户') {
+          name = 'rs/report/transfer_bill'
+        } else if (type === '换新表' || type === '气表清零') {
+          name = 'rs/report/change_meter'
+        } else if (type === '机表收费' || type === '机表收费撤销') {
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
+            if (title === '热敏收据补打') {
+              name = 'rs/report/fmy_machine_bill_thermal'
+            } else {
+              name = 'rs/report/fmy_machine_bill'
+            }
+          } else {
+            if (title === '热敏收据补打') {
+              name = 'rs/report/machine_bill_thermal'
+            } else {
+              name = 'rs/report/machine_bill'
+            }
+          }
+        } else if (type === '物联网收费' || type === '物联网收费撤销' || type === '物联网开户') {
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
+            if (title === '热敏收据补打') {
+              name = 'rs/report/fmy_iot_bill_thermal'
+            } else {
+              name = 'rs/report/fmy_iot_bill'
+            }
+          } else {
+            if (title === '热敏收据补打') {
+              name = 'rs/report/iot_bill_thermal'
+            } else {
+              name = 'rs/report/iot_bill'
+            }
+          }
+        } else if (type === '物联网补费' || type === '物联网扣费' || type === '物联网补气' || type === '物联网扣气' || type === '机表补费' || type === '机表扣费') {
+          name = 'rs/report/MakeUp'
+        } else if (type === '超用收费') {
+          if (title === '热敏收据补打') {
+            name = 'rs/report/overuse_bill_thermal'
+          } else {
+            name = 'rs/report/overuse_bill'
+          }
+        } else if (type === '其他收费' || type === '其他收费撤销') {
+          if (title === '热敏收据补打') {
+            name = 'rs/report/otherCharge_bill_thermal'
+          } else {
+            name = 'rs/report/otherCharge_bill'
+          }
+        } else if (type === '补卡') {
+          name = 'rs/report/replace_sell'
+        } else if (type === '发卡售气') {
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
+            if (title === '热敏收据补打') {
+              name = 'rs/report/fmy_sendCard_bill_thermal'
+            } else {
+              name = 'rs/report/fmy_sendCard_bill'
+            }
+          } else {
+            if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
+              name = 'rs/report/fee_sendCard_bill'
+            } else {
+              if (title === '热敏收据补打') {
+                name = 'rs/report/sendCard_bill_thermal'
+              } else {
+                name = 'rs/report/sendCard_bill'
+              }
+            }
+          }
+        } else if (type === '卡表收费' || type === '卡表收费撤销' || type === '卡表收费撤销') {
+          if (row.f_user_type === '非民用' && this.$login.r.includes('非民用纸质票据拆分')) {
+            if (title === '热敏收据补打') {
+              name = 'rs/report/fmy_card_bill_thermal'
+            } else {
+              name = 'rs/report/fmy_card_bill'
+            }
+          } else {
+            if (row.f_meter_classify === '金额卡表' && this.$appdata.getSingleValue('金额气量区分卡表票据')) {
+              name = 'rs/report/fee_card_bill'
+            } else {
+              if (title === '热敏收据补打') {
+                name = 'rs/report/card_bill_thermal'
+              } else {
+                name = 'rs/report/card_bill'
+              }
+            }
+          }
+        } else if (type === '预存缴费') {
+          name = 'rs/report/pre_sell'
+        } else if (type === '调价预存') {
+          name = 'rs/report/refund_sell'
+        } else if (type === '退费') {
+          name = 'rs/report/refund_sell'
+        } else if (type === '调价补费') {
+          name = 'rs/report/compensation_bill'
+        } else if (type === '数码表收费') {
+          name = 'rs/report/digtial_bill'
+        } else if (type === '气损收费' || type === '气损收费撤销') {
+          name = 'rs/report/gasloss_bill'
+        } else if (type === '掉气补气') {
+          name = 'rs/report/acceptOffGasAddGas_bill'
+        } else if (type === '其他补气') {
+          name = 'rs/report/acceptOtherGas_bill'
+        } else if (type === '清零补气' || type === '换表补气' || type === '批量换表补气') {
+          if (row.f_meter_classify.indexOf('卡表') > -1) {
+            name = 'rs/report/card_gas_bill'
+          } else {
+            name = 'rs/report/iot_sell'
+          }
+        } else if (type === '垃圾费收费') {
+          name = 'rs/report/garbageChargeReport'
+        } else if (type === '物联网赠费') {
+          name = 'rs/report/iotGiftFee'
+        } else if (type === '物联网赠气') {
+          name = 'rs/report/iotGiftGas'
+        } else if (type === '卡表赠费') {
+          name = 'rs/report/icGiftFee'
+        } else if (type === '卡表赠气') {
+          name = 'rs/report/icGiftGas'
+        }
+        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 {
+          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/src/filiale/wuhai/ReissueBill.vue

@@ -0,0 +1,306 @@
+<template>
+  <div class="auto">
+    <modal :show.sync="show" v-ref:modal large backdrop="false" style="overflow-y: auto !important;">
+      <header slot="modal-header" class="modal-header" style="text-align: center;">
+        <h4 class="modal-title">{{ data.type }}票据补打</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='reissue-bill'>
+              {{{ bill.data }}}
+            </div>
+            <div class="row" v-if="config.hasBillManage">
+              <div v-if="!messShow">
+                <!--<span><strong>发票号:{{model.f_using_number}}</strong></span>-->
+                <div v-if="model.f_rprint_type === 'new'">
+                  <div class="form-group form-input-group col-sm-4">
+                    <label class="control-label col-sm-2">新票号:</label>
+                    <div class="col-sm-2">
+                      <input type="text" class="form-control col-sm-2" v-model="model.newNumber.number" readonly>
+                    </div>
+                  </div>
+                </div>
+                <div v-if="model.f_rprint_type === 'old'">
+                  <div class="form-group form-input-group col-sm-4">
+                    <label class="control-label col-sm-2">原票号:</label>
+                    <div class="col-sm-2">
+                      <input type="text" class="form-control col-sm-2" v-model="model.oldNumber.number" readonly>
+                    </div>
+                  </div>
+                </div>
+
+              </div>
+            </div>
+            <div class="row" v-if="config.hasBillManage" style="margin-top: 1%">
+              <div class="form-group form-input-group col-sm-4">
+                <label class="col-sm-2 control-label">补打类型:</label>
+                <div class="col-sm-2">
+                  <v-select
+                    v-model="model.f_rprint_type"
+                    placeholder='请选择'
+                    :value.sync="model.f_rprint_type"
+                    :options='rprinttype'
+                    :value-single="true"
+                    :disabled="isOnlyNew"
+                    @change="printTypeChane"
+                    close-on-select clear-button>
+                  </v-select>
+                </div>
+              </div>
+              <div v-if="isOnlyNew">
+
+                <div class="form-group form-input-group col-sm-4"
+                     :class="[$v.billtype.required ? 'has-error' : 'has-success']">
+                  <label class="col-sm-2 control-label">票据类型</label>
+                  <div class="col-sm-2">
+                    <v-select :value.sync="model.f_bill_type"
+                              v-model="model.f_bill_type"
+                              :options='printtypes'
+                              placeholder='请选择'
+                              v-model="model.f_bill_type"
+                              @change="useTypeChange"
+                              :value-single="true"
+                              close-on-select v-ref:billtype>
+                    </v-select>
+                    <input type="text" v-show="false" v-model="$refs.billtype.selectedItems"
+                           v-validate:billtype='{required: true }'>
+                  </div>
+                </div>
+
+                <div class="form-group form-input-group col-sm-4" :class="[$v.usetype.required ? 'select-error' : '']">
+                  <label class="col-sm-2 control-label">使用类型</label>
+                  <div class="col-sm-2">
+                    <v-select :value.sync="model.f_use_type"
+                              v-model="model.f_use_type"
+                              :options='usetypes'
+                              placeholder='请选择'
+                              @change="useTypeChange"
+                              :value-single="true"
+                              close-on-select v-ref:usetype>
+                    </v-select>
+                    <input type="text" v-show="false" v-model="$refs.usetype.selectedItems"
+                           v-validate:usetype='{required: true }'>
+                  </div>
+                </div>
+
+              </div>
+
+
+            </div>
+            <div class="row" style="margin-top: 1%">
+              <div class="form-group form-input-group col-sm-12">
+                <label for="f_cause" class=" col-sm-2 control-label">补打原因:</label>
+                <div class="col-sm-10">
+                  <textarea class="form-control" v-model="model.f_cause" rows="1" placeholder="补打原因"></textarea>
+                </div>
+              </div>
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn btn-success" v-if="data.f_bill_style === '普通收据'" @click='print(true)' :disabled="!$v.valid">选择打印机打印</button>
+        <button type="button" class="btn btn-success" v-if="data.f_bill_style === '普通收据'" @click='print()' :disabled="!$v.valid">打印</button>
+        <report-print id='reissue-bill' top='5mm' left='5mm' width='90%' height='80%' :notrepeat="false" v-if="data.f_bill_style === '普通收据'"
+                      :showbtn="false" v-ref:reportprint></report-print>
+        <report-print-thermal id='reissue-bill' top='5mm' left='5mm' width='90%' height='80%' :notrepeat="false"
+                              v-if="data.f_bill_style === '热敏收据'" v-ref:reportprint></report-print-thermal>
+        <button class="btn btn-default" @click="clean()">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+/**
+ *票据补打
+ */
+
+import {DataModel} from 'vue-client'
+import ReportPrintThermal from '../../components/revenue/Common/reportPrintThermal.vue'
+
+let readyGen = async function (self) {
+  await self.$getConfig(self, 'ReissueBill')
+  console.log('补打业务config', self.config)
+  await getBillData(self)
+}
+
+let getBillGen = async function (self) {
+  // 判断发票管理是否启用
+  if (self.config.hasBillManage) {
+    if (self.model.f_rprint_type === 'old') {
+      await getOld(self)
+    } else {
+      await getNew(self)
+    }
+  }
+}
+
+let getOld = async function (self) {
+  let param = {
+    id: self.data.id,
+    type: self.data.type
+  }
+  let getOld = await self.$resetpost('rs/logic/sale_getOldBillNumber', param, {resolveMsg: null, rejectMsg: null})
+  console.log('获取原始票号', getOld)
+  // 验证原始票号是否存在
+  if (getOld.data.id && getOld.data.number) {
+    self.model.oldNumber.number = getOld.data.number
+    self.model.oldNumber.id = getOld.data.id
+  } else {
+    self.$showAlert('此次正常操作时没有出票，只能使用新票号进行补打', 'warning', 2000)
+    self.model.f_rprint_type = 'new'
+    self.isOnlyNew = true
+  }
+}
+
+let getNew = async function (self) {
+  // 获取原来收费记录使用的发票类型
+  let param = {
+    id: self.data.id,
+    type: self.data.type
+  }
+  let oldUseType = await self.$resetpost('rs/logic/sale_getOldUseType', param, {
+    resolveMsg: null,
+    rejectMsg: '获取原始票据信息出错！！'
+  })
+  console.log('获取原始票据信息。。。', oldUseType)
+
+  let newparam = {
+    f_bill_user: self.$login.f.name, // 票据使用人
+    f_filialeids: self.$login.f.orgid // 所属分公司
+  }
+
+  if (oldUseType.data.billtype && oldUseType.data.f_use_type) {
+    newparam.f_bill_type = oldUseType.data.billtype
+    newparam.f_use_type = oldUseType.data.f_use_type
+  } else {
+    if (self.model.f_use_type && self.model.f_bill_type) {
+      newparam.f_bill_type = self.model.f_bill_type
+      newparam.f_use_type = self.model.f_use_type
+    } else {
+      self.isOnlyNew = true
+      // self.model.f_bill_type = '普通收据'
+      self.$showAlert('请选择票据使用类型', 'warning', 2000)
+      return
+    }
+  }
+  let getNew
+  try {
+    getNew = await self.$resetpost('rs/logic/sale_getNewBillNumber', newparam, {resolveMsg: null, rejectMsg: null})
+  } catch (e) {
+    self.model.newNumber.number = ''
+    self.model.newNumber.id = ''
+    self.$showAlert('未获取到发票号', 'warning', 2000)
+    return
+  }
+  console.log('获取新票号', getNew)
+  self.model.newNumber.number = getNew.data.number
+  self.model.newNumber.id = getNew.data.id
+}
+
+/**
+ * ready执行过程
+ */
+let getBillData = async function (self) {
+  // 显示票据
+  self.bill = new DataModel(self.data.billUrl, {reprint: "'补打'", operator: `'${self.$login.f.name}'`})
+  await self.bill.search(self.data.id)
+  // self.bill.data = '我是补打发票'
+  await getBillGen(self)
+}
+
+export default {
+  components: {ReportPrintThermal},
+  title: '票据补打',
+  data () {
+    return {
+      config: {
+        hasBillManage: false  // 默认不启用发票管理
+      },
+      bill: Object,
+      model: {
+        oldNumber: {
+          number: '',
+          id: ''
+        },
+        newNumber: {
+          number: '',
+          id: ''
+        },
+        f_end_number: null,
+        f_cause: null,
+        f_rprint_type: 'new'
+      },
+      messShow: false,
+
+      isOnlyNew: false,
+      rprinttype: [{label: '原票号补打', value: 'old'}, {label: '新票号补打', value: 'new'}],
+      usetypes: this.$appdata.getParam('发票使用类型'),
+      printtypes: this.$appdata.getParam('分配票据格式')
+    }
+  },
+  props: ['show', 'data', 'billUrl'],
+  ready () {
+    readyGen(this)
+  },
+  methods: {
+    printTypeChane () {
+      if (this.model.f_rprint_type === 'new') {
+        getNew(this)
+      } else {
+        getOld(this)
+      }
+    },
+
+    useTypeChange () {
+      if (this.model.f_rprint_type === 'new') {
+        getNew(this)
+      }
+    },
+    clean () {
+      this.$dispatch('cancel', '票据补打', this.row)
+    },
+    async print (select) {
+      if (this.config.hasBillManage && !this.model.newNumber.number) {
+        this.$showMessage('当前没有票号')
+        return
+      }
+      // 进行补打
+      try {
+        console.log('开具收据的参数：', this.data.id, this.data.f_bill_type)
+        if (this.config.hasBillManage) {
+          await this.$CommonService.reissuePaperBill(this.data.id, this.data.f_bill_type, this.model)
+        } else {
+          this.data.f_cause = this.model.f_cause
+          await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {
+            resolveMsg: null,
+            rejectMsg: '票据补打出错！！'
+          })
+        }
+        console.log('开始打印、、', select)
+        if (select) {
+          this.$refs.reportprint.print(true)
+        } else {
+          this.$refs.reportprint.print()
+        }
+      } catch (error) {
+        this.$dispatch('refresh')
+      }
+    }
+  },
+  events: {
+    'print' () {
+      console.log('发送补打成功事件')
+      this.$dispatch('reissue-success')
+    },
+    'print-error' () {
+      this.$showAlert('打印失败，若有需要，请补打发票', 'error', 3)
+      this.$dispatch('error', '票据补打', this.data, null)
+    }
+  }
+}
+</script>
+
+<style>
+</style>

package/src/filiale/wuhai/sale.js

@@ -34,4 +34,6 @@ export default function () {
   // 补费扣费
   Vue.component('deduction-manage', (resolve) => { require(['./deductionManage'], resolve) })
   Vue.component('user-info-detail-manage-new', (resolve) => { require(['./UserInfoDetailManageNew'], resolve) })
+  Vue.component('card-list', (resolve) => { require(['./CardList'], resolve) })
+  Vue.component('reissue-bill', (resolve) => { require(['./ReissueBill'], resolve) })
 }