sale-client 4.0.30-preview → 4.0.31-preview

package/package.json

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

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/GiftFee/icTable.vue

@@ -100,12 +100,6 @@ let otherGasGen = async function (self) {
       throw new Error(`卡服务错误：${cardRes.data.Err}${cardRes.data.Exception}，请联系开发人员处理！！`)
     } else {
       await self.$CommonService.updatePassword(self.row, cardRes)
-      if (self.config.hasPrint) {
-        self.row.id = result.data.id
-        self.row.f_bill_type = self.isGas ? '卡表赠气' : '卡表赠费'
-        self.row.f_bill_style = '普通收据'
-        self.print = true
-      }
       self.$showAlert('赠气成功', 'success', 2000)
       return result.data.id
     }
@@ -122,8 +116,8 @@ let otherGasGen = async function (self) {
   }
 }
 let asyncIcTable = async function (self) {
-  await self.$getConfig(self, 'iotTable')
-  console.log('机表补费扣费config', self.config)
+  await self.$getConfig(self, 'icTable')
+  console.log('卡表赠气赠费config', self.config)
 }
 
 export default {
@@ -201,7 +195,14 @@ export default {
         }
         this.$resetpost('api/af-revenue/logic/updatefiles', data)
 
-        this.$dispatch('success')
+        if (this.config.hasPrint) {
+          this.row.id = res
+          this.row.f_bill_type = this.isGas ? '卡表赠气' : '卡表赠费'
+          this.row.f_bill_style = '普通收据'
+          this.print = true
+        } else {
+          this.$dispatch('success')
+        }
       })
     },
     pregas () {

package/src/filiale/fugou/components/revenue/comprehen/ComprehenOperation/GiftFee/iotTable.vue

@@ -62,7 +62,7 @@
 import Vue from 'vue'
 let asyncIotTable = async function (self) {
   await self.$getConfig(self, 'iotTable')
-  console.log('机表补费扣费config', self.config)
+  console.log('赠气赠费config', self.config)
 }
 export default {
   title: '赠气赠费',
@@ -99,13 +99,10 @@ export default {
     asyncIotTable(this)
     if (this.row.f_collection_type === '按气量') {
       this.model.f_operat_type = ['物联网赠气']
+      this.billData.url = 'rs/report/iotGiftGas'
     } else {
       this.model.f_operat_type = ['物联网赠费']
-    }
-    if (this.row.f_collection_type === '按气量') {
-      this.billData.url = 'api/af-revenue/report/iotGiftGas'
-    } else {
-      this.billData.url = 'api/af-revenue/report/iotGiftFee'
+      this.billData.url = 'rs/report/iotGiftFee'
     }
   },
   events: {

package/src/filiale/ronghao/DisableManage.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="auto">
+    <validator name='v'>
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-4 form-group">
+            <label for="f_reason" class="font_normal_body">停用原因</label>
+            <v-select v-model="model.f_reason"
+                      placeholder='停用原因'
+                      :value.sync="model.f_reason"
+                      :options='reason'
+                      v-ref:reason
+                      close-on-select ></v-select>
+          </div>
+          <div class="col-sm-4 form-group">
+            <input type="checkbox" class="large-checkbox" id="f_valveState" v-model="valveStateChecked">
+            <label for="f_operator" class="font-size-large">立即关阀</label>
+          </div>
+        </div>
+        <div class="row" style="margin-top:1px;">
+          <div class="col-sm-8 form-group">
+            <label for="f_reason" class="font_normal_body">备&emsp;&emsp;注</label>
+            <input class="input_search" style="width:80%" v-model="model.f_othereason"  placeholder="备注"/>
+          </div>
+        </div>
+      </form>
+      <div style="text-align:right;">
+        <button class="button_search button_spacing" @click="confirm()"  :disabled='!$v.valid'>确认</button>
+        <button class="button_clear" @click="clean()" >取消</button>
+      </div>
+    </validator>
+  </div>
+  <upload :blodid="blodid" v-if="false" isremark="true" fusetype="表具停用"></upload>
+</template>
+<script>
+/**
+ *综合业务
+ 表具停用组件
+ */
+export default {
+  title: '表具停用',
+  props: ['row'],
+  data () {
+    return {
+      valveStateChecked: false,
+      blodid: '',
+      showupload: true,
+      model: {},
+      reason: this.$appdata.getParam('停用原因')
+    }
+  },
+  ready () {
+    this.blodid = this.row.f_userinfo_id
+  },
+  methods: {
+    async confirm () {
+      await this.$LogicService.meterDisable(this.model, this.row)
+      let array = [{
+        f_user_id: this.row.f_user_id,
+        f_userfiles_id: this.row.f_userfiles_id,
+        f_alias: this.row.f_alias,
+        f_userinfo_id: this.row.f_userinfo_id,
+        f_orgname: this.$login.f.orgs,
+        f_orgid: this.$login.f.orgid,
+        f_meternumber: this.row.f_meternumber
+      }]
+      if (this.row.f_meter_type === '物联网表' && this.valveStateChecked) {
+        let data1 = {
+          f_apply_type: '阀门控制',
+          userid: array,
+          nowDate: new Date(),
+          f_apply_value: '关阀',
+          f_apply_beizhu: '表具停用自动关阀',
+          f_apply_operator: this.$login.f.name
+        }
+        // 根据复选框的状态添加条件
+        if (this.valveStateChecked) {
+          data1.f_valveState = 1
+        }
+        let data2 = {
+          userid: array,
+          instructtype: '阀门控制',
+          isOpen: '关阀',
+          instructTitle: '手动关阀',
+          reasonInfo: '表具停用自动关阀',
+          f_instruct_state: '待发送',
+          inputtor: this.$login.f.name
+        }
+        await this.$resetpost('rs/logic/iot_instructUpdateAndDelect',
+          {
+            data: {
+              data1: data1,
+              data2: data2
+            }
+          })
+      }
+      this.$dispatch('success')
+    },
+    clean () {
+      this.$dispatch('refresh')
+    }
+  }
+}
+</script>
+
+<style>
+.large-checkbox {
+  width: 20px;
+  height: 20px;
+  transform: scale(1.4);
+  margin-right: 14px;
+  margin-top: 15px;
+}
+
+.font-size-large {
+  padding-top: 10px;
+  padding-left: 10px;
+  font-size: 16px;
+}
+</style>

package/src/filiale/ronghao/EticketModal.vue

@@ -0,0 +1,95 @@
+<template>
+  <div class="auto form-horizontal">
+    <modal :show.sync="show" v-ref:modal large backdrop="false" :width="900">
+      <header slot="modal-header" class="modal-header">
+        <button type="button" class="close" @click="closeShow"><span>&times;</span></button>
+        <h4 class="modal-title">发票信息</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="auto select-overspread form-horizontal">
+          <div class="row auto">
+            <div class="col-sm-12 form-group " :class="[!row.f_paper_name ? 'has-error' : '']">
+              <label class="control-label col-sm-3">开票名称:</label>
+              <input class="form-control " :disabled="true"
+                     v-model="row.f_paper_name" placeholder="开票名称">
+            </div>
+            <div class="col-sm-12 form-group " :class="[ row.invoice_is_pax.length < 1 ? 'has-error' : '']">
+              <label class="control-label col-sm-3">是否征税:</label>
+              <v-select v-model="row.invoice_is_pax"
+                        placeholder='请选择'
+                        :value.sync="row.invoice_is_pax"
+                        close-on-select
+                        :width="60"
+                        :value-single="true"
+                        :search="false"
+                        :options='is_pax' clear-button>
+              </v-select>
+            </div>
+            <div class="col-sm-12 form-group ">
+              <label class="control-label col-sm-3">开户行及账号:</label>
+              <input class="form-control col-sm-2" :disabled="true"
+                     v-model="row.f_paper_account" placeholder="购方开户行及账号">
+            </div>
+            <div class="col-sm-12 form-group "
+                 :class="[ (row.f_taxpayer_id.length < 16 || row.f_taxpayer_id.length > 18) && row.f_paper_type === '数电专票' ? 'has-error' : '']">
+              <label class="control-label col-sm-3">纳税人识别号:</label>
+              <input class="form-control col-sm-2" :disabled="true"
+                     v-model="row.f_taxpayer_id" placeholder="纳税人识别号(16至18位)">
+            </div>
+            <div class="col-sm-12 form-group " :class="[!row.f_address_phone ? 'has-error' : '']">
+              <label class="control-label col-sm-3">开票地址电话:</label>
+              <input class="form-control col-sm-2" :disabled="true"
+                     v-model="row.f_address_phone" placeholder="开票地址">
+            </div>
+            <div class="col-sm-12 form-group " >
+              <label class="control-label col-sm-3">发票备注:</label>
+              <input class="form-control col-sm-2"
+                     v-model="row.f_eticket_reason" placeholder="发票备注">
+            </div>
+            <div class="col-sm-12 form-group ">
+              <label class="control-label col-sm-3">邮箱推送:</label>
+              <input class="form-control col-sm-2" :disabled="true"
+                     v-model="row.f_email" placeholder="邮箱推送">
+            </div>
+          </div>
+        </div>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button type="button" class="btn button_search"
+                :disabled="!(row.f_paper_name&&row.f_address_phone&&((row.f_taxpayer_id.length>=16 && row.f_taxpayer_id.length<=18) || row.f_paper_type === '数电普票')&&row.invoice_is_pax.length >0)"
+                @click='confirm'>确认收费
+        </button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+
+export default {
+  title: '电子发票',
+  data () {
+    return {
+      is_pax: [{label: '征税', value: '征税'}, {label: '不征税', value: '不征税'}],
+    }
+  },
+  props: ['row','show'],
+  ready () {
+  },
+  methods: {
+    confirm(){
+      this.$dispatch('confirm')
+    },
+    closeShow(){
+      this.$dispatch('closemodalshow')
+    }
+  },
+  watch: {
+    'row'(){
+      this.row.invoice_is_pax = '征税'
+    }
+  },
+  events: {}
+}
+</script>
+<style>
+</style>