sale-client 4.0.71-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

@@ -20,10 +20,10 @@ var devConfig = {
     },
     proxy: {
       '/api/af-revenue/logic': {
-        // pathRewrite: {
-        //   '/api/af-revenue/logic': '/logic'
-        // },
-        target: serverRul
+        pathRewrite: {
+          '/api/af-revenue/logic': '/logic'
+        },
+        target: localUrl
       },
       '/api/af-revenue/file': {
         // pathRewrite: {
@@ -31,11 +31,17 @@ 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'
-        // },
-        target: serverRul
+        pathRewrite: {
+          '/api/af-revenue/sql': '/sql'
+        },
+        target: localUrl
       },
       '/api': {
         target: serverRul

package/package.json

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

package/src/components/common/userinfo_detail/UserInfoDetailManageNew.vue

@@ -95,6 +95,12 @@
         <saletab header="用户重点记录" v-if="permission('用户重点记录')">
           <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
         </saletab>
+        <saletab header="维修记录" v-if="permission('维修记录')">
+          <repair-list :row="row"  @deal-msg="dealMsg"></repair-list>
+        </saletab>
+        <saletab header="安检记录" v-if="permission('安检记录')">
+          <security-check-info :row="row"  @deal-msg="dealMsg"></security-check-info>
+        </saletab>
 <!--        <saletab header="报装流转记录"   v-if="permission('报装流转记录查看')">-->
 <!--          <supervisory-control :row="row"  ></supervisory-control>-->
 <!--        </saletab>-->
@@ -127,6 +133,8 @@
   import UserDeviceQuery from './ic_detail/UserDeviceQuery'
   import contractSigningList from './ic_detail/contractSigningList'
   import UserKeyRecord from './ic_detail/UserKeyRecord'
+  import RepairList from "./ic_detail/RepairList";
+  import SecurityCheckInfo from './ic_detail/SecuritycheckInfo';
   // import SupervisoryControl from './apply_detail/Supervisory/SupervisoryControl'
   // import ApplyChargeSearch from './apply_detail/applyCharge/ApplyChargeSearch'
   // 导入物联网相关查询
@@ -144,6 +152,8 @@ export default {
     title: '用户详细信息',
     props: ['f_userfiles_id', 'f_userinfo_id', 'f_userinfo_code', 'parentname', 'buttonshow'],
     components: {
+      SecurityCheckInfo,
+      RepairList,
       PriceAdjustmentQueryUser,
       PriceChangeQueryUser,
       AutomaticPurse,

package/src/components/common/userinfo_detail/ic_detail/RepairList.vue

@@ -0,0 +1,109 @@
+<template>
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+      <!-- <criteria partial='criteria'>
+      </criteria> -->
+      <data-grid :model="model" partial='list' v-ref:grid
+                 class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+<!--            <th><nobr>操作</nobr></th>-->
+            <th><nobr>工单状态</nobr></th>
+            <th><nobr>工单类型</nobr></th>
+            <th><nobr>是否完成</nobr></th>
+            <th><nobr>工单编号</nobr></th>
+            <th><nobr>报修时间</nobr></th>
+            <th><nobr>报修电话</nobr></th>
+            <th><nobr>报修内容</nobr></th>
+            <th><nobr>用户地址</nobr></th>
+            <th><nobr>派单人员</nobr></th>
+            <th><nobr>维修人员</nobr></th>
+            <th><nobr>完成时间</nobr></th>
+          </tr>
+        </template>
+        <template partial='body'>
+<!--          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>-->
+<!--            <button class="button_search button_spacing" style="margin-right: 9px"-->
+<!--                    @click="$parent.$parent.$parent.showDetail(row)">详情-->
+<!--            </button>-->
+<!--          </nobr></td>-->
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr> {{ row.f_state ?row.f_state:(row.defname ?row.defname:'完成')}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_workorder_type}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_result_status?row.f_result_status:'未完成'}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_service_id}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_created_date}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_phone}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_remarks}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_address}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_single_man}}</nobr></td>
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_order_man}}</nobr></td>
+
+          <!--<td :style="row.f_result_status=='已完成'?'':'color:red'"><nobr>{{row.f_remarks}}</nobr></td>-->
+          <td :style="row.f_result_status==='已完成'?'':'color:red'"><nobr>{{row.f_date_leave}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  /**
+   *用户档案相关信息组件
+   */
+  import { PagedList } from 'vue-client'
+  export default {
+    title: '历史维修记录',
+    data () {
+      return {
+        model: new PagedList('api/af-revenue/sql/serviceDetails', 5),
+        row: Object,
+        show: false
+      }
+    },
+
+    props: {
+      user: {
+        type: Object
+      },
+      callObj: {
+        type: Object
+      },
+      clearflg: 0,
+      row: {
+        type: Object
+      }
+    },
+    methods: {
+      showDetail (row) {
+        console.log('996', row)
+        this.row = row
+        this.show = true
+      },
+      selected (row) {
+        if (this.row === row) {
+          this.row = null
+        } else {
+          this.row = row
+        }
+      },
+      isSelected (row) {
+        return this.row === row
+      }
+    },
+    watch: {
+      'user' (val) {
+        this.model.rows = []
+        this.model.search(`f_userinfo_id = '${this.row.f_userinfo_id}'`)
+      },
+      'clearflg' () {
+        this.model.rows = []
+      }
+    },
+    ready () {
+      console.log('看看row的信息', this.row)
+      if (this.row.f_userinfo_id) {
+        this.model.search(`f_userinfo_id = '${this.row.f_userinfo_id}'`)
+      }
+    }
+  }
+</script>

package/src/components/common/userinfo_detail/ic_detail/SecuritycheckInfo.vue

@@ -0,0 +1,155 @@
+<template>
+  <div id="pc-finduser-page">
+    <criteria-paged :model="model" v-ref:paged :simple="true">
+
+      <data-grid :model="model" partial='list' v-ref:grid
+                 class="list_area table_sy">
+        <template partial='head'>
+          <tr>
+<!--            <th><nobr>卡号</nobr></th>-->
+            <th><nobr>安检日期</nobr></th>
+            <th><nobr>入户情况</nobr></th>
+            <th><nobr>安检员</nobr></th>
+            <th> <nobr>隐患明细</nobr></th>
+<!--            <th> <nobr>操作</nobr></th>-->
+          </tr>
+        </template>
+        <template partial='body'>
+<!--          <td><nobr>{{row.f_card_id}}</nobr></td>-->
+          <td style="text-align: center"><nobr>{{row.f_onsite_time.substring(0,11)}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_entry_status}}</nobr></td>
+          <td style="text-align: center"><nobr>{{row.f_checker_name}}</nobr></td>
+     <td style="text-align: center" ><nobr>{{row.f_defect_text?row.f_defect_text:$parent.$parent.$parent.getjsonData(row.f_defect_content)}}</nobr></td>
+<!--          <td style="text-align: center"><nobr><button-link type="button" class="btn btn-link" @click="$parent.$parent.$parent.change(row)">查看</button-link></nobr></td>-->
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+<!--  <modal :show.sync="infoshow" large="true" v-ref:modal backdrop="false" width="1200">-->
+<!--    <header slot="modal-header" class="modal-header">-->
+<!--      安检详情-->
+<!--    </header>-->
+<!--    <article slot="modal-body" class="modal-body">-->
+<!--      <div class="from-group col-smm-12 col-md-12 col-xs-12" v-if="infoshow">-->
+<!--        <new-check-paper :f_plan_id="onedata.f_check_plan_id" :item="onedata" role="view" >-->
+<!--        </new-check-paper>-->
+<!--      </div>-->
+<!--    </article>-->
+<!--    <footer slot="modal-footer" class="modal-footer">-->
+<!--      <button type="button" class="btn btn-success" @click='close'>确认</button>-->
+<!--    </footer>-->
+<!--  </modal>-->
+</template>
+
+<script>
+  /**
+   *用户档案相关信息组件
+   */
+  import { PagedList } from 'vue-client'
+  import Vue from 'vue'
+  import { isEmpty } from "../../../../Util"
+  // import newCheckPaper from "./NewCheckpaper.vue"
+  // 获取json配置文件
+  let asyncReady = async function (self) {
+    // 获取配置信息
+    try {
+      let res = await Vue.resetget(`/phone/rs/vue`, {data: {}}, {resolveMsg: null, rejectMsg: null})
+      Vue.config = res.data
+    } catch (error) {
+      // 忽略704,文件找不到异常R
+      if (error.status !== 704) {
+        throw error
+      }
+    }
+  }
+
+  export default {
+    // components: {
+    //   newCheckPaper
+    // },
+    title: '用户安检历史',
+    data () {
+      return {
+        model: new PagedList('api/af-revenue/sql/查找安检单', 5, {orderitem: '"f_onsite_time desc"',f_plan_id:'""',f_approved:'""',f_entry_status:'""',f_no_checkplan:'""',f_filialeid:'""'}),
+        row: Object,
+        infoshow: false,
+        onedata: Object
+      }
+    },
+    props: {
+      user: {
+        type: Object
+      },
+      clearflg: 0,
+      row: {
+        type: Object
+      }
+    },
+    methods: {
+      close () {
+        this.infoshow = false
+      },
+      change (row) {
+        // Vue.$login = {jwt: row.f_checker_id}
+        asyncReady(this).then(() => {
+          row.f_upload_state = '已传'
+          this.$goto('new-check-paper', {f_plan_id: row.f_check_plan_id, item: row, role: 'view'}, 'self')
+        }).catch(
+          (respanse) => {
+            alert ('获取配置文件失败')
+          })
+      },
+      // change(val){
+      //
+      //   this.onedata = val
+      //   this.infoshow = true
+      // },
+      getjsonData (value) {
+        // 将value字符串转换成json对象
+        let jsonStr = JSON.parse(value)
+        let str = jsonStr.data
+        if (jsonStr.result === '正常') {
+          return '正常'
+        } else {
+          let result = ''
+          if (str) {
+            for (const itemdata of str) {
+              const keys = Object.keys(itemdata)
+              for (const itm of keys) {
+                const value = itemdata[itm]
+                result += itm + ':' + value + ' '
+              }
+            }
+          }
+          return result
+        }
+      },
+      selected (row) {
+        if (this.row === row) {
+          this.row = null
+        } else {
+          this.row = row
+        }
+      },
+      isSelected (row) {
+        return this.row === row
+      }
+    },
+    watch: {
+      'user' (val) {
+        // tag
+        this.model.search(`f_userinfoid = '${this.row.f_userinfo_id}'`)
+      },
+      'clearflg' () {
+        this.model.rows = []
+      }
+    },
+    ready () {
+      console.log('看看row的信息', this.row)
+      if (this.row.f_userinfo_id) {
+        this.model.search(`f_userinfoid = '${this.row.f_userinfo_id}'`)
+      }
+      // this.model.rows=[{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'},{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'},{f_onsite_time:'2020-01-01',f_entry_status:'入戶',f_checker_name:'何11'}]
+    }
+  }
+</script>

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>