apply-clients 3.3.10 → 3.3.14

package/package.json

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

package/src/AndroidApp.vue

@@ -2,11 +2,11 @@
   <!-- <app-base> -->
   <div id="android-app">
     <article>
-<!--      <route :comp="{name: 'app-exploration-user'}" name="root"></route>-->
+      <route :comp="{name: 'app-exploration-user'}" name="root"></route>
 <!--      <route :comp="{name: 'app-process-supervisory'}" name="root"></route>-->
 <!--      <route :comp="{name: 'apply-reserve'}" name="root"></route>-->
 <!--      <route :comp="{name: 'task-graph'}" name="root"></route>-->
-      <route :comp="{name: 'app-istall-function'}" name="root"></route>
+<!--      <route :comp="{name: 'app-istall-function'}" name="root"></route>-->
     </article>
     <time-out></time-out>
     <message-box></message-box>

package/src/components/android/Function/AppFunctionServiceControl.vue

@@ -15,7 +15,7 @@
   import Vue from 'vue'
   export default {
     title: '报建功能业务控制层',
-    props: ['selectdata'],
+    props: ['selectdata', 'jsondata'],
     data () {
       return {
         show_data: null, // 给通用页面显示的数据
@@ -27,6 +27,8 @@
     },
     methods: {
       async refurbish () {
+        this.selectdata = Object.assign({}, this.selectdata, this.jsondata)
+
         // fields 字段填充值
         for (const item of this.selectdata.fields) {
           if (!item.value) {

package/src/components/android/Function/AppInstallFunction.vue

@@ -4,12 +4,6 @@
       <criteria partial='criteria' @condition-changed='search' v-ref:cri>
         <div partial class="auto">
           <div class="row form-group app-input">
-            <label class="">项目名称：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_entry_name condition="u.f_entry_name like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">客户名称：</label>
             <div class="col-xs-8" >
               <input class="" v-model=model.f_user_name condition="u.f_user_name like '%{}%'" />
@@ -107,10 +101,6 @@
       <list :model="model" partial='list'>
         <div partial class="auto app-text panel">
           <div class="panel-body panel-self">
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_entry_name }}</p>
-            </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>客户名称：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_user_name }}</p>
@@ -208,11 +198,11 @@
       // 获取功能配置
       async getConfig () {
         let res = await this.$resetpost(
-          '${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetFunction',
+          `${this.$androidUtil.getProxyUrl()}/rs/logic/ApplyGetFunction`,
           null,
           {resolveMsg: null, rejectMsg: '配置数据获取失败！！！'}
         )
-        this.functions = res.data
+        this.function_vue = res.data
         // this.function_vue = {"functions":[{"title":"补充协议","showApplyTypes":["散户报建","团购报建","工商户报建"],"showDefnames":["报装缴费","设计出图","图纸审核","工程派工","工程施工"],"tables":["t_apply"],"fields":[{"label":"项目名称","type":"input","field":"f_entry_name","readonly":true,"value":null,"disabled":false,"required":true},{"label":"客户姓名","type":"input","field":"f_user_name","readonly":true,"value":null,"disabled":false,"required":true},{"label":"联系电话","type":"input","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"合同编号","type":"input","field":"f_contract_number","placeholder":"Z-自动拼接","readonly":true,"required":true},{"label":"合同金额","type":"number","field":"f_contract_money","placeholder":"请输入","readonly":true,"required":true},{"label":"追加总金额","type":"number","field":"f_add_contract_money","placeholder":"请输入","readonly":true,"required":true,"default":0},{"label":"应交金额","type":"number","field":"f_due_money","placeholder":"请输入","readonly":true,"required":true},{"label":"累计缴费金额","type":"number","field":"f_cumulative_payment_money","placeholder":"请输入","readonly":true,"required":true,"default":0},{"label":"未结总金额","type":"number","field":"f_surplus_money","placeholder":"请输入","readonly":true,"required":true},{"label":"付款比例","type":"input","field":"f_payment_ratio","placeholder":"请输入","readonly":true,"required":true}],"components":[{"title":"补充协议","device":"pc","name":"supplemental-agreement","mark":1},{"title":"补充协议","device":"app","name":"app-supplemental-agreement","mark":1}]},{"title":"收费","component":"service-view","showApplyTypes":["散户报建","改管报建","增容报建","团购报建","工商户报建","团购转散户"],"showDefnames":["报装缴费","设计出图","图纸审核","工程派工","工程施工","点火派单","通气点火","完工"],"tables":["t_apply"],"fields":[{"label":"项目名称","type":"input","field":"f_entry_name","readonly":true,"value":null,"disabled":false,"required":true},{"label":"客户姓名","type":"input","field":"f_user_name","readonly":true,"value":null,"disabled":false,"required":true},{"label":"联系电话","type":"input","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"合同编号","type":"input","field":"f_contract_number","placeholder":"Z-自动拼接","readonly":true,"required":true},{"label":"合同金额","type":"number","field":"f_contract_money","placeholder":"请输入","readonly":true,"required":true},{"label":"追加总金额","type":"number","field":"f_add_contract_money","placeholder":"请输入","readonly":true,"required":true,"default":0},{"label":"应交金额","type":"number","field":"f_due_money","placeholder":"请输入","readonly":true,"required":true},{"label":"累计缴费金额","type":"number","field":"f_cumulative_payment_money","placeholder":"请输入","readonly":true,"required":true,"default":0},{"label":"未结总金额","type":"number","field":"f_surplus_money","placeholder":"请输入","readonly":true,"required":true},{"label":"付款比例","type":"input","field":"f_payment_ratio","placeholder":"请输入","readonly":true,"required":true}],"components":[{"title":"缴费明细","device":"pc","name":"apply-charge-management"},{"title":"缴费明细","device":"app","name":"app-charge-management"}]},{"title":"暂停报建","personexpression":"","showApplyTypes":["散户报建","改管报建","增容报建","团购报建","工商户报建","团购转散户"],"showDefnames":["信息确认","报装申请","勘察派工","现场勘察","设计预算","合同签订","报装缴费","设计出图","图纸审核","工程派工","工程施工","点火派单","通气点火"],"tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":true,"required":true,"disabled":false},{"label":"暂停原因","type":"textarea","field":"f_stop_reason","rows":2,"readonly":false,"required":true,"disabled":false}],"buttons":[{"event":"pauseApply","button_name":"暂停","disabled":true}]},{"title":"终止报建","personexpression":"","showApplyTypes":["散户报建","改管报建","增容报建","团购报建","工商户报建","团购转散户"],"showDefnames":["信息确认","报装申请","勘察派工","现场勘察","设计预算","合同签订","报装缴费","设计出图","图纸审核","工程派工","工程施工","点火派单","通气点火"],"tables":["t_apply"],"fields":[{"label":"工程名称","type":"input","field":"f_entry_name","readonly":true,"disabled":false,"required":true},{"label":"工程编号","type":"input","field":"f_apply_num","readonly":true,"disabled":false,"required":true},{"label":"报建类型","type":"input","field":"f_apply_type","readonly":true,"required":true,"disabled":false},{"label":"用户名称","type":"input","field":"f_user_name","readonly":true,"disabled":false,"required":true},{"label":"用户电话","type":"tel","field":"f_phone","readonly":true,"disabled":false,"required":true},{"label":"证件类型","type":"input","field":"f_credentials","readonly":true,"required":true,"disabled":false},{"label":"证件号码","type":"input","field":"f_idnumber","readonly":true,"required":true,"disabled":false},{"label":"地址","type":"textarea","field":"f_address","rows":1,"readonly":true,"required":true,"disabled":false},{"label":"终止原因","type":"textarea","field":"f_stop_reason","rows":2,"readonly":false,"required":true,"disabled":false}],"buttons":[{"event":"stopApply","button_name":"终止","disabled":true}]}]}
       },
       clear () {
@@ -225,14 +215,13 @@
         this.$refs.cp.$refs.cri.search()
       },
       click (row, func) {
-        let selectdata = Object.assign({}, func, row)
         let _this = this
         this.$dispatch('gotoson', {
           _this: _this,
-          title: selectdata.title,
+          title: row.title,
           safe: true
         })
-        this.$goto('app-function-service-control', {selectdata: selectdata}, 'self', _this.search)
+        this.$goto('app-function-service-control', {selectdata: row, jsondata: func}, 'self', _this.search)
       },
       applyTypeChange () {
         if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {

package/src/components/android/Process/AppExplorationUser.vue

@@ -4,12 +4,6 @@
       <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
         <div partial class="auto">
           <div class="row form-group app-input">
-            <label class="">项目名称：</label>
-            <div class="col-xs-8" >
-              <input class="" v-model=model.f_entry_name condition="u.f_entry_name like '%{}%'" />
-            </div>
-          </div>
-          <div class="row form-group app-input" v-if="$parent.$parent.criteriaShow">
             <label class="">客户名称：</label>
             <div class="col-xs-8" >
               <input class="" v-model=model.f_user_name condition="u.f_user_name like '%{}%'" />
@@ -107,10 +101,6 @@
       <list :model="model" partial='list'>
         <div partial class="auto app-text panel">
           <div class="panel-body panel-self">
-            <div class="col-xs-12">
-              <p class="col-xs-3 text-left font"><b>项目名称：</b></p>
-              <p class="col-xs-9 text-left input-font">{{ row.f_entry_name }}</p>
-            </div>
             <div class="col-xs-12">
               <p class="col-xs-3 text-left font"><b>客户名称：</b></p>
               <p class="col-xs-9 text-left input-font">{{ row.f_user_name }}</p>