apply-clients 5.0.35-ezhou-3 → 5.0.35-ezhou-4

package/src/components/product/applyReport/PrintApplyReport.vue

@@ -0,0 +1,116 @@
+<template>
+  <style id="style">
+    td{
+      height: 30px;
+      padding: 0px;
+      text-align: center;
+    }
+    .cen{
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      width: 100%;
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+  </style>
+  <div id="print">
+    <table border="1">
+      <tr>
+        <th colspan="7"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
+      </tr>
+      <tr>
+        <th colspan="1" rowspan="2" class="cen">报装人员</th>
+        <th colspan="2" class="cen">个人报建</th>
+        <th colspan="4" class="cen">集体报建</th>
+      </tr>
+      <tr class="title">
+        <th class="cen">
+          <nobr>踏勘</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>安装</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>踏勘</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>安装</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>验收</nobr>
+        </th>
+        <th  class="cen">
+          <nobr>通气</nobr>
+        </th>
+      </tr>
+      <tr v-for="item in report">
+        <td>{{item.username}}</td>
+        <td>{{ item.gsurvey_name }}</td>
+        <td>{{ item.gconstruction_unit }}</td>
+        <td>{{ item.jsurvey_name }}</td>
+        <td>{{ item.jconstruction_unit }}</td>
+        <td>{{ item.checking_name }}</td>
+        <td>{{ item.jgas_name }}</td>
+      </tr>
+      <tr v-for="item in supplement">
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+        <td></td>
+      </tr>
+    </table>
+  </div>
+
+  <print-element v-show="false" v-ref:print id='print' styleid='style'
+                 top='10' left='60' width='100%' height='100%'>
+  </print-element>
+</template>
+
+<script>
+  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: ['report'],
+    data () {
+      return {}
+    },
+    ready () {
+    },
+    methods: {
+    },
+    computed: {
+      supplement () {
+        if (this.material.length < 10) {
+          return 10 - this.material.length
+        }
+        return 0
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

package/src/components/product/stopInfo/ApplyStopInfo.vue

@@ -230,7 +230,8 @@
                 model: new PagedList('rs/sql/checkuserStop', 20, {
                     data: {
                         id: this.$login.f.id,
-                        fengongsi: this.$login.f.f_fengongsi
+                        fengongsi: this.$login.f.f_fengongsi,
+                        f_product_id: 0
                     }
                 }),
                 condition: '',

package/src/ezhouAndroid.js

@@ -11,6 +11,8 @@ export default function () {
 /** ***************************报建模块*********************************/
   // 报建 总入口
   Vue.component('apply_app', (resolve) => { require(['./components/app_apply/ApplyApp'], resolve) })
+  // 报建 总入口
+  Vue.component('one-to-many', (resolve) => { require(['./components/app_apply/OneToMany'], resolve) })
   // 报建 待办流程页
   Vue.component('placecontrolerapp', (resolve) => { require(['./components/app_apply/PlaceControler'], resolve) })
   // 报建 已办事项
@@ -41,4 +43,6 @@ export default function () {
   Vue.component('feiminyongvv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongVV'], resolve) })
   // Vue.component('hetong-minyong', (resolve) => { require(['./components/app_apply/ezhou/HeTongMinYong'], resolve) })
   // Vue.component('hetong-feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/HeTongFeiMinYongV'], resolve) })
+  // 工程 待办事项
+  Vue.component('gongcheng', (resolve) => { require(['./components/app_apply/Gongcheng'], resolve) })
 }

package/src/plugins/commonService.js

@@ -5,7 +5,7 @@ let openEticketGen = async function (param, type, conf) {
   let getEticket = await Vue.resetpost('rs/logic/bjcombineData', {param: param, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
   console.log('获取的电子票数据', getEticket)
   try{
-    let url= await Vue.resetpost('rs/logic/bjopenEticket', {sell_id: param.id,eticket_id:getEticket.data,conf:conf},{resolveMsg: null, rejectMsg: null})
+    let url= await Vue.resetpost('rs/logic/bjopenEticket', {sell_id: param.id,eticket_id:getEticket.data.eticket_id,conf:conf},{resolveMsg: null, rejectMsg: null})
     return url
   }catch (e) {
     Vue.showAlert(`电子发票开票失败,请在发票管理处重新开具`,'warning',3000)