sale-client 3.4.190 → 3.4.191

package/package.json

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

package/src/components/revenue/HandManager/MbpeopleList.vue

@@ -205,10 +205,10 @@ import Vue from 'vue'
 let loadParamGem = async function (self) {
     await self.$LoadParams.loadParam()
     self.getfield = self.config.excelHeaders
-    self.$refs.paged.$refs.cri.model.f_meter_classify = ['机表']
+    // self.$refs.paged.$refs.cri.model.f_meter_classify = ['机表']
     self.$refs.paged.$refs.cri.model.f_book_name = ['is null']
     await self.initAdjustables()
-    await self.search()
+    // await self.search()
   }
   export default {
     name: 'MbpeopleList',

package/src/components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferRecords.vue

@@ -0,0 +1,215 @@
+<template>
+  <div class="flex-row">
+    <div class="span" style="overflow-y: auto;">
+      <validator name='v'>
+        <form novalidate class="form-horizontal">
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-4">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转入方编号</label>
+              <input class="input_search" style="width:60%" type="text" title="转入方编号" v-model="model.in_userinfo_code"
+                  readonly   placeholder="用户姓名">
+            </div>
+            <div class="col-sm-4">
+            <label for="f_newuser_name" id="label" class="font_normal_body">转入方姓名</label>
+              <input class="input_search" style="width:60%" type="text" title="转入方姓名" v-model="model.in_user_name"
+                  readonly   placeholder="用户姓名">
+            </div>
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-4" title="回车搜索传出方信息" :class="[$v.out_userinfo_code.required ? 'has-error' : 'has-success']">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转出方编号</label>
+              <input class="input_search" style="width:60%" type="text" title="回车搜索传出方信息" v-model="model.out_userinfo_code"
+                     v-validate:out_userinfo_code='{required: true }'  @keydown.enter="searchByCode"  placeholder="转出方编号，按下回车进行查询">
+            </div>
+            <div class="col-sm-4" :class="[$v.out_user_name.required ? 'has-error' : 'has-success']">
+              <label for="f_newuser_name" id="label" class="font_normal_body">转出方姓名</label>
+              <input class="input_search" style="width:60%" type="text" title="转出方姓名" v-model="model.out_user_name"
+                     v-validate:out_user_name='{required: true }' readonly  placeholder="转出方姓名">
+            </div>
+          </div>
+          <div class="row" style="margin-top:10px;">
+            <div class="col-sm-12" :class="[$v.f_comments.required ? 'has-error' : 'has-success']">
+              <label id="label" for="f_comments" class="font_normal_body">&nbsp;备&emsp;&emsp;注</label>
+              <input class="input_search" style="width:87%" v-model="model.f_comments"
+                     v-validate:f_comments='{required: true }'
+                     placeholder="备注"/>
+            </div>
+          </div>
+        </form>
+        <div style="text-align:right;height:auto;">
+          <button class="button_search" @click="notarize = true" :disabled='!$v.valid'>
+            确认
+          </button>
+          <button class="button_clear" @click="clear()">
+            取消
+          </button>
+        </div>
+      </validator>
+    </div>
+    <upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="用户记录转移管理"></upload>
+    <modal v-if="notarize" :show.sync="notarize" width="40%" title="信息确认" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="text-align: center">
+          <strong>此操作具有一定的风险性，需要您再次确认转出方用户信息，请输入传出方用户编号</strong>
+        <div class="row">
+          <div class="col-sm-6 col-sm-offset-3">
+            <label for="f_newuser_name" id="label" class="font_normal_body">再次确认用户编号</label>
+            <input class="input_search" style="width:60%" type="text" title="用户编号" v-model="notarize_userinfo_code"
+                      placeholder="用户编号">
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button class="button_search" @click="confirm()" :disabled='!notarize_userinfo_code'>
+          确认
+        </button>
+        <button class="button_clear" @click="notarize = false">
+          取消
+        </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+
+import {HttpResetClass} from 'vue-client'
+
+let asyncTransferManage = async function (self) {
+  // await self.$getConfig(self, 'TransferRecord')
+}
+
+export default {
+  title: '过户管理',
+  props: ['row'],
+  data () {
+    return {
+      // 附件上传必须
+      blodid: '',
+      notarize: false,
+      notarize_userinfo_code: '',
+      config: {
+        showupload: false,
+        tableNames: [
+          {
+            table: 't_sellinggas',
+            name: '收费记录',
+            checked: true,
+            disabled: true
+          }, {
+            table: 't_chargeprice',
+            name: '划价记录',
+            checked: true,
+            disabled: true
+          }]
+      },
+      model: {
+        table_name: [],
+        in_userinfo_id: '',
+        in_userfiles_id: '',
+        in_userinfo_code: '',
+        in_user_id: '',
+        out_userinfo_id: '',
+        out_userfiles_id: '',
+        out_user_id: '',
+        out_userinfo_code: '',
+        in_user_name: '',
+        out_user_name: '',
+        f_orgid: '',
+        f_orgname: '',
+        f_depid: '',
+        f_depname: '',
+        f_operatorid: '',
+        f_operator: '',
+        f_comments: ''
+      }
+    }
+  },
+  ready () {
+    this.blodid = this.row.f_userinfo_id
+    Object.assign(this.model, {
+      in_userinfo_id: this.row.f_userinfo_id,
+      in_userinfo_code: this.row.f_userinfo_code,
+      in_userfiles_id: this.row.f_userfiles_id,
+      in_user_id: this.row.f_user_id,
+      in_user_name: this.row.f_user_name,
+      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
+    })
+    asyncTransferManage(this)
+  },
+  methods: {
+    confirm () {
+      // 首先验证用户
+      new HttpResetClass().load('post', 'rs/sql/sale_getUser',
+        {
+          data: {
+            condition: `f_userinfo_code = '${this.notarize_userinfo_code}'`,
+            orderitem: ` f_userinfo_code Desc`
+          }
+        },
+        {resolveMsg: null, rejectMsg: '查找用户出错'}).then(
+        res => {
+          if (res.data.length === 0) {
+            this.$showAlert('验证信息有误，请重新输入用户编号进行查询并谨慎核对！！！', 'warning', 2000)
+          } else if (this.model.out_user_id !== res.data[0].f_user_id || this.model.out_userinfo_id !== res.data[0].f_userinfo_id || this.model.out_userfiles_id !== res.data[0].f_userfiles_id) {
+            this.$showAlert('验证信息有误，请重新输入用户编号进行查询并谨慎核对！！！', 'warning', 2000)
+            this.model.out_user_name = undefined
+          } else {
+            this.model.table_name = this.config.tableNames.map(item => item.table)
+            new HttpResetClass().load('post', 'rs/logic/transferRecords',
+              this.model,
+              {resolveMsg: null, rejectMsg: '查找用户出错'}).then(
+              res => {
+                this.$showAlert('操作成功', 'success', 2000)
+                this.clear()
+              }
+            )
+          }
+        }
+      )
+    },
+    clear () {
+      this.$dispatch('refresh')
+    },
+    searchByCode () {
+      if (this.model.in_userinfo_code === this.model.out_userinfo_code) {
+        this.$showAlert('转出方转入方信息不能一致，请谨慎核对！！！', 'warning', 2000)
+        return
+      }
+      new HttpResetClass().load('post', 'rs/sql/sale_getUser',
+        {
+          data: {
+            condition: `f_userinfo_code = '${this.model.out_userinfo_code}'`,
+            orderitem: ` f_userinfo_code Desc`
+          }
+        },
+        {resolveMsg: null, rejectMsg: '查找用户出错'}).then(
+          res => {
+            if (res.data.length > 0) {
+              Object.assign(this.model, {
+                out_userinfo_code: res.data[0].f_userinfo_code,
+                out_user_id: res.data[0].f_user_id,
+                out_userinfo_id: res.data[0].f_userinfo_id,
+                out_userfiles_id: res.data[0].f_userfiles_id,
+                out_user_name: res.data[0].f_user_name
+              })
+            } else {
+              this.$showAlert('查无用户信息，请谨慎核对！！！', 'warning', 2000)
+              this.model.out_user_name = undefined
+            }
+          }
+      )
+    }
+  },
+  events: {}
+}
+</script>
+
+<style scoped>
+#label {
+  margin-top: 5px;
+}
+</style>

package/src/filiale/liaoyuan/deductionManage.vue

@@ -0,0 +1,25 @@
+<template>
+  <div class="auto">
+    <fee-deduction v-if="row.f_meter_type === '物联网表'" :data="row"></fee-deduction>
+    <fee-machine v-if="row.f_meter_type === '机表'" :data="row"></fee-machine>
+  </div>
+</template>
+<script>
+  import feeDeduction from './feeDeduction'
+  import feeMachine from './feeMachine'
+  export default {
+    title: '补费扣费',
+    components: {
+      feeDeduction,
+      feeMachine
+    },
+    data () {
+      return {
+      }
+    },
+    props: ['row'],
+    ready () {
+
+    }
+  }
+</script>

package/src/filiale/liaoyuan/feeDeduction.vue

@@ -0,0 +1,162 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div  class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body" title="参数值:计入/不计入，计入:更新档案结余及累购，不计入:只保存记录不对档案进行操作">计入累购</label>
+            <input v-show="false" v-model="model.f_add_gas" v-validate:f_operat_type='{required: true}'>
+            <v-select :value.sync="model.f_add_gas" value-single
+                      :options='addGas' placeholder='请选择'
+                      disabled
+                      selected="是否计入累购"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
+
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">操&nbsp;&nbsp;作</label>
+            <input v-show="false" v-model="model.f_operat_type"
+                   v-validate:f_operat_type='{required: true}'>
+            <v-select v-if="this.data.f_collection_type==='按金额'" :value.sync="model.f_operat_type"
+                      :options='operator_type' placeholder='请选择'
+                      selected="补费"
+                      style="width:60%"
+                      close-on-select></v-select>
+            <v-select v-if="this.data.f_collection_type==='按气量'" :value.sync="model.f_operat_type"
+                      :options='operator_type2' placeholder='请选择'
+                      selected="补气"
+                      style="width:60%"
+                      close-on-select></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <div v-if="this.data.f_collection_type==='按金额'"
+                 :class="[$v.f_preamount.required || $v.f_preamount.dctest ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">&nbsp;金额&nbsp;</label>
+              <input class="input_search" type="number" v-model="model.f_preamount"
+                     v-validate:f_preamount='{required: true,  dctest: [0, ">" ]}' placeholder="金额">
+            </div>
+            <div v-if="this.data.f_collection_type==='按气量'"
+                 :class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">
+              <label class="font_normal_body">&nbsp;气量&nbsp;</label>
+              <input class="input_search" type="number" v-model="model.f_pregas"
+                     v-validate:f_pregas='{required: true,  dctest: [0, ">" ]}' placeholder="气量">
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-12">
+            <label for="f_paper_account" class="font_normal_body ">备&nbsp;&nbsp;注</label>
+            <input class="input_search" style="width:87%" rows="1" v-model="model.f_comments"></input>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="btn button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+        <button class="btn button_clear btn-gn" @click="clean()">取消</button>
+      </div>
+    </validator>
+    <!--<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>-->
+    <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>-->
+  </div>
+  <upload :blodid="data.f_userinfo_id" v-if="true" isremark="true" fusetype="补费扣费"></upload>
+</template>
+
+
+<script>
+  import Vue from 'vue'
+  let asyncfeeDeduction = async function (self) {
+    await self.$getConfig(self, 'feeDeduction')
+    console.log('物联网补费扣费config', self.config)
+    if(self.config.addgas){
+      self.model.f_add_gas = '计入'
+    } else {
+      self.model.f_add_gas = '计入'
+    }
+  }
+export default {
+    title: '物联网表补费扣费',
+    data () {
+      return {
+        blodid: '',
+        showupload: false,
+        config: {
+          addgas: false
+        },
+        addGas: [{label: '计入', value: '计入'}, {label: '不计入', value: '不计入'}],
+        operator_type: [{label: '补费', value: '物联网补费'}, {label: '扣费', value: '物联网扣费'}],
+        operator_type2: [{label: '补气', value: '物联网补气'}, {label: '扣气', value: '物联网扣气'}],
+        model: {
+          f_operat_type: '',
+          f_pregas: 0,
+          f_preamount: 0,
+
+          f_comments: ''
+        }
+
+      }
+    },
+    props: ['data'],
+    ready () {
+      // this.blodid = this.row.f_userinfo_id
+      if (this.data.f_collection_type === '按气量') {
+        this.model.f_operat_type = ['物联网补费']
+      } else {
+        this.model.f_operat_type = ['物联网补费']
+      }
+      asyncfeeDeduction(this)
+    },
+    methods: {
+      async confirm () {
+        let param = {
+          fillgas: {
+            f_add_gas: this.model.f_add_gas,
+            f_userinfo_id: this.data.f_userinfo_id,
+            f_user_id: this.data.f_user_id,
+            f_userfiles_id: this.data.f_userfiles_id,
+            f_user_name: this.data.f_user_name,
+            f_user_type: this.data.f_user_type,
+            f_gasproperties: this.data.f_gasproperties,
+            f_meter_type: this.data.f_meter_type,
+            f_pregas: this.model.f_pregas,
+            f_address: this.data.f_address,
+            f_meter_brand: this.data.f_meter_brand,
+            f_preamount: this.model.f_preamount,
+            f_type: this.model.f_operat_type[0],
+            // f_preamount_state: '有效',
+            f_comments: this.model.f_comments,
+            f_billing: this.data.f_billing,
+            f_operator: Vue.$login.f.name,
+            f_operatorid: Vue.$login.f.id,
+            f_orgid: Vue.$login.f.orgid,
+            f_orgname: Vue.$login.f.orgs,
+            f_depid: Vue.$login.f.depids,
+            f_depname: Vue.$login.f.deps,
+            f_card_id: this.data.f_card_id,
+            f_balance: this.data.f_balance_amount,
+            f_operat_type: this.model.f_operat_type[0],
+            f_describe: `${this.$login.f.name}对用户${this.data.f_user_name}进行${this.model.f_operat_type}操作`,
+            f_state: '有效'
+            // f_table_state:'有效'
+          }
+        }
+        console.log(param)
+        this.$resetpost('rs/logic/feededuction', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行${this.model.f_operat_type}吗？`, resolveMsg: `${this.model.f_operat_type}成功！！`, rejectMsg: `${this.model.f_operat_type}失败！！请重试！！`}).then((res) => {
+          this.clean()
+  })
+      },
+      clean () {
+        this.$dispatch('refresh')
+      }
+      // printok () {
+      //   this.$dispatch('success')
+      // },
+      // validateBill (val) {
+      //   this.validateOk = !val.isOk
+      //   this.billData.bill = val.bill
+      // }
+    }
+  }
+</script>

package/src/filiale/liaoyuan/feeMachine.vue

@@ -0,0 +1,138 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form novalidate class="form-horizontal">
+        <div  class="row">
+          <div class="col-sm-4 form-group">
+            <label class="font_normal_body">&nbsp;操作&nbsp;</label>
+            <input v-show="false" v-model="model.f_operat_type"
+                   v-validate:f_operat_type='{required: true}'>
+            <v-select  :value.sync="model.f_operat_type"
+                      :options='operator_type' placeholder='请选择'
+                      selected="补费"
+                      style="width:60%"
+                      close-on-select></v-select>
+            <!--<v-select v-if="this.data.f_collection_type==='按气量'" :value.sync="model.f_operat_type"-->
+                      <!--:options='operator_type2' placeholder='请选择'-->
+                      <!--selected="补气"-->
+                      <!--style="width:60%"-->
+                      <!--close-on-select></v-select>-->
+          </div>
+          <div class="col-sm-4 form-group"></div>
+
+          <div  class="col-sm-4 form-group"
+               :class="[$v.f_preamount.required || $v.f_preamount.dctest ? 'has-error' : 'has-success']">
+            <label class="font_normal_body">&nbsp;金额&nbsp;</label>
+            <input class="input_search" type="number" v-model="model.f_preamount" style="width:60%"
+                   v-validate:f_preamount='{required: true,  dctest: [0, ">" ]}' placeholder="金额">
+          </div>
+          <!--<div v-if="this.data.f_collection_type==='按气量'" class="col-sm-4 form-group"-->
+               <!--:class="[$v.f_pregas.required || $v.f_pregas.dctest ? 'has-error' : 'has-success']">-->
+            <!--<label class="font_normal_body">&nbsp;气量&nbsp;</label>-->
+            <!--<input class="input_search" type="number" v-model="model.f_pregas" style="width:60%"-->
+                   <!--v-validate:f_pregas='{required: true,  dctest: [0, ">" ]}' placeholder="气量">-->
+          <!--</div>-->
+
+        </div>
+
+        <div class="row">
+          <div class="col-sm-12">
+            <label for="f_paper_account" class="font_normal_body ">&nbsp;备注&nbsp;</label>
+            <input class="input_search" style="width:87%" rows="1" v-model="model.f_comments"></input>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="btn button_search btn-gn" @click="confirm()" :disabled='!$v.valid'>确认</button>
+        <button class="btn button_clear btn-gn" @click="clean()">取消</button>
+      </div>
+    </validator>
+    <!--<validate-bill v-if="hasValidateBill" :data="model" @validate-bill="validateBill"></validate-bill>-->
+    <!--<print-bill :show="print" :bill-manager='config.hasBillManage' v-ref:printbill :bill-url='billUrl' v-on:toggle="clean" @printok="printok" :data='printModel'></print-bill>-->
+    <!--<print-bill :show="print" :bill-config='config' :bill-data='billData' v-on:toggle="clean" @printok="printok" :data='printModel'  v-ref:printbill></print-bill>-->
+  </div>
+  <upload :blodid="data.f_userinfo_id" v-if="true" isremark="true" fusetype="补费扣费"></upload>
+</template>
+
+
+<script>
+  import Vue from 'vue'
+
+export default {
+    title: '机表补费扣费',
+    data () {
+      return {
+        blodid: '',
+        showupload: false,
+        operator_type: [{label: '补费', value: '机表补费'}, {label: '扣费', value: '机表扣费'}],
+        // operator_type2:[{label:'补气',value:'机表补费'},{label:'扣气',value:'机表扣费'}],
+        model: {
+          f_operat_type: '',
+          f_pregas: 0,
+          f_preamount: 0,
+
+          f_comments: ''
+        }
+
+      }
+    },
+    props: ['data'],
+    ready () {
+      // this.blodid = this.row.f_userinfo_id
+      // if(this.data.f_collection_type==='按气量'){
+      this.model.f_operat_type = ['机表补费']
+      // }else{
+        // this.model.f_operat_type=['物联网补费']
+      // }
+    },
+    methods: {
+      async confirm () {
+        let param = {
+          fillgas: {
+            f_userinfo_id: this.data.f_userinfo_id,
+            f_user_id: this.data.f_user_id,
+            f_userfiles_id: this.data.f_userfiles_id,
+            f_user_name: this.data.f_user_name,
+            f_user_type: this.data.f_user_type,
+            f_gasproperties: this.data.f_gasproperties,
+            f_meter_type: this.data.f_meter_type,
+            f_pregas: this.model.f_pregas,
+            f_address: this.data.f_address,
+            f_meter_brand: this.data.f_meter_brand,
+            f_preamount: this.model.f_preamount,
+            f_type: this.model.f_operat_type[0],
+            // f_preamount_state: '有效',
+            f_comments: this.model.f_comments,
+            f_billing: this.data.f_billing,
+            f_operator: Vue.$login.f.name,
+            f_operatorid: Vue.$login.f.id,
+            f_orgid: Vue.$login.f.orgid,
+            f_orgname: Vue.$login.f.orgs,
+            f_depid: Vue.$login.f.depids,
+            f_depname: Vue.$login.f.deps,
+            f_card_id: this.data.f_card_id,
+            f_balance: this.data.f_balance_amount,
+            f_operat_type: this.model.f_operat_type[0],
+            f_describe: `${this.$login.f.name}对用户${this.data.f_user_name}进行${this.model.f_operat_type}操作`,
+            f_state: '有效'
+            // f_table_state:'有效'
+          }
+        }
+        console.log(param)
+        this.$resetpost('rs/logic/feemachine', {data: param}, {warnMsg: `确定要对用户${this.data.f_user_name}进行${this.model.f_operat_type}吗？`, resolveMsg: `${this.model.f_operat_type}成功！！`, rejectMsg: `${this.model.f_operat_type}失败！！请重试！！`}).then((res) => {
+          this.clean()
+  })
+      },
+      clean () {
+        this.$dispatch('refresh')
+      }
+      // printok () {
+      //   this.$dispatch('success')
+      // },
+      // validateBill (val) {
+      //   this.validateOk = !val.isOk
+      //   this.billData.bill = val.bill
+      // }
+    }
+  }
+</script>

package/src/filiale/liaoyuan/sale.js

@@ -33,6 +33,8 @@ let specialComp = {
   // 售气收费 --弹出框
   'charge-modal': (resolve) => { require(['./ChargeModal'], resolve) },
   // 使用该抄表册的用户信息（使用户数）
-  'meterbook-user':(resolve) => { require(['./MeterBookUser'], resolve) }
+  'meterbook-user':(resolve) => { require(['./MeterBookUser'], resolve) },
+  // 补费扣费
+  'deduction-manage': (resolve) => { require(['./deductionManage'], resolve) }
 }
 exports.specialComp = specialComp

package/src/sale.js

@@ -191,6 +191,8 @@ export default function (filiale) {
   Vue.component('machine-card-bill', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/ReplaceCard/MachineCardBill'], resolve) })
   // 过户
   Vue.component('transfer-manage', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferManage'], resolve) })
+  // 过户
+  Vue.component('transfer-records', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/ChangeAccount/TransferRecords'], resolve) })
   // 表具停用
   Vue.component('disable-manage', (resolve) => { require(['./components/revenue/comprehen/ComprehenOperation/MeterDisable/DisableManage'], resolve) })
   // 表具启用