apply-clients 3.0.7-135 → 3.0.7-139

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.0.7-135",
+  "version": "3.0.7-139",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {
@@ -93,7 +93,7 @@
     "system-clients": "3.2.2",
     "system-phone": "1.1.18",
     "url-loader": "^0.5.7",
-    "vue-client": "1.22.33-12",
+    "vue-client": "1.24.32",
     "vue-hot-reload-api": "^1.2.0",
     "vue-html-loader": "^1.0.0",
     "vue-loader": "^8.2.1",

package/src/AndroidApp.vue

@@ -1,28 +1,28 @@
-<template>
-  <!-- <app-base> -->
-  <div id="android-app">
-    <article>
-      <route :comp="{name: 'login-app'}" name="root"></route>
-      <!--<route :comp="{name: 'apply_app'}" name="root"></route>-->
-      <!--<route :comp="{name: 'applytodolist'}" name="root"></route>-->
-      <!--<route :comp="{name: 'paper-state-noncivil'}" name="root"></route>-->
-    </article>
-    <time-out></time-out>
-    <message-box>
-    </message-box>
-  </div>
-</template>
-
-<script>
-
-  export default {
-    ready () {
-      if(!window.onerror) {
-        window.onerror = function (message, file, line, col, error) {
-          // HostApp.alert("Error occured: " + error.message)
-          return false
-        }
-      }
-    }
-  }
-</script>
+<template>
+  <!-- <app-base> -->
+  <div id="android-app">
+    <article>
+      <route :comp="{name: 'login-app'}" name="root"></route>
+      <!--<route :comp="{name: 'apply_app'}" name="root"></route>-->
+      <!--<route :comp="{name: 'applytodolist'}" name="root"></route>-->
+      <!--<route :comp="{name: 'paper-state-noncivil'}" name="root"></route>-->
+    </article>
+    <time-out></time-out>
+    <message-box>
+    </message-box>
+  </div>
+</template>
+
+<script>
+
+  export default {
+    ready () {
+      if(!window.onerror) {
+        window.onerror = function (message, file, line, col, error) {
+          // HostApp.alert("Error occured: " + error.message)
+          return false
+        }
+      }
+    }
+  }
+</script>

package/src/apply.js

@@ -1,146 +1,155 @@
-import Vue from 'vue'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function () {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-/** ***************************报建模块*********************************/
-
-/** ***********报建流程业务**********/
-  // 报建流程业务总入口
-  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('procedures-datagrid', (resolve) => { require(['./components/product/Procedures/ProceduresDataGrid'], 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) })
-  // 更改历史
-  Vue.component('apply-change-history', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyChangeHistory'], 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('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], 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) })
-  // 汇总查询入口 src/components/product/Statistics/ApplyStatisticsROOT.vue
-  Vue.component('apply-statistics-root', (resolve) => { require(['./components/product/Statistics/ApplyStatisticsROOT'], resolve) })
-}
+import Vue from 'vue'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function () {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+/** ***************************报建模块*********************************/
+
+/** ***********报建流程业务**********/
+  // 报建流程业务总入口
+  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('procedures-datagrid', (resolve) => { require(['./components/product/Procedures/ProceduresDataGrid'], 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) })
+  // 更改历史
+  Vue.component('apply-change-history', (resolve) => { require(['./components/product/Process/Processes/Service/ApplyChangeHistory'], 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('refund-install', (resolve) => { require(['./components/product/Function/functions/RefundInstall'], 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('tree2', (resolve) => { require(['./components/product/VueUtils/Tree'], 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) })
+  // 汇总查询入口 src/components/product/Statistics/ApplyStatisticsROOT.vue
+  Vue.component('apply-statistics-root', (resolve) => { require(['./components/product/Statistics/ApplyStatisticsROOT'], resolve) })
+  /** 报建退费记录 **/
+  Vue.component('apply-return-charge-search', (resolve) => { require(['./components/product/Function/returnpremium/ApplyReturnChargeSearch'], resolve) })
+  Vue.component('apply-return-charge-list', (resolve) => { require(['./components/product/Function/returnpremium/ApplyReturnChargeList'], resolve) })
+
+  /** VueUtils **/
+  Vue.component('apply-upload', (resolve) => { require(['./components/product/VueUtils/ApplyUpload'], resolve) })
+  Vue.component('apply-high-meter', (resolve) => { require(['./components/product/VueUtils/HighMeter'], resolve) })
+}

package/src/components/Util.js

@@ -2,6 +2,10 @@ import Vue from 'vue'
 // 登录后获取的所有数据，需要自行获取
 export var f
 
+export function isEmpty (str) {
+  return str === undefined || str === null || str.toString().trim() === ''
+}
+
 export function getAttendanceState (item, timeToWork, timeToGo) {
   item.f_state = ''
   if (!item.f_signin_time || !item.f_knockoff_time) {

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

@@ -1,6 +1,6 @@
 <template>
   <div class="full" style="background-color:  #f6f6f6;">
-    <div class="flex-row">
+    <div class="flex-row" style="flex: 1;height:100%;width:100%;overflow: auto">
       <div class="flex" style="flex: 1" :style="{height: totalheight,width:'80%'}">
         <div class="flex col-sm-12" :style="{height: leftheight}">
           <installinfoselect v-ref:installselect></installinfoselect>

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

@@ -117,6 +117,9 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
+              <th>
+                <nobr>报建状态</nobr>
+              </th>
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -163,6 +166,9 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
@@ -205,6 +211,7 @@
         refreshed:true,
         usertype: this.$appdata.getParam('用户类型'),
         defnameType: this.$appdata.getParam('流程状态'),
+        bjstate: [{label:"全部",value:''},...this.$appdata.getParam('报建状态')],
         applytype: [{label:"全部",value:''},...this.$appdata.getParam('报建类型')],
         //中燃 专用
         fapplytype: this.$appdata.getParam('用户类型'),
@@ -222,7 +229,7 @@
           {label: '全部', value: ''},
           {label: '是', value: '是'},
           {label: '否', value: '否'}
-        ]
+        ],
       }
     },
     ready() {

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

@@ -24,6 +24,8 @@
     <addcontract :addcontract="selectdata" v-if="showcontract"></addcontract>
     <!-- 终止报建 -->
     <stop-install :stopapply="selectdata" v-if="showstop"></stop-install>
+    <!-- 退费 -->
+    <refund-install :selectdata="selectdata" v-if="showsrefund"></refund-install>
     <!-- 领料记录 -->
     <material_recording :infee="selectdata" v-if="show_material"></material_recording>
   </div>
@@ -39,13 +41,13 @@
         model:null,
         json_datas:null,
         showview:false,
-
         showbuyer: false,  // 显示购货方信息
         showreceivebatch:false,
         showcontract: false, // 补充协议
         showinfee: false, // 报建收费
         showprestorefee: false, // 开发商预存报建收费
         showstop: false, // 终止报建
+        showsrefund: false, // 退费
         showbill: false, // 打印票据
         showpreparation: false, // 预付款
         show_material:false,//报建材料
@@ -69,7 +71,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -91,7 +93,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -112,7 +114,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -133,7 +135,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -154,7 +156,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -174,7 +176,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -195,7 +197,7 @@
         this.showview = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showbill = false
@@ -214,7 +216,7 @@
         this.showmaterialmessage = false
         this.showbuyer = false
         this.showview = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showstop = false
         this.showcontract = false
@@ -244,7 +246,7 @@
         this.showbill = false
         this.showinfee = false
         this.showprestorefee = false
-        this.showupfee = false
+        this.showsrefund = false
         this.showreducefee = false
         this.showcontract = false
         this.showpreparation = false
@@ -252,7 +254,26 @@
         this.show_material = false
       },
 
+      RefundInstall() {
+        this.$parent.$refs.installselect.clifun(this.selectdata)
+        // this.selectdata = row
+        this.$parent.clishow= true
+        this.$parent.show = false
 
+        this.showreceivebatch = false
+        this.showmaterialmessage = false
+        this.showbuyer = false
+        this.showview = false
+        this.showbill = false
+        this.showinfee = false
+        this.showprestorefee = false
+        this.showsrefund = true
+        this.showreducefee = false
+        this.showcontract = false
+        this.showpreparation = false
+        this.showstop = false
+        this.show_material = false
+      },
 
       // json配置数据处理 比如下拉框的options
       initializtion() {
@@ -277,7 +298,7 @@
           this.initializtion()
           this.$parent.clishow= true
           this.$parent.show = false
-
+          this.showsrefund = false
           this.showview = true
           this.showbill = false
           this.showinfee = false
@@ -292,6 +313,9 @@
           if(this.funcdata.title==='终止报建'){
             this.stopInstall()
           }
+          if(this.funcdata.title==='退费'){
+            this.RefundInstall()
+          }
           if(this.funcdata.title==='预付扣款'){
             this.instalfee('预付扣款')
           }