apply-clients 5.0.35-ezhou-2 → 5.0.35-ezhou-4

package/src/components/product/Process/Processes/selectUserinfo.vue

@@ -0,0 +1,183 @@
+<template>
+  <div style="margin-bottom: 20px;" class="form-group select-overspread">
+    <label class="control-label-justify control-label col-sm-3">选择用户</label>
+    <div class="col-sm-10" style="top: 42px;">
+      <button class="button_search button_spacing" type="button" style="width: max-content;position: absolute" @click="openSelect" :disabled="mark === 1">选择</button>
+    </div>
+  </div>
+
+  <modal v-if="showselect" :show.sync="showselect" width="80%" title="用户信息" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body" style="height: 600px!important;">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='$parent.$parent.searchCondition' v-ref:cri>
+          <div novalidate 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" style="width:60%" class="input_search" placeholder='客户编号' v-model="model.f_userinfo_code"
+                       v-on:keyup.enter="search"
+                       condition="ui.f_userinfo_code = '{}'">
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户名称：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                       v-on:keyup.enter="search" condition="ui.f_user_name like '%{}%'" placeholder='客户名称'>
+              </div>
+              <div class="form-group col-sm-3">
+                <label class="font_normal_body">客户电话：</label>
+                <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
+                       v-on:keyup.enter="search" condition="ui.f_user_phone = '{}'" placeholder='客户电话'>
+              </div>
+
+              <div class="form-group col-sm-3 button-range">
+                <button class="button_search button_spacing" @click.prevent="search" v-el:cx>查询</button>
+                <button class="button_clear button_spacing"  @click.prevent="$parent.$parent.$parent.clear()">清空</button>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.$parent.criteriaShow = !$parent.$parent.$parent.criteriaShow"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$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" v-model="model.f_address"
+                       v-on:keyup.enter="search" condition="ua.f_address like '%{}%'" placeholder='客户地址'>
+              </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 style="white-space: nowrap;">序号</th>
+              <th style="white-space: nowrap;">客户编号</th>
+              <th style="white-space: nowrap;">客户名称</th>
+              <th style="white-space: nowrap;">客户电话</th>
+              <th style="white-space: nowrap;">地址信息</th>
+              <th style="white-space: nowrap;">选择</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_userinfo_code }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_name }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_phone }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_address }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>
+                  <button type="button" name="button" class="button_export" @click.prevent="$parent.$parent.$parent.$parent.select(row)">确认选择</button>
+                </font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '收费管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showselect: false,
+      model: new PagedList('rs/sql/applyGetUserinfos', 20, null),
+      criteriaShow: false
+    }
+  },
+  ready () {
+  },
+  methods: {
+    select (row) {
+      this.$dispatch('selectUserinfo', row)
+
+      this.showselect = false
+    },
+    searchCondition (args) {
+      args.condition = `${args.condition}`
+
+      this.model.search(args.condition, args.model)
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    openSelect () {
+      this.showselect = true
+      setTimeout(() => {
+        this.$refs.cp.$refs.cri.search()
+      }, 100)
+    }
+  },
+  events: {
+  },
+  computed: {
+  },
+  watch: {
+  }
+}
+</script>
+<style scoped>
+.control-label-justify {
+  top: 42px;
+  display: inline-block;
+  vertical-align: top;
+  width: 110px;
+  text-align: justify;
+  font-family: PingFang-SC-Bold;
+}
+
+.control-label-justify::after {
+  content: "";
+  display: inline-block;
+  width: 100%;
+  overflow: hidden;
+  height: 0;
+}
+.input_view{
+  padding: 8px;
+  background-color: #ffffff;
+  border-radius: 2px;
+  border: solid 1px #c7c7c7!important;
+  color: #333333!important;
+  font-size: 15px!important;
+}
+
+.input_view[readonly]{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+.input_view:disabled{
+  border: 1px solid #DDD!important;
+  color:#ACA899!important;
+}
+</style>

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">
+        <div class="col-sm-12 form-group form-group1">
           <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']">
+                 :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']">
               <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']">
+                 :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']">
               <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,6 +106,7 @@
 
             </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']">
@@ -122,7 +123,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">
+            <table v-show="!datagrid.hidden" class="table table-bordered table-striped table-hover" style="margin-top: 80px">
               <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">
@@ -146,6 +147,9 @@
               </tr>
             </table>
           </div>
+          <div v-for="(i,item) in data.components" >
+            <component v-if="item.device === 'pc' || !item.device" :is="item.name" :selectdata="data" :mark="item.mark"></component>
+          </div>
         </div>
         <div class="col-sm-12 form-group text-center" style="padding-top:20px">
             <div class="form-group  col-sm-2 center-block">
@@ -506,6 +510,12 @@
       },
       // 初始化数据
       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++) {
@@ -776,7 +786,9 @@
     text-align: justify;
     font-family: PingFang-SC-Bold;
   }
-
+  .component-style{
+    top: 42px;
+  }
   .control-label-justify::after {
     content: "";
     display: inline-block;
@@ -797,4 +809,7 @@
   tr {
     height: 34px;
   }
+  .form-group{
+    margin-top:20px;
+  }
 </style>

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

@@ -20,6 +20,7 @@
 </template>
 <script>
   import {HttpResetClass} from 'vue-client'
+  import Vue from "vue";
   export default {
     title: '报建监控控制层',
     props: ['selectdata'],
@@ -36,6 +37,45 @@
       },
       // 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 = []
@@ -83,21 +123,18 @@
             this.data.fields[i].options = [{label: '全部', value: ''}, ...rs]
           }
 
-
-          if (this.selectdata[this.data.fields[i].field]) {
-            this.data.fields[i].value = this.selectdata[this.data.fields[i].field]
-          }
+          this.data.fields[i].value = this.selectdata[this.data.fields[i].field]
 
           if (typeof this.data.fields[i].value === 'string' && this.data.fields[i].value.startsWith("{") && this.data.fields[i].value.endsWith("}")) {
             this.data.fields[i].value = JSON.parse(this.data.fields[i].value)
           }
           this.data.fields[i].readonly = true
           this.data.fields[i].disabled = true
-            if(this.$login.r.find(value => value == '报建流程修改') && this.data.f_apply_type=='个人报建' && this.$login.r.includes('报建流程修改')){
+            if(this.$login.r.find(value => value == '报建流程修改') && this.$login.r.includes('报建流程修改')){
             this.data.fields[i].readonly = false
             this.data.fields[i].disabled = false
           }
-          if(this.$login.r.find(value => value == '集体报建流程修改') && this.data.f_apply_type=='集体报建' && this.$login.r.includes('报建流程修改')){
+          if(this.$login.r.find(value => value == '集体报建流程修改')  && this.$login.r.includes('报建流程修改')){
               this.data.fields[i].readonly = false
               this.data.fields[i].disabled = false
           }
@@ -117,7 +154,7 @@
           }
         }
         this.data.buttons = null
-        if( this.$login.r.find(value => value == '报建流程修改')  && this.data.f_apply_type=='个人报建' ){
+        if( this.$login.r.find(value => value == '报建流程修改')  ){
           // 仅留保存按钮
           this.data.buttons = [
             {
@@ -125,7 +162,7 @@
             }
           ]
         }
-        if(this.data.f_apply_type=='集体报建' && this.$login.r.includes('集体报建流程修改')){
+        if(this.$login.r.includes('集体报建流程修改')){
           // 仅留保存按钮
           this.data.buttons = [
             {
@@ -133,13 +170,115 @@
             }
           ]
         }
-
       }
     },
     events:{
       'getmodel'(){
         return this.$refs.service_show.getmodel()
       },
+      async 'onetomanydelete'(i, j) {
+        let http = new HttpResetClass()
+        let data = {
+          tables: this.$refs.service_show.data.onetomany[i].tables,
+          row: this.$refs.service_show.model.rows[i][j]
+        }
+        await  http.load('POST', 'rs/logic/applyDeleteValue', {data: data}, {
+          resolveMsg: null,
+          rejectMsg: 'onetomanydelete失败'
+        }).then(() => {
+          this.$dispatch('selfsearch')
+          this.$refs.service_show.model.rows[i].splice(j, 1)
+        })
+      },
+      //获取view层confirm事件
+      async 'confirm'(tables, row, showadd_index, j) {
+        debugger
+        var _this = this
+        for (let i = 0; i < tables.length; i++) {
+          let datas = {
+            tables: tables,
+            row: row
+          }
+          console.log("看看datas")
+          console.log(datas)
+          console.log("看看showadd_index")
+          console.log(showadd_index)
+          datas.row['f_process_id'] = this.selectdata.f_process_id
+          datas.row['f_apply_num'] = this.selectdata.f_apply_num
+          datas.row['f_filiale'] = this.selectdata.f_filiale
+          let http = new HttpResetClass()
+          let sellid = ''
+          let billtype = datas.row['f_bill_style']
+          if (tables[i] == 't_charge_record') {
+            await this.loadbuyer()
+            if (this.buyerinfo.rows.length < 1 && billtype === '增值税电子发票' && this.$appdata.getSingleValue('默认打印票据') === '是') {
+              this.$showAlert('未找到购买方信息，请去报建功能"购买方信息"中完善购买方信息后再收费', 'info', 2000)
+              this.$refs.service_show.model.rows[showadd_index].splice(j, 1)
+              this.$refs.service_show.initializtion()
+              return
+            }
+            datas.row.f_charging_status = '有效'
+            datas.row.f_is_correct = '否'
+            datas.row.f_charge_collectors = this.$login.f.name
+            datas.row.f_amount_words=this.smalltoBIG(datas.row.f_charge_money)
+            await http.load('POST', 'rs/logic/applycharge', datas, {
+              resolveMsg: null,
+              rejectMsg: '收费保存失败'
+            }).then((res) => {
+              sellid = JSON.parse(res.data.sellid).id
+              for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+                //
+                // if (this.$refs.service_show.data.fields[i].label == '累计缴费金额') {
+                //   this.$refs.service_show.data.fields[i].value = res.data.f_cumulative_money
+                // }
+                //
+                // if (this.$refs.service_show.data.fields[i].label == '未结总金额') {
+                //   this.$refs.service_show.data.fields[i].value = res.data.f_unaccounts_money
+                // }
+
+              }
+              let temp = _this.$refs.service_show.model.rows[showadd_index][j]
+              temp.id = sellid
+              _this.$refs.service_show.model.rows[showadd_index][j] = temp
+            })
+            if (this.$appdata.getSingleValue('默认打印票据') && this.$appdata.getSingleValue('默认打印票据') === '是') {
+              this.$showMessage('是否打票据', ['confirm', 'cancel']).then((res) => {
+                if (res === 'confirm') {
+                  console.log('打印票据')
+                  if (billtype === '增值税电子发票') {
+                    this.selectsellid = sellid
+                    this.showbuyerinfo = true
+                  } else {
+                    this.printbill(sellid)
+                  }
+                  for (let i = 0; i < this.$refs.service_show.data.fields.length; i++) {
+                    if (this.$refs.service_show.data.fields[i].label == '累计开票金额') {
+                      console.log("计算累计开票金额")
+                      this.$refs.service_show.data.fields[i].value = parseInt(this.$refs.service_show.data.fields[i].value) + this.datas.row.f_cumulative_invoicing
+                    }
+                  }
+                }
+              })
+            }
+            // 刷新列表数据
+            console.log("刷新一下")
+            this.$dispatch('selfsearch')
+            console.log("刷新完成")
+          } else {
+            debugger
+            await http.load('POST', 'rs/logic/saveentity', datas, {
+              resolveMsg: null,
+              rejectMsg: 'onetomany保存失败'
+            }).then((res) => {
+              // 刷新列表数据
+              this.$dispatch('selfsearch')
+              let temp = _this.$refs.service_show.model.rows[showadd_index][j]
+              temp.id = res.data.id
+              _this.$refs.service_show.model.rows[showadd_index][j] = temp
+            })
+          }
+        }
+      },
       // 获取view层button事件/
       async 'button'(model) {
         let http = new HttpResetClass()
@@ -340,6 +479,9 @@
             // xxx xx xxx
             if (this.$refs.service_show.data.fields[k].label === '县/区' && this.$refs.service_show.data.fields[k].value) {
               address += this.$refs.service_show.data.fields[k].value
+              if (address.indexOf('湖北省')!=-1){
+                address = address.replace('湖北省','')
+              }
             }
             if (this.$refs.service_show.data.fields[k].label === '街道名称' && this.$refs.service_show.data.fields[k].value) {
               address += this.$refs.service_show.data.fields[k].value
@@ -390,11 +532,18 @@
           this.data = jsonData
           this.initializtion()
           // 完成时间和完成人,部门，分公司
-          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
+          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
+          }
+
         } else if (sum == 0) {
           this.$showMessage(`没有在JSON配置文件中找到活动名为:(${this.selectdata.defname})的节点配置`)
         } else {