apply-clients 3.5.5-9 → 3.5.5-91

package/src/filiale/fugou/pc/ExplorationSelect.vue

@@ -54,7 +54,7 @@
               <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="$parent.$parent.search()"
-                     condition="ui.f_userinfo_code like '%{}%'">
+                     condition="u.f_userinfo_code like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">工程编号：</label>
@@ -418,11 +418,10 @@
 
         data.f_sub_state = "新增"
         data.f_apply_source = "线下发起"
-        data.f_process_id = await this.getProcessId(data.processname)
-
+        // data.f_process_id = await this.getProcessId()
+        data.workname=data.processname
         // 调用ExplorationUser事件
         this.$dispatch('apply', data)
-
         this.applyType = null
         this.showModal = false
       },

package/src/filiale/fugou/pc/InstallationDetails.vue

@@ -138,7 +138,7 @@
                    :readonly="mark === 1"/>
           </div>
         </div>
-        <div class="form-group col-sm-6" :class="[item.f_metertitles ? '' : 'has-error']">
+        <div class="form-group col-sm-6" >
           <label class="col-sm-4 control-label">表&ensp;封&ensp;号：</label>
           <div class="col-sm-8">
             <input class="form-control input_view" style=""

package/src/filiale/fugou/pc/ServiceControl.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="" v-if="showview">
+    <work-busy :is-busy="isBusy" ></work-busy>
     <show-back-reason :selectdata="show_data"></show-back-reason>
     <service-view v-ref:serviceview :data="show_data"></service-view>
   </div>
@@ -31,6 +32,7 @@
     props: ['selectdata'],
     data () {
       return {
+        isBusy: false,
         data: null, // 数据库数据，json配置文件数据的数据集合
         json_datas: null, // Json配置文件集合
         showview: false, // 控制显示service-view组件
@@ -529,9 +531,15 @@
       },
       // 缴费前置
       chargeBefore () {
-        if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
-          this.$showAlert('费用未结清！！！', 'warning', 3000)
-          throw null
+        if(Number(this.show_data.f_due_money)>0){
+          if(Number(this.show_data.f_discount_amount) >= Number(this.show_data.f_due_money)){
+            return
+          }else{
+            if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
+              this.$showAlert('费用未结清！！！', 'warning', 3000)
+              throw null
+            }
+          }
         }
       },
       // 缴费前置
@@ -593,6 +601,8 @@
         }
       },
       async qualitytesting () {
+        //主流程在质检流程时，再判断工程施工是否结束。
+        await this.materialinput()
         let http = new HttpResetClass()
         let data = {
           condition: `f_parent_process_id = '${this.show_data.f_process_id}'`,
@@ -1531,13 +1541,18 @@
             this.show_data.button.button_name = '转散户'
           }
         }
-        let res = await this.$resetpost(
-          `rs/logic/ApplyProductService`,
-          {data: this.show_data},
-          {resolveMsg: null, rejectMsg: '数据保存失败'}
-        )
-
-
+        this.isBusy=true
+        try {
+          let res = await this.$resetpost(
+            `rs/logic/ApplyProductService`,
+            {data: this.show_data},
+            {resolveMsg: null, rejectMsg: '数据保存失败'}
+          )
+        }catch (e) {
+          console.log(e)
+        }finally {
+          this.isBusy=false
+        }
         if (this.show_data.button.after) {
           this[this.show_data.button.after]()
         }
@@ -1581,17 +1596,29 @@
       },
       selectSearch (val, index) {},
       'onblur' (index) {
-        if(this.show_data.fields[index].label==="优惠金额"){
-          let contract=this.getLableValue('合同金额')
-          let add=this.getLableValue('追加款')
-          let money = this.getLableValue('优惠金额')
-          //转为数字，然后contract减去money，保留两位小数
-          let money_num = parseFloat(money)
-          let add_num = parseFloat(add)
-          let contract_num = parseFloat(contract)
-          let new_contract = contract_num+add_num - money_num
-          this.setLabelValue('应交金额', new_contract.toFixed(2))
+        if(this.show_data.f_apply_type === '改管报建'){
+          if(this.show_data.fields[index].label==="优惠金额"){
+            let contract=this.getLableValue('总金额')
+            let money = this.getLableValue('优惠金额')
+            let contract_num = parseFloat(contract)
+            let money_num = parseFloat(money)
+            let new_contract = contract_num - money_num
+            this.setLabelValue('应交金额', new_contract.toFixed(2))
+          }
+        }else{
+          if(this.show_data.fields[index].label==="优惠金额"){
+            let contract=this.getLableValue('合同金额')
+            let add=this.getLableValue('追加款')
+            let money = this.getLableValue('优惠金额')
+            //转为数字，然后contract减去money，保留两位小数
+            let money_num = parseFloat(money)
+            let add_num = parseFloat(add)
+            let contract_num = parseFloat(contract)
+            let new_contract = contract_num+add_num - money_num
+            this.setLabelValue('应交金额', new_contract.toFixed(2))
+          }
         }
+
       },
       'oninput' (index) {},
       'initializtionView' () {},

package/src/filiale/fugou/pc/StopApplyList.vue

@@ -0,0 +1,291 @@
+<template>
+  <div class="col-sm-12">
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='search' 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_apply_num"
+                     v-on:keyup.enter="search"
+                     condition="f_apply_num like '%{}%'">
+            </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="$parent.$parent.search()" condition="a.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" placeholder='用户地址' v-model="model.f_address"
+                     v-on:keyup.enter="search"
+                     condition="f_address like '%{}%'">
+            </div>
+            <div class="form-group col-sm-2 button-range">
+              <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
+              <button class="button_clear button_spacing"  @click="$parent.$parent.clear()">清空</button>
+              <div
+                :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                class="button_spacing"
+                style="float: right">
+              </div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShow">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">组织机构：</label>
+              <res-select
+                restype='organization'
+                :initresid='$parent.$parent.curorgid'
+                @res-select="$parent.$parent.getorg"
+                is-mul="false"
+              ></res-select>
+            </div>
+            <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="$parent.$parent.search()"
+                     condition="f_userinfo_code like '%{}%'">
+            </div>
+            <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_phone"
+                     v-on:keyup.enter="search"
+                     condition="f_phone like '%{}%'">
+            </div>
+            <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_contract_number"
+                     v-on:keyup.enter="search"
+                     condition="f_contract_number = '{}'">
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建类型：</label>
+              <v-select
+                v-model="model.f_apply_type"
+                placeholder='报建类型'
+                condition="f_apply_type = '{}'"
+                :value.sync="model.f_apply_type"
+                :options='$parent.$parent.applytype'
+                class="select select_list"
+                :value-single="true"
+                @change="$parent.$parent.applyTypeChange()"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">类型：</label>
+              <v-select
+                v-model="model.f_type"
+                placeholder='报建类型'
+                condition="f_type = '{}'"
+                :value.sync="model.f_type"
+                :options='$parent.$parent.types'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">办理环节：</label>
+              <v-select
+                v-model="model.defname"
+                placeholder='办理环节'
+                condition="defname = '{}'"
+                :value.sync="model.defname"
+                :options='$parent.$parent.defnames'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建性质：</label>
+              <v-select
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label  for="startDate" class="font_normal_body">开始时间：</label>
+              <datepicker id="startDate" placeholder="开始日期"
+                          style="width: 60%!important;"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :format="'yyyy-MM-dd 00:00:00'"
+                          :show-reset-button="true"
+                          condition="f_stop_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">结束时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="f_stop_date <= '{}'">
+              </datepicker>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
+        <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>
+            <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>
+            <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>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <dropdown v-if="row.f_type === '暂停报建' && row.f_state === '有效'">
+                <button type="button" data-toggle="dropdown" style="border: 0px;background: none;">
+                  <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
+                </button>
+                <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-left">
+                  <li>
+                    <a href="#" @click="$parent.$parent.$parent.click(row)">撤销</a>
+                  </li>
+                </ul>
+              </dropdown>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_apply_num}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_name}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_contact}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_phone}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_apply_type}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.defname}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_type}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_state}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_stop_reason}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_stop_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_operator}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_cancel_reason}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_cancel_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_cancel_operator}}</nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import {isEmpty} from '../../../components/Util'
+export default {
+  title: '勘探详情',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getStopApply', 20, {
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }),
+      curorgid: [this.$login.f.orgid],
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      types: [{label: '全部', value: ''},{label: '暂停报建', value: '暂停报建'}, {label: '终止报建', value: '终止报建'}],
+      defnames: [{label: '全部', value: ''}], // 流程节点
+      applyNatures: [{label: '全部', value: ''}], // 报建性质
+      criteriaShow: false
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  events: {
+  },
+  methods: {
+    // 查询
+    search () {
+      this.$dispatch('search')
+    },
+    click (row) {
+      this.$dispatch('cancelStopApply', row)
+    },
+    async applyTypeChange () {
+      if (!isEmpty(this.$refs.cp.$refs.cri.model.f_apply_type)) {
+        let res = await this.$resetpost('rs/logic/getDefnameByType',
+          { f_apply_type: this.$refs.cp.$refs.cri.model.f_apply_type },
+          {resolveMsg: null, rejectMsg: '节点信息获取失败！！！'}
+        )
+
+        this.defnames = [{label: '全部', value: ''}, ...res.data]
+
+        this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
+      } else {
+        this.defnames = [{label: '全部', value: ''}]
+
+        this.applyNatures = [{label: '全部', value: ''}]
+      }
+    },
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = null
+      })
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.model.params.data.orgid = val[0]
+    }
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+</style>