apply-clients 3.3.110-227 → 3.3.110-230

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.3.110-227",
+  "version": "3.3.110-230",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/apply.js

@@ -54,6 +54,7 @@ export default function () {
   // 收费管理
   Vue.component('apply-charge-management', (resolve) => { require(['./components/product/Process/Processes/chargeManagement'], resolve) })
   Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+  Vue.component('apply-print-chargepc', (resolve) => { require(['./components/product/Process/Processes/Print/printChargepc'], resolve) })
   Vue.component('apply-print-refund', (resolve) => { require(['./components/product/Process/Processes/Print/printRefund'], resolve) })
 
   // 补充协议

package/src/components/android/Process/AppServiceControl.vue

@@ -260,9 +260,13 @@ export default {
         )
         restp.data[0].processname = '散户报建流程'
         restp.data[0].defname = '合同签订'
-        this.$dispatch('gotoson',restp.data[0])
-        this.$goto('app-service-control', {selectdata: restp.data[0]}, 'self', restp.data[0])
-        // this.$dispatch('apply',restp.data[0])
+        let _this = this
+        this.$dispatch('gotoson', {
+          _this: _this,
+          title: restp.data[0].defname,
+          safe: true
+        })
+        this.$goto('app-service-control', {selectdata: restp.data[0]}, 'self')
 
       } else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && this.show_data.button.button_name === '提交'){
         let data2 = {
@@ -282,8 +286,14 @@ export default {
         console.log('打印查询的内容',restp1)
         // restp1.data[0].processname = '散户报建流程'
         // restp1.data[0].defname = '报装缴费'
-        this.$dispatch('gotoson',restp1.data[0])
-        this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self',restp1.data[0])
+
+        let _this = this
+        this.$dispatch('gotoson', {
+          _this: _this,
+          title: restp1.data[0].defname,
+          safe: true
+        })
+        this.$goto('app-service-control', {selectdata: restp1.data[0]}, 'self')
       }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
         let data3 = {
           condition: `u.id = ${this.show_data.id}`,
@@ -300,10 +310,21 @@ export default {
           {resolveMsg: null, rejectMsg: '报建数据查询失败！！！'}
         )
         console.log('打印查询的内容',restp2)
-        // restp2.data[0].processname = '散户报建流程'
-        // restp2.data[0].defname  = '工程派工'
-        this.$dispatch('gotoson',restp2.data[0])
-        this.$goto('app-service-control', {selectdata: restp2.data[0]}, 'self',restp2.data[0])
+        debugger
+        if(restp2.length>0){
+          let _this = this
+          this.$dispatch('gotoson', {
+            _this: _this,
+            title: restp2.data[0].defname,
+            safe: true
+          })
+          this.$goto('app-service-control', {selectdata: restp2.data[0]}, 'self')
+        }else{
+          debugger
+          this.$dispatch('confirm')
+          this.$dispatch('confirm')
+          this.$dispatch('confirm')
+        }
       }
       else{
         // console.log('-----')

package/src/components/product/Process/Processes/Print/printChargepc.vue

@@ -0,0 +1,142 @@
+<template>
+  <style id="printChargeStyle">
+    td{
+      height: 30px;
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      /*width: 100%;*/
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+    .orgs {
+      border-bottom: 2px solid;
+      padding: 5px;
+    }
+    .date {
+      float: left;
+      padding-left: 10px;
+    }
+    .status {
+      float: right;
+      padding-right: 10px;
+    }
+    .seal {
+      position: absolute;
+      right: 100px;
+      top: 120px;
+      width: 150px;
+      height: 150px;
+      /*opacity: 0.5;*/
+      z-index: -1;
+    }
+  </style>
+  <div id="printCharge">
+    <h4>
+      <span class="orgs">
+        {{orgs}}统一收据
+      </span>
+    </h4>
+    <table border="1" width="100%">
+      <tr>
+        <td colspan="2" style="border: none">
+          开票日期：{{ new Date().Format('yyyy年MM月dd日') }}
+        </td>
+        <td colspan="2" style="border: none">
+          收据编码：{{ charge.f_charge_number }}
+        </td>
+        <td colspan="2" style="border: none">
+          状态：{{ charge.f_charge_status }}
+        </td>
+      </tr>
+      <tr>
+        <td style="width: 17%">用户姓名</td>
+        <td colspan="2" style="width: 33%">{{ selectdata.f_user_name }}</td>
+        <td style="width: 17%">用户编号</td>
+        <td colspan="2" style="width: 33%">{{ selectdata.f_userinfo_code }}</td>
+      </tr>
+      <tr>
+        <td>用户地址</td>
+        <td colspan="5">{{ selectdata.f_address }}</td>
+      </tr>
+      <tr>
+        <td>收款项目</td>
+        <td colspan="2">{{ charge.f_payment_term }}</td>
+        <td>收款方式</td>
+        <td colspan="2">{{ charge.f_payment_method }}</td>
+      </tr>
+      <tr>
+        <td>金额</td>
+        <td colspan="2">{{ charge.f_charge_money }}</td>
+        <td>金额大写</td>
+        <td colspan="2">{{ charge.f_amount_words }}</td>
+      </tr>
+      <tr>
+        <td>收款人</td>
+        <td colspan="2">{{ charge.f_charge_collectors }}</td>
+        <td>销售方（章）</td>
+        <td colspan="2"></td>
+      </tr>
+      <tr>
+        <td>备&emsp;&emsp;注</td>
+        <td colspan="5">{{ charge.f_charge_remarks }}</td>
+      </tr>
+      <tr>
+        <td colspan="6">
+          请持此收据到{{orgs}}营业厅换取发票
+        </td>
+      </tr>
+    </table>
+    <img class="seal" border="0" :src="src" alt="">
+  </div>
+
+  <print-element v-show="false" v-ref:print id='printCharge' styleid='printChargeStyle'
+                 top='20' left='30' width='100%' height='100%'>
+  </print-element>
+</template>
+
+<script>
+  import { isEmpty } from '../../../../Util'
+  Date.prototype.Format = function (fmt) {
+    var o = {
+      "M+": this.getMonth() + 1, //月份
+      "d+": this.getDate(), //日
+      "H+": this.getHours(), //小时
+      "m+": this.getMinutes(), //分
+      "s+": this.getSeconds(), //秒
+      "q+": Math.floor((this.getMonth() + 3) / 3), //季度
+      "S": this.getMilliseconds() //毫秒
+    };
+    if (/(y+)/.test(fmt)) fmt = fmt.replace(RegExp.$1, (this.getFullYear() + "").substr(4 - RegExp.$1.length));
+    for (var k in o)
+      if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length == 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
+    return fmt;
+  }
+  export default {
+    title: '打印收费票据',
+    props: ['selectdata', 'charge'],
+    data () {
+      return {}
+    },
+    ready () {
+    },
+    methods: {
+    },
+    computed: {
+      orgs () {
+        return this.$login.f.orgs
+      },
+      src () {
+        return require(`./img/${this.$login.f.number}.png`)
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/product/Process/Processes/chargeManagement.vue

@@ -382,7 +382,7 @@
         <h4 class="modal-title">打印预览</h4>
       </header>
       <article slot="modal-body" class="modal-body clearfix">
-        <apply-print-charge :selectdata="selectdata" :charge="charge" v-ref:print></apply-print-charge>
+        <apply-print-chargepc :selectdata="selectdata" :charge="charge" v-ref:print></apply-print-chargepc>
       </article>
       <footer slot="modal-footer" class="modal-footer">
         <button type="button" class="btn btn-primary" @click="print()">打印</button>

package/src/components/product/Process/Service/ServiceControl.vue

@@ -1599,7 +1599,7 @@ export default {
           restgg.data[0].processname = '改管报建流程'
           restgg.data[0].defname = '报装缴费'
         }else{
-          restgg.data[0].processname = '增容报建'
+          restgg.data[0].processname = '增容报建流程'
           restgg.data[0].defname = '报装缴费'
         }
 
@@ -1682,9 +1682,12 @@ export default {
         )
         debugger
         console.log('打印查询的内容',restp2)
-        // restp2.data[0].processname = '散户报建流程'
-        // restp2.data[0].defname  = '工程派工'
-        this.$dispatch('apply',restp2.data[0])
+        if(restp2.length>0){
+          this.$dispatch('apply',restp2.data[0])
+        }else{
+          debugger
+          this.$dispatch('loadPage')
+        }
       }
       else{
           this.$dispatch('loadPage')