sale-client 4.2.70 → 4.2.72

package/src/filiale/qingjian/FileUserFiles.vue

@@ -1065,7 +1065,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/rizhao/FileUserFiles.vue

@@ -909,7 +909,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/rongcheng/FileUserFiles.vue

@@ -815,7 +815,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/rongchuang/FilesManage/FileUserFiles.vue

@@ -1029,7 +1029,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/shanggao/FileUserFiles.vue

@@ -920,7 +920,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/shanxian/components/FilesManage/FileUserFiles.vue

@@ -936,7 +936,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

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

@@ -443,7 +443,7 @@ import axios from 'axios'
         this.batchMeterShow = false
         let self = this
         try {
-          await axios.post('api/af-revenue/logic/importData',
+          await this.$resetpost('api/af-revenue/logic/importData',
             {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
               if (res.data) {
                 this.uploadCodeCondition = self.convertToIn(res.data.dataArr)

package/src/filiale/shaoguan/FilesManage/FileUserFiles.vue

@@ -815,7 +815,7 @@ let loadParamGem = async function (self) {
           debugger
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/shaoguan/Message/MessageList.vue

@@ -472,7 +472,7 @@ export default {
         f_operator: this.$login.f.name
       }
       console.log('filepath=' + JSON.stringify(data))
-      await axios.post('api/af-revenue/logic/importSms',
+      await this.$resetpost('api/af-revenue/logic/importSms',
         {data: data},
         // {onUploadProgress: (progressEvent)=> {
         //     var percentCompleted = Math.round((progressEvent.loaded * 100) / progressEvent.total)

package/src/filiale/shexian/FilesManage/FileUserFiles.vue

@@ -977,7 +977,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/wenxi/FileUserFiles.vue

@@ -964,7 +964,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/wuan/FileUserFiles.vue

@@ -938,7 +938,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/xinkang/WebMeterBatchOperationValve.vue

@@ -442,7 +442,7 @@ import axios from 'axios'
         this.batchMeterShow = false
         let self = this
         try {
-          await axios.post('api/af-revenue/logic/importData',
+          await this.$resetpost('api/af-revenue/logic/importData',
             {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
               if (res.data) {
                 this.uploadCodeCondition = self.convertToIn(res.data.dataArr)

package/src/filiale/yangchun/EticketPrint.vue

@@ -52,7 +52,7 @@ export default {
     async rushRedInvoice (data) {
       try {
         // 否则正常打票
-        let result = await axios.post('api/af-invoice/logic/getInvoice', Object.assign(data, {invoice_type: 1}), {
+        let result = await this.$resetpost('api/af-invoice/logic/getInvoice', Object.assign(data, {invoice_type: 1}), {
           resolveMsg: null,
           rejectMsg: '发票冲红失败!!'
         })
@@ -75,7 +75,7 @@ export default {
     async openETicket (id, model, f_charge_type, invoice_type, retry, is_tax, handplanTableName) {
       console.log('>>> f_invoice_type', invoice_type)
       try {
-        let result = await axios.post('api/af-invoice/logic/getInvoice', Object.assign({
+        let result = await this.$resetpost('api/af-invoice/logic/getInvoice', Object.assign({
           id,
           f_charge_type,
           retry,

package/src/filiale/yangchun/FilesManage/FileUserFiles.vue

@@ -1013,7 +1013,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/yuncheng/IndustryCommerceHand.vue

@@ -235,6 +235,9 @@
               <th>
                 <nobr>用气量</nobr>
               </th>
+              <th>
+                <nobr>剩余气量</nobr>
+              </th>
               <th>
                 <nobr>
                   <data-order field="f_last_input_date" name="上次抄表录入日期"
@@ -326,6 +329,7 @@
               {{ row.f_tablebase }}
             </td>
             <td style="text-align: center;">{{ $parent.$parent.$parent.calculationBase(row) }}</td>
+            <td style="text-align: center;">{{ row.f_surplus_gas }}</td>
             <td style="text-align: center;">{{ row.f_last_input_date }}</td>
             <td style="text-align: center;">{{ row.f_hand_date }}</td>
             <td style="text-align: center;">
@@ -496,6 +500,7 @@ export default {
           'f_last_tablebase': '上期底数',
           'f_tablebase': '本期指数',
           'f_oughtamount': '应交气量',
+          'f_surplus_gas': '剩余气量',
           'f_input_person': '录入人员',
           'f_meter_classify': '气表分类',
           'f_meter_brand': '气表品牌',

package/src/filiale/yuncheng/IndustryCommerceHandAudit.vue

@@ -741,6 +741,7 @@
         // 兼容原有弹窗方式
         let id = row ? row.id : this.nopassId
         let reviewReason = reason !== undefined ? reason : this.reasonText
+        // 修改现有记录
         let handplan = {
           id: id,
           f_input_date: null,
@@ -755,6 +756,43 @@
           resolveMsg: null,
           rejectMsg: '未通过，抄表数据返回未抄表保存出错!!!'
         })
+
+        // 先查询这条记录的完整数据
+        let originalData = null
+        if (id) {
+          try {
+            let result = await this.$resetpost('api/af-revenue/sql/saleSingleTable', {
+              data: {
+                tablename: 't_yccustom_handplan',
+                condition: `id = '${id}'`
+              }
+            }, {resolveMsg: null, rejectMsg: '查询原记录失败'})
+            if (result.data && result.data.length > 0) {
+              originalData = result.data[0]
+            }
+          } catch (error) {
+            console.error('查询原记录失败:', error)
+          }
+        }
+
+        // 插入新记录（不传id，让数据库自动生成）
+        let newHandplan = {
+          f_meter_state: '未通过',
+        }
+        // 复制原记录的其他字段到新记录
+        if (originalData) {
+          Object.keys(originalData).forEach(key => {
+            if (!newHandplan.hasOwnProperty(key) && key !== 'id') {
+              newHandplan[key] = originalData[key]
+            }
+          })
+        }
+
+        await this.$resetpost('api/af-revenue/entity/save/t_yccustom_handplan', newHandplan, {
+          resolveMsg: null,
+          rejectMsg: '插入新记录失败!!!'
+        })
+
         this.search()
       },
       loadMeterBooks () {

package/src/filiale/zhongsheng/FilesManage/FileUserFiles.vue

@@ -963,7 +963,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('api/af-revenue/logic/newSettleFileImport',
+            await this.$resetpost('api/af-revenue/logic/newSettleFileImport',
               {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)

package/src/filiale/zhongyi/FileUserFiles.vue

@@ -948,7 +948,7 @@ let loadParamGem = async function (self) {
           }
           let self = this
           try {
-            await axios.post('rs/business/batchRunExcelDefault/filemanage_fileSave_zhongyi/newSettleFileImport',
+            await this.$resetpost('rs/business/batchRunExcelDefault/filemanage_fileSave_zhongyi/newSettleFileImport',
               {data: param}, {timeout: 30000}).then((res) => {
                 if (res.data) {
                   self.$showMessage(`本次批量建档共上传${res.data.totalCount}条数据,符合条件的共${res.data.totalsum}条,不符合条件的共${res.data.totalCount - res.data.totalsum}条, 建档成功${res.data.successsum}条,建档失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)