sale-client 3.6.360-preview → 3.6.361-preview

package/package.json

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

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

@@ -13,14 +13,34 @@
                       :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 class="col-sm-3 form-group" :class="[$v.f_opr_state.required ? 'has-error' : '']" v-if="false">
+            <label class="font_normal_body col-sm-3">操作状态1</label>
+            <input type="text" v-show="false" v-model="KeyModel.f_final_opr_state" v-validate:f_opr_state='{required: true }'>
+            <v-select width="60%"
+                      v-model="KeyModel.f_final_opr_state"
+                      :value.sync="KeyModel.f_final_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 class="col-sm-3 form-group" id="f_comments" :class="[$v.f_comments.required ? 'has-error' : 'has-success']" v-if="KeyModel.f_opr_state == '移入'">
+            <label for="f_comments" class=" font_normal_body">移入原因</label>
+            <input  type="text"   v-model="KeyModel.f_comments" v-show="false"
+                    v-validate:f_comments='{required: true }' >
+            <v-select
+              width="60%"
+              :value.sync="KeyModel.f_comments"
+              v-model="KeyModel.f_comments"
+              :options="fcomments"
+              :value-single="true"
+              :close-on-select="false"
+            >
+            </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 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>
@@ -68,7 +88,6 @@
     <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>
@@ -228,9 +247,10 @@ export default {
   data () {
     return {
       KeyModel: {
+        f_final_opr_state: '移出',
         f_opr_state:'移入',
         f_comments: '',
-        f_function: '',
+        f_function: '限制购气',
         f_level:'',
         f_remark:''
       },
@@ -256,10 +276,8 @@ export default {
       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('限制功能')] : [],
+      fFunction: [{label: '限制购气', value:'限制购气'},{label: '禁止缴费退款', value:'禁止缴费退款'},{label: '禁止开阀', value:'禁止开阀'},{label: '禁止换表', value:'禁止换表'},{label: '禁止补退气', value:'禁止补退气'},{label: '下发强制关阀', value:'下发强制关阀'}],
+      fcomments:this.$appdata.getParam('移入原因') ? [ ...this.$appdata.getParam('移入原因')] : []
     }
       },
   props: ['show', 'f_price_id', 'f_userinfo_id','row','userOperationState'],
@@ -285,14 +303,19 @@ export default {
       }
     },
     async confirm (type) {
+      console.log('确认移入重点用户', this.$login.r)
       if (this.userOperationState === '移入') {
         this.$showMessage(`${type}失败, 用户已被移入重点用户, 请先移出重点用户`);
         return;
       }
-      if (type == '取消拉黑' && !this.$login.r.find(value => value == '取消拉黑')) {
+      if (type == '移出重点用户' && !this.$login.r.find(value => value == '取消拉黑')) {
         this.$showMessage('你没有移出重点用户的权限,请联系管理员!')
         return
       }
+      if (type == '移入重点用户' && !this.$login.r.find(value => value == '新增黑名单')) {
+        this.$showMessage('你没有移入重点用户的权限,请联系管理员!')
+        return
+      }
       let data = {
         f_operat_type: type,
         f_state: '待审核',
@@ -318,6 +341,7 @@ export default {
         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_final_opr_state: this.KeyModel.f_final_opr_state,
         f_level: this.KeyModel.f_level,
         f_function:this.KeyModel.f_function
       }
@@ -335,6 +359,10 @@ export default {
         this.$showMessage(`${operateType}失败,用户不是重点用户,请先移入重点用户`)
         return
       }
+      if (res.data.code == 503) {
+        this.$showMessage(`${operateType}失败,该用户已提交移出重点用户审核，请联系管理员处理`)
+        return
+      }
       this.initModel()
       this.$dispatch('success')
       this.$emit('cancel')

package/src/components/newBill/CardMeterCenter.vue

@@ -247,7 +247,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

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

@@ -4,25 +4,19 @@
       <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_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_operat_type}}</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>
@@ -31,50 +25,36 @@
 </template>
 
 <script>
-  import {HttpResetClass} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
 
-  let initGen = async function (self, val) {
-    let http = new HttpResetClass()
-    console.log(self.$login.f, '================')
-    let res = await http.load('POST', 'api/af-revenue/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
-  }
-  export default {
-    props: ['data'],
-    data () {
-      return {
-        model: {
-          rows: []
-        }
-      }
-    },
-    watch: {
-      'data' (val) {
-        if (val) {
-          initGen(this, val)
-        }
-      }},
-
-    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
-        }
+let initGen = async function (self, val) {
+  let http = new HttpResetClass()
+  console.log(self.$login.f, '================')
+  let res = await http.load('POST', 'api/af-revenue/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
+}
+export default {
+  props: ['data'],
+  data () {
+    return {
+      model: {
+        rows: []
       }
     }
+  },
+  watch: {
+    'data' (val) {
+      if (val) {
+        initGen(this, val)
+      }
+    }},
 
+  ready () {
+    initGen(this, this.data)
   }
+
+}
 </script>
 <style>
 

package/src/components/revenue/comprehen/SpecialUser/SpecialUserManage.vue

@@ -7,7 +7,7 @@
       <tabs header="黑名单管理" v-if="permission('黑名单管理')">
         <black-list-mangae   @deal-msg="dealMsg"></black-list-mangae>
       </tabs>
-      <tabs header="黑名单记录查询"  v-if="permission('黑名单记录查询')">
+      <tabs header="黑名单记录查询"  v-if="permission('重点用户记录查看')">
         <black-record-query  @deal-msg="dealMsg"></black-record-query>
       </tabs>
     </tab-button>

package/src/filiale/alashan/business/CardMeterCenter.vue

@@ -241,7 +241,7 @@
           if (self.row.f_collection_type === '按金额') {
             self.dymoney = 0
           } else {
-            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
             self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
           }
         } else {

package/src/filiale/gehua/CardMeterCenter.vue

@@ -238,7 +238,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/gehua/ShowCardSellGas.vue

@@ -273,7 +273,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/guangxi/CardMeterCenter.vue

@@ -238,7 +238,7 @@
           self.dymoney = 0
         } else {
           if (self.row.f_meter_brand !== '秦川IC卡表') {
-            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
             self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
           }
         }

package/src/filiale/guangxi/ShowCardSellGas.vue

@@ -274,7 +274,7 @@ let preamountGen = async function (self) {
         self.dymoney = 0
       } else {
         if (self.row.f_meter_brand !== '秦川IC卡表') {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       }

package/src/filiale/huayin/CardMeterCenter.vue

@@ -246,7 +246,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/jinbin/CardMeterCenter.vue

@@ -286,7 +286,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/jinbin/ShowCardSellGas.vue

@@ -215,7 +215,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         }else{
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/jinjiang/CardMeterCenter.vue

@@ -229,7 +229,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         }else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/kelai/CardMeterCenter.vue

@@ -252,7 +252,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/kelai/ShowCardSellGas.vue

@@ -307,7 +307,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/macheng/CardMeterCenter.vue

@@ -261,7 +261,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/ningjin/CardMeterCenter.vue

@@ -291,7 +291,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/rizhao/CardMeterCenter.vue

@@ -293,7 +293,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/rizhao/ShowCardSellGas.vue

@@ -292,7 +292,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/rongcheng/business/CardMeterCenter.vue

@@ -237,7 +237,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         }else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/rongchuang/CardMeterCenter.vue

@@ -239,7 +239,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           if (dymoney2.data.money) {
             self.dymoney = (getGas.data.money - 0).toFixed(4) - (dymoney2.data.money - 0).toFixed(4)
           }

package/src/filiale/rongchuang/bill/EticketRecordList.vue

@@ -37,6 +37,12 @@
                         close-on-select clear-button>
               </v-select>
             </div>
+            <div  class="form-group col-sm-2">
+              <label class="font_normal_body">开票人</label>
+              <input  type="text" class="form-control" v-model="model.f_operator" style="width:60%"
+                      condition="f_operator = '{}'" placeholder="开票人"
+              >
+            </div>
 
             <div style="float: right" class="span" >
               <button class="button_search"  @click="search()">查 询</button>
@@ -77,8 +83,8 @@
               </v-select>
             </div>
             <div class="form-group col-sm-2">
-              <label for="startDate" class="font_normal_body">开票日期</label>
-              <datepicker id="startDate" placeholder="开始日期"
+              <label for="startDate" class="font_normal_body">开票日期 ≥ </label>
+              <datepicker id="startDate" placeholder="开票日期"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
@@ -88,8 +94,8 @@
               </datepicker>
             </div>
             <div class="form-group col-sm-2">
-              <label  for="endDate"  class="font_normal_body">结束时间</label>
-              <datepicker id="endDate" placeholder="结束日期"
+              <label  for="endDate"  class="font_normal_body">开票日期 ≤ </label>
+              <datepicker id="endDate" placeholder="开票日期"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
@@ -98,6 +104,60 @@
               >
               </datepicker>
             </div>
+
+            <div  class="form-group col-sm-2" >
+              <label class="font_normal_body">用户类型</label>
+              <v-select id="f_charge_type"
+                        style="width:60%"
+                        v-model="model.f_user_type"
+                        placeholder='用户类型'
+                        condition="f_user_type ='{}'"
+                        :value.sync="model.f_user_type"
+                        :options='$parent.$parent.userTypes'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div  class="form-group col-sm-2" >
+              <label class="font_normal_body">发票类型</label>
+              <v-select id="f_charge_type"
+                        style="width:60%"
+                        v-model="model.f_invoice_category"
+                        placeholder='发票类型'
+                        condition="f_invoice_category ='{}'"
+                        :value.sync="model.f_invoice_category"
+                        :options='$parent.$parent.invoiceTypes'
+                        close-on-select clear-button>
+              </v-select>
+            </div>
+            <div  class="form-group col-sm-2">
+              <label class="font_normal_body">气价名称</label>
+              <input  type="text" class="form-control" v-model="model.f_price_name" style="width:60%"
+                      condition="f_price_name like '%{}%'" placeholder="气价名称"
+              >
+            </div>
+
+            <div class="form-group col-sm-2">
+              <label for="startDate" class="font_normal_body">收费日期 ≥ </label>
+              <datepicker id="startDate" placeholder="收费日期"
+                          v-model="model.startDate2"
+                          :value.sync="model.startDate2"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="f_operate_date >='{}'"
+                          style="width:60%"
+              >
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-2">
+              <label for="startDate" class="font_normal_body">收费日期 ≤ </label>
+              <datepicker id="startDate" placeholder="收费日期"
+                          v-model="model.endDate2"
+                          :value.sync="model.endDate2"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="f_operate_date <='{}'"
+                          style="width:60%"
+              >
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>
@@ -107,12 +167,16 @@
             <th>序号</th>
             <th>客户编号</th>
             <th>用户姓名</th>
+            <th>用户类型</th>
             <th>用户地址</th>
             <th>气量</th>
             <th>税后金额</th>
             <th>合计金额</th>
+            <th>气价名称</th>
             <th>收费类型</th>
             <th>收费时间</th>
+            <th>收费员</th>
+            <th>发票类型</th>
             <th>是否征税</th>
             <th>票据状态</th>
             <th>失败原因</th>
@@ -126,12 +190,16 @@
           <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_user_type}}</td>
           <td style="text-align:center">{{row.f_address}}</td>
           <td style="text-align:center">{{row.f_pregas}}</td>
           <td style="text-align:center">{{row.f_tax_money.toFixed(2)}}</td>
           <td style="text-align:center">{{row.f_total_money}}</td>
+          <td style="text-align:center">{{row.f_price_name}}</td>
           <td style="text-align:center">{{row.f_charge_type}}</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_invoice_category}}</td>
           <td style="text-align:center">{{row.f_tax_logotype}}</td>
           <td style="text-align:center">{{row.f_bill_state}}</td>
           <td style="text-align:center">{{row.f_sign_result}}</td>
@@ -217,7 +285,9 @@
           'f_tax_logotype': '是否征税',
           'f_bill_state': '票据状态',
           'f_kprq': '开票时间'
-        }
+        },
+        userTypes: [{label: '全部', value: ''}, {label: '民用', value: '民用'}, {label: '非民用', value: '非民用'}],
+        invoiceTypes: [{label: '全部', value: ''}, {label: '数电普票', value: '数电普票'}, {label: '数电专票', value: '数电专票'}]
       }
     },
     ready () {

package/src/filiale/shangluo/CardMeterCenter.vue

@@ -242,7 +242,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/shanxian/components/revenue/CardMeterCenter.vue

@@ -262,7 +262,7 @@
           if (self.row.f_collection_type === '按金额') {
             self.dymoney = 0
           } else {
-            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+            let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
             self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
           }
         } else {

package/src/filiale/tongchuan/CardMeterCenter.vue

@@ -270,7 +270,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/wenxi/CardMeterCenter.vue

@@ -261,7 +261,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/wenxi/ShowCardSellGas.vue

@@ -293,7 +293,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/wuhai/CardMeterCenter.vue

@@ -264,7 +264,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/wuhai/ShowCardSellGas.vue

@@ -291,7 +291,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/yangchun/BlackList/BlackList.vue

@@ -72,7 +72,7 @@
             </div>
           </div>
           <div class="row">
-            <div class="col-sm-3 form-group" :class="[$v.f_opr_state.required ? 'has-error' : '']">
+            <div class="col-sm-3 form-group" :class="[$v.f_opr_state.required ? 'has-error' : '']" v-if="showOprState">
               <label class="font_normal_body col-sm-4">操作状态</label>
               <input type="text" v-show="false" v-model="model.f_opr_state" v-validate:f_opr_state='{required: true }'>
               <v-select width="60%"
@@ -82,6 +82,16 @@
                         :value-single="true"
                         close-on-select></v-select>
             </div>
+            <div class="col-sm-3 form-group" :class="[$v.f_final_opr_state.required ? 'has-error' : '']" v-if="model.f_operat_type!='移入重点用户' ||  (isBlackList == 2 || model.isblacklist =='true')">
+              <label class="font_normal_body col-sm-4">操作状态</label>
+              <input type="text" v-show="false" v-model="model.f_final_opr_state" v-validate:f_final_opr_state='{required: true }'>
+              <v-select width="60%"
+                        v-model="model.f_final_opr_state"
+                        :value.sync="model.f_final_opr_state"
+                        :options="fstate"
+                        :value-single="true"
+                        close-on-select></v-select>
+            </div>
           <div class="row">
             <div class="col-sm-3 form-group" :class="[$v.f_level.required ? 'has-error' : '']">
               <label class="font_normal_body col-sm-4">管控级别</label>
@@ -116,15 +126,19 @@
                      readonly
                      placeholder="地址">
             </div>
-            <div class="col-sm-12 form-group" id="f_comments" :class="[$v.f_comments.required ? 'has-error' : 'has-success']" v-if="model.f_opr_state == '移入'"_>
+            <div class="col-sm-12 form-group" id="f_comments" :class="[$v.f_comments.required ? 'has-error' : 'has-success']">
               <label for="f_comments" class=" font_normal_body">移入原因</label>
-              <input class="input_search" type="text" class="input_search" style="width:87%" v-model="model.f_comments"
-                     placeholder="原因" v-validate:f_comments='{required: true }' >
-            </div>
-            <div class="col-sm-12 form-group" id="f_comments" :class="[$v.f_comments.required ? 'has-error' : 'has-success']" v-if="model.f_opr_state == '移出'"_>
-              <label for="f_comments" class=" font_normal_body">移出原因</label>
-              <input class="input_search" type="text" class="input_search" style="width:87%" v-model="model.f_comments"
-                     placeholder="原因" v-validate:f_comments='{required: true }' >
+              <input  type="text"   v-model="model.f_comments" v-show="false"
+                     v-validate:f_comments='{required: true }' >
+              <v-select
+                width="60%"
+                :value.sync="model.f_comments"
+                v-model="model.f_comments"
+                :options="fcomments"
+                :value-single="true"
+                :close-on-select="false"
+              >
+              </v-select>
             </div>
             <div class="col-sm-12 form-group" id="f_remark">
               <label for="f_remark" class=" font_normal_body">备&emsp;&emsp;注</label>
@@ -140,11 +154,11 @@
           </div>
 
           <div style="text-align:right;height:auto;margin-top:6px;">
-            <button class="button_search" type="button" @click="confirm('移入重点用户')" v-show="isBla ckList == 1 && model.isblacklist =='false'" :disabled='!$v.valid'>
+            <button class="button_search" type="button" @click="confirm('移入重点用户')" v-show="isBlackList == 1 && model.isblacklist =='false'" :disabled='!$v.valid'>
               提交移入重点用户审核
             </button>
             <button class="button_search"  type="button" @click="confirm('移出重点用户')"
-                    v-show="isBlackList == 2 || model.isblacklist =='true'" :disabled='!$v.valid'>
+                    v-show="showConfirmButton" :disabled='!$v.valid'>
               提交移出重点用户审核
             </button>
               <button class="button_search" type="button" @click="audit('通过')"
@@ -181,6 +195,7 @@
       self.model.f_function = JSON.parse(self.model.f_function)
     }
     self.model.f_meternumber = res.data[0].f_meternumber
+    // self.model.f_final_opr_state=res.data[0].f_final_opr_state
     self.model.f_card_id = res.data[0].f_card_id
     self.model.f_userinfo_id = res.data[0].f_userinfo_id
     self.model.f_user_phone = res.data[0].f_user_phone
@@ -210,6 +225,7 @@
         model: {
           noLimitGas: '',
           f_opr_state:'移入',
+          f_final_opr_state: '移出',
           f_function: [],
           f_level:'',
           f_userinfo_code: '',
@@ -241,8 +257,8 @@
           label: '全部',
           value: ''
         }, ...this.$appdata.getParam('限制功能')] : [],
-        nolimitGas:[{label: '是', value:'0'},{label: '否', value:'1'}]
-
+        nolimitGas:[{label: '是', value:'0'},{label: '否', value:'1'}],
+        fcomments:this.$appdata.getParam('移入原因') ? [ ...this.$appdata.getParam('移入原因')] : [],
       }
     },
     ready () {
@@ -294,8 +310,12 @@
         })
       },
       async confirm (type) {
-        if (type == '取消拉黑' && !this.$login.r.find(value => value == '取消拉黑')) {
-          this.$showMessage('你没有取消拉黑的权限,请联系管理员!')
+        if (type == '移出重点用户' && !this.$login.r.find(value => value == '取消拉黑')) {
+          this.$showMessage('你没有移出重点用户的权限,请联系管理员!')
+          return
+        }
+        if (type == '移入重点用户' && !this.$login.r.find(value => value == '新增黑名单')) {
+          this.$showMessage('你没有移入重点用户的权限,请联系管理员!')
           return
         }
         let data = {
@@ -322,6 +342,7 @@
           f_limit_amount: this.model.f_limit_amount,
           f_limit_value: this.model.f_limit_value,
           f_opr_state: this.model.f_opr_state,
+          f_final_opr_state: this.model.f_final_opr_state,
           f_level: this.model.f_level,
           f_function:this.model.f_function
         }
@@ -339,12 +360,16 @@
           this.$showMessage(`${operateType}失败,用户不是重点用户,请先移入重点用户`)
           return
         }
+        if (res.data.code === 503) {
+          this.$showMessage(`${operateType}失败,该用户已提交移出重点用户审核，请联系管理员处理`)
+          return
+        }
         this.initModel()
         this.$dispatch('success')
       },
       async audit (type) {
         if (!this.$login.r.find(value => value == '黑名单审核')) {
-          this.$showMessage('你没有审核黑名单的权限,请联系管理员!')
+          this.$showMessage('你没有审核重点用户的权限,请联系管理员!')
           return
         }
         let data = {
@@ -386,6 +411,12 @@
       },
     },
     computed: {
+      showConfirmButton() {
+        return this.isBlackList == 2 || this.model.isblacklist == 'true';
+      },
+      showOprState() {
+        return !this.showConfirmButton && this.model.f_opr_state == '移入';
+      }
       // parsedFFunction: {
       //   get() {
       //     if (this.model.f_function) {
@@ -403,6 +434,11 @@
       //   }
       // }
     },
+    mounted () {
+      // if (this.model.f_opr_state === '移入') {
+      //   this.model.f_opr_state = '移出';
+      // }
+    }
   }
 </script>
 <style lang="less">

package/src/filiale/yangchun/BlackList/BlackListRecord.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="flex-full" style="height: 40%">
+    <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+      <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>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">{{$index+1}}</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>
+        </tr>
+      </template>
+      <template partial='foot'></template>
+    </data-grid>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+
+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: `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
+}
+export default {
+  props: ['data'],
+  data () {
+    return {
+      model: {
+        rows: []
+      }
+    }
+  },
+  watch: {
+    'data' (val) {
+      if (val) {
+        initGen(this, val)
+      }
+    }},
+
+  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
+      }
+    }
+  }
+
+}
+</script>
+<style>
+
+</style>
+

package/src/filiale/yangchun/sale.js

@@ -9,6 +9,8 @@ export default function () {
   Vue.component('black-list', (resolve) => { require(['./BlackList/BlackList'], resolve) })
   // 黑名单记录查询
   Vue.component('black-record-query', (resolve) => { require(['./BlackList/BlackRecordQuery'], resolve) })
+  Vue.component('black-list-record', (resolve) => { require(['./BlackList/BlackListRecord'], resolve) })
+
   // 特殊用户
   Vue.component('special-user-manage', (resolve) => { require(['./SpecialUserManage'], resolve) })
 

package/src/filiale/yuansheng/CardMeterCenter.vue

@@ -263,7 +263,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {

package/src/filiale/yuansheng/ShowCardSellGas.vue

@@ -292,7 +292,7 @@ let preamountGen = async function (self) {
       if (self.row.f_collection_type === '按金额') {
         self.dymoney = 0
       } else {
-        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+        let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
         self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
       }
     } else {

package/src/filiale/zhongyi/CardMeterCenter.vue

@@ -291,7 +291,7 @@
         if (self.row.f_collection_type === '按金额') {
           self.dymoney = 0
         } else {
-          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed4))
+          let dymoney2 = await self.$CommonService.gasCalculate(self.model, (getGas.data.gas - 0).toFixed(4))
           self.dymoney = (getGas.data.chargenum - 0).toFixed(4) - (dymoney2.data.chargenum - 0).toFixed(4)
         }
       } else {