apply-clients 3.3.5 → 3.3.6

package/package.json

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

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -1,12 +1,16 @@
 <template>
     <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
         <div class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">项目名称：</label>
-              <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_entry_name like '%{}%'" placeholder='项目名'>
+              <label class="font_normal_body">组织机构：</label>
+              <res-select
+                restype='organization'
+                :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                is-mul="false"
+              ></res-select>
             </div>
             <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
@@ -54,6 +58,11 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="a.f_apply_num = '{}'">
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">项目名称：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_entry_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="a.f_entry_name like '%{}%'" placeholder='项目名'>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
               <input type="text" style="width: 60%" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
@@ -114,10 +123,10 @@
             <th>合同编号</th>
             <th>报建类型</th>
             <th>缴费编码</th>
-            <th>收费金额</th>
+            <th>收费金额(退款金额)</th>
             <th>付款方式</th>
-            <th>收费人员</th>
-            <th>收费日期</th>
+            <th>收费人员(退款人员)</th>
+            <th>收费日期(退款日期)</th>
             <th>状态</th>
           </tr>
         </template>
@@ -169,19 +178,17 @@ export default {
   title: '报建收费列表',
   data () {
     return {
-      model: new PagedList('rs/sql/getApplyCharge', 30, {
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }, {
+      model: new PagedList('rs/sql/getApplyCharge', 30, null, {
         f_charge_money: 0
       }),
+      curorgid: [this.$login.f.orgid],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
       chargeStatus: [
         {label: '全部', value: ''},
         {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'}
+        {label: '作废', value: '作废'},
+        {label: '退款', value: '退款'}
       ],
       criteriaShow: false,
       chargeAll: {
@@ -208,9 +215,13 @@ export default {
   methods: {
     clear () {
       Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = []
+        this.$refs.cp.$refs.cri.model[key] = ''
       })
     },
+    searchCondition (args) {
+      args.condition = args.condition + ` and cr.f_orgid = '${this.curorgid[0]}'`
+      this.model.search(args.condition, args.model)
+    },
     // 查询
     search () {
       this.$refs.cp.$refs.cri.search()
@@ -227,6 +238,13 @@ export default {
       let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
 
       this.chargeAll = res.data[0]
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.search()
     }
   },
   computed: {

package/src/components/product/ApplyCharge/ApplyChargeSearch.vue

@@ -1,30 +1,30 @@
-<template>
-  <div class="flex-row">
-    <div class="basic-main">
-      <div style="height: 95%">
-        <apply-charge-list v-ref:query ></apply-charge-list>
-      </div>
-      <p class="bg-info text-center" style="font-size: 20px;height: 5%">合计收费记录共
-        <span style="color: red">{{$refs.query.chargeAll.count}}</span>笔，
-        合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
-      </p>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  title: '报建收费明细',
-  data () {
-    return {
-    }
-  },
-  ready () {
-  },
-  methods: {
-  }
-}
-</script>
-
-<style scoped>
-</style>
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div style="height: 95%">
+        <apply-charge-list v-ref:query ></apply-charge-list>
+      </div>
+      <p class="bg-info text-center" style="font-size: 20px;height: 5%">
+        合计记录共<span style="color: red">&ensp;{{$refs.query.chargeAll.count}}&ensp;</span>笔，
+        合计金额<span style="color: red">&ensp;{{$refs.query.chargeAll.sum}}&ensp;</span>元
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '报建收费明细',
+  data () {
+    return {
+    }
+  },
+  ready () {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/components/product/Order/OrderApplyList.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="col-sm-12">
     <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <div class="form-group col-sm-3">
@@ -13,12 +13,24 @@
                 is-mul="false"
               ></res-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">预约类型：</label>
+              <v-select
+                v-model="model.f_ordertype"
+                placeholder='预约类型'
+                condition="o.f_ordertype = '{}'"
+                :value.sync="model.f_ordertype"
+                :options='$parent.$parent.orderType'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">处理状态：</label>
               <v-select
                 v-model="model.f_orderstate"
                 placeholder='处理状态'
-                condition="f_orderstate like '%{}%'"
+                condition="o.f_orderstate = '{}'"
                 :value.sync="model.f_orderstate"
                 :options='$parent.$parent.orderState'
                 class="select select_list"
@@ -38,63 +50,51 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">用户类型：</label>
+              <label class="font_normal_body">预约来源：</label>
               <v-select
-                placeholder='用户类型'
-                v-model="model.f_user_type"
-                :value.sync="model.f_user_type"
-                condition="f_user_type like '%{}%'"
-                :options='$parent.$parent.userType'
+                placeholder='预约来源'
+                v-model="model.f_order_source"
+                :value.sync="model.f_order_source"
+                condition="o.f_order_source = '{}'"
+                :options='$parent.$parent.orderSource'
                 class="select select_list"
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">用户性质：</label>
-              <v-select
-                placeholder='用户性质'
-                v-model="model.f_user_nature"
-                :value.sync="model.f_user_nature"
-                condition="f_user_nature like '%{}%'"
-                :options='$parent.$parent.userNature'
-                class="select select_list"
-                :value-single="true"
-                close-on-select ></v-select>
+              <label class="font_normal_body">用户编号：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_userinfo_code like '%{}%'" placeholder='用户编号'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户姓名：</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='用户姓名'>
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">联&ensp;系&ensp;人：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_contact"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_contact like '%{}%'" placeholder='联系人'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_user_name like '%{}%'" placeholder='用户姓名'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">联系电话：</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_phone"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_phone like '%{}%'" placeholder='联系电话'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_phone like '%{}%'" placeholder='联系电话'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">详细地址：</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_address like '%{}%'" placeholder='详细地址'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_address like '%{}%'" placeholder='详细地址'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">审&ensp;核&ensp;人：</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_check_user"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_check_user like '%{}%'" placeholder='审核人'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_check_user like '%{}%'" placeholder='审核人'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">处&ensp;理&ensp;人：</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_process_user"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_process_user like '%{}%'" placeholder='处理人'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="o.f_process_user like '%{}%'" placeholder='处理人'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建编号：</label>
               <input type="text" style="width:60%" class="input_search" v-model="model.f_apply_num"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_apply_num like '%{}%'" placeholder='报建编号'>
+                     v-on:keyup.enter="$parent.$parent.search()" condition="u.f_apply_num like '%{}%'" placeholder='报建编号'>
             </div>
             <div class="form-group col-sm-3">
               <label  for="startDate" class="font_normal_body">开始时间：</label>
@@ -104,7 +104,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
-                          condition="f_orderdate >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="o.f_orderdate >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -115,7 +115,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
-                          condition="f_orderdate <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="o.f_orderdate <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
               </datepicker>
             </div>
           </div>
@@ -195,19 +195,25 @@ export default {
   title: '预约单',
   data () {
     return {
-      model: new PagedList('rs/sql/getOrderApply', 20, {
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }),
+      model: new PagedList('rs/sql/getOrderApply', 20, null),
       curorgid: [this.$login.f.orgid],
       criteriaShow: false,
+      orderType: [
+        {'label': '预约报装', 'value': '预约报装'},
+        {'label': '预约改管', 'value': '预约改管'},
+        {'label': '预约增容', 'value': '预约增容'},
+        {'label': '预约点火', 'value': '预约点火'}
+      ],
       orderState: [
         {'label': '待审核', 'value': '待审核'},
         {'label': '待处理', 'value': '待处理'},
         {'label': '预约成功', 'value': '预约成功'},
         {'label': '预约失败', 'value': '预约失败'}
       ],
+      orderSource: [
+        {'label': '微客服', 'value': '微客服'},
+        {'label': '呼叫中心', 'value': '呼叫中心'}
+      ],
       userType: [
         {'label': '个人', 'value': '个人'},
         {'label': '整体小区', 'value': '整体小区'}
@@ -229,6 +235,10 @@ export default {
     handleOrder (type, row) {
       this.$dispatch('handleOrder', type, row)
     },
+    searchCondition (args) {
+      args.condition = args.condition + ` and o.f_orgid = '${this.curorgid[0]}'`
+      this.model.search(args.condition, args.model)
+    },
     search () {
       this.$dispatch('search')
     },
@@ -241,7 +251,8 @@ export default {
       if (val.length <= 0) {
         return
       }
-      this.model.params.data.orgid = val[0]
+      this.curorgid = val
+      this.search()
     }
   },
   computed: {

package/src/components/product/Order/OrderMessage.vue

@@ -39,6 +39,17 @@
             v-model="selectdata.f_orderremark"
           ></textarea>
         </div>
+        <div class="col-sm-12" style="min-height: 200px;max-height: 300px;margin: 10px auto" v-if="selectdata.f_fileurl">
+<!--          <a href="http://192.168.20.27:8400/zhoukou-oracle/files/2021/9/17/fd2bd8dbe150f1c99d897f3c1ac1db45.jpg" target="_blank">-->
+<!--            <img style="min-height: 150px;max-height: 200px;" src="http://192.168.20.27:8400/zhoukou-oracle/files/2021/9/17/fd2bd8dbe150f1c99d897f3c1ac1db45.jpg">-->
+<!--          </a>-->
+          <a :href="selectdata.f_fileurl" target="_blank">
+            <img style="min-height: 150px;max-height: 200px;" :src="selectdata.f_fileurl">
+          </a>
+<!--        <div class="col-sm-12 form-group" style="height: 200px!important;">-->
+<!--        <img style="margin: auto;height: 100%" :src="selectdata.f_fileurl">-->
+<!--          {{selectdata.f_fileurl}}-->
+        </div>
       </div>
       <!-- 审核信息 -->
       <div class="auto" v-if="type === 'check' || selectdata.f_orderstate !== '待审核'">
@@ -80,11 +91,7 @@
           <label class="font_normal_body">工程名称</label>
           <input type="text" class="input_search" style="width: 60%" v-model="apply.f_entry_name" v-validate:f_entry_name = "['required']" :readonly="selectdata.f_orderstate === '预约成功'" />
         </div>
-        <div class="col-sm-6 form-group" v-if="selectdata.f_ordertype === '预约改管'">
-          <label class="font_normal_body">报建类型</label>
-          <input type="text" class="input_search" style="width: 60%" v-model="apply.f_apply_type" value="改管报建" readonly />
-        </div>
-        <div class="col-sm-6 form-group" v-else :class="[$v.f_apply_type.required ? 'has-error' : '']">
+        <div class="col-sm-6 form-group" v-if="selectdata.f_ordertype === '预约报装'" :class="[$v.f_apply_type.required ? 'has-error' : '']">
           <label class="font_normal_body">报建类型</label>
           <input type="text" v-show="false" v-validate:f_apply_type = "['required']" v-model="apply.f_apply_type">
           <v-select
@@ -97,6 +104,14 @@
             width="60%" :disabled="selectdata.f_orderstate === '预约成功'"
             close-on-select ></v-select>
         </div>
+        <div class="col-sm-6 form-group" v-if="selectdata.f_ordertype === '预约改管'">
+          <label class="font_normal_body">报建类型</label>
+          <input type="text" class="input_search" style="width: 60%" v-model="apply.f_apply_type" value="改管报建" readonly />
+        </div>
+        <div class="col-sm-6 form-group" v-if="selectdata.f_ordertype === '预约增容'">
+          <label class="font_normal_body">报建类型</label>
+          <input type="text" class="input_search" style="width: 60%" v-model="apply.f_apply_type" value="增容报建" readonly />
+        </div>
         <div class="col-sm-6 form-group" v-if="selectdata.f_orderstate === '预约成功'">
           <label class="font_normal_body">办&ensp;理&ensp;人</label>
           <input type="text" class="input_search" style="width: 60%" v-model="selectdata.f_dispose_operator" readonly />

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

@@ -6,7 +6,7 @@
           <th class="textNoLineBreak">序号</th>
           <th class="textNoLineBreak" v-if="selectdata.f_apply_type !== '开发商集体报建'">地址</th>
           <th class="textNoLineBreak">缴费编号</th>
-          <th class="textNoLineBreak">收费金额</th>
+          <th class="textNoLineBreak">收费金额（退款金额）</th>
           <th class="textNoLineBreak">金额大写</th>
           <th class="textNoLineBreak">收费项目</th>
           <th class="textNoLineBreak">付款方式</th>
@@ -72,7 +72,7 @@
             <nobr>{{row.f_charge_remarks}}</nobr>
           </td>
           <td style="text-align: center;">
-            <nobr>{{row.f_charging_status}}</nobr>
+            <nobr>{{row.f_charge_status}}</nobr>
           </td>
           <td style="text-align: center;">
             <nobr>{{row.f_void_staff}}</nobr>
@@ -84,7 +84,7 @@
             <nobr>{{row.f_void_remarks}}</nobr>
           </td>
           <td style="text-align: center;">
-            <nobr>
+            <nobr v-if="row.f_charge_status !== '退款'">
               <button
                 type="button"
                 name="button"
@@ -161,6 +161,7 @@
               :options='paymentMethod'
               class="select select_list"
               :value-single="true"
+              @change="changePaymentMethod()"
               close-on-select ></input-select>
           </div>
         </div>
@@ -171,17 +172,15 @@
                    class="form-control input_view"
                    style="width: 100%"
                    v-validate:f_payer_name = "['required']"
-                   v-model="charge.f_payer_name" />
+                   v-model="charge.f_payer_name" value="" />
           </div>
         </div>
         <div class="form-group col-sm-12" v-if="charge.f_payment_method === '银行转账'" :class="[$v.f_payer_account.required ? 'has-error' : '']">
           <label class="col-sm-2 control-label">付款方账号：</label>
           <div class="col-sm-10">
-            <input type="text"
-                   class="form-control input_view"
-                   style="width: 100%"
+            <input type="text" style="width: 100%" class="form-control input_view"
                    v-validate:f_payer_account = "['required']"
-                   v-model="charge.f_payer_account" />
+                   v-model="charge.f_payer_account" value=""/>
           </div>
         </div>
         <div class="form-group col-sm-12" v-if="charge.f_payment_method === '银行转账'" :class="[$v.f_payer_number.required ? 'has-error' : '']">
@@ -191,7 +190,7 @@
                    class="form-control input_view"
                    style="width: 100%" @change="payerNumberChange()"
                    v-validate:f_payer_number = "['required']"
-                   v-model="charge.f_payer_number" />
+                   v-model="charge.f_payer_number" value="" />
           </div>
         </div>
         <div class="form-group col-sm-12">
@@ -378,6 +377,7 @@
 import {getNowDate,isEmpty} from '../../../Util'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
+import Vue from 'vue'
 
 export default {
   title: '收费管理',
@@ -531,6 +531,22 @@ export default {
       }
       return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
     },
+    async changePaymentMethod () {
+      if (this.charge.f_payment_method === '银行转账' && this.selectdata.f_apply_type === '团购报建') {
+        let http = new HttpResetClass()
+        let data = {
+          tablename: 't_dev_info',
+          condition: `f_orgid = '${this.$login.f.orgid}' and id = '${this.selectdata.f_dev_id}'`
+        }
+        let res = await http.load('POST', 'rs/sql/singleTable', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '开发商档案查询失败！！！'
+        })
+
+        this.charge.f_payer_name = res.data[0].f_dev_name
+        this.charge.f_payer_account = res.data[0].f_bank_account
+      }
+    },
     async getUserAddress() {
       let http = new HttpResetClass()
       let data = {}
@@ -568,11 +584,16 @@ export default {
     async showChargeModal() {
       this.getUserAddress()
 
+      if (this.selectdata.f_apply_type === '团购报建') {
+        this.charge.f_dev_info_id = this.selectdata.f_dev_id
+      }
+
       this.showCharge = true
     },
     async search () {
       let http = new HttpResetClass()
       let data = {
+        // condition: `cr.f_charge_status != '退款'`,
         f_process_id: this.selectdata.f_process_id
       }
       let res = await http.load('POST', 'rs/sql/getApplyChargeRecord', {data:data}, {

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

@@ -1,126 +1,130 @@
-<template>
-  <style id="style">
-    td{
-      height: 50px;
-      width: 40px;
-      text-align: center;
-    }
-    table{
-      margin: auto;
-      width: 100%;
-      border-collapse:collapse;
-      border: 1px solid black;
-    }
-    h1,h2,h3,h4,h5,h6 {
-      text-align: center;
-    }
-    .date{
-      float: left;
-      padding-left: 30px;
-    }
-    .number{
-      float: right;
-      padding-right: 30px;
-    }
-    .rescue{
-      float: left;
-      padding: 0 30px 0 40px;
-    }
-    .service{
-      float: left;
-    }
-    .payee{
-      float: right;
-      padding-right: 30px;
-    }
-  </style>
-  <div id="print">
-    <h4>武安明星天然气有限公司收费单</h4>
-    <span>
-      <p class="date">{{new Date().Format('yyyy-MM-dd HH:mm:ss')}}</p>
-      <p class="number">缴费编号：{{ charge.f_charge_number }}</p>
-    </span>
-    <table border="1">
-      <tr>
-        <td>用户姓名</td>
-        <td colspan="2">{{ f_user_name }}</td>
-        <td>联系电话</td>
-        <td>{{ f_user_phone }}</td>
-      </tr>
-      <tr>
-        <td>地&emsp;&emsp;址</td>
-        <td colspan="4">{{ f_useraddress }}</td>
-      </tr>
-      <tr>
-        <td>收费项目</td>
-        <td colspan="2">庭院管网建设费</td>
-        <td>收费方式</td>
-        <td>{{ charge.f_payment_method }}</td>
-      </tr>
-      <tr>
-        <td>收费金额</td>
-        <td>{{ charge.f_charge_money }}</td>
-        <td>大&emsp;&emsp;写</td>
-        <td colspan="2">{{ charge.f_amount_words }}</td>
-      </tr>
-      <tr>
-        <td>备&emsp;&emsp;注</td>
-        <td colspan="4">{{ selectdata.f_entry_name }}</td>
-      </tr>
-    </table>
-    <span>
-      <p class="rescue">抢险电话：5835588</p>
-      <p class="service">服务电话：3718002</p>
-      <p class="payee">收款人：{{ charge.f_charge_collectors }}</p>
-    </span>
-  </div>
-
-  <print-element v-show="false" v-ref:print id='print' styleid='style'
-                 top='40' left='60' 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 () {
-    console.log('------------------打印-------------------')
-    console.log()
-  },
-  computed: {
-    f_user_name () {
-      return isEmpty(this.charge.f_user_name) ? this.selectdata.f_contact : this.charge.f_user_name
-    },
-    f_user_phone () {
-      return isEmpty(this.charge.f_user_phone) ? this.selectdata.f_phone : this.charge.f_user_phone
-    },
-    f_useraddress () {
-      return isEmpty(this.charge.f_useraddress) ? `武安市${this.selectdata.f_street}${this.selectdata.f_residential_area}` : `武安市${this.charge.f_useraddress}`
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
+<template>
+  <style id="style">
+    td{
+      height: 50px;
+      width: 40px;
+      text-align: center;
+    }
+    table{
+      margin: auto;
+      width: 100%;
+      border-collapse:collapse;
+      border: 1px solid black;
+    }
+    h1,h2,h3,h4,h5,h6 {
+      text-align: center;
+    }
+    .date{
+      float: left;
+      padding-left: 30px;
+    }
+    .number{
+      float: right;
+      padding-right: 30px;
+    }
+    .rescue{
+      float: left;
+      padding: 0 30px 0 40px;
+    }
+    .service{
+      float: left;
+    }
+    .payee{
+      float: right;
+      padding-right: 30px;
+    }
+  </style>
+  <div id="print">
+    <h4>{{orgs}}统一收据</h4>
+    <table border="1">
+      <tr>
+        <td colspan="6">
+          开票日期：{{new Date().Format('yyyy年MM月dd日')}}
+        </td>
+      </tr>
+      <tr>
+        <td>用户姓名</td>
+        <td colspan="2">{{ f_user_name }}</td>
+        <td>联系电话</td>
+        <td>{{ f_user_phone }}</td>
+      </tr>
+      <tr>
+        <td>地&emsp;&emsp;址</td>
+        <td colspan="4">{{ f_useraddress }}</td>
+      </tr>
+      <tr>
+        <td>收费项目</td>
+        <td colspan="2">庭院管网建设费</td>
+        <td>收费方式</td>
+        <td>{{ charge.f_payment_method }}</td>
+      </tr>
+      <tr>
+        <td>收费金额</td>
+        <td>{{ charge.f_charge_money }}</td>
+        <td>大&emsp;&emsp;写</td>
+        <td colspan="2">{{ charge.f_amount_words }}</td>
+      </tr>
+      <tr>
+        <td>备&emsp;&emsp;注</td>
+        <td colspan="4">{{ selectdata.f_entry_name }}</td>
+      </tr>
+    </table>
+    <span>
+      <p class="rescue">抢险电话：5835588</p>
+      <p class="service">服务电话：3718002</p>
+      <p class="payee">收款人：{{ charge.f_charge_collectors }}</p>
+    </span>
+  </div>
+
+  <print-element v-show="false" v-ref:print id='print' styleid='style'
+                 top='40' left='60' 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 () {
+    console.log('------------------打印-------------------')
+    console.log()
+  },
+  computed: {
+    f_user_name () {
+      return isEmpty(this.charge.f_user_name) ? this.selectdata.f_contact : this.charge.f_user_name
+    },
+    f_user_phone () {
+      return isEmpty(this.charge.f_user_phone) ? this.selectdata.f_phone : this.charge.f_user_phone
+    },
+    f_useraddress () {
+      return isEmpty(this.charge.f_useraddress) ? `武安市${this.selectdata.f_street}${this.selectdata.f_residential_area}` : `武安市${this.charge.f_useraddress}`
+    },
+    orgs () {
+      return this.$login.f.orgs
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -404,9 +404,45 @@ export default {
       if (this.selectdata.f_process_dep === '运营部') {
         return 'this.getParentByType($organization$).getChildByName($运营部报装$).getChildren()'
       }
+    },
+    async getDevInfo () {
+      let data = {
+        tablename: 't_dev_info',
+        condition: `f_orgid = '${this.$login.f.orgid}'`
+      }
+      let res = await this.$resetpost(
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
+      )
+
+      return res.data.map(item => {
+        return {
+          label: item.f_dev_name,
+          value: item.f_dev_name
+        }
+      })
     }
   },
   events: {
+    async 'devInfoChange' (index) {
+      if (isEmpty(this.show_data.f_company_name)) {
+        return
+      }
+      let data = {
+        tablename: 't_dev_info',
+        condition: `f_orgid = '${this.$login.f.orgid}' and f_dev_name = '${this.show_data.f_company_name}'`
+      }
+      let res = await this.$resetpost(
+        `rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '公司查询失败！！！'}
+      )
+      this.show_data.f_dev_id = res.data[0].id
+      this.setLabelValue('法人名称', res.data[0].f_legal_person)
+      this.setLabelValue('证件类型', res.data[0].f_credentials)
+      this.setLabelValue('证件号码', res.data[0].f_idnumber)
+    },
     'refundMoneyChange' (index) {
       let f_cumulative_payment_money = this.show_data.f_cumulative_payment_money
       let f_refund_money = this.show_data.fields[index].value
@@ -431,7 +467,7 @@ export default {
       this.setLabelValue('证件号码', row.f_idnumber)
       this.setLabelValue('地址', row.f_address)
       this.setLabelValue('累计缴费金额', row.f_cumulative_payment_money)
-      this.show_data.f_parent_process_id = row.f_process_id
+
       this.show_data.parentApply = JSON.parse(JSON.stringify(row))
 
       delete row.id
@@ -445,10 +481,29 @@ export default {
       delete row.f_process_id
 
       this.show_data = Object.assign({}, this.show_data, row)
+
+      this.show_data.f_parent_process_id = this.show_data.parentApply.f_process_id
     },
-    'stopApplyReadyEvent' () {
+    async 'stopApplyReadyEvent' () {
       let f_depname = this.$login.f.f_department_name
       this.setLabelValue('发起部门', f_depname)
+
+      if (isEmpty(this.show_data.f_parent_process_id)) {
+        return
+      }
+      let data = {
+        condition: `f_process_id = '${this.show_data.f_parent_process_id}'`,
+        data: {
+          id: this.$login.f.id,
+          orgid: this.$login.f.orgid
+        }
+      }
+      let res = await this.$resetpost(
+        `rs/sql/supervisory`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '项目查询失败！！！'}
+      )
+      this.show_data.parentApply = res.data[0]
     },
     // 选择用户档案信息
     'selectUserinfo' (row) {