sale-client 4.3.80 → 4.3.82

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed May 13 15:19:48 CST 2026
+gradle.version=5.2.1

package/build/dev-server.js

@@ -26,7 +26,10 @@ var devConfig = {
     //   target: localUrl
     // },
     //   '/api/af-revenue/logic': {
-    //     target: serverRul
+    //     pathRewrite: {
+    //       '/api/af-revenue/logic': '/logic'
+    //     },
+    //     target: localUrl
     //   },
       // '/api/af-revenue/file': {
       //   // pathRewrite: {

package/package.json

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

package/src/components/revenue/comprehen/SpecialUser/BasicLiving/BasicLivingList.vue

@@ -131,7 +131,7 @@
               <nobr>结束时间</nobr>
             </th>
             <th style="text-align: center;"  v-show='!$parent.$parent.$parent.$parent.isdetail' >
-              <nobr>附件查看</nobr>
+              <nobr>操作</nobr>
             </th>
           </tr>
         </template>
@@ -145,7 +145,8 @@
           <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_start_date}}</nobr></td>
           <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"><nobr>{{row.f_end_date}}</nobr></td>
           <td v-show='!$parent.$parent.$parent.$parent.isdetail' style="text-align: center;"> <nobr>
-            <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
+            <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">附件查看</button>
+            <button v-if="$login.r.includes('移除低保户')" class="button_delete button_spacing width-60" @click.stop="$parent.$parent.$parent.remove(row)">移除</button>
           </nobr></td>
         </template>
         <template partial='foot'></template>
@@ -185,7 +186,7 @@
         f_orgid: '',
         criteriaShow: false,
         clientWidth: document.body.clientWidth,
-        showupload:false,
+        showupload: false,
         selected: {},
         basicImport: '',
         getfield: {
@@ -229,6 +230,16 @@
         this.selected = row
         console.log('11', row)
       },
+      remove (row) {
+        this.$showMessage('是否确认移除该用户?', ['confirm', 'cancel']).then(res => {
+          if (res === 'cancel') {
+          } else {
+            this.$resetpost('api/af-revenue/logic/removeBasicLiving', {data: row}).then((res)=>{
+              this.search()
+            })
+          }
+        })
+      },
       async getRes (condition, obj) {
         console.log('低保户condition =', condition)
         console.log('低保户obj =', obj)

package/src/filiale/yangchun/CardList.vue

@@ -285,7 +285,7 @@
       asyncCardList(this)
       // this.search()
     },
-    methods: {
+    methods:{
       dateDes (date) {
         return this.$login.dateDescripte(date)
       },
@@ -339,7 +339,7 @@
             }
           }
           if (row.type === '物联网收费' || row.type === '卡表赠气' || row.type === '物联网赠费' || row.type === '卡表赠费' || row.type === '物联网赠气') {
-            let table_name = this.$appdata.getSingleValue('新抄表')? 't_web_handplan' : 't_handplan'
+            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) {
@@ -369,32 +369,25 @@
           }
           if (this.authArr.includes('冲正权限')) {
 
-            if (!this.config.cancletime && !this.$login.f.rolesnames.includes('财务退款')) {
-              if (!this.config.cancleother) {
-                if (row.f_operator != this.$login.f.name) {
-                  this.$showAlert('不能撤销不是自己进行的操作', 'warning', 1500)
-                  return
-                }
-              }
-              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
-                }
-              // }
+            const canCancelOther = this.config.cancleother || this.authArr.includes('撤销他人记录') || this.$login.f.rolesnames.includes('财务退款')
+            if (!canCancelOther && row.f_operator !== this.$login.f.name) {
+              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)
+          return
         }
+      }
 
         if (title === '撤销') {
           this.cancel_show = true

package/src/main.js

@@ -2,7 +2,7 @@ import Vue from 'vue'
 import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
-import FilialeSale from './filiale/liaoyuan/sale'
+import FilialeSale from './filiale/yangchun/sale'
 import sale from './sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'