apply-clients 5.0.35-90 → 5.0.35-93

package/src/components/app_apply/ezhou/ServiceView.vue

@@ -444,7 +444,6 @@ export default {
     },
     // 初始化数据
     initializtion () {
-
       if (this.data.title == '现场勘查' || this.data.title == '现场勘查定价') {
         this.isshow = false
       }
@@ -484,52 +483,10 @@ export default {
             this.data.fields[i].required = false
           }
           if (this.data.fields[i].label==='气价名称'){
-            console.log(this.data.fields[i].options)
-            let data={
-              items:"f_price_name",
-              tablename:"t_stairprice",
-              condition:`f_filialeids = '${Vue.user.f_orgids}' and f_state= '有效' and getdate()>=f_perform_date and getdate()<=f_end_date `,
-              orderitem:'id'
-            }
-            let qijia=[]
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-              console.log("66666666666666666666")
-              console.log(JSON.stringify(res))
-              console.log(typeof res)
-              //console.log(JSON.stringify(res.data[0]))
-              let result=res.data
-              result.forEach(ress=>{
-                qijia.push({
-                  label:ress.f_price_name,
-                  value:ress.f_price_name
-                })
-              })
-              this.data.fields[i].options=qijia
-            })
+              this.data.fields[i].options=Vue.prototype.$qijia
           }
           if (this.data.fields[i].label==='气表品牌'){
-            console.log(this.data.fields[i].options)
-            let data={
-              items:"f_meter_brand",
-              tablename:"t_gasbrand",
-              condition:`f_filialeids = '${Vue.user.f_orgids}'`,
-              orderitem:'id'
-            }
-            let pinpai=[]
-            new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-              console.log("666666666666666666662")
-              console.log(JSON.stringify(res))
-              console.log(typeof res)
-              //console.log(JSON.stringify(res.data[0]))
-              let result=res.data
-              result.forEach(ress=>{
-                pinpai.push({
-                  label:ress.f_meter_brand,
-                  value:ress.f_meter_brand
-                })
-              })
-              this.data.fields[i].options=pinpai
-            })
+              this.data.fields[i].options=Vue.prototype.$pinpai
           }
         }
       }
@@ -664,29 +621,9 @@ export default {
       console.log(this.data.title)
       if (this.data.fields[index].label=='气表品牌'){
         console.log("进入改变气表型号")
-        console.log(this.data.fields[index+1].options)
-        this.data.fields[index+1].options=[]
-        let data={
-          items:"gm.f_meter_style",
-          tablename:"t_gasmodel gm left join t_gasbrand gb on  gm.f_gasbrand_id=gb.id",
-          condition:`gb.f_filialeids = '${Vue.user.f_orgids}' and  gb.f_meter_brand='${value}'`,
-          orderitem:'gm.id'
-        }
-        let xinghao=[]
-        new HttpResetClass().load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/tel_singleTable_OrderBy`, {data: data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
-          console.log("66666666666666666666")
-          console.log(JSON.stringify(res))
-          console.log(typeof res)
-          //console.log(JSON.stringify(res.data[0]))
-          let result=res.data
-          result.forEach(ress=>{
-            xinghao.push({
-              label:ress.f_meter_style,
-              value:ress.f_meter_style
-            })
-          })
-          this.data.fields[index+1].options=xinghao
-        })
+        const pinpai = Vue.prototype.$pinpai.filter(res=>res.value===value);
+        const arr = Vue.prototype.$xinghao.filter(res=>res.id==pinpai[0].id)
+        this.$set(`data.fields[${index+1}].options`,arr)
       }
       if (this.data.title == '现场勘查') {
         if (index == 4) {

package/src/components/product/Common/PrintBill.vue

@@ -1,121 +1,121 @@
-<template>
-  <div class="auto form-horizontal" >
-    <modal  :show.sync="show" v-if="show"  v-ref:modal large backdrop="false">
-      <header slot="modal-header" class="modal-header">
-        <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
-        <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
-      </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_xx' v-if="bill.data" v-html="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_xx'" top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="false" :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 } from 'vue-client'
-  import Vue from "vue";
-
-  let getBillData = async function(self, val) {
-    debugger
-    self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
-    await self.bill.search(self.data.chargeid)
-    // self.bill.condition=
-    // 获取发票号
-    self.model.f_using_number = self.billData.bill.number
-    console.log(self.bill)
-  }
-
-  export default {
-    title: '收费发票',
-    data () {
-      return {
-        model: {
-          f_using_number: null
-        },
-        bill: {data:''},
-        messShow: false
-      }
-    },
-    props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
-    ready () {
-      console.log('打票！！！！！！！！！！！！！！！！！')
-
-
-    },
-    methods: {
-        closebuyerinfo(){
-            this.show=false;
-        },
-      cancel  () {
-        this.$dispatch('toggle')
-      },
-
-
-      async print () {
-        // 更新系统发票
-          this.data.f_operator=this.$login.f.name,
-          this.data.f_filiale= this.$login.f.f_fengongsi,
-          this.data.f_outlets= this.$login.f.f_parentname,
-          this.data.f_orgstr=this.$login.f.orgpathstr,
-          this.data.f_filialeids=this.$login.f.f_orgids
-
-        try {
-          if (this.billConfig.hasBillManage) {
-            console.log("进入hasBillManage====================================")
-            await this.$commonService.openPaperBill(this.data.chargeid, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常',this.data.f_operator,this.data.f_filiale,this.data.f_outlets,this.data.f_orgstr,this.data.f_filialeids)
-          }
-          //票据打印！！！！！！！！！！！！！！！！！！！！
-          this.$refs.reportprint.print()
-          this.$dispatch('selfsearch')
-          this.$parent.model.f_charge_money=0
-          this.$parent.model.f_amount_words=0
-          this.$parent.model.f_amount_words=0
-          this.show=false
-        } catch (error) {
-          this.$dispatch('refresh')
-        }
-      }
-    },
-    watch: {
-      'show' (val) {
-        if (val) {
-          getBillData(this, val).then(() => {
-                }).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-if="show"  v-ref:modal large backdrop="false">
+      <header slot="modal-header" class="modal-header">
+        <h3 style="color:black" class="modal-title" >{{billConfig.billtype}}</h3>
+        <button type="button" class="close" @click="closebuyerinfo"><span>&times;</span></button>
+      </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_xx' v-if="bill.data" v-html="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_xx'" top='15mm' left='5mm'  width='90%'  height='70%' :notrepeat="false" :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 } from 'vue-client'
+  import Vue from "vue";
+
+  let getBillData = async function(self, val) {
+    debugger
+    self.bill = new DataModel(self.billData.url, {reprint: "'正常'"})
+    await self.bill.search(self.data.chargeid)
+    // self.bill.condition=
+    // 获取发票号
+    self.model.f_using_number = self.billData.bill.number
+    console.log(self.bill)
+  }
+
+  export default {
+    title: '收费发票',
+    data () {
+      return {
+        model: {
+          f_using_number: null
+        },
+        bill: {data:''},
+        messShow: false
+      }
+    },
+    props: ['show', 'data', 'billData', 'billConfig','titleName','billDataantai'],
+    ready () {
+      console.log('打票！！！！！！！！！！！！！！！！！')
+
+
+    },
+    methods: {
+        closebuyerinfo(){
+            this.show=false;
+        },
+      cancel  () {
+        this.$dispatch('toggle')
+      },
+
+
+      async print () {
+        // 更新系统发票
+          this.data.f_operator=this.$login.f.name,
+          this.data.f_filiale= this.$login.f.f_fengongsi,
+          this.data.f_outlets= this.$login.f.f_parentname,
+          this.data.f_orgstr=this.$login.f.orgpathstr,
+          this.data.f_filialeids=this.$login.f.f_orgids
+
+        try {
+          if (this.billConfig.hasBillManage) {
+            console.log("进入hasBillManage====================================")
+            await this.$commonService.openPaperBill(this.data.chargeid, this.data.f_bill_type, this.billConfig.billType, this.billData.bill, '正常',this.data.f_operator,this.data.f_filiale,this.data.f_outlets,this.data.f_orgstr,this.data.f_filialeids)
+          }
+          //票据打印！！！！！！！！！！！！！！！！！！！！
+          this.$refs.reportprint.print()
+          this.$dispatch('selfsearch')
+          this.$parent.model.f_charge_money=0
+          this.$parent.model.f_amount_words=0
+          this.$parent.model.f_amount_words=0
+          this.show=false
+        } catch (error) {
+          this.$dispatch('refresh')
+        }
+      }
+    },
+    watch: {
+      'show' (val) {
+        if (val) {
+          getBillData(this, val).then(() => {
+                }).catch((error) => {
+
+            this.$emit('error', error)
+          })
+        }
+      }
+    },
+    events: {
+      'print' () {
+        this.$dispatch('printok', '发票打印', this.data)
+      },
+      'print-error' () {
+        this.$dispatch('error', '发票打印', this.data, null)
+      }
+    }
+  }
+
+</script>
+<style >
+</style>