sale-client 4.0.72-preview → 4.0.73-preview

package/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Mon Dec 30 14:38:17 CST 2024
+gradle.version=5.2.1

package/build/dev-server.js

@@ -31,6 +31,12 @@ var devConfig = {
         // },
         target: serverRul
       },
+      '/weixin2/rs':{
+        pathRewrite: {
+          '/weixin2/rs': '/rs'
+        },
+        target: 'http://410663id1ia4.vicp.fun'
+      },
       '/api/af-revenue/sql': {
         pathRewrite: {
           '/api/af-revenue/sql': '/sql'

package/package.json

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

package/src/components/revenue/comprehen/ComprehenOperation/BatchChange/BatchCancellation.vue

@@ -52,11 +52,27 @@
             <input class="input_search" style="width:80%" v-model="model.f_reason" v-validate:f_reason='{required: true }' rows="3" placeholder="请填写原因">
           </div>
         </div>
+        <div class="row" style="margin-top:10px;">
+          <div v-if="config.hasAudit" :class="[$v.f_meter_base.required ? 'has-error' : 'has-success']">
+            <label class="ch font_normal_body">审核人员</label>
+            <input v-show="false" v-model="model.f_audit_person"
+                   v-validate:f_audit_person='{required: true}'>
+            <v-select :value.sync="model.f_audit_person"
+                      :options='auditor' placeholder='请选择'
+                      selected="审核人员"
+                      :value-single="true"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
+        </div>
       </form>
       <upload :blodid="useraccount[0].f_userinfo_id"  isremark="true" fusetype="销户" v-ref:caneclfile></upload>
 
       <div style="text-align:right;height:auto;margin-top:30px;margin-right:50px;">
-        <button class="button_search" @click="createHand()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_search" v-show="config.hasAudit" type="button" @click="createHand()" :disabled='!$v.valid'>
+          过户审核
+        </button>
+        <button class="button_search" v-show="!config.hasAudit" @click="createHand()"  :disabled='!$v.valid'>确认</button>
         <button class="button_clear" @click="clean()">取消</button>
       </div>
     </validator>
@@ -67,29 +83,34 @@ import Vue from 'vue'
 import {HttpResetClass} from 'vue-client'
 
 /**
-*综合业务
-表具停用组件
-*/
+ *综合业务
+ 表具停用组件
+ */
 export default {
   title: '批量销户',
   data () {
     return {
+      resid: [],  // 存放新增的f_files表中id
       config: {
-        upload: false // 默认附件不必传
+        upload: false, // 默认附件不必传
+        hasAudit: false // 是否审核
       },
       model: {
         count: 0,
         discount: 0,
         f_meter_base: null,
         f_reason: '',
-        userinfo: {}
+        userinfo: {},
+        f_operat_type: '销户'
       },
-      infoIds: []
+      infoIds: [],
+      auditor: []
     }
   },
   props: ['useraccount'],
   async ready () {
     await this.$getConfig(this, 'UserFiles')
+    this.getAuditor()
     this.useraccount.forEach((item) => {
       if (item.f_user_state !== '销户') {
         this.model.count = this.model.count + 1
@@ -125,7 +146,10 @@ export default {
   // },
 
   methods: {
-
+    async getAuditor () {
+      await this.$GetSaleParam.initinputtor()
+      this.auditor = this.$GetSaleParam.getAudit(this.$login.f.orgid)
+    },
     async createHand () {
       if (this.config.upload) {
         if (this.$refs.caneclfile.fileInfoData && this.$refs.caneclfile.fileInfoData.length > 0) {
@@ -172,13 +196,13 @@ export default {
     async confirm () {
       let http = new HttpResetClass()
       let owe = await http.load('POST', 'api/af-revenue/sql/singleTable_OrderBy', {
-        data: {
-          items: 'f_whether_pay',
-          tablename: 't_handplan',
-          condition: ` f_userfiles_id  = '${this.useraccount[0].f_userfiles_id}' and  f_hand_state = '有效' and f_meter_state='已抄表' and f_whether_pay='否'`,
-          orderitem: ' id desc'
-        }
-      }, {resolveMsg: null, rejectMsg: null}
+          data: {
+            items: 'f_whether_pay',
+            tablename: 't_handplan',
+            condition: ` f_userfiles_id  = '${this.useraccount[0].f_userfiles_id}' and  f_hand_state = '有效' and f_meter_state='已抄表' and f_whether_pay='否'`,
+            orderitem: ' id desc'
+          }
+        }, {resolveMsg: null, rejectMsg: null}
       )
       console.log('获取到的欠费记录', owe)
       // 如果是机表/物联网表，验证是否有欠费
@@ -189,7 +213,11 @@ export default {
       } else if ((this.model.userinfo.f_meter_classify === '物联网表' && this.model.userinfo.f_balance_amount && this.model.userinfo.f_balance_amount > 0) || (this.model.userinfo.f_meter_classify !== '物联网表' && this.model.userinfo.f_balance && this.model.userinfo.f_balance > 0)) {
         this.$showAlert('该表有余额，无法销户', 'warning', 3000)
       } else {
-        await this.cancellation()
+        if (!this.config.hasAudit) {
+          await this.cancellation()
+        } else {
+          this.auditConfirm()
+        }
       }
     },
     async cancellation () {
@@ -204,6 +232,64 @@ export default {
         this.$dispatch('error', '批量销户', this.row, error)
       })
     },
+    async auditConfirm () {
+      let fileParam = []
+      for (let row of this.resid) {
+        fileParam.push({id: row.id})
+      }
+      let param = {
+        // 业务参数
+        requestParam: {
+          f_operat_type: '销户',
+          f_describe: `${Vue.$login.f.name}对客户${this.model.userinfo.f_user_name}进行销户`,
+          f_user_id: this.model.userinfo.f_user_id,
+          f_user_name: this.model.userinfo.f_user_name,
+          f_state: '销户',
+          f_comments: this.model.f_reason,
+          f_operator: Vue.$login.f.name,
+          f_operatorid: Vue.$login.f.id,
+          f_orgid: Vue.$login.f.orgid,
+          f_orgname: Vue.$login.f.orgs,
+          f_depid: Vue.$login.f.depids,
+          f_depname: Vue.$login.f.deps,
+          f_userinfo_id: this.model.userinfo.f_userinfo_id
+        },
+        // 审核人
+        f_audit_person: this.model.f_audit_person,
+        // 描述
+        f_describe: `${this.$login.f.name}对用户${this.useraccount[0].f_user_name}进行销户`,
+        // 附件
+        fileParam: fileParam,
+        // 登录人信息
+        userBaseInfo: {
+          f_operator: Vue.$login.f.name,
+          f_userinfo_code: this.useraccount[0].f_userinfo_code,
+          f_userinfo_id: this.useraccount[0].f_userinfo_id,
+          f_operatorid: Vue.$login.f.id,
+          f_orgid: Vue.$login.f.orgid,
+          f_orgname: Vue.$login.f.orgs,
+          f_depid: Vue.$login.f.depids,
+          f_depname: Vue.$login.f.deps
+        },
+        // 业务类型
+        type: '销户',
+        // 执行业务
+        f_type: this.model.f_operat_type,
+        // 其他业务请求
+        f_otherparam: [],
+        // 备注
+        f_comments: this.model.f_reason,
+        // 执行logic
+        logicName: 'saveSingleCancellation'
+      }
+      this.$resetpost('api/af-revenue/logic/commonAuditLogic', {data: param}, {
+        warnMsg: `确定要对用户${this.useraccount[0].f_user_name}进行${this.model.f_operat_type}审核吗？`,
+        resolveMsg: `提交审核完成！！`,
+        rejectMsg: `提交审核失败！！请重试！！`
+      }).then((res) => {
+        this.clean()
+      })
+    },
     // confirm () {
     //   this.model.f_reality_count = this.model.count
     //
@@ -237,6 +323,17 @@ export default {
       this.$info('取消操作')
       this.$dispatch('clean', '批量销户', this.row)
     }
+  },
+  events: {
+    // 删除Resid数组元素
+    'delResid' (val) {
+      this.resid.$remove({id: val, f_biobid: ''})
+      // this.resid.splice(this.resid.indexOf({id:val,f_biobid:''}),1);
+    },
+    // 增加Resid数组元素
+    'resid' (val) {
+      this.resid.push({id: val, f_biobid: ''})
+    }
   }
 }
 </script>