apply-clients 5.0.35-30 → 5.0.35-33

package/package.json

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

package/src/apply.js

@@ -1,154 +1,154 @@
-import Vue from 'vue'
-
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-import commonService from './plugins/commonService'
-/** ****************服务插件*********************/
-
-export default function () {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-  Vue.use(commonService)
-/** ***************************报建模块*********************************/
-
-/** ***********报建流程业务**********/
-  // 报建流程业务总入口
-  Vue.component('exploration-user', (resolve) => { require(['./components/product/Process/ExplorationUser'], resolve) })
-  // 报建流程业务总入口页面list布局
-  Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
-  // 报建流程业务报建改装流程入口
-  Vue.component('modify-user-files', (resolve) => { require(['./components/product/Process/ModifyUserFiles'], resolve) })
-  // 报建收费查看
-  Vue.component('apply-charge-search', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyChargeSearch'], resolve) })
-  // 材料使用汇总
-  Vue.component('material-use-list', (resolve) => { require(['./components/product/Process/MaterialUseList'], resolve) })
-  // 预算材料
-  Vue.component('material-message', (resolve) => { require(['./components/product/Process/Processes/CustomerMaterialMessage'], resolve) })
-  //领取材料
-  Vue.component('receive-batch', (resolve) => { require(['./components/product/Process/Processes/ReceiveBatch'], resolve) })
-  // 报建材料记录功能
-  Vue.component('material_recording', (resolve) => { require(['./components/product/Function/functions/material_recording'], resolve) })
-  // 档案tab页
-  Vue.component('record-message', (resolve) => { require(['./components/product/Process/Processes/CustomerRecordMessage'], resolve) })
-  // 材料tab页
-  Vue.component('material-message', (resolve) => { require(['./components/product/Process/Processes/CustomerMaterialMessage'], resolve) })
-  // 设备tab页
-  Vue.component('equipment-message', (resolve) => { require(['./components/product/Process/Processes/CustomerEquipmentMessage'], resolve) })
-  // 楼栋tab页
-  Vue.component('building-message', (resolve) => { require(['./components/product/Process/Processes/CustomerBuildingMessage'], resolve) })
-  // 业务tab(control层)页
-  Vue.component('service-control', (resolve) => { require(['./components/product/Process/Processes/Service/ServiceControl'], resolve) })
-  // 公共业务显示(view层)页
-  Vue.component('service-view', (resolve) => { require(['./components/product/ServiceView'], resolve) })
-
-  Vue.component('material-batch-list', (resolve) => { require(['./components/product/MaterialBatchList'], resolve) })
-  Vue.component('material-batch-manage', (resolve) => { require(['./components/product/MaterialBatchManage'], resolve) })
-  // 派工单tab页 废弃
-  // Vue.component('send-order', (resolve) => { require(['./components/product/Process/Processes/SendOrder'], resolve) })
-  // 停气碰口tab页
-  Vue.component('gas-stop', (resolve) => { require(['./components/product/Process/Processes/Service/GasStop'], resolve) })
-  // 显示退回理由tab页
-  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/ShowBackReason'], resolve) })
-
-  // 报建历史信息页面
-  Vue.component('history_control', (resolve) => { require(['./components/product/Process/ProcessInfo/history_control'], resolve) })
-
-// 工程结算
-  Vue.component('project-settlement', (resolve) => { require(['./components/product/Process/Processes/ProjectSettlement'], resolve) })
-// 报建功能业务总入口
-  Vue.component('install-function', (resolve) => { require(['./components/product/Function/InstallFunction'], resolve) })
-  // 报建菜单页面控制层
-  Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
-// 终止报建业务
-  Vue.component('stop-install', (resolve) => { require(['./components/product/Function/functions/StopInstall'], resolve) })
-// 报建业务信息
-  Vue.component('installinfoselect', (resolve) => { require(['./components/product/Function/InstallInfoSelect'], resolve) })
-// 报建收费
-  Vue.component('installfee', (resolve) => { require(['./components/product/Function/functions/InstallFee'], resolve) })
-  // 报建收费
-  Vue.component('buyer-message', (resolve) => { require(['./components/product/Function/functions/BuyerMessage'], resolve) })
-  // 预缴费收费
-  Vue.component('prestorefee', (resolve) => { require(['./components/product/Function/functions/PrestoreFee'], resolve) })
-  // 预缴费
-  Vue.component('preparationfee', (resolve) => { require(['./components/product/Function/functions/PreparationFee'], resolve) })
-  // 操作记录撤销
-  Vue.component('apply-record-cancel', (resolve) => { require(['./components/product/Function/functions/ApplyRecordCancel'], resolve) })
-// 费用变更信息
-  Vue.component('updatefee', (resolve) => { require(['./components/product/Function/functions/UpdateFee'], resolve) })
-// 费用减免信息
-  Vue.component('reducefee', (resolve) => { require(['./components/product/Function/functions/ReduceFee'], resolve) })
-// 报建收费信息
-  Vue.component('installfeeinfo', (resolve) => { require(['./components/product/Function/functions/InstallFeeInfo'], resolve) })
-// 报建业务信息
-  Vue.component('installinfodown', (resolve) => { require(['./components/product/Function/InstallInfoDown'], resolve) })
-// 详细业务信息
-  Vue.component('allselect', (resolve) => { require(['./components/product/Function/functions/AllSelect'], resolve) })
-// 添加合同信息
-  Vue.component('addcontract', (resolve) => { require(['./components/product/Function/functions/AddContract'], resolve) })
-// 打印票据
-  Vue.component('billselect', (resolve) => { require(['./components/product/Bill/BillSelect'], resolve) })
-  // 打印记录表票据
-  Vue.component('billjlb', (resolve) => { require(['./components/product/Bill/BillJLB'], resolve) })
-  // 打印开通卡票据
-  Vue.component('billktk', (resolve) => { require(['./components/product/Bill/BillKTK'], resolve) })
-  // 打印确认卡票据
-  Vue.component('billqrk', (resolve) => { require(['./components/product/Bill/BillQRK'], resolve) })
-  // 打印改装卡票据
-  Vue.component('billgzk', (resolve) => { require(['./components/product/Bill/BillGZK'], resolve) })
-  // 打印销售单票据
-  Vue.component('billxsd', (resolve) => { require(['./components/product/Bill/BillXSD'], resolve) })
-  // 销售单票据信息
-  Vue.component('billxsdmakeinfo', (resolve) => { require(['./components/product/Bill/BillXSDMakeInfo'], resolve) })
-  // 确认卡票据信息
-  Vue.component('billqrkmakeinfo', (resolve) => { require(['./components/product/Bill/BillQRKMakeInfo'], resolve) })
-  // 改装卡票据信息
-  Vue.component('billgzkmakeinfo', (resolve) => { require(['./components/product/Bill/BillGZKMakeInfo'], resolve) })
-  // 开通卡票据信息
-  Vue.component('billktkmakeinfo', (resolve) => { require(['./components/product/Bill/BillKTKMakeInfo'], resolve) })
-  // 销售记录表票据信息
-  Vue.component('billjlbmakeinfo', (resolve) => { require(['./components/product/Bill/BillJLBMakeInfo'], resolve) })
-  // 销售记录表历史票据信息
-  Vue.component('billqrkrecordinfo', (resolve) => { require(['./components/product/Bill/BillQRKRecordInfo'], resolve) })
-  // 改装卡历史票据信息
-  Vue.component('billgzkrecordinfo', (resolve) => { require(['./components/product/Bill/BillGZKRecordInfo'], resolve) })
-  // 销售单历史票据信息
-  Vue.component('billxsdrecordinfo', (resolve) => { require(['./components/product/Bill/BillXSDRecordInfo'], resolve) })
-  // 开通卡历史票据信息
-  Vue.component('billktkrecordinfo', (resolve) => { require(['./components/product/Bill/BillKTKRecordInfo'], resolve) })
-  // 开通卡历史票据信息
-  Vue.component('billjlbrecordinfo', (resolve) => { require(['./components/product/Bill/BillJLBRecordInfo'], resolve) })
-
-// 报建收费卡片详情
-  Vue.component('build-apply-detail', (resolve) => { require(['./components/product/VueUtils/rightview/carddetail/BuildFeeDetail2'], resolve) })
-// 报建费用变更详情
-  Vue.component('change-apply-detail', (resolve) => { require(['./components/product/VueUtils/rightview/carddetail/ChangeFeeDetail2'], resolve) })
-// 报建费用减免详情
-  Vue.component('reduce-apply-detail', (resolve) => { require(['./components/product/VueUtils/rightview/carddetail/ReduceFeeDetail2'], resolve) })
-// 报建费用减免详情
-  Vue.component('stopapply-apply-detail', (resolve) => { require(['./components/product/VueUtils/rightview/carddetail/StopApplyDetail2'], resolve) })
-// 报建费用减免详情
-  Vue.component('install-apply-cardlist', (resolve) => { require(['./components/product/VueUtils/rightview/InstallCardList2'], resolve) })
-
-  Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
-  // 流程监控总组件
-  Vue.component('supervisory-control', (resolve) => { require(['./components/product/Supervisory/SupervisoryControl'], resolve) })
-  Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
-  Vue.component('supervisory-chart', (resolve) => { require(['./components/product/Supervisory/SupervisoryhCart'], resolve) })
-  Vue.component('supervisory-baseinfo', (resolve) => { require(['./components/product/Supervisory/SupervisoryBaseInfo'], resolve) })
-  // 业务tab(control层)页
-  Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
-  // 发票号验证
-  Vue.component('apply-validate-bill', (resolve) => { require(['./components/product/Common/ApplyValidateBill'], resolve) })
-  // 售气发票打印
-  Vue.component('printbill', (resolve) => { require(['./components/product/Common/PrintBill'], resolve) })
-  Vue.component('apply-accept-bill', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyAcceptBill'], resolve) })
-// 售气发票打印
-  Vue.component('bjpaper-ticket-bill', (resolve) => { require(['./components/product/Process/Processes/Service/PaperTicketBill'], resolve) })
-// APP图片显示
-  Vue.component('apply-upload', (resolve) => { require(['./components/product/Function/functions/ApplyUpload'], resolve) })
-
-  Vue.component('apply-stop', (resolve) => { require(['./components/product/stopInfo/ApplyStopInfo'], resolve) })
-
-
-}
+import Vue from 'vue'
+
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+import commonService from './plugins/commonService'
+/** ****************服务插件*********************/
+
+export default function () {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+  Vue.use(commonService)
+/** ***************************报建模块*********************************/
+
+/** ***********报建流程业务**********/
+  // 报建流程业务总入口
+  Vue.component('exploration-user', (resolve) => { require(['./components/product/Process/ExplorationUser'], resolve) })
+  // 报建流程业务总入口页面list布局
+  Vue.component('exploration-select', (resolve) => { require(['./components/product/Process/ExplorationSelect'], resolve) })
+  // 报建流程业务报建改装流程入口
+  Vue.component('modify-user-files', (resolve) => { require(['./components/product/Process/ModifyUserFiles'], resolve) })
+  // 报建收费查看
+  Vue.component('apply-charge-search', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyChargeSearch'], resolve) })
+  // 材料使用汇总
+  Vue.component('material-use-list', (resolve) => { require(['./components/product/Process/MaterialUseList'], resolve) })
+  // 预算材料
+  Vue.component('material-message', (resolve) => { require(['./components/product/Process/Processes/CustomerMaterialMessage'], resolve) })
+  //领取材料
+  Vue.component('receive-batch', (resolve) => { require(['./components/product/Process/Processes/ReceiveBatch'], resolve) })
+  // 报建材料记录功能
+  Vue.component('material_recording', (resolve) => { require(['./components/product/Function/functions/material_recording'], resolve) })
+  // 档案tab页
+  Vue.component('record-message', (resolve) => { require(['./components/product/Process/Processes/CustomerRecordMessage'], resolve) })
+  // 材料tab页
+  Vue.component('material-message', (resolve) => { require(['./components/product/Process/Processes/CustomerMaterialMessage'], resolve) })
+  // 设备tab页
+  Vue.component('equipment-message', (resolve) => { require(['./components/product/Process/Processes/CustomerEquipmentMessage'], resolve) })
+  // 楼栋tab页
+  Vue.component('building-message', (resolve) => { require(['./components/product/Process/Processes/CustomerBuildingMessage'], resolve) })
+  // 业务tab(control层)页
+  Vue.component('service-control', (resolve) => { require(['./components/product/Process/Processes/Service/ServiceControl'], resolve) })
+  // 公共业务显示(view层)页
+  Vue.component('service-view', (resolve) => { require(['./components/product/ServiceView'], resolve) })
+
+  Vue.component('material-batch-list', (resolve) => { require(['./components/product/MaterialBatchList'], resolve) })
+  Vue.component('material-batch-manage', (resolve) => { require(['./components/product/MaterialBatchManage'], resolve) })
+  // 派工单tab页 废弃
+  // Vue.component('send-order', (resolve) => { require(['./components/product/Process/Processes/SendOrder'], resolve) })
+  // 停气碰口tab页
+  Vue.component('gas-stop', (resolve) => { require(['./components/product/Process/Processes/Service/GasStop'], resolve) })
+  // 显示退回理由tab页
+  Vue.component('show-back-reason', (resolve) => { require(['./components/product/Process/ShowBackReason'], resolve) })
+
+  // 报建历史信息页面
+  Vue.component('history_control', (resolve) => { require(['./components/product/Process/ProcessInfo/history_control'], resolve) })
+
+// 工程结算
+  Vue.component('project-settlement', (resolve) => { require(['./components/product/Process/Processes/ProjectSettlement'], resolve) })
+// 报建功能业务总入口
+  Vue.component('install-function', (resolve) => { require(['./components/product/Function/InstallFunction'], resolve) })
+  // 报建菜单页面控制层
+  Vue.component('function-service-control', (resolve) => { require(['./components/product/Function/Service/FunctionServiceControl'], resolve) })
+// 终止报建业务
+  Vue.component('stop-install', (resolve) => { require(['./components/product/Function/functions/StopInstall'], resolve) })
+// 报建业务信息
+  Vue.component('installinfoselect', (resolve) => { require(['./components/product/Function/InstallInfoSelect'], resolve) })
+// 报建收费
+  Vue.component('installfee', (resolve) => { require(['./components/product/Function/functions/InstallFee'], resolve) })
+  // 报建收费
+  Vue.component('buyer-message', (resolve) => { require(['./components/product/Function/functions/BuyerMessage'], resolve) })
+  // 预缴费收费
+  Vue.component('prestorefee', (resolve) => { require(['./components/product/Function/functions/PrestoreFee'], resolve) })
+  // 预缴费
+  Vue.component('preparationfee', (resolve) => { require(['./components/product/Function/functions/PreparationFee'], resolve) })
+  // 操作记录撤销
+  Vue.component('apply-record-cancel', (resolve) => { require(['./components/product/Function/functions/ApplyRecordCancel'], resolve) })
+// 费用变更信息
+  Vue.component('updatefee', (resolve) => { require(['./components/product/Function/functions/UpdateFee'], resolve) })
+// 费用减免信息
+  Vue.component('reducefee', (resolve) => { require(['./components/product/Function/functions/ReduceFee'], resolve) })
+// 报建收费信息
+  Vue.component('installfeeinfo', (resolve) => { require(['./components/product/Function/functions/InstallFeeInfo'], resolve) })
+// 报建业务信息
+  Vue.component('installinfodown', (resolve) => { require(['./components/product/Function/InstallInfoDown'], resolve) })
+// 详细业务信息
+  Vue.component('allselect', (resolve) => { require(['./components/product/Function/functions/AllSelect'], resolve) })
+// 添加合同信息
+  Vue.component('addcontract', (resolve) => { require(['./components/product/Function/functions/AddContract'], resolve) })
+// 打印票据
+  Vue.component('billselect', (resolve) => { require(['./components/product/Bill/BillSelect'], resolve) })
+  // 打印记录表票据
+  Vue.component('billjlb', (resolve) => { require(['./components/product/Bill/BillJLB'], resolve) })
+  // 打印开通卡票据
+  Vue.component('billktk', (resolve) => { require(['./components/product/Bill/BillKTK'], resolve) })
+  // 打印确认卡票据
+  Vue.component('billqrk', (resolve) => { require(['./components/product/Bill/BillQRK'], resolve) })
+  // 打印改装卡票据
+  Vue.component('billgzk', (resolve) => { require(['./components/product/Bill/BillGZK'], resolve) })
+  // 打印销售单票据
+  Vue.component('billxsd', (resolve) => { require(['./components/product/Bill/BillXSD'], resolve) })
+  // 销售单票据信息
+  Vue.component('billxsdmakeinfo', (resolve) => { require(['./components/product/Bill/BillXSDMakeInfo'], resolve) })
+  // 确认卡票据信息
+  Vue.component('billqrkmakeinfo', (resolve) => { require(['./components/product/Bill/BillQRKMakeInfo'], resolve) })
+  // 改装卡票据信息
+  Vue.component('billgzkmakeinfo', (resolve) => { require(['./components/product/Bill/BillGZKMakeInfo'], resolve) })
+  // 开通卡票据信息
+  Vue.component('billktkmakeinfo', (resolve) => { require(['./components/product/Bill/BillKTKMakeInfo'], resolve) })
+  // 销售记录表票据信息
+  Vue.component('billjlbmakeinfo', (resolve) => { require(['./components/product/Bill/BillJLBMakeInfo'], resolve) })
+  // 销售记录表历史票据信息
+  Vue.component('billqrkrecordinfo', (resolve) => { require(['./components/product/Bill/BillQRKRecordInfo'], resolve) })
+  // 改装卡历史票据信息
+  Vue.component('billgzkrecordinfo', (resolve) => { require(['./components/product/Bill/BillGZKRecordInfo'], resolve) })
+  // 销售单历史票据信息
+  Vue.component('billxsdrecordinfo', (resolve) => { require(['./components/product/Bill/BillXSDRecordInfo'], resolve) })
+  // 开通卡历史票据信息
+  Vue.component('billktkrecordinfo', (resolve) => { require(['./components/product/Bill/BillKTKRecordInfo'], resolve) })
+  // 开通卡历史票据信息
+  Vue.component('billjlbrecordinfo', (resolve) => { require(['./components/product/Bill/BillJLBRecordInfo'], resolve) })
+
+// 报建收费卡片详情
+  Vue.component('build-apply-detail', (resolve) => { require(['./components/product/VueUtils/rightview/carddetail/BuildFeeDetail2'], resolve) })
+// 报建费用变更详情
+  Vue.component('change-apply-detail', (resolve) => { require(['./components/product/VueUtils/rightview/carddetail/ChangeFeeDetail2'], resolve) })
+// 报建费用减免详情
+  Vue.component('reduce-apply-detail', (resolve) => { require(['./components/product/VueUtils/rightview/carddetail/ReduceFeeDetail2'], resolve) })
+// 报建费用减免详情
+  Vue.component('stopapply-apply-detail', (resolve) => { require(['./components/product/VueUtils/rightview/carddetail/StopApplyDetail2'], resolve) })
+// 报建费用减免详情
+  Vue.component('install-apply-cardlist', (resolve) => { require(['./components/product/VueUtils/rightview/InstallCardList2'], resolve) })
+
+  Vue.component('back-page', (resolve) => { require(['./components/product/VueUtils/ToolsPage'], resolve) })
+  // 流程监控总组件
+  Vue.component('supervisory-control', (resolve) => { require(['./components/product/Supervisory/SupervisoryControl'], resolve) })
+  Vue.component('supervisory-list', (resolve) => { require(['./components/product/Supervisory/SupervisoryList'], resolve) })
+  Vue.component('supervisory-chart', (resolve) => { require(['./components/product/Supervisory/SupervisoryhCart'], resolve) })
+  Vue.component('supervisory-baseinfo', (resolve) => { require(['./components/product/Supervisory/SupervisoryBaseInfo'], resolve) })
+  // 业务tab(control层)页
+  Vue.component('supervisory-service-control', (resolve) => { require(['./components/product/Supervisory/Service/SupervisoryServiceControl'], resolve) })
+  // 发票号验证
+  Vue.component('apply-validate-bill', (resolve) => { require(['./components/product/Common/ApplyValidateBill'], resolve) })
+  // 售气发票打印
+  Vue.component('printbill', (resolve) => { require(['./components/product/Common/PrintBill'], resolve) })
+  Vue.component('apply-accept-bill', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyAcceptBill'], resolve) })
+// 售气发票打印
+  Vue.component('bjpaper-ticket-bill', (resolve) => { require(['./components/product/Process/Processes/Service/PaperTicketBill'], resolve) })
+// APP图片显示
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/Function/functions/ApplyUpload'], resolve) })
+
+  Vue.component('apply-stop', (resolve) => { require(['./components/product/stopInfo/ApplyStopInfo'], resolve) })
+
+  Vue.component('apply-report', (resolve) => { require(['./components/product/applyReport/ApplyReport'], resolve) })
+}

package/src/components/product/Common/ApplyValidateBill.vue

@@ -38,17 +38,23 @@
       }
     },
     props: ['data','show'],
-    ready () {
-
+   async ready () {
+      /*debugger
       console.log(this.data.f_bill_type)
       if (this.data.f_bill_type) {
-        getCurrentBill(this)
+        await  getCurrentBill(this)
+        console.log('打印参数',this.data.f_process_id)
 
-      }
+      }*/
     },
     watch : {
-      'show' (val) {
-          getCurrentBill(this)
+      data:{
+        deep:true,
+        immediate:true,
+        async handler(){
+          console.log('1111155555')
+          await getCurrentBill(this)
+        }
       }
     }
   }

package/src/components/product/Function/functions/InstallFee.vue

@@ -420,7 +420,7 @@
           f_charge_collectors: this.$login.f.name,
           f_charge_date: '',
           f_charge_remarks: '',
-          f_filiale: this.$login.f.f_fengongsi,
+          f_filiale: '',
           f_process_id: '',
           f_apply_num: '',
           f_payment_method: '',
@@ -430,7 +430,7 @@
         },
         charges: [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}],
         // 启用发票管理需要对票号进行验证
-        hasValidateBill: true,
+        hasValidateBill: false,
         validateOk: false,
         userinfoRow: {
           rows: []
@@ -581,7 +581,7 @@
           f_charge_collectors: this.$login.f.name,
           f_charge_date: '',
           f_charge_remarks: '',
-          f_filiale: this.$login.f.f_fengongsi,
+          f_filiale: '',
           f_process_id: '',
           f_apply_num: '',
           f_charging_status: '有效',
@@ -729,7 +729,7 @@
           this.addItem.f_charge_collectors = this.$login.f.name
           this.addItem.f_charge_date = this.model.f_charge_date
           this.addItem.f_charge_remarks = this.model.f_charge_remarks
-          this.addItem.f_filiale = this.$login.f.f_fengongsi
+          this.addItem.f_filiale = this.model.f_payment_account =='安泰' ? '欣泰集团.安泰天然气' : '欣泰天然气'
           this.addItem.f_process_id = this.infee.f_process_id
           this.addItem.f_apply_num = this.infee.f_apply_num
           this.model.rows.push(this.addItem)
@@ -953,7 +953,7 @@
 
       // 获取数据
       async load() {
-
+        console.log('load被重新调用111')
         this.refresh = !this.refresh
         console.log("刷新validate，重新加载" + this.refresh)
         // this.ifsearch = !this.ifsearch
@@ -1006,6 +1006,8 @@
         this.oldInfo.f_address = this.model.f_address;
         this.model.f_isone = ['否'];
         this.charges = [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}];
+        this.hasValidateBill=true
+        console.log('load被重新调用222')
       }
     },
     computed: {

package/src/components/product/Process/Processes/Service/ApplyChargeSearch.vue

@@ -249,7 +249,7 @@
         price: new PagedList('rs/sql/getChargeAll', 999999, {orderitem: '`f_charge_money`'}),
         human: [],
         filiale: [],
-        method: [],
+        method: this.$appdata.getParam('付款方式'),
         usertype:[
           {label: '民用', value: '民用'},
           {label: '非民用', value: '非民用'}

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

@@ -0,0 +1,151 @@
+<template>
+  <div class="d1 flex">
+    <div class="left col-sm-12">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
+          <form novalidate class="" partial>
+            <div class="row">
+              <div class="col-sm-4">
+                <button class="btn btn-primary btn-sm" type="button" @click="search(),$parent.$parent.showpager()" style="margin-left:10%">
+                  <span class="glyphicon glyphicon-search"></span>查询</button>
+
+<!--                <button class="btn-primary btn btn-sm" @click.prevent="$parent.$parent.clear()">清空</button>-->
+              </div>
+            </div>
+
+          </form>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid  class="list_area" is-fixed='false'>
+          <template partial='head'>
+            <tr>
+              <th colspan="6"><h4>报装人员勘察 安装 通气 统计查询</h4></th>
+            </tr>
+            <tr>
+              <th colspan="1" rowspan="2">报装人员</th>
+              <th colspan="2">个人报建</th>
+              <th colspan="3">集体报建</th>
+            </tr>
+            <tr class="title">
+              <th>
+                <nobr>踏勘</nobr>
+              </th>
+              <th>
+                <nobr>安装</nobr>
+              </th>
+              <th>
+                <nobr>踏勘</nobr>
+              </th>
+              <th>
+                <nobr>安装</nobr>
+              </th>
+              <th>
+                <nobr>通气</nobr>
+              </th>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align: center;">
+                <nobr>{{row.username}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.gsurvey_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.gconstruction_unit}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.jsurvey_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.jconstruction_unit}}</nobr>
+              </td>
+
+              <td style="text-align: center;">
+                <nobr>{{row.jgas_name}}</nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</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;
+  }
+  import {
+    PagedList
+  } from 'vue-client'
+  import * as Util from '../../Util'
+
+  export default {
+    title: '报建统计',
+    data() {
+      return {
+        usertype: this.$appdata.getParam('用户类型'),
+        showbtn: false,
+        model: new PagedList('rs/sql/checkuserReport', 20, {
+          data: {
+            id: this.$login.f.id,
+            fengongsi: this.$login.f.f_fengongsi
+          }
+        }),
+        condition: '',
+        showstopinfoflag:false,
+        stopremarks:""
+      }
+    },
+    ready() {
+      this.$refs.cp.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
+      this.$refs.cp.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+      this.$refs.cp.$refs.cri.search()
+    },
+    methods: {
+      clear(){
+        this.$refs.cp.$refs.cri.model = {}
+      },
+      stopinfoshow(index){
+        this.showstopinfoflag = true;
+        let remakrs = this.model.rows[index].f_stop_remarks;
+        console.log(JSON.stringify(remakrs))
+        console.log(remakrs)
+
+        this.stopremarks= remakrs;
+      },
+      clifun(row) {
+        this.$refs.cp.$refs.grid.model.rows = [row]
+        this.$refs.cp.pager = false
+        this.$dispatch('showbtn', row)
+      },
+      showpager() {
+        this.$refs.cp.pager = true
+        this.$dispatch('hiddenbtn')
+      },
+      closestopinfo(){
+        this.showstopinfoflag = close;
+      }
+    }
+  }
+</script>
+<style scoped>
+  label {
+    display: flex;
+    justify-content:center;
+    align-items:Center;
+    padding-top: 8px;
+  }
+</style>