apply-clients 5.0.35-99 → 5.0.35-ezhou-1

package/src/components/product/ServiceView.vue

@@ -10,13 +10,13 @@
     <!--</div>-->
     <validator name="v">
       <form class="form-horizontal">
-        <div class="col-sm-12 form-group form-group1">
+        <div class="col-sm-12 form-group">
           <div v-for="(index,item) in data.fields">
             <!--input-->
             <div :style="item.style+';height: 34px;'"
                  v-if="item.type==='input' || item.type==='number'||item.type === 'tel'||item.type === 'email'"
                  v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group form-group1']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
               <label :style="item.label_style? item.label_style:''+';width:85px;'"
                      :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':item.label_style?'':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <div :style="item.value_style? item.value_style:''"
@@ -36,7 +36,7 @@
             <!--时间datepicker-->
             <div :style="item.style? item.style+';height: 34px;':'height: 34px;'" v-if="item.type==='datepicker'"
                  v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group form-group1']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
               <label style="width:85px"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label-justify control-label':'control-label control-label-justify col-sm-6'">{{item.label}}</label>
               <div :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'">
@@ -94,7 +94,7 @@
 
             <!--select-->
             <div style="height: 34px" v-if="item.type==='select'" v-show="!item.hidden"
-                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group ':'col-sm-4 form-group']">
+                 :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-4 form-group']">
               <label style="width:85px;"
                 :class="item.label_bootstraped?item.label_bootstraped+' control-label control-label-justify':'control-label-justify control-label col-sm-6'">{{item.label}}</label>
               <input-select :class="item.value_bootstraped?item.value_bootstraped:'col-sm-6'" @blur="check_disable"
@@ -106,7 +106,6 @@
 
             </div>
 
-
             <!--checkbox-->
             <div v-if="item.type==='checkbox'"
                  :class="[data.fields[index].required&&!(data.fields[index].value) ? 'has-error' : '',data.fields[index].bootstraped?data.fields[index].bootstraped+' form-group':'col-sm-12 form-group']">
@@ -123,7 +122,7 @@
           </div>
           <!-- onetomany -->
           <div class="col-sm-12" v-for="(i,datagrid) in data.onetomany">
-            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover" style="margin-top: 80px">
+            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover">
               <tr style="background-color: #00A3F0">
                 <th style="text-align: center;border-color: #00A3F0"><font color="white">序号</font></th>
                 <th v-for="labels in datagrid.fields" style="text-align: center;border-color: #00A3F0">
@@ -507,12 +506,6 @@
       },
       // 初始化数据
       initializtion() {
-        if(this.data.f_apply_type='集体报建' && this.data.f_user_type=='非民用' && this.data.defname=='验收'){
-          for(let j=0;j< this.data.fields.length;j++) {
-            this.data.fields[j].required = false
-          }
-        }
-
         let fields = this.data.fields
         let flag = false
         for (let i = 0; i < fields.length; i++) {
@@ -804,7 +797,4 @@
   tr {
     height: 34px;
   }
-  .form-group{
-    margin-top:20px;
-  }
 </style>

package/src/components/product/Supervisory/Service/SupervisoryServiceControl.vue

@@ -20,7 +20,6 @@
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
-  import Vue from "vue";
   export default {
     title: '报建监控控制层',
     props: ['selectdata'],
@@ -37,45 +36,6 @@
       },
       // json配置数据处理 比如下拉框的options
       async initializtion() {
-        // onetomany 数据获取
-        if (this.data.onetomany) {
-          console.log('判断是onetomany,this.data.onetomany的数据为=>' + JSON.stringify(this.data.onetomany))
-          for (let index = 0; index < this.data.onetomany.length; index++) {
-            let http = new HttpResetClass()
-            let data = {}
-            if (this.data.onetomany[index].tables[0] == 't_charge_record') {
-              data = {
-                tablename: this.data.onetomany[index].tables[0],
-                condition: `f_apply_num = '${this.selectdata.f_apply_num}'  and f_process_id='${this.selectdata.f_process_id}' and f_charging_status != '作废'`
-              }
-            } else {
-              data = {
-                tablename: this.data.onetomany[index].tables[0],
-                condition: `f_process_id='${this.selectdata.f_process_id}'`
-              }
-            }
-            let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-              resolveMsg: null,
-              rejectMsg: 'onetomany查询失败'
-            })
-            // 初始化 onetomany
-            let rows = []
-            console.log('查询返回结果res.data=>' + JSON.stringify(res.data))
-            this.data.onetomany[index].rows = res.data
-            // console.log(JSON.stringify('this.data.onetomany[index].rows=>' + JSON.stringify(this.data.onetomany[index].rows)))
-
-            // 初始化onetomany中的fields
-            for (let j = 0; j < this.data.onetomany[index].fields.length; j++) {
-              // 如果配置类型为select,优先从参数列表获取options
-              if (this.data.onetomany[index].fields[j].type === 'select') {
-                let temp = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                if (temp && temp.length > 0) {
-                  this.data.onetomany[index].fields[j].options = Vue.$appdata.getParam(this.data.onetomany[index].fields[j].label)
-                }
-              }
-            }
-          }
-        }
         // selectdata 填充 data
         if (this.selectdata.f_survey_name) {
           let buyerinfos = []
@@ -133,11 +93,11 @@
           }
           this.data.fields[i].readonly = true
           this.data.fields[i].disabled = true
-            if(this.$login.r.find(value => value == '报建流程修改') && this.$login.r.includes('报建流程修改')){
+            if(this.$login.r.find(value => value == '报建流程修改') && this.data.f_apply_type=='个人报建' && this.$login.r.includes('报建流程修改')){
             this.data.fields[i].readonly = false
             this.data.fields[i].disabled = false
           }
-          if(this.$login.r.find(value => value == '集体报建流程修改')  && this.$login.r.includes('报建流程修改')){
+          if(this.$login.r.find(value => value == '集体报建流程修改') && this.data.f_apply_type=='集体报建' && this.$login.r.includes('报建流程修改')){
               this.data.fields[i].readonly = false
               this.data.fields[i].disabled = false
           }
@@ -157,7 +117,7 @@
           }
         }
         this.data.buttons = null
-        if( this.$login.r.find(value => value == '报建流程修改')  ){
+        if( this.$login.r.find(value => value == '报建流程修改')  && this.data.f_apply_type=='个人报建' ){
           // 仅留保存按钮
           this.data.buttons = [
             {
@@ -165,7 +125,7 @@
             }
           ]
         }
-        if(this.$login.r.includes('集体报建流程修改')){
+        if(this.data.f_apply_type=='集体报建' && this.$login.r.includes('集体报建流程修改')){
           // 仅留保存按钮
           this.data.buttons = [
             {
@@ -173,6 +133,7 @@
             }
           ]
         }
+
       }
     },
     events:{
@@ -429,18 +390,11 @@
           this.data = jsonData
           this.initializtion()
           // 完成时间和完成人,部门，分公司
-          if(this.selectdata.defname =='完工'){ this.data.filiale = this.selectdata.f_filiale
-            this.data.f_parentname = this.selectdata.f_parentname
-            this.data.operate_date = this.selectdata.sendtime
-            this.data.operator = this.selectdata.sender
-            this.showview = true
-          }else{
-            this.data.f_parentname = this.selectdata.f_parentname
-            this.data.operate_date = this.selectdata.finishtime
-            this.data.operator = this.selectdata.person
-            this.showview = true
-          }
-
+          this.data.filiale = this.selectdata.f_filiale
+          this.data.f_parentname = this.selectdata.f_parentname
+          this.data.operate_date = this.selectdata.finishtime
+          this.data.operator = this.selectdata.sender
+          this.showview = true
         } else if (sum == 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
         } else {

package/src/components/product/Supervisory/SupervisoryList.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="d1">
-    <div class="left col-sm-12" style="height:90%;">
+    <div class="left col-sm-12">
       <criteria-paged :model="model" v-ref:cp>
-        <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri style="padding: 20px;background-color:  #f6f6f6;">
           <form novalidate class="" partial>
             <div class="col-sm-12">
               <div class="col-sm-2 ">
@@ -53,15 +53,7 @@
                   </v-select>
                 </div>
               </div>
-              <div class="col-sm-2" >
-                <label class="col-sm-4 control-label">支付账户</label>
-                <div class="col-sm-8">
-                  <v-select style="min-width: 100%;" @change="$dispatch('setQueryCondition',model)" :options="[{label:'全部',value:''},{label:'安泰',value:'安泰'},{label:'欣泰',value:'欣泰'}]"
-                            condition="f_payment_account = '{}'" placeholder='支付账户'
-                            v-model="model.f_payment_account" :value.sync="model.f_payment_account" close-on-select>
-                  </v-select>
-                </div>
-              </div>
+
             </div>
             <div class="col-sm-12" style="margin-top:5px;">
               <div class="col-sm-2">
@@ -128,7 +120,7 @@
                 </div>
               </div>
               <div class="col-sm-1" style="margin-left:20px;">
-                <button style="margin-left:5%;" class="btn btn-primary btn-sm width-80 button_spacing" type="button" @click="search(),$parent.$parent.cleaner()">
+                <button style="margin-left:5%;" class="btn btn-primary btn-sm width-80 button_spacing" type="button" @click="search(),$parent.$parent.close()">
                   <span class="glyphicon glyphicon-search"></span>查询
                 </button>
                 <button class="btn-primary btn btn-sm button_spacing" @click.prevent="$parent.$parent.clear()">清空</button>
@@ -172,15 +164,6 @@
               <th>
                 <nobr>报建类型</nobr>
               </th>
-              <th>
-                <nobr>应缴金额</nobr>
-              </th>
-              <th>
-                <nobr>已缴金额</nobr>
-              </th>
-              <th>
-                <nobr>未缴金额</nobr>
-              </th>
               <th>
                 <nobr>报建日期</nobr>
               </th>
@@ -221,15 +204,6 @@
               <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_type}}</nobr>
               </td>
-              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-                <nobr>{{row.f_total_cost}}</nobr>
-              </td>
-              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-                <nobr>{{row.f_cumulative_money}}</nobr>
-              </td>
-              <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
-                <nobr>{{row.f_unaccounts_money}}</nobr>
-              </td>
               <td @click="$parent.$parent.$parent.check(row)" style="text-align: center;">
                 <nobr>{{row.f_apply_date}}</nobr>
               </td>
@@ -238,15 +212,6 @@
         </data-grid>
       </criteria-paged>
     </div>
-    <div  class="flex" style="height: 10%;width: 100%;">
-      <div novalidate class="form-inline auto" partial>
-        <p class="bg-info text-center" style="padding: 8px;font-size: 20px">合计收费记录共
-          <span style="color: red">{{model.rows.length}}</span>笔，
-          合计应缴总金额<span style="color: red">{{price.rows[0].f_total_cost}}</span>元，
-          已缴<span style="color: red">{{price.rows[0].f_cumulative_money}}</span>元，未缴<span  style="color: red">{{price.rows[0].f_unaccounts_money}}</span>元
-        </p>
-      </div>
-    </div>
   </div>
 </template>
 <script>
@@ -281,18 +246,9 @@
         model: new PagedList('rs/sql/supervisory', 20, {
           data: {
             id: `${this.$login.f.name}`,
-            fengongsi: `${this.$login.f.f_fengongsi}`,
-            f_product_id :0
-          }
-        }),
-        modeluse: new PagedList('rs/sql/supervisory', 999999, {
-          data: {
-            id: `${this.$login.f.name}`,
-            fengongsi: `${this.$login.f.f_fengongsi}`,
-            f_product_id :0
+            fengongsi: `${this.$login.f.f_fengongsi}`
           }
         }),
-        price: new PagedList('rs/sql/getChargeAllSum', 999999, {orderitem: '`f_total_cost`'}),
         condition: '',
         select: '',
         alloptions:[]
@@ -301,30 +257,10 @@
     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.search()
+      this.$refs.cp.$refs.cri.search()
       this.getConfig();
     },
     methods: {
-      selfSearch (args) {
-        args.condition = args.condition + ` and u.f_filiale = '${this.$login.f.f_fengongsi}' `
-        this.model.search(args.condition,args.model)
-      },
-      search () {
-        let startDate = Util.toStandardDateString() + ' 00:00:00'
-        let endDate = Util.toStandardDateString() + ' 23:59:59'
-        this.$refs.cp.$refs.cri.condition = this.$refs.cp.$refs.cri.condition + ` and u.f_filiale = '${this.$login.f.f_fengongsi}' `
-        this.$refs.cp.$refs.cri.search()
-      },
-      cleaner () {
-        Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = ''
-        })
-      let condition = this.$refs.cp.$refs.cri.condition + ` and u.f_filiale = '${this.$login.f.f_fengongsi}' `
-        // console.log('condition2:', this.$refs.cp.$refs.cri.condition)
-        // this.modeluse.search(condition)
-        this.price.search(condition)
-        this.$dispatch('close')
-      },
       clear(){
         Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
           this.$refs.cp.$refs.cri.model[key] = []
@@ -400,12 +336,12 @@
   }
 </script>
 <style>
-  /*label {*/
-  /*  display: flex;*/
-  /*  justify-content:center;*/
-  /*  align-items:Center;*/
-  /*  padding-top: 8px;*/
-  /*}*/
+  label {
+    display: flex;
+    justify-content:center;
+    align-items:Center;
+    padding-top: 8px;
+  }
   tr.title {
     background-color: #6666ff;
   }

package/src/components/product/stopInfo/ApplyStopInfo.vue

@@ -230,8 +230,7 @@
                 model: new PagedList('rs/sql/checkuserStop', 20, {
                     data: {
                         id: this.$login.f.id,
-                        fengongsi: this.$login.f.f_fengongsi,
-                        f_product_id: 0
+                        fengongsi: this.$login.f.f_fengongsi
                     }
                 }),
                 condition: '',

package/src/ezhouAndroid.js

@@ -11,8 +11,6 @@ export default function () {
 /** ***************************报建模块*********************************/
   // 报建 总入口
   Vue.component('apply_app', (resolve) => { require(['./components/app_apply/ApplyApp'], resolve) })
-  // 报建 总入口
-  Vue.component('one-to-many', (resolve) => { require(['./components/app_apply/OneToMany'], resolve) })
   // 报建 待办流程页
   Vue.component('placecontrolerapp', (resolve) => { require(['./components/app_apply/PlaceControler'], resolve) })
   // 报建 已办事项
@@ -43,6 +41,4 @@ export default function () {
   Vue.component('feiminyongvv', (resolve) => { require(['./components/app_apply/ezhou/FeiMinYongVV'], resolve) })
   // Vue.component('hetong-minyong', (resolve) => { require(['./components/app_apply/ezhou/HeTongMinYong'], resolve) })
   // Vue.component('hetong-feiminyongv', (resolve) => { require(['./components/app_apply/ezhou/HeTongFeiMinYongV'], resolve) })
-  // 工程 待办事项
-  Vue.component('gongcheng', (resolve) => { require(['./components/app_apply/Gongcheng'], resolve) })
 }

package/src/plugins/commonService.js

@@ -5,7 +5,7 @@ let openEticketGen = async function (param, type, conf) {
   let getEticket = await Vue.resetpost('rs/logic/bjcombineData', {param: param, charge_type: type, eticket: conf}, {resolveMsg: null, rejectMsg: '获取电子票数据出错'})
   console.log('获取的电子票数据', getEticket)
   try{
-    let url= await Vue.resetpost('rs/logic/bjopenEticket', {sell_id: param.id,eticket_id:getEticket.data.eticket_id,conf:conf},{resolveMsg: null, rejectMsg: null})
+    let url= await Vue.resetpost('rs/logic/bjopenEticket', {sell_id: param.id,eticket_id:getEticket.data,conf:conf},{resolveMsg: null, rejectMsg: null})
     return url
   }catch (e) {
     Vue.showAlert(`电子发票开票失败,请在发票管理处重新开具`,'warning',3000)