sale-client 3.6.329 → 3.6.330

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue Jun 25 18:59:47 CST 2024
+#Wed Jul 03 11:29:24 CST 2024
 gradle.version=5.2.1

package/package.json

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

package/src/components/FilesManage/FileUserAddress.vue

@@ -130,6 +130,10 @@
             <label  class="font_normal_body " >备&emsp;&emsp;注</label>
             <textarea class="input_textarea" rows="3" style="margin-top: 25px; width:80%;height: auto;" v-model="model.f_comments"></textarea>
           </div>
+          <div class="col-sm-12 form-group">
+            <label  class="font_normal_body " style="margin-top: 40px">小区备注</label>
+            <textarea class="input_textarea" rows="3" style="margin-top: 70px; width:80%;height: auto;" v-model="model.f_comments1"></textarea>
+          </div>
           <div style="text-align:right;margin-top:40px;margin-right:50px;" class="col-sm-12">
             <button class="button_search button_spacing" @click="confirm()" :disabled='!$v.valid'>保存</button>
             <button class="button_clear button_spacing" @click="cancel()">取消</button>
@@ -313,6 +317,7 @@
           f_pcd_id: '',
           f_street_id: '',
           f_comments: '',
+          f_comments1:'',
           f_residential_area_id: '',
           f_pcd: '',
           f_street: '',
@@ -539,6 +544,8 @@
           this.initstreets(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_street_id}' `)
           this.initpcds(` f_filialeid = '${this.f_filialeids}' and id ='${selectArea.f_pcd_id}' `)
           this.model.slice_area = [{name: selectArea.f_slice_area, code: selectArea.f_area_code}]
+          this.model.f_comments1=selectArea.f_comments
+
           // 拼接地址
           this.model.f_address = `${selectArea.f_street}${selectArea.f_residential_area}`
         }
@@ -705,6 +712,7 @@
           f_residential_area_id: '',
           f_pcd: '',
           f_comments: '',
+          f_comments1:'',
           f_street: '',
           f_residential_area: '',
           f_slice_area: '',

package/src/components/charge/ChargeOper.vue

@@ -165,6 +165,14 @@ let getBtnsGen = async function (self) {
       self.styleChange(self.operBtns[0])
     }
   }
+  // 添加“限制购气”按钮
+  self.operBtns.push({
+    name: '限制购气',
+    value: {
+      'weight': 0,
+      'routeName': 'limit-gas-manages'
+    }
+  })
 }
 
 export default {

package/src/components/common/limit/LimitGasManage.vue

@@ -0,0 +1,308 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+
+        <div class="row">
+          <div class="col-sm-4 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-4 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-4 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>
+
+        <div class="row" style="margin-top:10px;" >
+          <div class="col-sm-4 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 class="col-sm-4 form-group" :class="[$v.f_time_value.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>
+
+        <div class="row" style="margin-top:10px;" v-if="model.f_limit_style !=='按总量'">
+          <div class="col-sm-4 form-group" :class="[$v.f_limit_times.required ? 'has-error' : '']">
+            <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-4 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-4 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;" v-if="model.f_limit_style ==='按总量'">
+          <div class="col-sm-4 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-4 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-4 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-4 form-group" :class="[$v.f_start_date.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >执行时间</label>
+            <input type="text" v-show="false" v-model="model.f_start_date"
+                   v-validate:f_start_date='{required: true }'>
+            <datepicker placeholder="执行时间" style="width:60%"
+                        v-model="model.f_start_date"
+                        :value.sync="model.f_start_date" v-ref:f_start_date
+                        :format="'yyyy-MM-dd'">
+            </datepicker>
+          </div>
+        </div>
+
+      </form>
+    </validator>
+    <div style="text-align:right; height: 25%">
+      <button class="btn btn-success" v-if="limitshow" @click="cancellimit">取消限购</button>
+      <button class="button_search btn-gn" :disabled="!$v.valid" @click="confirm">确认</button>
+      <button class="button_clear btn-gn" @click="clean()">取消</button>
+    </div>
+  </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
+  }
+}
+
+export default {
+  title: '限制购气',
+  name: 'limit-gas-manages',
+  data () {
+    return {
+      model: {
+        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_start_date: this.$login.toStandardDateString()
+      },
+      limitshow: false,
+      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: '无效'}]
+    }
+  },
+  props: ['show', 'f_price_id', 'f_userinfo_id','row'],
+  ready () {
+    this.getLimitData()
+  },
+  watch: {
+    'f_price_id' () {
+      this.getLimitData()
+    },
+    'f_userinfo_id' () {
+      this.getLimitData()
+    }
+  },
+  methods: {
+    getLimitData () {
+      console.log('获取限购配置。。', this.f_price_id, this.f_userinfo_id)
+      if (this.f_price_id || this.f_userinfo_id) {
+        getLimitDataGen(this)
+      }
+    },
+    computed: {
+      limitValid () {
+        let result = true
+        for (let key in this.model) {
+          if (this.model[key] === '') {
+            result = false
+          }
+        }
+        return result
+      },
+    },
+    async confirm () {
+      this.$dispatch('limit', this.model)
+      this.model = {
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_third_pay: this.model.f_third_pay,
+        f_time_type: this.model.f_time_type,
+        f_limit_times: this.model.f_limit_times,
+        f_time_value: this.model.f_time_value,
+        f_limit_type: this.model.f_limit_type,
+        f_limit_style: this.model.f_limit_style,
+        f_limit_value: this.model.f_limit_value,
+        f_limit_amount: this.model.f_limit_amount,
+        f_status: this.model.f_status,
+        f_start_date: this.$login.toStandardDateString()
+      }
+      console.log('提交限购数据', this.model)
+      // let sql =`
+      // INSERT INTO t_limit_gas (
+      //   f_third_pay,
+      //   f_time_type,
+      //   f_limit_times,
+      //   f_time_value,
+      //   f_limit_type,
+      //   f_limit_style,
+      //   f_limit_value,
+      //   f_limit_amount,
+      //   f_state,
+      //   f_start_date,
+      //   f_userinfo_id
+      // ) VALUES (
+      //   '${this.model.f_third_pay}',
+      //   '${this.model.f_time_type}',
+      //   '${this.model.f_limit_times}',
+      //   '${this.model.f_time_value}',
+      //   '${this.model.f_limit_type}',
+      //   '${this.model.f_limit_style}',
+      //   '${this.model.f_limit_value}',
+      //   '${this.model.f_limit_amount}',
+      //   '${this.model.f_status}',
+      //   '${this.model.f_start_date}',
+      //   '${this.model.f_userinfo_id}'
+      // )`
+      let restrict = {
+        f_third_pay: this.model.f_third_pay,
+        f_time_type: this.model.f_time_type,
+        f_limit_times: this.model.f_limit_times,
+        f_time_value: this.model.f_time_value,
+        f_limit_type: this.model.f_limit_type,
+        f_limit_style: this.model.f_limit_style,
+        f_limit_value: this.model.f_limit_value,
+        f_limit_amount: this.model.f_limit_amount,
+        f_operator: this.$login.f.name,
+        f_status: this.model.f_status,
+        f_start_date: this.$login.toStandardDateString()
+      }
+      let operInfo = {
+        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,
+      }
+      let user = {
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_user_name: this.row.f_user_name,
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_table_state: this.row.f_table_state,
+        f_user_id: this.row.f_user_id,
+      }
+      let param = {
+        restrict,
+        user,
+        operInfo
+      }
+      await this.$resetpost('rs/logic/limitGas',{data: param})
+    },
+    async cancellimit() {
+      let sql = `update t_limit_gas set f_state = '无效' where id = '${this.model.id}'`
+      let data = {
+        sql: sql
+      }
+      await this.$resetpost('rs/logic/runSQL',data)
+      this.model = {
+        f_third_pay: '0',
+        f_time_type: '按月',
+        f_limit_times: '',
+        f_time_value: '',
+        f_limit_type: '气量',
+        f_limit_style:'',
+        f_limit_value: 0,
+        f_limit_amount: 0,
+        f_status:'',
+        f_start_date: this.$login.toStandardDateString()
+      }
+      getLimitDataGen(this)
+    },
+    clean () {
+      this.$info('取消操作')
+      this.$dispatch('refresh', this.row)
+    },
+  }
+}
+
+</script>
+
+<style>
+
+</style>
+

package/src/components/revenue/comprehen/ComprehenOperation/LimitGasManage.vue

@@ -0,0 +1,306 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+
+        <div class="row">
+          <div class="col-sm-4 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-4 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-4 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>
+
+        <div class="row" style="margin-top:10px;" >
+          <div class="col-sm-4 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 class="col-sm-4 form-group" :class="[$v.f_time_value.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>
+
+        <div class="row" style="margin-top:10px;" v-if="model.f_limit_style !=='按总量'">
+          <div class="col-sm-4 form-group" :class="[$v.f_limit_times.required ? 'has-error' : '']">
+            <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-4 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-4 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;" v-if="model.f_limit_style ==='按总量'">
+          <div class="col-sm-4 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-4 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-4 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-4 form-group" :class="[$v.f_start_date.required ? 'has-error' : '']">
+            <label class="font_normal_body col-sm-3" >执行时间</label>
+            <input type="text" v-show="false" v-model="model.f_start_date"
+                   v-validate:f_start_date='{required: true }'>
+            <datepicker placeholder="执行时间" style="width:60%"
+                        v-model="model.f_start_date"
+                        :value.sync="model.f_start_date" v-ref:f_start_date
+                        :format="'yyyy-MM-dd'">
+            </datepicker>
+          </div>
+        </div>
+
+      </form>
+    </validator>
+    <div style="text-align:right; height: 25%">
+      <button class="btn btn-success" v-if="limitshow" @click="cancellimit">取消限购</button>
+      <button class="button_search btn-gn" :disabled="!$v.valid" @click="confirm">确认</button>
+      <button class="button_clear btn-gn" @click="clean()">取消</button>
+    </div>
+  </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
+  }
+}
+
+export default {
+  title: '限制购气',
+  data () {
+    return {
+      model: {
+        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_start_date: this.$login.toStandardDateString()
+      },
+      limitshow: false,
+      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: '无效'}]
+    }
+  },
+  props: ['show', 'f_price_id', 'f_userinfo_id','row'],
+  ready () {
+    this.getLimitData()
+  },
+  watch: {
+    'f_price_id' () {
+      this.getLimitData()
+    },
+    'f_userinfo_id' () {
+      this.getLimitData()
+    }
+  },
+  methods: {
+    getLimitData () {
+      console.log('获取限购配置。。', this.f_price_id, this.f_userinfo_id)
+      if (this.f_price_id || this.f_userinfo_id) {
+        getLimitDataGen(this)
+      }
+    },
+    computed: {
+      limitValid () {
+        let result = true
+        for (let key in this.model) {
+          if (this.model[key] === '') {
+            result = false
+          }
+        }
+        return result
+      },
+    },
+    async confirm () {
+      this.$dispatch('limit', this.model)
+      this.model = {
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_third_pay: this.model.f_third_pay,
+        f_time_type: this.model.f_time_type,
+        f_limit_times: this.model.f_limit_times,
+        f_time_value: this.model.f_time_value,
+        f_limit_type: this.model.f_limit_type,
+        f_limit_style: this.model.f_limit_style,
+        f_limit_value: this.model.f_limit_value,
+        f_limit_amount: this.model.f_limit_amount,
+        f_status: this.model.f_status,
+        f_start_date: this.$login.toStandardDateString()
+      }
+      console.log('提交限购数据', this.model)
+      // let sql =`
+      // INSERT INTO t_limit_gas (
+      //   f_third_pay,
+      //   f_time_type,
+      //   f_limit_times,
+      //   f_time_value,
+      //   f_limit_type,
+      //   f_limit_style,
+      //   f_limit_value,
+      //   f_limit_amount,
+      //   f_state,
+      //   f_start_date,
+      //   f_userinfo_id
+      // ) VALUES (
+      //   '${this.model.f_third_pay}',
+      //   '${this.model.f_time_type}',
+      //   '${this.model.f_limit_times}',
+      //   '${this.model.f_time_value}',
+      //   '${this.model.f_limit_type}',
+      //   '${this.model.f_limit_style}',
+      //   '${this.model.f_limit_value}',
+      //   '${this.model.f_limit_amount}',
+      //   '${this.model.f_status}',
+      //   '${this.model.f_start_date}',
+      //   '${this.model.f_userinfo_id}'
+      // )`
+      let restrict = {
+        f_third_pay: this.model.f_third_pay,
+        f_time_type: this.model.f_time_type,
+        f_limit_times: this.model.f_limit_times,
+        f_time_value: this.model.f_time_value,
+        f_limit_type: this.model.f_limit_type,
+        f_limit_style: this.model.f_limit_style,
+        f_limit_value: this.model.f_limit_value,
+        f_limit_amount: this.model.f_limit_amount,
+        f_operator: this.$login.f.name,
+        f_status: this.model.f_status,
+        f_start_date: this.$login.toStandardDateString()
+      }
+      let operInfo = {
+        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,
+      }
+      let user = {
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_user_name: this.row.f_user_name,
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_table_state: this.row.f_table_state,
+        f_user_id: this.row.f_user_id,
+      }
+      let param = {
+        restrict,
+        user,
+        operInfo
+      }
+      await this.$resetpost('rs/logic/limitGas',{data: param})
+    },
+    async cancellimit() {
+      let sql = `update t_limit_gas set f_state = '无效' where id = '${this.model.id}'`
+      let data = {
+        sql: sql
+      }
+      await this.$resetpost('rs/logic/runSQL',data)
+      this.model = {
+        f_third_pay: '0',
+        f_time_type: '按月',
+        f_limit_times: '',
+        f_time_value: '',
+        f_limit_type: '气量',
+        f_limit_style:'',
+        f_limit_value: 0,
+        f_limit_amount: 0,
+        f_status:'',
+        f_start_date: this.$login.toStandardDateString()
+      }
+      getLimitDataGen(this)
+    },
+    clean () {
+      this.$info('取消操作')
+      this.$dispatch('refresh', this.row)
+    },
+  }
+}
+
+</script>
+
+<style>
+
+</style>

package/src/filiale/bayan/LimitGasManage.vue

@@ -143,6 +143,7 @@ let getLimitDataGen = async function (self) {
 
 export default {
   title: '限制购气',
+  // name: 'limit-gas-manages',
   data () {
     return {
       model: {

package/src/filiale/bayan/sale.js

@@ -26,6 +26,6 @@ export default function () {
   Vue.component('machine-meter-center', (resolve) => { require(['./MachineMeterCenter'], resolve) })
   // 其他收费xin
   Vue.component('other-charge-new', (resolve) => { require(['./OtherChargeNew'], resolve) })
-  // 收费页面限制购气
-  Vue.component('limit-gas-manages', (resolve) => { require(['./LimitGasManage'], resolve) })
+  // // 收费页面限制购气
+  // Vue.component('limit-gas-manages', (resolve) => { require(['./LimitGasManage'], resolve) })
 }

package/src/filiale/rongchuang/EticketRecordList.vue

@@ -125,10 +125,7 @@
             <th style="text-align:center">{{ row.f_charge_type }}</th>
             <th style="text-align:center">{{ row.f_operate_date }}</th>
             <th style="text-align:center">
-              <button class="btn btn-link" v-if="row.f_bill_url"
-                      @click="$parent.$parent.$parent.watch_ch(row.f_bill_url)">
-                查看发票
-              </button>
+              <a class="btn btn-link" v-if="row.f_bill_url" :href="row.f_bill_url" target="_blank">查看发票</a>
             </th>
             <th style="text-align:center">
               <template >

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

@@ -210,10 +210,6 @@
     },
     methods: {
       async open_eTicket () {
-        if (this.$login.f.orgid != '33520') {
-          this.$showAlert('目前只有 正安县新兴天然气有限公司 可以进行开发票操作！！', 'warning', 2000)
-          return
-        }
         if(this.selecteds.length>1){
           this.$showAlert('选中条数大于一条，请重新修改！！', 'warning', 2000)
           return

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

@@ -154,10 +154,6 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     async open_eTicket () {
-      if (this.$login.f.orgid != '33520') {
-        this.$showAlert('目前只有 正安县新兴天然气有限公司 可以进行开发票操作！！', 'warning', 2000)
-        return
-      }
       if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
         return

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

@@ -150,10 +150,6 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     async open_eTicket () {
-      if (this.$login.f.orgid != '33520') {
-        this.$showAlert('目前只有 正安县新兴天然气有限公司 可以进行开发票操作！！', 'warning', 2000)
-        return
-      }
       if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
         return

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

@@ -145,10 +145,6 @@ export default {
       this.$refs.paged.$refs.cri.search()
     },
     async open_eTicket () {
-      if (this.$login.f.orgid != '33520') {
-        this.$showAlert('目前只有 正安县新兴天然气有限公司 可以进行开发票操作！！', 'warning', 2000)
-        return
-      }
       if ([...new Set(this.selecteds.map(item => item.f_userinfo_code))].length > 1) {
         this.$showAlert('所选择用户不是同一用户！！', 'warning', 2000)
         return

package/src/sale.js

@@ -414,6 +414,8 @@ export default function () {
   Vue.component('correct-bill', (resolve) => { require(['./components/revenue/Common/CorrectBill'], resolve) })
   // 限购配置
   Vue.component('limit-gas', (resolve) => { require(['./components/revenue/Common/LimitGas'], resolve) })
+  // 收费页面限制购气
+  Vue.component('limit-gas-manages', (resolve) => { require(['./components/common/limit/LimitGasManage'], resolve) })
   // 限购管理
   Vue.component('limit-manage', (resolve) => { require(['./components/common/limit/LimitManage'], resolve) })
   Vue.component('limit-list', (resolve) => { require(['./components/common/limit/LimitList'], resolve) })
@@ -1209,4 +1211,5 @@ export default function () {
   // 合同签名
   Vue.component('contract-signing-brain', (resolve) => { require(['./components/common/userinfo_detail/contractSigningBrain'], resolve) })
   Vue.component('contract-sig', (resolve) => { require(['./components/common/userinfo_detail/contractSig'], resolve) })
+
 }