apply-clients 5.0.35-84 → 5.0.35-87

package/src/components/app_apply/Gongcheng.vue

@@ -182,7 +182,7 @@ export default {
 
       console.log(`param=>>>${JSON.stringify(param)}`)
       let http = new HttpResetClass()
-      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/checkuser`, {data: param}).then(res => {
+      http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/checkusergongchegn`, {data: param}).then(res => {
         console.log(`前台本地报建代办工单查询结果data=>>>${JSON.stringify(res.data)}`)
         if (res.data) {
           this.rows = res.data
@@ -254,13 +254,13 @@ export default {
     }, 6000000)// 60000
   },
   created() {
-    /*var result = HostApp.readLocalFile('workflow_apply.json')
+    var result = HostApp.readLocalFile('workflow_apply.json')
     if(result.code == 500){
       this.$showMessage('获取流程配置文件失败，请联系系统管理员')
       return
     }
-    var data = JSON.parse(result.data)*/
-    var data={
+    var data = JSON.parse(result.data)
+   /* var data={
       "start_activitys": [
         "集体报装申请",
         "报装申请",
@@ -3573,7 +3573,7 @@ export default {
           ]
         }
       ]
-    }
+    }*/
 
     console.log('前台存入缓存中的data=>' + JSON.stringify(data))
     Vue.workflow_vue = Vue.prototype.$workflow_vue = data

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>