apply-clients 3.1.36 → 3.1.39

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

@@ -1,232 +1,30 @@
-<template>
-  <div class="basic-main">
-    <criteria-paged :model="model" v-ref:cp>
-      <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>
-              <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>
-              <datepicker id="startDate" placeholder="开始日期"
-                          style="width: 60%!important;"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="cr.f_charge_date >= '{}'">
-              </datepicker>
-            </div>
-            <div class="form-group col-sm-3">
-              <label for="endDate" class="font_normal_body">结束时间：</label>
-              <datepicker id="endDate" placeholder="结束日期"
-                          style="width: 60%!important;"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          :show-reset-button="true"
-                          condition="cr.f_charge_date <= '{}'">
-              </datepicker>
-            </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_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
-              <div
-                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
-                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
-                class="button_spacing"
-                style="float: right">
-              </div>
-            </div>
-          </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"
-                     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" style="width: 60%" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
-                     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">报建类型：</label>
-              <v-select
-                v-model="model.f_apply_type"
-                placeholder='请选择'
-                condition="a.f_apply_type = '{}'"
-                :value.sync="model.f_apply_type"
-                :options='$parent.$parent.applytype'
-                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>
-              <input type="text" class="input_search" style="width: 60%" placeholder='收费人员' v-model="model.f_charge_collectors"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="cr.f_charge_collectors like '%{}%'">
-            </div>
-            <div class="form-group col-sm-3">
-              <label class="font_normal_body">付款方式：</label>
-              <v-select
-                v-model="model.f_payment_method"
-                placeholder='请选择'
-                condition="cr.f_payment_method = '{}'"
-                :value.sync="model.f_payment_method"
-                :options='$parent.$parent.paymentMethod'
-                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_charging_status"
-                placeholder='请选择'
-                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>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy" style="height: 100%">
-        <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>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr >
-            <td style="text-align: center;">
-              <nobr><font>{{$index+1}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_apply_num}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_entry_name}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_contract_number}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_apply_type}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_money}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_payment_method}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_collectors}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_charge_date}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_charging_status}}</font></nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr><font>{{row.f_address}}</font></nobr>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-    <div  class="flex" style="height: 10%">
-      <div novalidate class="form-inline auto" partial>
-        <p class="bg-info text-center" style="padding: 8px;font-size: 20px">合计收费记录共
-          <span style="color: red">{{chargeAll.count}}</span>笔，合计金额<span style="color: red">{{chargeAll.sum}}</span>元
-        </p>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-export default {
-  title: '报建收费明细',
-  data () {
-    return {
-      model: new PagedList('rs/sql/getApplyCharge', 30, {
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }),
-      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-      paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
-      chargingStatus: [
-        {label: '全部', value: ''},
-        {label: '有效', value: '有效'},
-        {label: '作废', value: '作废'}
-      ],
-      criteriaShow: false,
-      chargeAll: {
-        count: 0,
-        sum: 0
-      }
-    }
-  },
-  ready () {
-    // 调用查询
-    this.search()
-  },
-  methods: {
-    clear() {
-      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-        this.$refs.cp.$refs.cri.model[key] = []
-      })
-    },
-    // 查询
-    search () {
-      this.$refs.cp.$refs.cri.search()
-      this.getChargeAll()
-    },
-    async getChargeAll () {
-      let http = new HttpResetClass()
-      let data = {
-        condition: this.model.condition,
-        data: {
-          orgid: this.$login.f.orgid
-        }
-      }
-      let res = await http.load('POST', 'rs/sql/getChargeAll', {data: data}, {resolveMsg: null, rejectMsg: null})
-
-      this.chargeAll = res.data[0]
-    }
-  }
-}
-</script>
-
-<style scoped>
-  .button-range {
-    display: flex;
-    float: right;
-    width: auto;
-    align-items: center;
-  }
-</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/Function/InstallFunction.vue

@@ -8,10 +8,10 @@
         <div class="col-sm-3">
           <installfeeinfo :selectdata="selectdata"></installfeeinfo>
         </div>
-        <div class="col-sm-9">
+        <div class="col-sm-9" style="overflow: auto; height: 95%">
           <div class="panel panel-info">
             <div class="panel-heading head auto" style="background-color: #e8f4ff">{{funcdata.title}}</div>
-            <div class="panel-body" style="overflow: auto;">
+            <div class="panel-body">
               <function-service-control v-ref:func :funcdata="funcdata" :selectdata="selectdata"></function-service-control>
             </div>
           </div>

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

@@ -4,16 +4,16 @@
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <div class="form-group col-sm-5">
+            <div class="form-group col-sm-4">
               <label class="font_normal_body">客户名称/联系人：</label>
               <input type="text" class="input_search" v-model="model.f_user_name"
                      v-on:keyup.enter="search" condition=" (f_user_name like '%{}%' or f_contact like '%{}%') " placeholder='二选一输入'>
             </div>
             <div class="form-group col-sm-4">
-              <label class="font_normal_body">合同编号：</label>
-              <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
+              <label class="font_normal_body">工程编号：</label>
+              <input type="text"  class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="search"
-                     condition="f_contract_number like '%{}%'">
+                     condition="f_apply_num like '%{}%'">
             </div>
             <div class="form-group col-sm-3 operate">
               <label class="font_normal_body"></label>
@@ -27,6 +27,18 @@
             </div>
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">合同编号：</label>
+              <input type="text" class="input_search" placeholder='合同编号' v-model="model.f_contract_number"
+                     v-on:keyup.enter="search"
+                     condition="f_contract_number like '%{}%'">
+            </div>
+            <div class="form-group col-sm-4">
+              <label class="font_normal_body">票号：</label>
+              <input type="text" class="input_search" placeholder='票号' v-model="model.f_ticket_number"
+                     v-on:keyup.enter="search"
+                     condition="c.f_ticket_number like '%{}%'">
+            </div>
             <div class="form-group col-sm-4">
               <label class="font_normal_body">用户地址：</label>
               <input type="text" class="input_search" placeholder='用户地址' v-model="model.f_address"
@@ -57,6 +69,28 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
+            <div class="form-group col-sm-4">
+              <label  for="startDate" class="font_normal_body">开始时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="f_apply_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-4">
+              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="f_apply_date <= '{}'">
+              </datepicker>
+            </div>
           </div>
         </div>
       </criteria>
@@ -64,6 +98,7 @@
         <template partial='head'>
           <tr class="title">
             <th>序号</th>
+            <th>报建编号</th>
             <th>当前环节</th>
             <th>客户名称/联系人</th>
             <th>合同编号</th>
@@ -79,6 +114,9 @@
             <td  style="text-align: center;">
               <nobr>{{$index+1}}</nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_apply_num}}</font></nobr>
+            </td>
             <td style="text-align: center;">
               <nobr>{{row.defname}}</nobr>
             </td>
@@ -126,7 +164,7 @@
     data () {
       return {
         // applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
-        applytype: [{label: '全部', value: ''}],
+        applytype: [{label:"全部",value:''}, {label:"集中报建",value:'集中报建'}, {label:"非民用报建",value:'非民用报建'},{label:"散户报建",value:'散户报建'}],
         funcs: [],
         defnames: [],
         model: new PagedList('rs/sql/checkuserfunction', 20, {
@@ -147,6 +185,7 @@
       // 获取配置
       checkfuncs (row) {
         this.funcs = this.$function_vue.functions
+        console.log("测试",this.funcs)
       },
       // 获取所有办理环节
       getDefnames () {

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -10,7 +10,7 @@
     <!-- 终止报建 -->
     <stop-install :selectdata="selectdata" v-if="showstop"></stop-install>
     <!-- 报建缴费 -->
-    <apply-charge-management :selectdata="selectdata" v-if="applycharge"></apply-charge-management>
+    <apply-charge-management :mark="mark" :selectdata="selectdata" v-if="applycharge"></apply-charge-management>
 
     <apply-record-cancel :selectdata="selectdata" v-if="showcancel"></apply-record-cancel>
   </div>
@@ -24,6 +24,7 @@
     data () {
       return {
         data: null,
+        mark:0,
         showview: false, // 控制通用页面
         showstop: false, // 控制终止
         showcancel: false, // 控制撤销
@@ -92,6 +93,7 @@
       },
       // 功能组件显示控制
       hasChange(){
+        console.log("cs数据",this.selectdata)
         if(this.funcdata.fields) {
           this.data = this.funcdata
           // 初始化要展示的数据结构
@@ -120,7 +122,12 @@
           this.applycharge = true
           this.showcancel = false
         }
-
+        if (this.selectdata.f_apply_type === '散户报建'){
+          this.mark = 2
+          this.showview = false
+          this.applycharge = true
+          this.showcancel = false
+        }
       },
       // 打印派工单
       async printDispatch() {
@@ -193,6 +200,58 @@
         this.$dispatch('selfsearch')
         this.$refs.serviceview.data.onetomany[i].rows.splice(j,1,data)
       },
+      async 'check'(index) {
+        // =====================================安康逸华特殊逻辑===========================================
+
+
+        // 合成地址
+        if (
+          this.$refs.serviceview.data.fields[index].label === '县/区' ||
+          this.$refs.serviceview.data.fields[index].label === '街道' ||
+          this.$refs.serviceview.data.fields[index].label === '小区' ||
+          this.$refs.serviceview.data.fields[index].label === '楼号' ||
+          this.$refs.serviceview.data.fields[index].label === '单元号' ||
+          this.$refs.serviceview.data.fields[index].label === '楼层' ||
+          this.$refs.serviceview.data.fields[index].label === '门牌号'
+        ) {
+          console.log('即将合成地址')
+          var address = ''
+          for (let i = 0; i < this.$refs.serviceview.data.fields.length; i++) {
+            // 控制设置级联
+            // 源select所选的值 this.$refs.service_show.data.activitys.fields[index].value
+            // xxx xx xxx
+            if (this.$refs.serviceview.data.fields[i].label === '县/区' && this.$refs.serviceview.data.fields[i].value) {
+              address += this.$refs.serviceview.data.fields[i].value
+            }
+            if (this.$refs.serviceview.data.fields[i].label === '街道' && this.$refs.serviceview.data.fields[i].value) {
+              address += this.$refs.serviceview.data.fields[i].value
+            }
+            if (this.$refs.serviceview.data.fields[i].label === '小区' && this.$refs.serviceview.data.fields[i].value) {
+              address += this.$refs.serviceview.data.fields[i].value
+            }
+            if (this.$refs.serviceview.data.fields[i].label === '楼号' && this.$refs.serviceview.data.fields[i].value) {
+              address += ' ' + this.$refs.serviceview.data.fields[i].value
+            }
+            if (this.$refs.serviceview.data.fields[i].label === '单元号' && this.$refs.serviceview.data.fields[i].value) {
+              address += '-' + this.$refs.serviceview.data.fields[i].value
+            }
+            if (this.$refs.serviceview.data.fields[i].label === '楼层' && this.$refs.serviceview.data.fields[i].value) {
+              address += '-' + this.$refs.serviceview.data.fields[i].value
+            }
+            if (this.$refs.serviceview.data.fields[i].label === '门牌号' && this.$refs.serviceview.data.fields[i].value) {
+              address += '-' + this.$refs.serviceview.data.fields[i].value
+            }
+          }
+          console.log('获取到的address=>' + address)
+          // 数据获取完毕时放入地址text
+          for (let i = 0; i < this.$refs.serviceview.data.fields.length; i++) {
+            if (this.$refs.serviceview.data.fields[i].label === '地址') {
+              this.$refs.serviceview.data.fields[i].value = address
+              console.log('修改fields[i].value后的值=>' + this.$refs.serviceview.data.fields[i].value)
+            }
+          }
+        }
+      },
       // onetomany模态框监听事件
       async 'check_modal'(index) {},
       async 'oninput_modal'(index) {}