sale-client 3.5.288 → 3.5.290

package/build/dev-server.js

@@ -1,5 +1,5 @@
 var path = require('path')
-const [localUrl, serverRul] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
+const [localUrl, serverRul] = ['https://qnjtkf.cn:7400/#', 'https://qnjtkf.cn:7400/#']
 var merge = require('webpack-merge')
 var baseConfig = require('./webpack.dev.conf')
 var devConfig = {
@@ -20,6 +20,9 @@ var devConfig = {
       '/rs/file': {
         target: serverRul
       },
+      '/invoice': {
+        target: serverRul
+      },
       // 查找资源服务数据
       '/rs/search': {
         target: serverRul

package/package.json

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

package/src/components/charge/gasloss/gasLossManage.vue

@@ -14,7 +14,6 @@
 </template>
 
 <script>
-  import {HttpResetClass} from 'vue-client'
   export default {
     title: '气损收费',
     name: 'gasLossManage',
@@ -22,8 +21,6 @@
       return {
         showupload: false,
         showAddMssage: false,
-
-
         showItem: false
       }
     },

package/src/components/charge/gasloss/gasLossOperate.vue

@@ -7,7 +7,6 @@
             <div style="height:550px;overflow-y: auto;">
             <div style="margin-top:10px;" class="auto row" v-for="row in model.gaslossdetail">
               <div class="panel panel-primary datapanel" style="background-color: #f4f6f8">
-<!--                <div class="auto row">-->
                   <div class="col-sm-4 form-group" :class="{'has-success':row.f_type,'has-error':!row.f_type}">
                     <label for="f_brand_spec" class="font_normal_body" title="参数名称：气损分类">气损分类</label>
                     <input v-show="false" v-model="row.f_type" v-validate:f_type='{required: true }'>
@@ -50,107 +49,89 @@
                     <button type="button" class="glyphicon glyphicon-minus btn-danger" @click.stop="delthisdetail($index)"></button>
                     <button type="button" class="glyphicon glyphicon-plus btn-success" @click.stop="addadetail()"></button>
                   </div>
-<!--                </div>-->
               </div>
             </div>
           </div>
-              <div class=" panel panel-primary datapanel" style="height:260px">
-                <div class="row">
-                  <div class="col-sm-4 form-group">
-                    <label class=" font_normal_body">&emsp;客户编号</label>
-                    <input class="input_search" style="width:60%"
-                           v-model="model.f_userinfo_code"
-                           @blur="codeChange()"
-                           placeholder="客户编号">
-                  </div>
-                  <div class="col-sm-4 form-group" :class="{'has-success':model.f_charge_person,'has-error':!model.f_charge_person}">
-                    <label class=" font_normal_body">&emsp;缴&nbsp;费&nbsp;人&nbsp;</label>
-                    <input class="input_search" style="width:60%"
-                           v-validate:f_charge_person='{required: true }'
-                           v-model="model.f_charge_person"
-                           placeholder="缴费人">
-                  </div>
-                  <div class="col-sm-4 form-group" :class="{'has-success':model.f_charge_phone,'has-error':!model.f_charge_phone}">
-                    <label class=" font_normal_body">&emsp;联系电话</label>
-                    <input class="input_search" style="width:60%"
-                           v-validate:f_charge_phone='{required: true }'
-                           v-model="model.f_charge_phone"
-                           placeholder="联系电话">
-                  </div>
-                  <div class="col-sm-12 form-group" :class="{'has-success':model.f_charge_address,'has-error':!model.f_charge_address}">
-                    <label class=" font_normal_body">缴费人地址</label>
-                    <input class="input_search" style="width:89%"
-                           v-validate:f_charge_address='{required: true }'
-                           v-model="model.f_charge_address"
-                           placeholder="缴费人地址">
-                  </div>
-                  <div class="col-sm-4 form-group">
-                    <label for="f_paytype" class="font_normal_body" title="参数名称：付款方式">&emsp;收款方式</label>
-                    <v-select id="f_payment"
-                              v-model="f_payment"
-                              placeholder='请选择'
-                              :value.sync="model.f_payment"
-                              :value-single="true"
-                              :options='paytype'
-                              close-on-select clear-button>
-                    </v-select>
-                  </div>
-                  <div class="col-sm-4 form-group">
-                    <label for="f_print" class="font_normal_body">&emsp;打印格式</label>
-                    <v-select id="print"
-                              v-model="model.f_print"
-                              placeholder='请选择'
-                              :value.sync="model.f_print"
-                              :options='printstyle'
-                              :value-single="true"
-                              close-on-select clear-button>
-                    </v-select>
-                  </div>
-                  <div class="col-sm-4 auto">
-                    <label for="f_collection" style="text-align:right;"><font size="6px" style="font-weight:bold;color:darkred">收&emsp;款:{{model.f_collection}}</font></label>
-                  </div>
-                  <div class="col-sm-9 form-group">
-                    <label class=" font_normal_body">&emsp;备&emsp;&emsp;注</label>
-                    <input class="input_search" style="width:70%"
-                           v-model="model.f_comments"
-                           placeholder="备注">
-                  </div>
-                  <div style="text-align:right;height: 25%;">
-                    <button class="button_search btn-gn" type="button" @click="confirm()" :disabled='!$v.valid || validateOk'>确认</button>
-                    <button class="button_clear btn-gn" type="button" @click="clean()">取消</button>
-                  </div>
-                </div>
-
-                  <!--          <payment-code-button :clickable="!$v.valid || validateOk"-->
-                  <!--                               :payment.sync="model.f_payment" :payment-data="paytype"-->
-                  <!--                               @confirm-payment="confirm()">-->
-                  <!--          </payment-code-button>-->
-
-
+          </div>
+          <div class=" panel panel-primary datapanel" style="height:260px">
+            <div class="row">
+              <div class="col-sm-4 form-group">
+                <label class=" font_normal_body">&emsp;客户编号</label>
+                <input class="input_search" style="width:60%"
+                       v-model="model.f_userinfo_code"
+                       @blur="codeChange()"
+                       placeholder="客户编号">
               </div>
-            </div>
-
+              <div class="col-sm-4 form-group" :class="{'has-success':model.f_charge_person,'has-error':!model.f_charge_person}">
+                <label class=" font_normal_body">&emsp;缴&nbsp;费&nbsp;人&nbsp;</label>
+                <input class="input_search" style="width:60%"
+                       v-validate:f_charge_person='{required: true }'
+                       v-model="model.f_charge_person"
+                       placeholder="缴费人">
+              </div>
+              <div class="col-sm-4 form-group" :class="{'has-success':model.f_charge_phone,'has-error':!model.f_charge_phone}">
+                <label class=" font_normal_body">&emsp;联系电话</label>
+                <input class="input_search" style="width:60%"
+                       v-validate:f_charge_phone='{required: true }'
+                       v-model="model.f_charge_phone"
+                       placeholder="联系电话">
+              </div>
+              <div class="col-sm-12 form-group" :class="{'has-success':model.f_charge_address,'has-error':!model.f_charge_address}">
+                <label class=" font_normal_body">缴费人地址</label>
+                <input class="input_search" style="width:89%"
+                       v-validate:f_charge_address='{required: true }'
+                       v-model="model.f_charge_address"
+                       placeholder="缴费人地址">
+              </div>
+              <div class="col-sm-4 form-group">
+                <label for="f_paytype" class="font_normal_body" title="参数名称：付款方式">&emsp;收款方式</label>
+                <v-select id="f_payment"
+                          v-model="f_payment"
+                          placeholder='请选择'
+                          :value.sync="model.f_payment"
+                          :value-single="true"
+                          :options='paytype'
+                          close-on-select clear-button>
+                </v-select>
+              </div>
+              <div class="col-sm-4 form-group">
+                <label for="f_print" class="font_normal_body">&emsp;打印格式</label>
+                <v-select id="print"
+                          v-model="model.f_print"
+                          placeholder='请选择'
+                          :value.sync="model.f_print"
+                          :options='printstyle'
+                          :value-single="true"
+                          close-on-select clear-button>
+                </v-select>
+              </div>
+              <div class="col-sm-4 auto">
+                <label for="f_collection" style="text-align:right;"><font size="6px" style="font-weight:bold;color:darkred">收&emsp;款:{{model.f_collection}}</font></label>
+              </div>
+              <div class="col-sm-9 form-group">
+                <label class=" font_normal_body">&emsp;备&emsp;&emsp;注</label>
+                <input class="input_search" style="width:70%"
+                       v-model="model.f_comments"
+                       placeholder="备注">
+              </div>
+              <div style="text-align:right;height: 25%;">
+                <button class="button_search btn-gn" type="button" @click="checkInvoiceMsg()" :disabled='!$v.valid || validateOk'>确认</button>
+                <button class="button_clear btn-gn" type="button" @click="clean()">取消</button>
+              </div>
+              </div>
+          </div>
         </form>
         <validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>
         <print-bill :show="print" :data='model' :bill-config='config' :bill-data='billData' v-on:toggle="close" @printok="printok" v-ref:printbill></print-bill>
-        <!-- <print-other-charge-bill :show="print" v-ref:printbill :row='row' :logic='model' v-on:success="close" v-on:toggle="close"></print-other-charge-bill> -->
-        <!-- <tax-other-bill :show="taxprint"  v-ref:taxprintbill :row='row' :logic='model' v-on:success="close" v-on:toggle="close"></tax-other-bill> -->
-
+        <ticket-print  :show="eticket_show" @toggle="eticket_toggle"  v-ref:eticketbill></ticket-print>
+        <eticket-modal :show="eticket_msg" @close-modal-show="eticket_msg = false" :row="model" @confirm="confirm"></eticket-modal>
       </validator>
-
     </div>
-
     <payment-code v-ref:paymentcode :payment="model.f_payment"  :money="model.f_collection"></payment-code>
-
   </div>
-<!--  <div class="auto">-->
-<!--    <upload isremark="true" fusetype="气损收费"></upload>-->
-<!--  </div>-->
 </template>
 
-
 <script>
-
   import {HttpResetClass} from 'vue-client'
   import Vue from 'vue'
 
@@ -158,35 +139,28 @@
     try {
       // 加入扫码盒付款码支付流水号
       self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
-      // let resid = await self.$LogicService.otherCharge(self.model, self.row)
-      self.model.f_bill_style=self.model.f_print
+      self.model.f_bill_style = self.model.f_print
       let http = new HttpResetClass()
-      self.model.f_describe=`${Vue.$login.f.name}对${self.model.f_charge_person}进行气损收费`
+      self.model.f_describe = `${Vue.$login.f.name}对${self.model.f_charge_person}进行气损收费`
       let resid = await http.load('POST', 'rs/logic/gasLoss', self.model, {resolveMsg: '气损收费成功', rejectMsg: '气损收费失败'})
       console.log('f_print:', resid)
-      if (true) {
-        if (self.model.f_print != '电子发票') {
-          if (self.config.hasBillManage) {
-            self.model.id = resid.data
-            self.model.f_bill_type = '其他费用'
-            self.model.f_bill_style = self.model.f_print[0]
-            self.print = true
-          } else {
-            self.model.id = resid.data
-            self.print = true
-          }
-        } else if (self.model.f_print === '国税发票') {
-          // TODO
-          self.clean()
-          self.$dispatch('refresh')
-        } else if (self.model.f_print === '电子发票') {
-          self.$CommonService.openEticket(resid, '其他费用')
-          self.clean()
-          self.$dispatch('refresh')
+      if (self.model.f_print !== '电子发票') {
+        if (self.config.hasBillManage) {
+          self.model.id = resid.data
+          self.model.f_bill_type = '其他费用'
+          self.model.f_bill_style = self.model.f_print[0]
+          self.print = true
+        } else {
+          self.model.id = resid.data
+          self.print = true
         }
-      } else {
+      } else if (self.model.f_print === '国税发票') {
+        // TODO
         self.clean()
         self.$dispatch('refresh')
+      } else if (self.model.f_print === '电子发票') {
+        self.eticket_show = true
+        await self.$refs.eticketbill.openETicket([resid.data], self.model, '气损收费')
       }
     } catch (error) {
       self.$showAlert(error, 'danger', 0)
@@ -195,9 +169,9 @@
   }
 
   let asyncGasLoss = async function (self) {
-    try{
+    try {
       await self.$getConfig(self, 'gasLossCharge')
-    } catch(error){
+    } catch (error) {
       console.log('无配置文件')
     }
     self.model.f_print = self.config.printType
@@ -219,10 +193,13 @@
           payment: '现金缴费',  // 付款方式
           f_type: '', // 气损分类
           f_loss_type: '' // 气损类型
-
         },
+        eticket_msg: false,
+        eticket_show: false,
+        invoice_is_pax: '征税',
+        is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
         model: {
-          f_userinfo_id:null,
+          f_userinfo_id: null,
           f_collection: 0,
           f_payment: '',
           f_bill_style: '',
@@ -239,7 +216,15 @@
           f_depname: Vue.$login.f.deps,
           f_operat_type: '气损收费',
           f_print: '',
-          gaslossdetail:[{}]
+          gaslossdetail: [{}],
+          f_user_name: '',
+          f_user_phone: '',
+          f_address: '',
+          f_paper_name: '',
+          f_paper_account: '',
+          f_idnumber: '',
+          f_taxpayer_id: '',
+          f_address_phone: ''
         },
         print: false,
         taxprint: false,
@@ -263,36 +248,64 @@
     },
 
     methods: {
-      async codeChange(){
-        if(this.model.f_userinfo_code){
+      checkInvoiceMsg () {
+        if (this.model.f_print === '电子发票') {
+          if (!this.model.f_taxpayer_id) {
+            this.model.f_taxpayer_id = this.model.f_idnumber
+          }
+          if (!this.model.f_paper_name) {
+            this.model.f_paper_name = this.model.f_user_name
+          }
+          if (!this.model.f_address_phone) {
+            this.model.f_address_phone = this.model.f_address + ' ' + this.model.f_user_phone
+          }
+          this.eticket_msg = true
+        } else {
+          this.confirm()
+        }
+      },
+      eticket_toggle () {
+        this.eticket_show = false
+        this.$dispatch('success')
+      },
+      async codeChange () {
+        this.model.f_userinfo_code = this.model.f_userinfo_code.trim()
+        if (this.model.f_userinfo_code) {
           let http = new HttpResetClass()
           let res = await http.load('POST', 'rs/sql/singleTable_OrderBy', {
             data: {
-              items: 'u.f_userinfo_id,u.f_user_name,u.f_user_phone,a.f_address',
+              items: 'u.f_userinfo_id,u.f_user_name,u.f_user_phone,a.f_address,u.f_paper_name,u.f_paper_account,u.f_idnumber,u.f_taxpayer_id,u.f_address_phone',
               tablename: 't_userinfo u  left join t_user_address a on u.f_userinfo_id = a.f_userinfo_id',
               condition: `u.f_userinfo_code = '${this.model.f_userinfo_code}' and u.f_user_state = '正常'`,
               orderitem: 'u.f_userinfo_id desc'
             }
           }, {resolveMsg: null, rejectMsg: '获取用户信息失败'})
-          if(res.data.length==0){
-            this.$showAlert('该客户编号不存在，请重新输入','warning',3000)
-            this.model.f_userinfo_code=null
-          }else{
-            this.model.f_userinfo_id=res.data[0].f_userinfo_id
-            this.model.f_charge_person=res.data[0].f_user_name
-            this.model.f_charge_phone=res.data[0].f_user_phone
-            this.model.f_charge_address=res.data[0].f_address
+          if (res.data.length == 0) {
+            this.$showAlert('该客户编号不存在，请重新输入', 'warning', 3000)
+            this.model.f_userinfo_code = null
+          } else {
+            this.model.f_userinfo_id = res.data[0].f_userinfo_id
+            this.model.f_charge_person = res.data[0].f_user_name
+            this.model.f_charge_phone = res.data[0].f_user_phone
+            this.model.f_charge_address = res.data[0].f_address
+            this.model.f_user_name = res.data[0].f_user_name
+            this.model.f_user_phone = res.data[0].f_user_phone
+            this.model.f_address = res.data[0].f_address
+            this.model.f_paper_name = res.data[0].f_paper_name
+            this.model.f_paper_account = res.data[0].f_paper_account
+            this.model.f_idnumber = res.data[0].f_idnumber
+            this.model.f_taxpayer_id = res.data[0].f_taxpayer_id
+            this.model.f_address_phone = res.data[0].f_address_phone
           }
-
         }
       },
-      async clean(){
+      async clean () {
         this.model = {}
         await this.$nextTick()
-        this.model={
+        this.model = {
+          f_userinfo_id: null,
           f_collection: 0,
-          f_payment: this.config.payment,
-          f_print: this.config.printType,
+          f_payment: '',
           f_bill_style: '',
           f_comments: '',
           f_charge_person: '',
@@ -306,16 +319,25 @@
           f_depid: Vue.$login.f.depids,
           f_depname: Vue.$login.f.deps,
           f_operat_type: '气损收费',
-          gaslossdetail:[{}]
+          f_print: '',
+          gaslossdetail: [{}],
+          f_user_name: '',
+          f_user_phone: '',
+          f_address: '',
+          f_paper_name: '',
+          f_paper_account: '',
+          f_idnumber: '',
+          f_taxpayer_id: '',
+          f_address_phone: ''
         }
       },
       async confirm () {
+        this.eticket_msg = false
         // // 先调用付款码支付组件流程
         let ss = await this.$refs.paymentcode.flowPath()
         this.$refs.paymentcode.paymentCodeShow = false
         console.log('付款码操作返回', ss)
         if (!ss.result) return
-
         gasLossGen(this)
       },
       close () {
@@ -350,7 +372,7 @@
           this.model.gaslossdetail.splice(index, 1)
           this.getcollection()
         }
-      },
+      }
     },
     computed: {
     }

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

@@ -57,6 +57,13 @@
                             :starthead="$parent.$parent.starthead"
                             titletable="预存气费打印明细"
                              ></print-data>
+                <export-excel :data="{condition:$parent.$parent.condition}"
+                              :field="$parent.$parent.fields"
+                              sqlurl="rs/logic/exportfile" sql-name="sale_HandplanQuery" template-name='抄表查询'
+                              v-ref:exports
+                              :choose-col="true">
+
+                </export-excel>
               </div>
             </div>
 

package/src/components/revenue/base/rightview/carddetail/BlacklistDetail.vue

@@ -43,12 +43,9 @@ export default {
     }
   },
   ready () {
-    let sql = 'singleTable_OrderBy'
+    let sql = 'getBlack'
     let condition = {
-      items: '*',
-      tablename: 't_userinfo',
-      condition: ' f_userinfo_id = ' + this.data.f_userinfo_id,
-      orderitem: 'f_userinfo_id'
+      condition: ' tr.id = ' + this.data.id
     }
     this.$info(`加载数据中..., sql:${sql}`)
     this.$refs.pv.load('rs/logic/getOneData', {data: {sql: sql, params: condition}}).then((a) => {

package/src/filiale/gehua/MeterinfoTest.vue

@@ -102,7 +102,7 @@
           <div class="col-sm-4 form-group" :class="[$m.way.required ? 'has-error' : '']" v-if="row.gasbrand.length > 0 && row.gasbrand[0].f_meter_type == '物联网表' && row.gasbrand[0].f_hascard == '是'">
             <label for="f_open_way" class="font_normal_body">开户方式</label>
             <v-select :value.sync="row.f_open_way" v-model='row.f_open_way'
-                      placeholder='开户方式' :options='openWay'
+                      placeholder='开户方式' :options='openWay' :value-single="true"
                       close-on-select :disabled="false" v-ref:way></v-select>
             <input type="text" v-show="false" v-model="$refs.way.selectedItems" v-validate:way='{required: true }'>
           </div>

package/src/filiale/qianneng/eticket/EticketRecordList.vue

@@ -135,7 +135,7 @@
             </th>
             <th style="text-align:center">
               <template v-if="row.f_invoice_source !== '外部录入'">
-                <button class="btn btn-link" v-if="row.f_bill_state==='开票成功'"
+                <button class="btn btn-link" v-if="row.f_bill_state==='开票成功' && row.f_tax_money > 0"
                         @click="$parent.$parent.$parent.fp_ch(row)">发票冲红
                 </button>
                 <button class="btn btn-link" v-if="row.f_bill_state==='待开票'"
@@ -144,6 +144,9 @@
                 <button class="btn btn-link" v-if="row.f_bill_state==='开票失败'"
                         @click="$parent.$parent.$parent.kp(row)">重新开票
                 </button>
+                <button class="btn btn-link" v-if="row.f_bill_state==='冲红失败'"
+                        @click="$parent.$parent.$parent.kp(row)">重新冲红
+                </button>
                 <button class="btn btn-link" v-if="['查询失败','等待查询'].includes(row.f_bill_state)"
                         @click="$parent.$parent.$parent.fp_search(row)">电票查询
                 </button>
@@ -252,6 +255,10 @@ export default {
       this.eticket_show = true
       this.$refs.eticketbill.openEticketGen(row.id)
     },
+    ch (row) {
+      this.eticket_show = true
+      this.$refs.eticketbill.rushRedInvoice(row.id)
+    },
     eticket_toggle () {
       this.eticket_show = false
       this.show = false

package/src/filiale/shanxian/FileUserAddress.vue

@@ -73,23 +73,30 @@
                       close-on-select v-ref:slice>
             </v-select>
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group "
+               :class="[$v.f_building.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;号</label>
             <input type="text" style="width:40%" v-model="model.f_building" class="input_search"
+                   v-validate:f_building='{required: true }'
                    placeholder="楼号"/>
             <input type="text" style="width:20%" v-model="model.f_building_suffix" class="input_search"
             />
 
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group "
+               :class="[$v.f_unit.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">单&emsp;&emsp;元</label>
-            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search" placeholder="单元"/>
+            <input type="text" style="width:40%" v-model="model.f_unit" class="input_search"
+                   v-validate:f_unit='{required: true }'
+                   placeholder="单元"/>
             <input type="text" style="width:20%" v-model="model.f_unit_suffix" class="input_search"
             />
           </div>
-          <div v-if="!usertype" class="col-sm-6 form-group ">
+          <div v-if="!usertype" class="col-sm-6 form-group "
+               :class="[$v.f_floor.required ? 'has-error' : 'has-success']">
             <label for="f_address" class="font_normal_body">楼&emsp;&emsp;层</label>
             <input type="text" style="width:40%" v-model="model.f_floor" class="input_search"
+                   v-validate:f_floor='{required: true }'
                    placeholder="楼层" />
             <input type="text" style="width:20%" v-model="model.f_floor_suffix" class="input_search"
             />

package/src/filiale/wenxi/GasPriceUser.vue

@@ -0,0 +1,485 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-3" >
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
+                     condition="f_userinfo_code = '{}'" @keyup.enter="search()">
+            </div>
+<!--            <div class="form-group col-sm-3">-->
+<!--              <label class="font_normal_body">客户状态</label>-->
+<!--              <v-select :value.sync="model.f_user_state" v-model="model.f_user_state"-->
+<!--                        :options='$parent.$parent.userstates' placeholder='客户状态'-->
+<!--                        close-on-select condition="f_user_state='{}'"></v-select>-->
+<!--            </div>-->
+            <div class="form-group col-sm-3" >
+              <label  class="font_normal_body">表&emsp;&emsp;号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_meternumber" placeholder='表号'
+                     condition="f_meternumber = '{}'" @keyup.enter="search()">
+            </div>
+            <div class="form-group col-sm-4 button-range" >
+              <button class="button_search" style="margin-right: 10px"  @click="$parent.$parent.changeprice()" v-el:cba>批量调价</button>
+              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+              <export-excel
+                :data="{condition: $parent.$parent.condition}"
+                :field="$parent.$parent.getfield"
+                sqlurl="rs/logic/exportfile" sql-name="salegetGasUser" :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}"
+                   @click="$parent.$parent.criteriaShow2 = !$parent.$parent.criteriaShow2"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow2">
+            <div class="form-group col-sm-3" >
+              <label  class="font_normal_body">气表状态</label>
+              <v-select  style="width:60%" :value.sync="model.f_table_state"
+                         v-model="model.f_table_state"
+                         :options='$parent.$parent.gasStates' placeholder='气表状态'
+                         condition="f_table_state ='{}'"></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">客户类型</label>
+              <v-select :value.sync="model.f_user_type"
+                        @change="$parent.$parent.userTypeChange1()"
+                        :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                        condition="f_user_type = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">用气性质</label>
+              <v-select :value.sync="model.f_gasproperties1" v-model="model.f_gasproperties1"
+                        :options='$parent.$parent.gasproperties1' placeholder='请选择'
+                        condition="f_gasproperties = '{}'"
+                        close-on-select></v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">用气类别</label>
+              <v-select :value.sync="model.f_gongye_type" v-model='model.f_gongye_type'
+                        :options='$parent.$parent.gongyetype' placeholder='用气类别'
+                        condition="f_gongye_type = '{}'"
+                        close-on-select
+                        v-el:cc></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">气表类型</label>
+              <v-select :value.sync="model.f_meter_classify" v-model="model.f_meter_classify"
+                        :options='$parent.$parent.meters' placeholder='气表类型'
+                        close-on-select
+                        condition="f_meter_classify = '{}'"
+                        style="width: 60%"
+              >
+              </v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">小区名称</label>
+              <v-select :value.sync="model.f_residential_area_id" v-model="model.f_residential_area_id"
+                        :options='$parent.$parent.areaList' placeholder='小区名称'
+                        close-on-select   @select-search="$parent.$parent.getAreaList"
+                        condition="f_residential_area_id = '{}'"
+                        style="width: 60%"
+              >
+              </v-select>
+            </div>
+            <div class="col-sm-3 form-group">
+              <label class="font_normal_body">气表品牌</label>
+              <v-select :value.sync="model.f_meter_brand"
+                        v-model="model.f_meter_brand"
+                        :options="$parent.$parent.meterbrands"
+                        condition="f_meter_brand = '{}'"
+                        close-on-select></v-select>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid :optional="true">
+        <template partial='head'>
+          <th><nobr>客户编号</nobr></th>
+          <th><nobr>表号</nobr></th>
+          <th><nobr>气价名称</nobr></th>
+          <th><nobr>气价类型</nobr></th>
+          <th><nobr>客户类型</nobr></th>
+          <th><nobr>用气性质</nobr></th>
+          <th><nobr>客户名称</nobr></th>
+          <th><nobr>客户地址</nobr></th>
+        </template>
+        <template partial='body'>
+          <td style="text-align:center"><span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_userinfo_code}}</b></a></span></td>
+          <td style="text-align:center">{{row.f_meternumber}}</td>
+          <td style="text-align:center">{{row.f_price_name}}</td>
+          <td style="text-align:center">{{row.f_price_type}}</td>
+          <td style="text-align:center">{{row.f_user_type}}</td>
+          <td style="text-align:center">{{row.f_gasproperties}}</td>
+          <td style="text-align:center">{{row.f_user_name}}</td>
+          <td style="text-align:center;white-space: nowrap;">{{row.f_address}}</td>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+
+
+    <modal :show.sync="show" width="50%" backdrop="false">
+
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title" style="text-align: center;">气价调整</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="panel panel-primary datapanel">
+          <form class="form-horizontal select-overspread">
+            <div class="form-group">
+              <div class="row bg-info text-center text-center" style="height:35px">
+                <div style="float: left">
+                  <label class="font_normal_body">旧气价信息</label>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%">
+                <div class="col-sm-3 flex-row ">
+                  <label class="control-label">客户类型</label>
+                  <p class="form-control-static">{{oldinfo.f_user_type}}</p>
+                </div>
+                <div class="col-sm-3 flex-row ">
+                  <label class="control-label">用气性质</label>
+                  <p class="form-control-static">{{oldinfo.f_gasproperties}}</p>
+                </div>
+                <div class="col-sm-3 flex-row ">
+                  <label class="control-label">气价类型</label>
+                  <p class="form-control-static">{{oldinfo.f_price_type}}</p>
+                </div>
+                <div class="col-sm-3 flex-row ">
+                  <label class="control-label">气价名称</label>
+                  <p class="form-control-static">{{oldinfo.f_price_name}}</p>
+                </div>
+              </div>
+              <div class="row bg-info text-center text-center" style="height:35px">
+                <div style="float: left">
+                  <label class="font_normal_body">新气价信息</label>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%">
+                <div class="col-sm-4 flex-row" >
+                  <label class="control-label">用户类型</label>
+                  <v-select :value.sync="newinfo.f_user_type"
+                            :options='usertypes' placeholder='用户类型'
+                            @change="userTypeChange()"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-4 flex-row">
+                  <label class="control-label">用气性质</label>
+                  <v-select :value.sync="newinfo.f_gasproperties" v-model="newinfo.f_gasproperties"
+                            :options='gasproperties' placeholder='用气性质'
+                            close-on-select v-ref:gas></v-select>
+                </div>
+                <div class="col-sm-4 flex-row">
+                  <label class="control-label">气价类型</label>
+                  <v-select :value.sync="newinfo.pricetype" v-model="newinfo.pricetype"
+                            placeholder='气价类型' :options="pricetypes"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%">
+
+                <div class="col-sm-4 flex-row" >
+                  <label class="control-label">气价名称</label>
+                  <v-select :value.sync="newinfo.pricename" v-model="newinfo.pricename"
+                            placeholder='气价名称' :options="getPricenames()" @change="priceChange"
+                            close-on-select :disabled='newinfo.pricetype.length === 0 ' v-ref:name></v-select>
+                 <span class="col-sm-3" v-if="newinfo.pricetype.length === 1 && gasproperties.length === 0"
+                        style="color:red;text-align:right">请确定用气性质已选择！！</span>
+                </div>
+
+                <div class="col-sm-4 flex-row">
+                  <label class="control-label">气价备注</label>
+                  <input type="text" class="input_search" style="width:60%" v-model="newinfo.f_price_comments" placeholder='气价备注' disabled>
+                </div>
+
+                <div class="col-sm-4 flex-row">
+                  <label class="control-label">调价原因</label>
+                  <v-select :value.sync="newinfo.f_comments" v-model="newinfo.f_comments"
+                            placeholder='调价原因' :options="adjustpricereasons" :value-single="true"
+                            close-on-select v-ref:type>
+                  </v-select>
+                </div>
+
+              </div>
+
+            </div>
+          </form>
+        </div>
+
+        <upload :blodid="blodid" :businessid="blodid" isremark="true" fusetype="批量调价" v-ref:fileupload></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search" @click="modifyUser">确定</button>
+        <button type="button" class="button_clear" @click='close'>取消</button>
+      </footer>
+
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+  let loadParamGem = async function (self) {
+    await self.$LoadParams.loadParam(self.priceorgid ? self.priceorgid : self.f_filialeid)
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+  }
+  export default {
+    title: '气价使用人',
+    data () {
+      return {
+        model: new PagedList('rs/sql/getGasUser', 20, {}),
+        condition: '',
+        criteriaShow2: false,
+        gasproperties1: [],
+        getfield: {},
+        show: false,
+        gasproperties: [],
+        f_filialeid: this.$login.f.orgid,
+        newinfo: {
+          f_user_type: '',
+          f_gasproperties: '',
+          pricetype: '',
+          pricename: '',
+          f_comments: ''
+        },
+        oldinfo: {
+          f_user_type: '',
+          f_gasproperties: '',
+          f_price_type: '',
+          f_price_name: '',
+          f_price_id: '',
+          f_stairprice_id: ''
+        },
+        areaList: [],
+        gongyetype: this.$appdata.getParam('用气类别') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用气类别')] : [],
+        usertypes: this.$appdata.getParam('用户类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')] : [],
+        pricetypes: this.$appdata.getParam('气价类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')] : [],
+        meters: this.$appdata.getParam('气表类型') ? [{label: '全部', value: ''}, ...this.$appdata.getParam('气表类型')] : [],
+        adjustpricereasons: this.$appdata.getParam('批量调价原因'),
+        config: {
+          excelHeaders: {
+            'f_price_name': '气价名称',
+            'f_userinfo_code': '客户编号',
+            'f_user_name': '客户姓名',
+            'f_address': '客户地址',
+            'f_orgname': '组织机构'
+          }
+        },
+        blodid: '临时id' + Date.now()
+      }
+    },
+    props: ['priceid', 'pricename', 'priceorgid'],
+    ready () {
+      this.search()
+      this.getfield = this.config.excelHeaders
+      loadParamGem(this)
+      this.getAreaList()
+    },
+    methods: {
+      initParams () {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      },
+      getAreaList (searchText) {
+        let condition = ' 1 = 1 '
+        if (searchText) {
+          condition = ` f_residential_area like '%${searchText}%' `
+        }
+        let HttpReset = new HttpResetClass()
+        HttpReset.load('POST', 'rs/sql/saleSingleTable?pageNo=1&pageSize=100', {
+          data: {
+            items: 'f_residential_area, id',
+            tablename: 't_area',
+            orderitem: 'id desc',
+            condition: condition
+          }
+        }, {resolveMsg: null, rejectMsg: '获取小区信息失败!'}).then((req) => {
+          let redata = []
+          req.data.forEach((row, n) => {
+            redata[n] = {
+              label: row.f_residential_area,
+              value: row.id
+            }
+          })
+          this.areaList = [{label: '全部', value: ''}, ...redata]
+        })
+      },
+      userTypeChange1 () {
+        this.gasproperties1 = []
+        if (this.$refs.paged.$refs.criteria.model !== null) {
+          this.$refs.paged.$refs.criteria.model.f_gasproperties1 = ''
+          this.gasproperties1 = this.$appdata.getParam(this.$refs.paged.$refs.criteria.model.f_user_type[0])
+        } else {
+          this.gasproperties1 = [{label: '全部', value: ''}]
+        }
+      },
+      close () {
+        this.show = false
+        Object.keys(this.newinfo).forEach(key => {
+          this.newinfo[key] = ''
+        })
+      },
+      async modifyUser () {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData()
+        let condition = rowdata.length == 0 ? this.condition : ''
+        let com = rowdata.map((row) => { return row.f_userfiles_id }).join(',')
+        let fileuploadid = this.$refs.fileupload.fileInfoData.map((row) => { return row.id }).join(',')
+
+        let param = {
+          // 新气价信息
+          f_user_type: this.newinfo.f_user_type[0],
+          f_gasproperties: this.newinfo.f_gasproperties[0],
+          f_price_type: this.newinfo.pricetype[0],
+          f_price_name: this.newinfo.pricename[0].f_price_name,
+          f_price_id: this.newinfo.pricename[0].f_price_id,
+          f_perform_date: this.newinfo.pricename[0].f_perform_date,
+          f_stairprice_id: this.newinfo.pricename[0].id,
+          // 修改原因
+          f_comments: this.newinfo.f_comments,
+          // 操作人组织机构信息
+          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,
+          // 修改条件
+          con: com,
+          condition: condition,
+          fileuploadid: fileuploadid
+        }
+        if (this.priceid) {
+          if (this.newinfo.pricename[0].f_price_id == this.model.rows[0].f_price_id) {
+            this.$showMessage('选择的气价和当前气价相同, 请重新选择')
+            return
+          }
+          // 旧气价信息
+          param.f_user_type_old = this.model.rows[0].f_user_type
+          param.f_gasproperties_old = this.model.rows[0].f_gasproperties
+          param.f_price_type_old = this.model.rows[0].f_price_type
+          param.f_price_name_old = this.model.rows[0].f_price_name
+          param.f_price_id_old = this.model.rows[0].f_price_id
+          param.f_stairprice_id_old = this.model.rows[0].f_stairprice_id
+          let res = await this.$resetpost('rs/logic/pricechangeall', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+          this.$showMessage(`成功批量修改了${res.data}位用户的气价`)
+        } else {
+          param.oldinfo = this.param
+          let res = await this.$resetpost('rs/logic/pricechangebatch', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+          this.$showMessage(`成功批量修改了${res.data}位用户的气价`)
+        }
+        this.criteriaShow = false
+        this.close()
+        this.search()
+      },
+      userTypeChange () {
+        this.gasproperties = []
+        if (this.newinfo.f_user_type.length === 1) {
+          this.gasproperties = this.$appdata.getParam(this.newinfo.f_user_type[0])
+        }
+      },
+      search () {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      changeprice () {
+        let rowdata = this.$refs.paged.$refs.grid.getRowData().length > 0 ? this.$refs.paged.$refs.grid.getRowData() : this.model.rows
+        if (this.priceid && this.model.rows.length > 0) {
+          this.oldinfo = {
+            f_user_type: this.model.rows[0].f_user_type,
+            f_gasproperties: this.model.rows[0].f_gasproperties,
+            f_price_type: this.model.rows[0].f_price_type,
+            f_price_name: this.model.rows[0].f_price_name,
+            f_price_id: this.model.rows[0].f_price_id,
+            f_stairprice_id: this.model.rows[0].f_stairprice_id
+          }
+        } else {
+          this.oldinfo = {
+            f_user_type: rowdata[0].f_user_type,
+            f_gasproperties: rowdata[0].f_gasproperties,
+            f_price_type: rowdata[0].f_price_type,
+            f_price_name: rowdata[0].f_price_name
+          }
+          for (var i = 1; i < rowdata.length; i++) {
+            if (rowdata[i].f_user_type !== rowdata[i - 1].f_user_type) {
+              this.oldinfo.f_user_type = ''
+            }
+            if (rowdata[i].f_gasproperties !== rowdata[i - 1].f_gasproperties) {
+              this.oldinfo.f_gasproperties = ''
+            }
+            if (rowdata[i].f_price_type !== rowdata[i - 1].f_price_type) {
+              this.oldinfo.f_price_type = ''
+            }
+            if (rowdata[i].f_price_name != rowdata[i - 1].f_price_name) {
+              this.oldinfo.f_price_name = ''
+            }
+          }
+        }
+        this.show = true
+      },
+      selfSearch (args) {
+        this.$refs.paged.$refs.grid.selectInit()
+        if (this.priceid) {
+          args.condition = `${args.condition} and f_price_id = '${this.priceid}'`
+        } else {
+          args.condition = `${args.condition} and f_orgid = '${this.$login.f.orgid}'`
+        }
+        this.condition = args.condition
+        this.model.search(args.condition, args.model)
+      },
+      dealmsg (val) {
+        this.$parent.f_userinfo_id = val.f_userinfo_id
+        this.$parent.listpage = false
+      },
+      getPricenames () {
+        console.log('气价。，。。', this.newinfo.pricetype, this.newinfo.f_user_type, this.newinfo.f_gasproperties)
+        let rs = []
+        if (this.newinfo.f_user_type.length === 1 && this.newinfo.f_gasproperties.length === 1 && this.newinfo.pricetype.length === 1) {
+          let params = {
+            f_user_type: this.newinfo.f_user_type[0],
+            f_gasproperties: this.newinfo.f_gasproperties[0],
+            f_price_type: this.newinfo.pricetype[0]
+          }
+          rs = this.$GetSaleParam.getPriceAll(params)
+        }
+        if (rs.length === 0) {
+          this.newinfo.pricename = ''
+        }
+        return rs
+      },
+      priceChange (val) {
+        if (val && val.length > 0) {
+          // 展示气价备注
+          this.$set('newinfo.f_price_comments', val[0].f_comments ? val[0].f_comments : '无')
+        }
+      }
+    },
+    watch: {
+      'priceid' () {
+        this.search()
+      },
+      'priceorgid' () {
+        this.$LoadParams.loadParam(this.priceorgid ? this.priceorgid : this.f_filialeid)
+      }
+    },
+    computed: {
+      userstates () {
+        return [{label: '全部', value: ''}, {label: '销户', value: '销户'}, {label: '停用', value: '停用'}, ...this.$appdata.getParam('客户状态')]
+      },
+      gasStates () {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气表状态')]
+      }
+    }
+  }
+</script>

package/src/filiale/wenxi/sale.js

@@ -37,4 +37,6 @@ export default function () {
   Vue.component('charge-list', (resolve) => { require(['./ChargeList'], resolve) })
   // 过户
   Vue.component('transfer-manage', (resolve) => { require(['./TransferManage'], resolve) })
+  // 使用该气价的用户信息
+  Vue.component('gasprice-user', (resolve) => { require(['./GasPriceUser'], resolve) })
 }

package/src/filiale/xinkang/ChargeQueryUser.vue

@@ -48,20 +48,20 @@
                             :field="$parent.$parent.isIot?$parent.$parent.iotFields:$parent.$parent.fields"
                             :is-selected="true" :model="$parent.$parent.printModel"
                             @print-data="$parent.$parent.print()" print-name="购气流水"></print-data>
-                <export-excel :data="{condition:$parent.$parent.condition,f_user_id: model.f_user_id}" v-if="model.f_meter_type === '物联网表'"
-                              :field="$parent.$parent.iotFields"
-                              sqlurl="rs/logic/exportfile" sql-name="sale_WebChargeQuery" template-name='收费查询'
-                              v-ref:exports
-                              :choose-col="true">
+<!--                <export-excel :data="{condition:$parent.$parent.condition,f_user_id: model.f_user_id}" v-if="model.f_meter_type === '物联网表'"-->
+<!--                              :field="$parent.$parent.iotFields"-->
+<!--                              sqlurl="rs/logic/exportfile" sql-name="sale_WebChargeQuery" template-name='收费查询'-->
+<!--                              v-ref:exports-->
+<!--                              :choose-col="true">-->
 
-                </export-excel>
-                <export-excel :data="{condition:$parent.$parent.condition,f_user_id: model.f_user_id}" v-else
-                              :field="$parent.$parent.fields"
-                              sqlurl="rs/logic/exportfile" sql-name="sale_ChargeQuery" template-name='收费查询'
-                              v-ref:exports
-                              :choose-col="true">
+<!--                </export-excel>-->
+<!--                <export-excel :data="{condition:$parent.$parent.condition,f_user_id: model.f_user_id}" v-else-->
+<!--                              :field="$parent.$parent.fields"-->
+<!--                              sqlurl="rs/logic/exportfile" sql-name="sale_ChargeQuery" template-name='收费查询'-->
+<!--                              v-ref:exports-->
+<!--                              :choose-col="true">-->
 
-                </export-excel>
+<!--                </export-excel>-->
               </div>
             </div>
           </div>

package/src/main.js

@@ -3,7 +3,7 @@ import all from 'vue-client/src/all'
 import App from './App'
 import system from 'system-clients/src/system'
 import sale from './sale'
-import wenxi from './filiale/tongchuan/sale'
+import wenxi from './filiale/qianneng/sale'
 // import FilialeSale from './filiale/yuansheng/sale'
 import address from 'address-client/src/address'
 import ldap from 'ldap-clients/src/ldap'