sale-client 3.6.314 → 3.6.316

package/package.json

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

package/src/components/revenue/base/UserList.vue

@@ -165,6 +165,9 @@
                   <li v-if="row.f_meter_type === '物联网表' && $parent.$parent.$parent.jurisdiction.includes('补费扣费')">
                     <a href="#" @click.stop="$parent.$parent.$parent.operate('补费扣费', 'deduction-manage', row)">补费扣费</a>
                   </li>
+                  <li v-if="$parent.$parent.$parent.jurisdiction.includes('限购配置')">
+                    <a href="#" @click.stop="$parent.$parent.$parent.operate('限购配置', 'limit-gas-manage', row)">限购配置</a>
+                  </li>
                 </ul>
               </dropdown>
             </td>

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterListMaintain.vue

@@ -6,43 +6,104 @@
           <criteria partial='criteria' v-ref:criteria @condition-changed="$parent.selfSearch"
                     v-show="$parent.searchshow">
             <div novalidate class="form-inline auto" partial>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">组织机构</label>
-                <res-select :initresid='$parent.$parent.curorgid'
-                            @res-select="$parent.$parent.getorg"
-                            class="select select_list"
-                            restype='organization'
-                            style="width: 60%">
-                </res-select>
+<!--              <div class="col-sm-2 form-group">-->
+<!--                <label class="font_normal_body">组织机构</label>-->
+<!--                <res-select :initresid='$parent.$parent.curorgid'-->
+<!--                            @res-select="$parent.$parent.getorg"-->
+<!--                            class="select select_list"-->
+<!--                            restype='organization'-->
+<!--                            style="width: 60%">-->
+<!--                </res-select>-->
+<!--              </div>-->
+              <div class="row">
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}'" placeholder='客户编号'>
+                </div>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="span" style="float:right;">
+                  <button class="button_search" @click="search()">查 询</button>
+                  <export-excel v-if="$parent.$parent.excelTable"
+                                class="auto"
+                                :data="{condition: $parent.$parent.condition,orderitem: $parent.$parent.orderitem}"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/saleExport" progress="saleGetExportProgress"  sql-name="changemeterFiles"
+                                template-name='换表记录'
+                                :choose-col="true"></export-excel>
+                  <div
+                    :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                    @click="$parent.$parent.hidden()"
+                    class="button_spacing"
+                    style="float: right"></div>
+                </div>
               </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户编号</label>
-                <input type="text" class="input_search"  style="width: 60%" v-model="model.f_userinfo_code"
-                       condition="f_userinfo_code = '{}'" placeholder='客户编号'>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户姓名</label>
-                <input type="text" class="input_search"  style="width: 60%" v-model="model.f_user_name"
-                       condition="f_user_name = '{}'" placeholder='客户姓名'>
-              </div>
-              <div class="col-sm-2 form-group">
-                <label class="font_normal_body">有无附件</label>
-                <v-select :disabled=false
-                          :options='$parent.$parent.pj'
-                          :value-single="true"
-                          :value.sync="model.is_has_file"
-                          close-on-select
-                          placeholder='请选择'
-                          v-model="model.is_has_file"
-                          condition="is_has_file = '{}'"
-                          search=fasle
-                >
-                </v-select>
-              </div>
-              <div class="span" style="float:right;">
-                <button class="button_search" @click="search()">查 询</button>
+              <div class="row" v-if="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="['company','department']" @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">客户姓名</label>
+                  <input type="text" class="input_search"  style="width: 60%" v-model="model.f_user_name"
+                         condition="f_user_name = '{}'" placeholder='客户姓名'>
+                </div>
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">有无附件</label>
+                  <v-select :disabled=false
+                            :options='$parent.$parent.pj'
+                            :value-single="true"
+                            :value.sync="model.is_has_file"
+                            close-on-select
+                            placeholder='请选择'
+                            v-model="model.is_has_file"
+                            condition="is_has_file = '{}'"
+                            search=fasle
+                  >
+                  </v-select>
+                </div>
+<!--                <div-->
+<!--                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"-->
+<!--                  class="form-group">-->
+<!--                  <label class="font_normal_body">换表编号</label>-->
+<!--                  <input type="text" class="input_search"  style="width: 60%" v-model="model.id"-->
+<!--                         condition="id = '{}'" placeholder='用户编号'>-->
+<!--                </div>-->
+                <div :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                     class="form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select id="f_meter_brand"
+                            v-model="model.f_meter_brand"
+                            placeholder='气表品牌'
+                            :value.sync="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrand'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select style="width: 60%"></v-select>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">开始日期</label>
+                  <datepicker placeholder="开始日期" v-model="model.startDate" :value.sync="model.startDate" style="width:60%"
+                              :format="'yyyy-MM-dd 00:00:00'" condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div
+                  :class="{'col-sm-2':!$parent.$parent.editList,'col-sm-4':$parent.$parent.editList}"
+                  class="form-group">
+                  <label class="font_normal_body">结束日期</label>
+                  <datepicker placeholder="结束日期" v-model="model.endDate" :value.sync="model.endDate" style="width:60%"
+                              :format="'yyyy-MM-dd 23:59:59'" condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
               </div>
             </div>
+
           </criteria>
           <data-grid :model="model" v-ref:grid class="list_area table_sy" partial='list'>
             <template partial='head'>
@@ -84,7 +145,10 @@
                   <nobr>旧表具剩余金额</nobr>
                 </th>
                 <th>
-                  <nobr>备注</nobr>
+                  <nobr>换表原因</nobr>
+                </th>
+                <th>
+                  <nobr>其他备注</nobr>
                 </th>
                 <th>
                   <nobr>换表人</nobr>
@@ -145,6 +209,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_othereason}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_change_operator}}</nobr>
               </td>
@@ -177,7 +244,9 @@
 <script>
   import {PagedList} from 'vue-client'
 const myMap = new Map()
-
+  let asyncReadyGen = async function (self) {
+    await self.initQueryParam()
+  }
   export default {
     'title': '',
     data () {
@@ -187,12 +256,44 @@ const myMap = new Map()
         // 控制查询条件显示
         searchshow: true,
         curorgid: [this.$login.f.orgid],
+        criteriaShow: false,
         f_orgid: '',
+        condition: '',
         // 排序
         orderitem: 'f_operate_date desc',
         orderFields: {
           f_operate_date: 'no'
         },
+        // 控制样式
+        editList: false,
+        excelTable: true,
+        getfield: {
+          'f_userinfo_code': '客户编号',
+          'f_user_name': '客户名称',
+          'f_address': '客户地址',
+          'f_type': '换表类型',
+          'f_changemeter_fee': '换表费',
+          'f_meternumber_old': '旧表号',
+          'f_meternumber': '新表号',
+          'f_meter_brand_old': '旧气表品牌',
+          'f_meter_brand': '新气表品牌',
+          'f_remanent_gas': '旧表剩余补气量',
+          'f_remanent_money': '旧表剩余金额',
+          'f_comments': '换表原因',
+          'f_othereason': '其他备注',
+          'f_change_operator': '换表人',
+          'f_state': '状态',
+          'f_operate_date': '换表日期',
+          'f_operator': '人员',
+          'f_depname': '所属部门',
+          'f_orgname': '所属公司'
+        },
+        meterbrand: [],
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: []
+        },
         whetherPay: [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}],
         da: {
           rows: []
@@ -201,6 +302,7 @@ const myMap = new Map()
       }
     },
     ready () {
+      asyncReadyGen(this)
       this.search()
       // this.getwarehouse()
     },
@@ -210,6 +312,22 @@ const myMap = new Map()
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeid = val[0]
       },
+      async getRes (condition, obj) {
+        this.orgCondtionStr = condition
+        this.orgname = obj.orgnames[0]
+        this.depname = obj.depnames[0]
+
+      },
+      initQueryParam () {
+        let arr = []
+        this.$GetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          arr.push(temp)
+        })
+        this.meterbrand = [{label: '全部', value: ''}, ...arr]
+      },
       view (row) {
         this.$parent.showupload = true
         this.$parent.row = row
@@ -231,7 +349,9 @@ const myMap = new Map()
       async getwarehouse () {
 
       },
-
+      hidden () {
+        this.criteriaShow = !this.criteriaShow
+      },
       join1 (row) {
         this.joinrow = row
         this.joinshow = true
@@ -273,10 +393,13 @@ const myMap = new Map()
           this.getorg([this.$login.f.orgid])
         }
         console.log('查询。。。', this.f_orgid)
-        if (this.f_orgid) {
-          args.condition = `${args.condition} and f_orgid  in ${this.f_orgid}`
+        if (!this.orgCondtionStr) {
+          args.condition = `${args.condition}` + ' and f_orgid = ' + this.$login.f.orgid
+        } else {
+          args.condition = `${args.condition}` + this.orgCondtionStr
         }
         this.model.search(args.condition, args.model)
+        this.condition = args.condition
       },
       mergeRowData (joinrows) {
 

package/src/components/revenue/comprehen/Maintenance/changeMeter/changemeterOperate.vue

@@ -104,8 +104,18 @@
 
         <!--        </div>-->
 
-
-
+        <div class="row">
+          <div class="col-sm-8">
+            <label class="font_normal_body">换表原因</label>
+            <input type="text" v-model="model.f_comments"  style="width: 80%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-8">
+            <label class="font_normal_body">其他备注</label>
+            <input type="text" v-model="model.f_othereason"  style="width: 80%" class="input_search">
+          </div>
+        </div>
       </form>
       <div style="float: right">
         <button class="button_search" @click="save">保存</button>
@@ -142,16 +152,16 @@
         // 构建数组来存储对象
         editbank: true,
         recordList: [],
-        foperator:[],
+        foperator: [],
         changestate: [{label: '有效', value: '有效'}, {label: '无效', value: '无效'}],
         showfiles: false,
         // meterstate:[{label:'已抄',value:'已抄'},{label:'未抄',value:'未抄'}],
         // handstate:[{label:'有效',value:'有效'},{label:'冲正',value:'冲正'},{label:'作废',value:'作废'},{label:'待审核',value:'待审核'}],
         fileNameSet: {
-          // 'f_change_operator':'换表人',
-          'f_operate_date': '换表日期'
-          // 'f_changemeter_state':'换表状态',
-          // 'f_table_state':'旧表状态',
+          'f_change_operator': '换表人',
+          'f_operate_date': '换表日期',
+          'f_comments': '换表原因',
+          'f_othereason': '其他备注'
           // 'f_newtable_state':'新表状态'
         }
       }
@@ -195,7 +205,7 @@
           if(res.data.length>0){
             this.model.f_operator = res.data[0].name
           }else{
-            this.model.f_operatorid=''
+            this.model.f_operatorid = ''
             this.$showAlert('操作员信息未找到','warning',2000)
           }
           console.log('this.f_operatorid', this.model.f_operator)
@@ -217,37 +227,43 @@
             var car = {
               chinesename: this.fileNameSet[item],
               fieldname: item,
-              tablename: 't_changemeter',
+              tablename: 't_changetables',
               oldvalue: this.oldmodel[item],
               newvalue: this.model[item],
               state: '有效',
               modifitime: Util.toStandardTimeString(),
               operator: this.$login.f.name,
               changemeter_id: this.model.id,
-              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_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
             }
             this.recordList.push(car)
             // 该方法并未对chinesename fieldname operator等进行判断赋值，此暂写为定值
             console.log(car)
           }
         }
-
         await this.$resetpost('rs/logic/saveChangeMeterRecord', {data: {recordlist: this.recordList, newData: this.model}})
-        // if(this.model.f_operat_type==='换表'||this.model.f_operat_type==='换表撤销'){
-        //   await this.$resetpost('rs/entity/t_changemeter', this.model, {
-        //     resolveMsg: '修改成功',
-        //     rejectMsg: '未通过，修改出错!!!'
-        //   })
-        //   await this.$resetpost('rs/entity/t_changetables', this.model, {
-        //     resolveMsg: '修改成功',
-        //     rejectMsg: '未通过，修改出错!!!'
-        //   })
-        console.log('this.model', this.model)
+        // let changetablesData = {
+        //   id: this.model.id,
+        //   f_change_operator: this.model.f_change_operator,
+        //   f_comments: this.model.f_comments,
+        //   f_othereason: this.model.f_othereason,
+        //   f_operate_date: this.model.f_operate_date
+        // }
+        let sqldata = `update t_changetables set
+            f_change_operator ='${this.model.f_change_operator}',
+            f_comments ='${this.model.f_comments}',
+            f_othereason ='${this.model.f_othereason}',
+            f_operate_date='${this.model.f_operate_date}'
+        where  id ='${this.model.id}'`
+        console.log('换表记录修正保存', sqldata)
+        await this.$resetpost('rs/logic/runSQL', {data: {sql: sqldata}}, {resolveMsg: null, rejectMsg: null})
+        // await this.$resetpost('rs/entity/t_changetables', changetablesData, {resolveMsg: '修改成功', rejectMsg: '未通过，修改出错!!!'})
+        // console.log('this.model', this.model)
         this.$dispatch('close')
       }
     },

package/src/components/revenue/comprehen/Maintenance/changeMeter/maintenanceChangeMeterRecords.vue

@@ -92,7 +92,7 @@
       },
       async getGroupData () {
         console.log('获取记录')
-        let condition = ' changemeter_id= ' + this.model.id + " and tablename='t_changemeter'"
+        let condition = ' changemeter_id= ' + this.model.id + " and tablename='t_changetables'"
         let res = await this.$resetpost('rs/sql/singleTable_OrderBy', {
           data: {
             items: '*',

package/src/components/revenue/comprehen/StairPrice/GasPriceUser.vue

@@ -26,7 +26,7 @@
               <export-excel
                 :data="{condition: $parent.$parent.condition}"
                 :field="$parent.$parent.getfield"
-                sqlurl="rs/logic/exportfile" sql-name="salegetGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"
+                sqlurl="rs/logic/saleExport" sql-name="getGasUser" :template-name="$parent.$parent.pricename+'气价使用人'"
                 :choose-col="true"></export-excel>
               <div style="float: right" class="button_spacing"
                    :class="{'button_shrink_top': $parent.$parent.criteriaShow2,'button_shrink_bottom': !$parent.$parent.criteriaShow2}"

package/src/filiale/bayan/ChargeOper.vue

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

package/src/filiale/bayan/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/yuncheng/ChangeMeter.vue

@@ -246,28 +246,22 @@
           </div>
         </div>
         <div class="row auto">
-<!--          <div class="col-sm-12"-->
-<!--               v-if="!commitflag"-->
-<!--          >-->
-<!--            <label class="font_normal_body ">备&emsp;&emsp;注</label>-->
-<!--            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"></textarea>-->
-<!--          </div>-->
-<!--          <div class="col-sm-12"-->
-<!--               :class="[$v.f_comments.required ? 'has-error' : 'has-success']"-->
-<!--               v-if="commitflag"-->
-<!--          >-->
-<!--            <label class="font_normal_body ">备&emsp;&emsp;注</label>-->
-<!--            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"-->
-<!--                      v-validate:f_comments='{required: true}'-->
-<!--            ></textarea>-->
-<!--          </div>-->
-          <div class="col-sm-12"
-               :class="[$v.f_comments.required ? 'has-error' : 'has-success']"
-          >
+          <div class="col-sm-4 form-group">
+            <label for="f_comments" class=" font_normal_body" title="参数名称：换表原因">换表原因</label>
+            <v-select id="f_comments"
+                      title="参数:换表原因"
+                      v-model="f_comments"
+                      placeholder='请选择'
+                      :value-single="true"
+                      :value.sync="model.f_comments"
+                      :options='reason'
+                      close-on-select clear-button></v-select>
+          </div>
+        </div>
+        <div class="row auto">
+          <div class="col-sm-12">
             <label class="font_normal_body ">备&emsp;&emsp;注</label>
-            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_comments"
-                      v-validate:f_comments='{required: true}'
-            ></textarea>
+            <textarea class="input_textarea" rows="3" style="width:87%;" v-model="model.f_othereason"></textarea>
           </div>
         </div>
         <div style="text-align:right;height:auto;">
@@ -390,6 +384,7 @@ export default {
           f_meternumber: '',
           f_meter_base: '',
           f_metertitles: '',
+          f_defendcard: '',
           f_oldmeter_use_reference: 0 // 旧表使用量参考值
         },
         // 旧表底数

package/src/filiale/yuncheng/HandplanQuery.vue

@@ -376,12 +376,12 @@
                 <th>
                   <nobr>收费人员</nobr>
                 </th>
-                <th>
-                  <nobr>冲正时间</nobr>
-                </th>
-                <th>
-                  <nobr>冲正人员</nobr>
-                </th>
+<!--                <th>-->
+<!--                  <nobr>冲正时间</nobr>-->
+<!--                </th>-->
+<!--                <th>-->
+<!--                  <nobr>冲正人员</nobr>-->
+<!--                </th>-->
                 <th>
                   <nobr>下发日期</nobr>
                 </th>
@@ -549,12 +549,12 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_sell_operator}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_corrhand_date}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_corrhand_operator}}</nobr>
-              </td>
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_corrhand_date}}</nobr>-->
+<!--              </td>-->
+<!--              <td style="text-align: center;">-->
+<!--                <nobr>{{row.f_corrhand_operator}}</nobr>-->
+<!--              </td>-->
               <td style="text-align: center;">
                 <nobr>{{row.f_hand_date}}</nobr>
               </td>
@@ -846,7 +846,7 @@
             'f_hand_date': '下发日期',
             'f_input_date': '录入日期',
             'f_meter_state': '抄表状态',
-            'f_audit_person':'审核人',
+            'f_audit_person': '审核人',
             'f_audit_date': '审核日期',
             'f_audit_state': '审核状态',
             'f_examinereason': '审核备注',

package/src/filiale/yuncheng/MeterMessage.vue

@@ -0,0 +1,184 @@
+<template>
+  <!--<div class="auto">-->
+    <validator name='v'  @valid="onValid()"  @invalid="onInvalid()">
+        <form novalidate class="form-horizontal">
+          <div class="row auto" >
+
+            <div class="col-sm-4 form-group" :class="[$v.metertype.required ? 'has-error' : '']">
+              <label for="f_meter_type" class="font_normal_body">新表类型</label>
+              <input type="text" class="input_search" style="width: 60%" v-show="false" v-model="$refs.metertype.selectedItems" v-validate:metertype='{required: true }'>
+              <v-select :value.sync="metermessage.f_meter_type"
+                        v-model="metermessage.f_meter_type"
+                        :options='meterType' placeholder='气表类型'
+                        close-on-select v-ref:metertype style="width: 60%"></v-select>
+            </div>
+
+            <div class="col-sm-4 form-group" :class="[$v.brand.required ? 'has-error' : '']">
+              <label for="gasbrand" class="font_normal_body">新表品牌</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.brand.selectedItems" v-validate:brand='{required: true }'>
+              <v-select :value.sync="metermessage.gasbrand" :options='getMeterBrands(metermessage.f_meter_type)' @change='brandChange' placeholder='气表品牌' close-on-select
+                        search v-model='metermessage.gasbrand' v-ref:brand></v-select>
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.model.required ? 'has-error' : '']">
+              <label for="gasmodel" class="font_normal_body">新表型号</label>
+              <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.model.selectedItems"  v-validate:model='{required: true }'>
+              <v-select :value.sync="metermessage.gasmodel" :options='metermessage.gasbrand[0] ? metermessage.gasbrand[0].gasmodel : [] ' placeholder='气表型号' close-on-select
+                        v-model='metermessage.gasmodel' :disabled= 'metermessage.gasbrand.length === 0 ' @change='modelChange' v-ref:model></v-select>
+            </div>
+
+          </div>
+          <div class="row auto" >
+            <div class="col-sm-4 form-group" :class="[$v.meternumber.required ? 'has-error' : '']">
+              <label for="f_meternumber" class="font_normal_body">新&ensp;表&ensp;号</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search"
+                     @blur="meternumberValidate()"  v-model="metermessage.f_meternumber" v-validate:meternumber='{required: true }' placeholder='表号' >
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.f_defendcard.required ? 'has-error' : '']">
+              <label for="f_defendcard" class="font_normal_body">防盗卡号</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search"  v-model="metermessage.f_defendcard" placeholder='防盗卡号'>
+            </div>
+            <div class="col-sm-4 form-group" :class="[$v.f_meter_base.required ? 'has-error' : '']">
+              <label for="f_meter_base" class="font_normal_body">新表底数</label>
+              <input type="text" class="input_search" style="width:60%" class="input_search" v-validate:f_meter_base='{required: true }' @blur='meterbase()' v-model="metermessage.f_meter_base" placeholder='表底数' >
+            </div>
+          </div>
+
+        </form>
+    </validator>
+  <!--</div>-->
+</template>
+
+<script>
+  import {HttpResetClass} from "vue-client";
+
+  /**
+   *公共组件
+   *获取气表信息
+   */
+  export default {
+    data () {
+      return {
+        isdecimal: '否',
+        imgsrc: '/images/mainicon/biaopan.png',
+        imgmeter: '/images/mainicon/addmeter.png',
+
+        meterType: this.$appdata.getParam('气表类型')
+      }
+    },
+    props: ['f_userfiles_id', 'metermessage'],
+    methods: {
+      onValid () {
+        this.$dispatch('valid')
+      },
+      onInvalid () {
+        this.$dispatch('invalid')
+      },
+      brandChange (val) {
+        this.isdecimal = val.length > 0 ? val[0].f_isdecimal : '否'
+        this.meternumberValidate()
+      },
+      modelChange (val) {
+        this.$dispatch('gasmodel', this.metermessage.gasbrand)
+      },
+      resetValidate () {
+        this.$resetValidation()
+      },
+      meterbase () {
+        if (this.isdecimal === '是') {
+          this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(4)
+        } else {
+          this.metermessage.f_meter_base = (this.metermessage.f_meter_base - 0).toFixed(0)
+        }
+      },
+      getMeterBrands (meterType) {
+        let res = []
+        if (meterType.length > 0) {
+          this.meterbrands.forEach((item) => {
+            if (item.value.f_meter_type === meterType[0]) {
+              res.push(item)
+            }
+          })
+        }
+        return res
+      },
+      async meternumberValidate () {
+        let http1 = new HttpResetClass()
+        let res1 = await http1.load('POST', '/rs/sql/getBrandAndType', {data: {condition: ` mi.f_meternumber = '${this.metermessage.f_meternumber}'`}}, {resolveMsg: null, rejectMsg: '获取默认气表品牌型号失败！！'})
+        if (res1.data.length > 0) {
+
+
+          // 已经选择了气表 则不再替换
+          if (this.metermessage.f_meter_type <= 0 ){
+            this.metermessage.f_meter_type = [res1.data[0].f_meter_classify]
+          }
+            // 替换表号自带的气表品牌和型号
+          let meterbrands = this.meterbrands
+          for (let row of meterbrands) {
+            if (row.label == res1.data[0].f_meter_brand) {
+              // 已经选择了气表品牌则不再替换
+              if (this.metermessage.gasbrand.length <= 0) this.metermessage.gasbrand = [row.value]
+              // 替换气表型号
+              if (res1.data[0].f_meter_style) {
+                for (let model of row.value.gasmodel) {
+                  if (model.label == res1.data[0].f_meter_style) {
+                    // 已经选择了气表型号则不再替换
+                    if (this.metermessage.gasmodel.length <= 0) this.metermessage.gasmodel = [model.value]
+                    continue
+                  }
+                }
+              }
+              continue
+            }
+          }
+        }
+        if (this.metermessage.f_meternumber && this.metermessage.gasbrand.length > 0) {
+          // 表号位数验证
+          let meternumberLen = this.metermessage.gasbrand[0].f_meternumber_len
+          if (meternumberLen) {
+            if (this.metermessage.f_meternumber.length != meternumberLen) {
+              this.metermessage.f_meternumber = ''
+              this.$showAlert(`表号位数不正确, 当前气表品牌表号位数是: ${meternumberLen}`, 'warning', 3000)
+              return
+            }
+          }
+          // 表计信息验证
+          if (this.metermessage.gasbrand[0].f_meterverification == '是') {
+            if (res1.data.length <= 0) {
+              this.$showAlert(`当前表号: ${this.metermessage.f_meternumber}在表计信息中无记录, 请核实!!!`, 'warning', 3000)
+              this.metermessage.f_meternumber = ''
+              return
+            }
+          }
+          if (this.metermessage.gasbrand[0].f_meter_type === '物联网表') {
+            let param = {
+              f_userfiles_id: this.f_userfiles_id,
+              f_meternumber: this.metermessage.f_meternumber,
+              f_gasbrand_id: this.metermessage.gasbrand[0].id
+            }
+
+            let res = await this.$resetpost('rs/logic/meternumberValidate', param, {
+              resolveMsg: null,
+              rejectMsg: '表号验证失败！！'
+            })
+            console.log('标号验证返回：', res)
+            if (res.data) {
+              this.metermessage.f_meternumber = ''
+              this.$showAlert('表号已存在！！', 'warning', 3000)
+            }
+          }
+        }
+      }
+    },
+    computed: {
+      usertypes () {
+        return this.$appdata.getParam('用户类型')
+      },
+      positions () {
+        return this.$appdata.getParam('安装位置')
+      },
+      meterbrands () {
+        return this.$GetSaleParam.getGasbrand()
+      }
+    }
+  }
+</script>

package/src/filiale/yuncheng/machineHandAudit.vue

@@ -154,6 +154,15 @@
                           close-on-select
                           condition="f_audit_state = '{}'"></v-select>
               </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">抄表状态</label>
+                <v-select :value.sync="model.f_meter_state" v-model="model.f_meter_state"
+                          :options='$parent.$parent.meterstates' placeholder='抄表状态'
+                          style="width:60%"
+                          :value-single="true"
+                          close-on-select
+                          condition="f_meter_state = '{}'"></v-select>
+              </div>
               <div class="col-sm-2 form-group">
                 <label class="font_normal_body">抄&ensp;表&ensp;册</label>
                 <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
@@ -424,7 +433,7 @@
     </header>
     <article slot="modal-body" class="modal-body">
       <div class="from-group">
-        <img-self :src="imgfilename"   width="500" height="500"></img-self>
+        <img-self :src="imgfilename" :width="750" :height="750"></img-self>
       </div>
     </article>
     <footer slot="modal-footer" class="modal-footer">
@@ -502,7 +511,7 @@
           'f_adjustment_volume': '增量值',
           'f_oughtfee': '应交金额',
           'f_result_state': '抄表结果状态',
-          'f_audit_state':'审核状态',
+          'f_audit_state': '审核状态',
           'f_last_input_date': '上次抄表录入日期',
           'f_hand_date': '下发日期',
           'f_input_date': '抄表录入日期',

package/src/filiale/yuncheng/sale.js

@@ -49,4 +49,6 @@ export default function () {
   Vue.component('mulitinfo', (resolve) => { require(['./Mulitinfo'], resolve) })
         // 计划下发
   Vue.component('machine-down', (resolve) => { require(['./machineDown'], resolve) })
+  // 获取气表信息
+  Vue.component('meter-message', (resolve) => { require(['./MeterMessage'], resolve) })
 }