apply-clients 3.3.222 → 3.4.2-FuGu-4

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

@@ -1,16 +1,12 @@
 <template>
     <criteria-paged :model="model" v-ref:cp>
-      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+      <criteria partial='criteria' @condition-changed='search' 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>
-              <res-select
-                restype='organization'
-                :initresid='$parent.$parent.curorgid'
-                @res-select="$parent.$parent.getorg"
-                is-mul="false"
-              ></res-select>
+              <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  for="startDate" class="font_normal_body">开始时间：</label>
@@ -20,7 +16,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="cr.f_charge_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="cr.f_charge_date >= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -31,7 +27,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="cr.f_charge_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="cr.f_charge_date <= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3 button-range">
@@ -53,8 +49,8 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <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_apply_num"
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" style="width: 60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="a.f_apply_num = '{}'">
             </div>
@@ -64,12 +60,6 @@
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="a.f_contract_number = '{}'">
             </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" placeholder='流水号' v-model="model.f_payer_number"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="cr.f_payer_number = '{}'">
-            </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">报建类型：</label>
               <v-select
@@ -103,11 +93,11 @@
             <div class="form-group col-sm-3">
               <label class="font_normal_body">缴费状态：</label>
               <v-select
-                v-model="model.f_charge_status"
+                v-model="model.f_charging_status"
                 placeholder='请选择'
-                condition="cr.f_charge_status = '{}'"
-                :value.sync="model.f_charge_status"
-                :options='$parent.$parent.chargeStatus'
+                condition="cr.f_charging_status = '{}'"
+                :value.sync="model.f_charging_status"
+                :options='$parent.$parent.chargingStatus'
                 class="select select_list"
                 :value-single="true"
                 close-on-select ></v-select>
@@ -119,16 +109,17 @@
         <template partial='head'>
           <tr>
             <th>序号</th>
-            <th>工程编号</th>
+            <th>报建编号</th>
+            <th>项目名称</th>
             <th>合同编号</th>
             <th>报建类型</th>
             <th>缴费编码</th>
-            <th>收费金额(退款金额)</th>
+            <th>收费金额</th>
             <th>付款方式</th>
-            <th>流水号</th>
-            <th>收费人员(退款人员)</th>
-            <th>收费日期(退款日期)</th>
+            <th>收费人员</th>
+            <th>收费日期</th>
             <th>状态</th>
+            <th>地址</th>
           </tr>
         </template>
         <template partial='body'>
@@ -139,6 +130,9 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_apply_num}}</font></nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_entry_name}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_contract_number}}</font></nobr>
             </td>
@@ -154,9 +148,6 @@
             <td style="text-align: center;">
               <nobr><font>{{row.f_payment_method}}</font></nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_payer_number}}</font></nobr>
-            </td>
             <td style="text-align: center;">
               <nobr><font>{{row.f_charge_collectors}}</font></nobr>
             </td>
@@ -164,7 +155,10 @@
               <nobr><font>{{row.f_charge_date}}</font></nobr>
             </td>
             <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_status}}</font></nobr>
+              <nobr><font>{{row.f_charging_status}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_address}}</font></nobr>
             </td>
           </tr>
         </template>
@@ -179,17 +173,19 @@ export default {
   title: '报建收费列表',
   data () {
     return {
-      model: new PagedList('rs/sql/getApplyCharge', 30, null, {
+      model: new PagedList('rs/sql/getApplyCharge', 30, {
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }, {
         f_charge_money: 0
       }),
-      curorgid: [this.$login.f.orgid],
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
-      chargeStatus: [
+      chargingStatus: [
         {label: '全部', value: ''},
         {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'},
-        {label: '退款', value: '退款'}
+        {label: '作废', value: '作废'}
       ],
       criteriaShow: false,
       chargeAll: {
@@ -197,7 +193,7 @@ export default {
         sum: 0
       },
       getfield: {
-        'f_apply_num': '工程编号',
+        'f_apply_num': '报建编号',
         'f_entry_name': '项目名称',
         'f_contract_number': '合同编号',
         'f_apply_type': '报建类型',
@@ -205,7 +201,8 @@ export default {
         'f_payment_method': '付款方式',
         'f_charge_collectors': '收费人员',
         'f_charge_date': '收费日期',
-        'f_charge_status': '状态'
+        'f_charging_status': '状态',
+        'f_address': '地址'
       }
     }
   },
@@ -216,13 +213,9 @@ 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()
@@ -239,13 +232,6 @@ 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

@@ -4,9 +4,9 @@
       <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 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>

package/src/components/product/ApplyCharge/printCharge.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/Function/InstallFunction.vue

@@ -39,7 +39,7 @@
         showData: true     // 控制列表数据
       }
     },
-    created () {
+    ready () {
       this.getConfig()
     },
     methods: {
@@ -60,7 +60,6 @@
         let data = {
           condition: `u.id = ${servicedata.id}`,
           data: {
-            id: this.$login.f.id,
             orgid: this.$login.f.orgid
           }
         }
@@ -89,6 +88,16 @@
         // 调用查询
         this.$refs.query.$refs.cp.$refs.cri.search()
       },
+      'loadPage' () {
+        // 关闭详细
+        this.showtotal = false
+        // 显示列表数据
+        this.showData = true
+        // 显示分页
+        this.$refs.query.$refs.cp.pager = true
+        // 调用查询
+        this.$refs.query.$refs.cp.loadPage(this.$refs.query.model.pageIndex)
+      },
       // 点击功能操作
       'func' (funcdata, row) {
         this.selectdata = Object.assign({}, funcdata, row)

package/src/components/product/Function/InstallInfoSelect.vue

@@ -14,18 +14,19 @@
               ></res-select>
             </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_apply_num"
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_apply_num = '{}'">
             </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='客户名称'>
+              <label class="font_normal_body">项目名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
             </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.loadPage()">返回</button>
               <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
               <div
                 :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
@@ -37,10 +38,14 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <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_phone"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="f_phone like '%{}%'">
+              <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='联系人'>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
@@ -73,6 +78,12 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </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_phone"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_phone like '%{}%'">
+            </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_address"
@@ -87,7 +98,7 @@
                           :value.sync="model.startDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="f_apply_date >= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date >= '{}'">
               </datepicker>
             </div>
             <div class="form-group col-sm-3">
@@ -98,7 +109,7 @@
                           :value.sync="model.endDate"
                           :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
-                          condition="f_apply_date <= to_date('{}', 'yyyy-mm-dd hh24:mi:ss')">
+                          condition="f_apply_date <= '{}'">
               </datepicker>
             </div>
           </div>
@@ -108,8 +119,8 @@
         <template partial='head'>
           <tr class="title">
             <th style="white-space: nowrap;">序号</th>
-            <th style="white-space: nowrap;">工程编号</th>
-            <th style="white-space: nowrap;">客户名称</th>
+            <th style="white-space: nowrap;">报建编号</th>
+            <th style="white-space: nowrap;">项目名称/客户名称/联系人</th>
             <th style="white-space: nowrap;">合同编号</th>
             <th style="white-space: nowrap;">电话</th>
             <th style="white-space: nowrap;">地址</th>
@@ -129,7 +140,7 @@
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_user_name}}</nobr>
+              <nobr>{{row.f_entry_name}}/{{row.f_user_name}}/{{row.f_contact}}</nobr>
             </td>
             <td style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>
@@ -177,35 +188,6 @@
     title: '报建业务信息',
     props: ['showData'],
     data () {
-      if(this.$login.f.orgs==='华东大区' || this.$login.f.orgs==='华中大区'|| this.$login.f.orgs==='华北大区' || this.$login.f.orgs==='东北大区'
-        ||this.$login.f.orgs==='鲁北区域'|| this.$login.f.orgs==='广西区域' || this.$login.f.orgs==='苏皖区域'|| this.$login.f.orgs === '奥德装备集团'||
-        this.$login.f.orgs==='黑龙江区域'
-      ){
-        return {
-          model: new PagedList('rs/sql/checkuserfunctiondq', 20, {
-            data: {
-              orgs: this.$login.f.orgs
-            }
-          }),
-          funcs: [], // 功能列表
-          curorgid: [this.$login.f.orgid],
-          applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-          defnames: [{label: '全部', value: ''}], // 流程节点
-          criteriaShow: false
-        }}
-      if(this.$login.f.orgs==='设计院'){
-        return {
-          model: new PagedList('rs/sql/checkuserfunctionsjy', 20, {
-            data: {
-              orgid: this.$login.f.orgid
-            }
-          }),
-          funcs: [], // 功能列表
-          curorgid: [this.$login.f.orgid],
-          applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-          defnames: [{label: '全部', value: ''}], // 流程节点
-          criteriaShow: false
-        }}
       return {
         model: new PagedList('rs/sql/checkuserfunction', 20, {
           data: {
@@ -228,11 +210,14 @@
       search () {
         this.$dispatch('search')
       },
+      loadPage () {
+        this.$dispatch('loadPage')
+      },
       // 获取配置
       async checkfuncs (row) {
 
         this.funcs = []
-        let functions = this.$function_vue.functions
+        let functions = JSON.parse(JSON.stringify(this.$function_vue.functions))
 
         for (const item of functions) {
           // 显示类型
@@ -251,9 +236,6 @@
           if (item.device && item.device !== 'pc') {
             continue
           }
-          // if (item.device || item.device !== 'pc') {
-          //   continue
-          // }
           this.funcs.push(item)
         }
       },