sale-client 3.6.349 → 3.6.351

package/package.json

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

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

@@ -91,6 +91,9 @@
         <saletab header="合同查看"  v-if="permission('合同查看')">
           <contract-signing-list :row="row" v-if="show == '合同查看'" @deal-msg="dealMsg"></contract-signing-list>
         </saletab>
+        <saletab header="用户重点记录" >
+          <user-key-record :row="row"  @deal-msg="dealMsg"></user-key-record>
+        </saletab>
       </saletabbut>
     </div>
   </div>
@@ -116,6 +119,7 @@
   import WebHandQueryUser from './ic_detail/WebHandQueryUser'
   import UserDeviceQuery from './ic_detail/UserDeviceQuery'
   import contractSigningList from './ic_detail/contractSigningList'
+  import UserKeyRecord from './ic_detail/UserKeyRecord'
 
   // 导入物联网相关查询
   import QueryInstruct from './iot_detail/QueryInstruct'
@@ -157,7 +161,8 @@ export default {
       DeveiceRecord,
       MachineRecordQuery,
       UserDeviceQuery,
-      contractSigningList
+      contractSigningList,
+      UserKeyRecord
     },
     data () {
       return {

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

@@ -0,0 +1,152 @@
+<template>
+  <div class="flex" style="justify-content: space-between;" v-if="!openInsertKeyUser" >
+    <div @keyup.enter="search">
+      <criteria-paged :model="model" v-ref:paged>
+        <criteria @condition-changed='$parent.search' partial='criteria' v-ref:criteria>
+          <div class="form-horizontal select-overspread container-fluid auto" novalidate partial>
+            <div class="row" width="100%">
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">开始时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_start_date"
+                            class="datepicker"
+                            condition="f_parameter_value >= '{} 00:00:00' "
+                            placeholder="起始时间"
+                            style="width:60%"
+                            v-model="model.f_start_date"
+                ></datepicker>
+              </div>
+              <div class="col-sm-2 form-group" >
+                <label class="font_normal_body" >结束时间</label>
+                <datepicker :format="'yyyy-MM-dd'" :value.sync="model.f_end_date"
+                            class="datepicker"
+                            condition="f_parameter_value <= '{} 23:59:59' "
+                            placeholder="结束时间"
+                            style="width:60%"
+                            v-model="model.f_end_date"
+                ></datepicker>
+              </div>
+              <div style="float: right">
+                <button @click="search()" class="button_search" style="margin-right: 10px" v-el:cba>查询</button>
+                <button class="btn btn-success" @click="$parent.$parent.clear()" v-el:cx>清空</button>
+                <button  @click.stop="$parent.$parent.insertKeyUser()" class="button_search" style="margin-right: 10px" v-el:cba>添加重点用户</button>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" class="list_area table_sy" partial='list' v-ref:grid>
+          <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>
+              <th><nobr>操作状态</nobr></th>
+              <th><nobr>操作时间</nobr></th>
+              <th><nobr>操作人</nobr></th>
+            </tr>
+          </template>
+            <template partial='body' partial='list' v-ref:grid>
+              <tr  v-for="(row, index) in model.items" :key="index">
+                <td style="text-align:center">{{$index+1}}</td>
+                <td style="text-align:center">{{row.f_userinfo_code}}</td>
+                <td style="text-align:center">{{row.f_user_name}}</td>
+                <td style="text-align:center">{{row.f_address}}</td>
+                <td style="text-align:center">{{row.f_user_phone}}</td>
+                <td style="text-align:center">{{row.f_meternumber}}</td>
+                <td style="text-align:center">{{row.f_card_id}}</td>
+                <td style="text-align:center">{{row.f_comments}}</td>
+                <td style="text-align:center">{{row.f_level}}</td>
+                <td style="text-align:center">{{$parent.$parent.$parent.formatFunction(row.f_function)}}</td>
+                <td style="text-align:center">{{row.f_remark}}</td>
+                <td style="text-align:center">{{row.f_state}}</td>
+                <td style="text-align:center">{{row.f_opr_state}}</td>
+                <td style="text-align:center">{{row.f_operate_date}}</td>
+                <td style="text-align:center">{{row.f_operator}}</td>
+                <td style="text-align:center;display:none;" >{{row.f_userinfo_id}}
+                </td>
+              </tr>
+            </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+  <insert-key-user v-if="openInsertKeyUser"
+                   :f_userinfo_id="selectedUserId"
+                   @cancel="handleCancel"
+                   :userOperationState="userOperationState"
+                   @updateUserOperationState="updateUserOperationState"
+  ></insert-key-user>
+
+</template>
+<script>
+import {PagedList} from "vue-client"
+import insertKeyUser from './insertKeyUser.vue'
+export default {
+  title: '用户重点记录',
+  components: {
+    insertKeyUser
+  },
+  data () {
+    return {
+      userOperationState: '',
+      selectedUserId: null,
+      openInsertKeyUser: false,
+      condition: '1=1',
+      model: new PagedList('/rs/sql/sale_blackRecordQuery', 20),
+      searchValue: this.$appdata.getSingleValue('综合条件查询') ? this.$appdata.getSingleValue('综合条件查询') : 'f_userfiles_id',
+    }
+  },
+  props: ['row'],
+  methods: {
+    formatFunction(functionString) {
+      if (!functionString) return ''
+      try {
+        // 解析 JSON 字符串为数组
+        let functionArray = JSON.parse(functionString)
+        // 将数组转换为用逗号分隔的字符串
+        return functionArray.join(', ')
+      } catch (e) {
+        // 如果解析失败，返回原始字符串
+        return functionString
+      }
+    },
+    handleCancel() {
+      this.openInsertKeyUser = false
+    },
+    clear () {
+      Object.keys(this.$refs.paged.$refs.criteria.model).forEach((key) => {
+        this.$refs.paged.$refs.criteria.model[key] = []
+      })
+    },
+    async search () {
+      this.condition = `${this.$refs.paged.$refs.criteria.condition} and ${this.searchValue} = '${this.row[this.searchValue]}'`
+      this.model.search(this.condition, this.model)
+    },
+    insertKeyUser () {
+      this.openInsertKeyUser = true
+      this.selectedUserId = this.row.f_userinfo_id
+      console.log('看看传进来没',this.selectedUserId)
+    },
+    updateUserOperationState(state) {
+      this.userOperationState = state;
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.search()
+  },
+  computed: {
+
+  }
+
+}
+</script>
+<style scoped>
+</style>

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

@@ -0,0 +1,358 @@
+<template>
+  <div class="auto">
+    <validator name="v">
+      <form class="form-horizontal" novalidate>
+        <div class="row" style="margin-top:15px;">
+          <div class="col-sm-3 form-group" :class="[$v.f_opr_state.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3">操作状态</label>
+            <input type="text" v-show="false" v-model="KeyModel.f_opr_state" v-validate:f_opr_state='{required: true }'>
+            <v-select width="60%"
+                      v-model="KeyModel.f_opr_state"
+                      :value.sync="KeyModel.f_opr_state"
+                      :options="fstate"
+                      :value-single="true"
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-3 form-group" v-if="KeyModel.f_opr_state == '移入'">
+            <label class="font_normal_body col-sm-3">移入原因</label>
+            <input type="text" v-model="KeyModel.f_comments" class="input_search" placeholder="请输入移入原因" >
+          </div>
+          <div class="col-sm-3 form-group" v-if="KeyModel.f_opr_state == '移出'">
+            <label class="font_normal_body col-sm-3">移出原因</label>
+            <input type="text" v-model="KeyModel.f_comments" class="input_search" placeholder="请输入移入原因" >
+          </div>
+          <div v-if="KeyModel.f_opr_state == '移入'">
+            <div class="col-sm-3 form-group" :class="[$v.f_level.required ? 'has-error' : '']">
+              <label class="font_normal_body col-sm-3">管控级别</label>
+              <input type="text" v-show="false" v-model="KeyModel.f_level" v-validate:f_level='{required: true }'>
+              <v-select width="60%"
+                        v-model="KeyModel.f_level"
+                        :value.sync="KeyModel.f_level"
+                        :options="flevel"
+                        :value-single="true"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-3 form-group" :class="[$v.f_function.required ? 'has-error' : '']">
+              <label class="font_normal_body col-sm-3">限制功能</label>
+              <input type="text" v-show="false" v-model="KeyModel.f_function" v-validate:f_function='{required: true }'>
+              <v-select width="60%"
+                        v-model="KeyModel.f_function"
+                        :options="fFunction"
+                        :multiple=true
+                        :value.sync="KeyModel.f_function"
+                        close-on-select></v-select>
+            </div>
+          </div>
+          <div v-if="KeyModel.f_opr_state === '移出'">
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body col-sm-3">取消限购</label>
+              <input type="text" v-show="false" v-model="KeyModel.noLimitGas" >
+              <v-select width="60%"
+                        v-model="KeyModel.noLimitGas"
+                        :options="nolimitGas"
+                        :value-single="true"
+                        close-on-select></v-select>
+            </div>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-3 form-group">
+            <label class="font_normal_body col-sm-3">备&emsp;&emsp;注</label>
+            <input type="text" class="input_search" v-model="KeyModel.f_remark" placeholder="备注" style="vertical-align:middle;width: 70%">
+          </div>
+        </div>
+      </form>
+    </validator>
+  </div>
+  <div class="auto" v-if="KeyModel.f_opr_state === '移入'">
+    <div style="color: #0d8ddb; font-size: 25px; margin-top: 15px; margin-bottom: 10px; margin-left: 25px">限购配置</div>
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+
+        <div class="row">
+          <div class="col-sm-3 form-group" :class="[$v.f_third_pay.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >第三方缴费</label>
+            <input type="text" v-show="false" v-model="$refs.f_third_pay.selectedItems"
+                   v-validate:f_third_pay='{required: true }'>
+            <v-select width="60%"
+                      :value.sync="model.f_third_pay"
+                      v-model="model.f_third_pay"
+                      :options='thirdPays'
+                      :value-single="true" v-ref:f_third_pay
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-3 form-group" :class="[$v.f_limit_style.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >限制类型</label>
+            <input type="text" v-show="false" v-model="$refs.f_limit_style.selectedItems"
+                   v-validate:f_limit_style='{required: true }'>
+            <v-select width="60%"
+                      :value.sync="model.f_limit_style"
+                      v-model="model.f_limit_style"
+                      :options='limitstyle'
+                      :value-single="true" v-ref:f_limit_style
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-3 form-group" :class="[$v.f_time_type.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >周期类型</label>
+            <input type="text" v-show="false" v-model="$refs.f_time_type.selectedItems"
+                   v-validate:f_time_type='{required: true }'>
+            <v-select width="60%"
+                      :value.sync="model.f_time_type"
+                      v-model="model.f_time_type"
+                      :options='timeTypes'
+                      :value-single="true" v-ref:f_time_type
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-3 form-group" :class="[$v.f_time_value.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >周期时长</label>
+            <input type="text" class="input_search" v-model="model.f_time_value" placeholder="周期时长"  v-validate:f_time_value='{required: true }' style="vertical-align:middle;width: 60%">
+          </div>
+        </div>
+
+        <div class="row" style="margin-top:10px;">
+          <div class="col-sm-3 form-group" :class="[$v.f_status.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >生效状态</label>
+            <input type="text" v-show="false" v-model="$refs.f_status.selectedItems"
+                   v-validate:f_status='{required: true }'>
+            <v-select width="60%"
+                      :value.sync="model.f_status"
+                      v-model="model.f_status"
+                      :options='fstatus'
+                      :value-single="true" v-ref:f_status
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-3 form-group" :class="[$v.f_limit_times.required ? 'has-error' : '']" v-if="model.f_limit_style !=='按总量'">
+            <label class="font_normal_body col-sm-3" >限制次数</label>
+            <input type="text" class="input_search" v-model="model.f_limit_times"  style="vertical-align:middle;width: 60%" v-validate:f_limit_times='{required: true }' placeholder="限制次数">
+          </div>
+          <div class="col-sm-3 form-group" :class="[$v.f_limit_value.required ? 'has-error' : '']" v-if="model.f_limit_style !=='按总量' && model.f_limit_type ==='气量'">
+            <label class="font_normal_body col-sm-3" >单次限购</label>
+            <input type="text" class="input_search" v-model="model.f_limit_value"  style="vertical-align:middle;width: 60%" v-validate:f_limit_value='{required: true }' placeholder="单次限购">
+          </div>
+          <div class="col-sm-3 form-group" :class="[$v.f_limit_amount.required ? 'has-error' : '']" v-if="model.f_limit_style !=='按总量' && model.f_limit_type ==='金额'">
+            <label class="font_normal_body col-sm-3" >单次限购</label>
+            <input type="text" class="input_search" v-model="model.f_limit_amount"  style="vertical-align:middle;width: 60%" v-validate:f_limit_amount='{required: true }' placeholder="单次限购">
+          </div>
+        </div>
+
+        <div class="row" style="margin-top:10px;" v-if="model.f_limit_style ==='按总量'">
+          <div class="col-sm-3 form-group" :class="[$v.f_limit_value.required ? 'has-error' : '']" v-if="model.f_limit_type ==='气量'">
+            <label class="font_normal_body col-sm-3" >总限购量</label>
+            <input type="text" class="input_search" v-model="model.f_limit_value" style="vertical-align:middle;width: 60%" v-validate:f_limit_value='{required: true }' placeholder="单次限购">
+          </div>
+          <div class="col-sm-3 form-group" :class="[$v.f_limit_amount.required ? 'has-error' : '']" v-if="model.f_limit_type ==='金额'">
+            <label class="font_normal_body col-sm-3" >总限购量</label>
+            <input type="text" class="input_search" v-model="model.f_limit_amount"  style="vertical-align:middle;width: 60%" v-validate:f_limit_amount='{required: true }' placeholder="单次限购">
+          </div>
+        </div>
+
+        <div class="row" style="margin-top:10px;">
+          <div class="col-sm-3 form-group" :class="[$v.f_limit_type.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >支付限制</label>
+            <input type="text" v-show="false" v-model="$refs.f_limit_type.selectedItems"
+                   v-validate:f_limit_type='{required: true }'>
+            <v-select width="60%"
+                      :value.sync="model.f_limit_type"
+                      v-model="model.f_limit_type"
+                      :options='limitTypes'
+                      :value-single="true" v-ref:f_limit_type
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-3 form-group" :class="[$v.f_parameter_value.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >执行时间</label>
+            <input type="text" v-show="false" v-model="model.f_parameter_value"
+                   v-validate:f_parameter_value='{required: true }'>
+            <datepicker placeholder="执行时间" style="width:60%"
+                        v-model="model.f_parameter_value"
+                        :value.sync="model.f_parameter_value" v-ref:f_parameter_value
+                        :format="'yyyy-MM-dd'">
+            </datepicker>
+          </div>
+        </div>
+
+      </form>
+    </validator>
+    <div style="text-align: right; height: 25%">
+      <button class="button_search btn-gn" :disabled="!$v.valid" @click="confirm('移入重点用户')">确认</button>
+      <button class="button_clear btn-gn" @click="clean()">取消</button>
+    </div>
+  </div>
+  <div style="text-align: right; height: 25%" v-if="KeyModel.f_opr_state === '移出'">
+    <button class="button_search btn-gn" :disabled="!$v.valid" @click="confirm('移出重点用户')">确认</button>
+    <button class="button_clear btn-gn" @click="cancels">取消</button>
+  </div>
+
+</template>
+<script>
+
+import {HttpResetClass} from "vue-client";
+
+let getLimitDataGen = async function (self) {
+  let param = {
+    tablename: 't_limit_gas'
+  }
+  if (self.f_price_id) {
+    param.condition = ` f_price_id = '${self.f_price_id}'  and isnull(f_state,'') != '无效'`
+  } else if  (self.f_userinfo_id) {
+    param.condition = ` f_userinfo_id = '${self.f_userinfo_id}' and isnull(f_state,'') != '无效'`
+  }
+  let http = new HttpResetClass()
+  let res = await http.load('POST', 'rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取限购配置失败！！'})
+  console.log('获取的限购数据', res)
+  if (res.data.length > 0 ) {
+    self.model = Object.assign({}, self.model, res.data[0])
+    self.model.f_third_pay = self.model.f_third_pay + ''
+    self.limitshow = true
+  } else {
+    self.limitshow = false
+  }
+  initGen(self)
+}
+
+let initGen = async function (self) {
+  // 获取低保气价
+  let http = new HttpResetClass()
+  let res = await http.load('POST', 'rs/sql/sale_getUserAndVersion', {data: {condition: `u.f_userinfo_id='${self.f_userinfo_id}'`, f_orgid: self.$login.f.orgid}}, {
+    resolveMsg: null,
+    rejectMsg: null
+  })
+  console.log(res.data)
+  console.log('用户id:' + res.data[0].f_userinfo_id)
+  self.model.f_user_name = res.data[0].f_user_name
+  self.model.version = res.data[0].version
+}
+export default {
+  title: '添加重点用户',
+  name: 'insert-key-user',
+
+  data () {
+    return {
+      KeyModel: {
+        f_opr_state:'移入',
+        f_comments: '',
+        f_function: '',
+        f_level:'',
+        f_remark:''
+      },
+      model: {
+        version:'',
+        f_user_name:'',
+        f_third_pay: '0',
+        f_time_type: '按月',
+        f_limit_times: '',
+        f_time_value: '0',
+        f_limit_type: '气量',
+        f_limit_style:'',
+        f_limit_value: '',
+        f_limit_amount: '',
+        f_status:'',
+        f_parameter_value: this.$login.toStandardDateString()
+      },
+      thirdPays: [{label: '支持', value: '1'},{label: '不支持', value: '0'}],
+      timeTypes: [{label: '按月', value: '按月'},{label: '按日', value: '按日'}],
+      limitTypes: [{label: '气量', value: '气量'},{label: '金额', value: '金额'}],
+      limitstyle: [{label: '按次数', value: '按次数'},{label: '按总量', value: '按总量'}],
+      fstatus: [{label: '有效', value: '有效'},{label: '无效', value: '无效'}],
+      fstate: [{label: '移入', value: '移入'},{label: '移出', value: '移出'}],
+      flevel: [{label: '高', value: '高'},{label: '中', value: '中'},{label: '低', value: '低'}],
+      nolimitGas:[{label: '是', value:'0'},{label: '否', value:'1'}],
+      fFunction: this.$appdata.getParam('限制功能') ? [{
+        label: '全部',
+        value: ''
+      }, ...this.$appdata.getParam('限制功能')] : [],
+    }
+      },
+  props: ['show', 'f_price_id', 'f_userinfo_id','row','userOperationState'],
+  ready () {
+    this.getLimitData()
+  },
+  watch: {
+    'f_price_id' () {
+      this.getLimitData()
+    },
+    'f_userinfo_id' () {
+      this.getLimitData()
+    }
+  },
+  methods: {
+    cancels() {
+      this.$emit('cancel')
+    },
+    getLimitData () {
+      console.log('获取限购配置。。', this.f_price_id, this.f_userinfo_id)
+      if (this.f_price_id || this.f_userinfo_id) {
+        getLimitDataGen(this)
+      }
+    },
+    async confirm (type) {
+      if (this.userOperationState === '移入') {
+        this.$showMessage(`${type}失败, 用户已被移入重点用户, 请先移出重点用户`);
+        return;
+      }
+      if (type == '取消拉黑' && !this.$login.r.find(value => value == '取消拉黑')) {
+        this.$showMessage('你没有移出重点用户的权限,请联系管理员!')
+        return
+      }
+      let data = {
+        f_operat_type: type,
+        f_state: '待审核',
+        f_user_id: this.model.f_user_id,
+        f_user_name: this.model.f_user_name,
+        f_comments: this.KeyModel.f_comments,
+        f_remark: this.KeyModel.f_remark,
+        f_operator: this.$login.f.name,
+        f_operatorid: this.$login.f.id,
+        f_orgid: this.$login.f.orgid,
+        f_orgname: this.$login.f.orgs,
+        f_depid: this.$login.f.depids,
+        f_depname: this.$login.f.deps,
+        f_parameter_value:this.model.f_parameter_value,
+        f_operate_date: this.$login.toStandardTimeString(),
+        f_describe: `${this.$login.f.name}对客户${this.model.f_user_name}进行${type}`,
+        f_userinfo_id: {
+          f_userinfo_id: this.f_userinfo_id,
+          f_user_state: '正常',
+          version: this.model.version
+        },
+        f_limit_times: this.model.f_limit_times,
+        f_limit_amount: this.model.f_limit_amount,
+        f_limit_value: this.model.f_limit_value,
+        f_opr_state: this.KeyModel.f_opr_state,
+        f_level: this.KeyModel.f_level,
+        f_function:this.KeyModel.f_function
+      }
+      console.log('查看参数data', data)
+      let res = await this.$resetpost('rs/logic/backlistOperate', data, {resolveMsg: null, rejectMsg: null})
+      let operateType = type == '移入重点用户' ? '移入重点用户审核提交' : '移出重点用户审核提交'
+      if (res.data.code == 200) {
+        this.$showMessage(`${operateType}成功`)
+      }
+      if (res.data.code == 500) {
+        this.$showMessage(`${operateType}失败,用户已被移入重点用户,请先移出重点用户`)
+        return
+      }
+      if (res.data.code == 501) {
+        this.$showMessage(`${operateType}失败,用户不是重点用户,请先移入重点用户`)
+        return
+      }
+      this.initModel()
+      this.$dispatch('success')
+      this.$emit('cancel')
+    },
+    clean () {
+      this.$info('取消操作')
+      this.$dispatch('refresh', this.row)
+      this.$emit('cancel')
+    },
+  },
+  computed: {
+    isDisabled() {
+      return this.userOperationState === '移入'
+    }
+  }
+}
+
+</script>
+<style>
+
+</style>

package/src/components/revenue/comprehen/SpecialUser/BlackList/BlackListRecord.vue

@@ -4,19 +4,25 @@
       <template partial='head'>
         <tr>
           <th style="text-align: center;">序号</th>
-          <th style="text-align: center;">操作类型</th>
+          <th style="text-align: center;">移入（移出）原因</th>
+          <th style="text-align: center;">管控级别</th>
+          <th style="text-align: center;">限制功能</th>
+          <th style="text-align: center;">备注</th>
+          <th style="text-align: center;">操作状态</th>
           <th style="text-align: center;">操作时间</th>
           <th style="text-align: center;">操作人</th>
-          <th style="text-align: center;">原因</th>
         </tr>
       </template>
       <template partial='body'>
         <tr>
           <td style="text-align: center;">{{$index+1}}</td>
-          <td style="text-align: center;">{{row.f_operat_type}}</td>
+          <td style="text-align: center;">{{row.f_comments}}</td>
+          <td style="text-align: center;">{{row.f_level}}</td>
+          <td style="text-align: center;">{{$parent.$parent.formatFunction(row.f_function)}}</td>
+          <td style="text-align: center;">{{row.f_remark}}</td>
+          <td style="text-align: center;">{{row.f_opr_state}}</td>
           <td style="text-align: center;">{{row.f_operate_date}}</td>
           <td style="text-align: center;">{{row.f_operator}}</td>
-          <td style="text-align: center;">{{row.f_comments}}</td>
         </tr>
       </template>
       <template partial='foot'></template>
@@ -30,7 +36,7 @@
   let initGen = async function (self, val) {
     let http = new HttpResetClass()
     console.log(self.$login.f, '================')
-    let res = await http.load('POST', 'rs/sql/sale_getBlackListRecord', {data: {condition: `f_userinfo_id=${self.data.f_userinfo_id} and f_orgid = ${self.$login.f.orgid}` }}, {resolveMsg: null, rejectMsg: null})
+    let res = await http.load('POST', 'rs/sql/sale_getBlackListRecord', {data: {condition: `t.f_userinfo_id=${self.data.f_userinfo_id} and f_orgid = ${self.$login.f.orgid}` }}, {resolveMsg: null, rejectMsg: null})
     self.model = Object.assign({}, self.model, val)
     self.model.rows = res.data
   }
@@ -52,6 +58,20 @@
 
     ready () {
       initGen(this, this.data)
+    },
+    methods: {
+      formatFunction (functionString) {
+        if (!functionString) return ''
+        try {
+          // 解析 JSON 字符串为数组
+          let functionArray = JSON.parse(functionString)
+          // 将数组转换为用逗号分隔的字符串
+          return functionArray.join(', ')
+        } catch (e) {
+          // 如果解析失败，返回原始字符串
+          return functionString
+        }
+      }
     }
 
   }