sale-client 3.4.112 → 3.4.113

package/src/filiale/meihekou/MeterinfoTest.vue

@@ -167,7 +167,6 @@
           <div class="col-sm-4 form-group" v-show="opteratormetrbook" >
             <label for="f_position" class="font_normal_body"  >&ensp;抄&ensp;表&ensp;册</label>
             <v-select :value.sync="row.f_meter_book_num" v-model="row.f_meter_book_num"
-                      :value-single="true"
                       :options='meterbookoptions' placeholder='抄表册'
                       close-on-select></v-select>
           </div>

package/src/filiale/meihekou/PrintBill.vue

@@ -1,140 +1,140 @@
-<template>
-  <div class="auto form-horizontal" >
-    <modal :show.sync="show"  v-ref:modal large backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h3 style="color:black" class="modal-title">收费发票</h3>
-      </header>
-      <article slot="modal-body" class="modal-body">
-<!--        <div v-if="bill.data">-->
-<!--          {{{bill.data}}}-->
-<!--        </div>-->
-        <validator name='v'>
-          <form class="form-horizontal  select-overspread">
-            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
-              {{{bill.data}}}
-            </div>
-          </form>
-        </validator>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <div v-if="billConfig.hasBillManage">
-          <div class="col-sm-2" >
-            <span><strong>发票号:{{model.f_using_number}}</strong></span>
-          </div>
-        </div>
-        <button type="button" class="btn btn-success" @click='print()'>打印</button>
-        <report-print id='normal-bill' top='5mm' left='5mm'  width='90%'  height='80%' :notrepeat="true" :showbtn="false" v-ref:reportprint></report-print>
-        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
-      </footer>
-    </modal>
-  </div>
-</template>
-<script>
-  import { DataModel, HttpResetClass } from 'vue-client'
-
-  let getBillData = async function (self, val) {
-    console.log('temp:', self)
-    let temp = {
-      reprint: "'正常'",
-      condition: self.data.id
-    }
-    if (self.data.fillgasid) {
-      temp.fillgasid = `"${self.data.fillgasid}"`
-    }
-    if (self.data.f_meter_type == '气量卡表') {
-      let http = new HttpResetClass()
-      let param = {
-        model: {f_userfiles_id: self.data.f_userfiles_id},
-        isGasValue: 0,
-        value: 0
-      }
-      let a = await http.load('POST', 'rs/logic/commonCal', {data: param}, {resolveMsg: null, rejectMsg: '获取阶梯使用情况出错'})
-      let value = a.data
-      let jt = a.data.chargeprice.length
-      if (jt > 1) {
-        value.f_hasuse1 = (value.sumamount >= value.f_stair1ceiling ? value.f_stair1ceiling : value.sumamount).toFixed(4)
-        value.f_hasuse2 = (value.sumamount >= value.f_stair2ceiling ? value.f_stair2ceiling - value.f_stair1ceiling : value.sumamount - value.f_stair1ceiling).toFixed(4)
-        value.f_hasuse3 = (value.sumamount >= value.f_stair3ceiling ? value.f_stair3ceiling - value.f_stair2ceiling : value.sumamount - value.f_stair2ceiling).toFixed(4)
-        if (value.f_hasuse2 < 0) value.f_hasuse2 = 0
-        if (value.f_hasuse3 < 0) value.f_hasuse3 = 0
-      } else {
-        let parm1 = {
-          items: 'f_pregas',
-          tablename: 't_sellinggas',
-          condition: `id=${self.data.id}`
-        }
-        let b = await http.load('POST', 'rs/sql/querySingleTable', {data: parm1}, {resolveMsg: null, rejectMsg: '获取同价使用情况出错'})
-        value.f_hasuse1 = b.data[0].f_pregas
-        value.f_hasuse2 = 0
-        value.f_hasuse3 = 0
-        value.f_stair1price = value.chargeprice[0].f_price
-        value.f_stair2price = 0
-        value.f_stair3price = 0
-      }
-      temp = Object.assign(temp, value)
-    }
-    console.log('self.billData.url:', self.billData.url)
-    self.bill = new DataModel(self.billData.url, temp)
-    await self.bill.search(self.data.id)
-    // 获取发票号
-    self.model.f_using_number = self.billData.bill.number
-  }
-
-  export default {
-    title: '收费发票',
-    data () {
-      return {
-        model: {
-          f_using_number: null
-        },
-        bill: {},
-        messShow: false
-      }
-    },
-    props: ['show', 'data', 'billData', 'billConfig'],
-    ready () {
-      console.log('打票', this.billConfig, this.billData)
-    },
-    methods: {
-      cancel  () {
-        this.$dispatch('toggle')
-      },
-
-      async print () {
-        // 更新系统发票
-        try {
-          if (this.billConfig.hasBillManage) {
-            if (this.data.f_bill_type != '清算单') { await this.$CommonService.openPaperBill(this.data.id, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常') }
-          } else {
-            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
-          }
-          this.$refs.reportprint.print()
-        } catch (error) {
-          this.$dispatch('refresh')
-        }
-      }
-    },
-    watch: {
-      'show' (val) {
-        if (val) {
-          getBillData(this, val).then(() => {
-            this.$emit('ready')
-          }).catch((error) => {
-            this.$emit('error', error)
-          })
-        }
-      }
-    },
-    events: {
-      'print' () {
-        // 对票据明细进行更新或插入操作
-        this.$dispatch('printok', '发票打印', this.data)
-      },
-      'print-error' () {
-        this.$dispatch('error', '发票打印', this.data, null)
-      }
-    }
-  }
-</script>
-<style >
-</style>
+<template>
+  <div class="auto form-horizontal" >
+    <modal :show.sync="show"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title">收费发票</h3>
+      </header>
+      <article slot="modal-body" class="modal-body">
+<!--        <div v-if="bill.data">-->
+<!--          {{{bill.data}}}-->
+<!--        </div>-->
+        <validator name='v'>
+          <form class="form-horizontal  select-overspread">
+            <div class="row" style="display: flex;justify-content: center;" id='normal-bill' v-if="bill.data">
+              {{{bill.data}}}
+            </div>
+          </form>
+        </validator>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <div v-if="billConfig.hasBillManage">
+          <div class="col-sm-2" >
+            <span><strong>发票号:{{model.f_using_number}}</strong></span>
+          </div>
+        </div>
+        <button type="button" class="btn btn-success" @click='print()'>打印</button>
+        <report-print id='normal-bill' top='5mm' left='5mm'  width='90%'  height='80%' :notrepeat="true" :showbtn="false" v-ref:reportprint></report-print>
+        <button type="button" class="btn btn-default"  @click='cancel()' v-if="!billConfig.hasBillManage">取消</button>
+      </footer>
+    </modal>
+  </div>
+</template>
+<script>
+  import { DataModel, HttpResetClass } from 'vue-client'
+
+  let getBillData = async function (self, val) {
+    console.log('temp:', self)
+    let temp = {
+      reprint: "'正常'",
+      condition: self.data.id
+    }
+    if (self.data.fillgasid) {
+      temp.fillgasid = `"${self.data.fillgasid}"`
+    }
+    if (self.data.f_meter_type == '气量卡表') {
+      let http = new HttpResetClass()
+      let param = {
+        model: {f_userfiles_id: self.data.f_userfiles_id},
+        isGasValue: 0,
+        value: 0
+      }
+      let a = await http.load('POST', 'rs/logic/commonCal', {data: param}, {resolveMsg: null, rejectMsg: '获取阶梯使用情况出错'})
+      let value = a.data
+      let jt = a.data.chargeprice.length
+      if (jt > 1) {
+        value.f_hasuse1 = (value.sumamount >= value.f_stair1ceiling ? value.f_stair1ceiling : value.sumamount).toFixed(4)
+        value.f_hasuse2 = (value.sumamount >= value.f_stair2ceiling ? value.f_stair2ceiling - value.f_stair1ceiling : value.sumamount - value.f_stair1ceiling).toFixed(4)
+        value.f_hasuse3 = (value.sumamount >= value.f_stair3ceiling ? value.f_stair3ceiling - value.f_stair2ceiling : value.sumamount - value.f_stair2ceiling).toFixed(4)
+        if (value.f_hasuse2 < 0) value.f_hasuse2 = 0
+        if (value.f_hasuse3 < 0) value.f_hasuse3 = 0
+      } else {
+        let parm1 = {
+          items: 'f_pregas',
+          tablename: 't_sellinggas',
+          condition: `id=${self.data.id}`
+        }
+        let b = await http.load('POST', 'rs/sql/querySingleTable', {data: parm1}, {resolveMsg: null, rejectMsg: '获取同价使用情况出错'})
+        value.f_hasuse1 = b.data[0].f_pregas
+        value.f_hasuse2 = 0
+        value.f_hasuse3 = 0
+        value.f_stair1price = value.chargeprice[0].f_price
+        value.f_stair2price = 0
+        value.f_stair3price = 0
+      }
+      temp = Object.assign(temp, value)
+    }
+    console.log('self.billData.url:', self.billData.url)
+    self.bill = new DataModel(self.billData.url, temp)
+    await self.bill.search(self.data.id)
+    // 获取发票号
+    self.model.f_using_number = self.billData.bill.number
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model: {
+          f_using_number: null
+        },
+        bill: {},
+        messShow: false
+      }
+    },
+    props: ['show', 'data', 'billData', 'billConfig'],
+    ready () {
+      console.log('打票', this.billConfig, this.billData)
+    },
+    methods: {
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+
+      async print () {
+        // 更新系统发票
+        try {
+          if (this.billConfig.hasBillManage) {
+            if (this.data.f_bill_type != '清算单') { await this.$CommonService.openPaperBill(this.data.id, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常') }
+          } else {
+            await this.$resetpost('rs/logic/sale_billReprint', {data: this.data}, {resolveMsg: null, rejectMsg: '票据补打出错！！'})
+          }
+          this.$refs.reportprint.print()
+        } catch (error) {
+          this.$dispatch('refresh')
+        }
+      }
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+            this.$emit('ready')
+          }).catch((error) => {
+            this.$emit('error', error)
+          })
+        }
+      }
+    },
+    events: {
+      'print' () {
+        // 对票据明细进行更新或插入操作
+        this.$dispatch('printok', '发票打印', this.data)
+      },
+      'print-error' () {
+        this.$dispatch('error', '发票打印', this.data, null)
+      }
+    }
+  }
+</script>
+<style >
+</style>