apply-clients 3.2.34 → 3.2.48

package/src/components/product/{Process → Apply/Process}/Processes/chargeManagement.vue

@@ -5,7 +5,6 @@
           <tr>
             <th class="textNoLineBreak">序号</th>
             <th class="textNoLineBreak" v-if="$parent.$parent.selectdata.f_apply_type !== '开发商集体报建'">地址</th>
-            <th class="textNoLineBreak">缴费编号</th>
             <th class="textNoLineBreak">收费金额</th>
             <th class="textNoLineBreak">金额大写</th>
             <th class="textNoLineBreak">付款方式</th>
@@ -34,9 +33,6 @@
             <td style="text-align: center;" v-if="$parent.$parent.selectdata.f_apply_type !== '开发商集体报建'">
               <nobr>{{row.f_useraddress}}</nobr>
             </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_charge_number}}</nobr>
-            </td>
             <td style="text-align: center;">
               <nobr>{{row.f_charge_money}}</nobr>
             </td>
@@ -73,16 +69,9 @@
                   type="button"
                   name="button"
                   class="btn btn-link"
-                  :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
+                  :disabled="$parent.$parent.mark === 1 || row.f_charging_status === '作废'"
                   @click="$parent.$parent.showInvalidModal(row)"
                 >作废</button>
-
-                <button
-                  type="button"
-                  name="button"
-                  class="btn btn-link"
-                  @click="$parent.$parent.showPrintModal(row)"
-                >打印预览</button>
               </nobr>
             </td>
           </tr>
@@ -147,7 +136,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-          v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '煤改气报建'"
+          v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">单价（户）：</label>
           <div class="col-sm-10">
@@ -159,7 +148,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-             v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '煤改气报建'"
+             v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">累计缴费金额：</label>
           <div class="col-sm-10">
@@ -171,7 +160,7 @@
           </div>
         </div>
         <div class="form-group col-sm-12"
-             v-if="selectdata.f_apply_type === '散户集体报建' || selectdata.f_apply_type === '煤改气报建'"
+             v-if="selectdata.f_apply_type === '散户集体报建'"
         >
           <label class="col-sm-2 control-label">未结金额：</label>
           <div class="col-sm-10">
@@ -297,23 +286,10 @@
         <button type="button" class="btn btn-primary" @click="invalidApplyCharge()">确认作废</button>
       </footer>
     </modal>
-
-    <modal v-if="showPrint" :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false" title="打印预览">
-      <header slot="modal-header" class="modal-header">
-        <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
-        <h4 class="modal-title">打印预览</h4>
-      </header>
-      <article slot="modal-body" class="modal-body clearfix">
-        <apply-print-charge :selectdata="selectdata" :charge="charge" v-ref:print></apply-print-charge>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-        <button type="button" class="btn btn-primary" @click="print()">打印</button>
-      </footer>
-    </modal>
   </div>
 </template>
 <script>
-import {getNowDate,isEmpty} from '../../../Util'
+import {getNowDate,isEmpty} from '../../../../Util'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 
@@ -332,7 +308,6 @@ export default {
     return {
       showCharge: false,
       showInvalid: false,
-      showPrint: false,
       model: {
         data: null
       },
@@ -347,16 +322,6 @@ export default {
     this.search()
   },
   methods: {
-    print () {
-      this.$refs.print.showInput = false
-      setTimeout(() => {
-        this.$refs.print.$refs.print.PrintTable()
-      }, 10)
-    },
-    showPrintModal(row) {
-      this.charge = row
-      this.showPrint = true
-    },
     changeUseraddress() {
       this.charge.f_useraddress_id = this.chargeUseraddress.id
     },
@@ -407,7 +372,7 @@ export default {
         this.$showAlert('单笔收费不能超过未交总金额！！！', 'warning', 3000)
         return
       }
-      if (this.selectdata.f_apply_type === '散户集体报建' || this.selectdata.f_apply_type === '煤改气报建') {
+      if (this.selectdata.f_apply_type === '散户集体报建') {
         if (Number(this.charge.f_charge_money) > Number(this.selectdata.f_price)) {
           this.$showAlert('单笔收费不能超过单价！！！', 'warning', 3000)
           return
@@ -477,15 +442,11 @@ export default {
         rejectMsg: null
       })
 
-      this.useraddressList = res.data
-      if (this.selectdata.f_apply_type === '散户集体报建' || this.selectdata.f_apply_type === '煤改气报建') {
-        // 去除累计缴费金额大于等于单价的用户地址
-        this.useraddressList = res.data.filter(item => {
-          let f_cumulative_payment_money = isEmpty(item.f_cumulative_payment_money) ? 0 : item.f_cumulative_payment_money
-          return Number(f_cumulative_payment_money) < Number(isEmpty(this.selectdata.f_price) ? 0 : this.selectdata.f_price)
-        })
-      }
-
+      // 去除累计缴费金额大于等于单价的用户地址
+      this.useraddressList = res.data.filter(item => {
+        let f_cumulative_payment_money = isEmpty(item.f_cumulative_payment_money) ? 0 : item.f_cumulative_payment_money
+        return Number(f_cumulative_payment_money) < Number(this.selectdata.f_price)
+      })
       if (this.useraddressList.length > 0) {
         this.useraddressList = this.useraddressList.map(item => {
           return {
@@ -517,7 +478,6 @@ export default {
     closeModal() {
       this.showCharge = false
       this.showInvalid = false
-      this.showPrint = false
       this.charge = {}
       this.chargeUseraddress = null
       this.search()

package/src/components/product/{Process → Apply/Process}/Processes/supplementalAgreement.vue

@@ -185,7 +185,7 @@
   </div>
 </template>
 <script>
-import {getNowDate,isEmpty} from '../../../Util'
+import {getNowDate,isEmpty} from '../../../../Util'
 import {PagedList} from 'vue-client'
 import {HttpResetClass} from 'vue-client'
 export default {

package/src/components/product/{Process → Apply/Process}/Service/ServiceControl.vue

@@ -10,7 +10,7 @@
 <script>
   import Vue from 'vue'
   import {HttpResetClass} from 'vue-client'
-  import {getNowDate,isEmpty} from '../../../Util'
+  import {getNowDate,isEmpty} from '../../../../Util'
   // Date格式化
   Date.prototype.Format = function (fmt) {
     var o = {
@@ -140,8 +140,8 @@
               if (this.data.buttons[i].source){
                 let http = new HttpResetClass()
                 let res = await http.load('POST', 'rs/search', {
-                  source: this.data.buttons[i].source,
-                  userid: this.$login.f.id
+                    source: this.data.buttons[i].source,
+                    userid: this.$login.f.id
                 }, {resolveMsg: null, rejectMsg: null})
 
                 let options = []
@@ -284,12 +284,9 @@
           throw '未结金额大于0，无法提交！！！'
         }
         if (model.defname === '施工' && model.button.button_name === '提交') {
-          if (model.f_apply_type === '开发商集体报建' && this.getLableValue('未安装户数') > 0) {
-            throw `还有${this.getLableValue('未安装户数')}户未安装，无法提交`
-          }
           let http = new HttpResetClass()
           let data = {
-            condition: `ui.f_process_id = '${model.f_process_id}' and uf.f_table_state = '待开通'`
+            f_process_id: model.f_process_id
           }
           let res = await http.load('POST', 'rs/sql/notInstalled', {data: data}, {resolveMsg: null, rejectMsg: null})
           if (res.data[0].num > 0) {
@@ -333,60 +330,6 @@
             item.value = null
           }
         }
-      },
-      async getStreetList () {
-        let data = {
-          tablename: 't_street',
-          condition: `f_filialeid = ${this.$login.f.orgid} and f_street is not null`
-        }
-
-        let res = await this.$resetpost(
-          `rs/sql/singleTable`,
-          {data: data},
-          {resolveMsg: null, rejectMsg: '街道查询失败，请重新进入！！！'}
-        )
-
-        let streetList = []
-
-        res.data.forEach(item => {
-          streetList.push({
-            label: item.f_street,
-            value: item.f_street
-          })
-        })
-
-        for (const item of this.show_data.fields) {
-          if (item.label === '街道') {
-            item.options = streetList
-          }
-        }
-      },
-      async getAreaList () {
-        let data = {
-          tablename: 't_area',
-          condition: `f_filialeid = ${this.$login.f.orgid} and f_street = '${this.getLableValue('街道')}'`
-        }
-
-        let res = await this.$resetpost(
-          `rs/sql/singleTable`,
-          {data: data},
-          {resolveMsg: null, rejectMsg: '小区查询失败，请重新进入！！！'}
-        )
-
-        let areaList = []
-
-        res.data.forEach(item => {
-          areaList.push({
-            label: item.f_residential_area,
-            value: item.f_residential_area
-          })
-        })
-
-        for (const item of this.show_data.fields) {
-          if (item.label === '小区') {
-            item.options = areaList
-          }
-        }
       }
       // ========================= 武安 =================================
     },
@@ -437,11 +380,6 @@
       },
       async 'initializtionView'() {
         // ========================= 武安 =================================
-        this.addressType()
-
-        if (this.show_data.defname === '用户受理' && this.show_data.f_apply_type === '散户报建') {
-          await this.getStreetList()
-        }
         // ========================= 武安 =================================
       },
       // 失去焦点出触发事件
@@ -452,7 +390,7 @@
           if (this.show_data.fields[index].label === '地址类型'){
             this.addressType()
           }
-          if (this.show_data.fields[index].label === '街道' && this.show_data.f_apply_type !== '散户报建'){
+          if (this.show_data.fields[index].label === '街道'){
             console.log('-----------添加街道-----------')
             if (this.show_data.fields[index].value === null || this.show_data.fields[index].value === '') {
               this.show_data.fields[index].value = null
@@ -484,11 +422,7 @@
               }
             }
           }
-          if (this.show_data.fields[index].label === '街道' && this.show_data.f_apply_type === '散户报建') {
-            this.setLabelValue('小区', '')
-            await this.getAreaList()
-          }
-          if (this.show_data.fields[index].label === '小区' && this.show_data.f_apply_type !== '散户报建'){
+          if (this.show_data.fields[index].label === '小区'){
             if (this.show_data.fields[index].value === null || this.show_data.fields[index].value === '') {
               this.show_data.fields[index].value = null
               this.$showAlert('小区名称不能为空！！！', 'warning', 3000)
@@ -587,11 +521,13 @@
               f_address = this.getLableValue('街道') +
                 this.getLableValue('小区') +
                 this.getLableValue('楼号') +
-                (isEmpty(this.getLableValue('楼号')) ? '' : '-') +
+                (isEmpty(this.getLableValue('楼号')) ? '' : '号楼') +
                 this.getLableValue('单元') +
-                (isEmpty(this.getLableValue('单元')) ? '' : '-') +
+                (isEmpty(this.getLableValue('单元')) ? '' : '单元') +
+                this.getLableValue('楼层') +
+                (isEmpty(this.getLableValue('楼层')) ? '' : '层') +
                 this.getLableValue('门牌号') +
-                (isEmpty(this.getLableValue('门牌号')) ? '' : '')
+                (isEmpty(this.getLableValue('门牌号')) ? '' : '室')
             }
             this.setLabelValue('地址',f_address)
           }

package/src/components/product/{Supervisory → Apply/Supervisory}/Service/SupervisoryServiceControl.vue

@@ -75,14 +75,9 @@
       // json配置数据处理
       async initializtion() {
         this.data.fields.forEach(item => {
-
           if (this.selectdata[item.field]) {
             item.value = this.selectdata[item.field]
           }
-          if (this.selectdata[item.field] === 0) {
-            item.value = this.selectdata[item.field]
-          }
-
           // 如果配置类型为select,获取options
           if(item.type==='select'){
             item.options=[]

package/src/components/product/{Supervisory → Apply/Supervisory}/SupervisoryControl.vue

@@ -1,26 +1,25 @@
 <template>
   <div class="flex-row">
-    <div class="basic-main">
-      <div :class="showData ? 'top' : 'auto'">
-        <supervisory-list v-ref:query :show-data="showData"></supervisory-list>
+    <div class="basic-main" style="overflow:auto;">
+      <div class="tops" v-bind:style="{ height: topheight }">
+        <supervisory-list v-ref:queryuser></supervisory-list>
       </div>
-      <div v-if="showtotal" style="height: 89%">
-        <div class="col-sm-2">
+      <div v-if="showtotal" v-bind:style="{ height: botheight }">
+        <div class="col-sm-2" v-if="showbasic">
           <supervisory-chart :selectdata="selectdata"></supervisory-chart>
         </div>
         <div class="col-sm-10">
           <tabset v-ref:tabs :close="false">
-            <tab :header='selectdata.defname'>
+            <tab :header='selectdata.defname' style="background-color :#ffffff!important;overflow: auto;">
               <supervisory-service-control :selectdata="selectdata" :node-snapshot="true"></supervisory-service-control>
             </tab>
-            <tab header='附件'>
+            <tab header='附件' style="background-color :#ffffff!important;overflow: auto;">
               <apply-upload :blodid="selectdata.f_process_id"
                             :isupload = "false"
                             :isdelete="false"
                             :isusetype="true"
                             :isremark = "true"
                             :takeimg="false"
-                            :issearch="true"
                             :defname="selectdata.defname">
               </apply-upload>
             </tab>
@@ -38,9 +37,14 @@
     title: '流程监控',
     data () {
       return {
+        flagl: false,
+        flagg: false,
+        showbasic: false, // 控制节点列表显示
         showtotal: false, // 控制详细信息显示
-        showData: true,
         selectdata: {},
+        botheight: '0%',   // 详细信息显示高度
+        topheight: '100%', // 工程列表显示高度
+        info: '流程监控',
         xmlname: '' // 配置文件名称
       }
     },
@@ -75,6 +79,7 @@
       async 'apply' (val) {
         this.selectdata = val
         this.showtotal = false
+        this.showbasic = false
 
         if (this.selectdata.f_apply_type === '开发商集体报建') {
           this.xmlname = '开发商集体报建流程'
@@ -86,8 +91,6 @@
           this.xmlname = '工商户报建流程'
         } else if (this.selectdata.f_apply_type === '散户集体报建') {
           this.xmlname = '散户集体报建流程'
-        } else if (this.selectdata.f_apply_type === '煤改气报建') {
-          this.xmlname = '散户集体报建流程'
         } else {
           this.$showMessage('暂无此类报装')
           return
@@ -96,20 +99,38 @@
         // 获取配置文件
         await this.loadName()
 
-        this.$refs.query.$refs.cp.pager = false
-        this.showData = false
-
+        this.topheight = '10%'
+        this.botheight = '90%'
+        // this.$refs.queryuser.$refs.cp.$refs.grid.model.rows = [val]
+        this.$refs.queryuser.$refs.cp.pager = false
+        this.showbasic = true
         this.showtotal = true
+
       },
-      'search' () {
-        // 关闭详细
+      'close'() {
+        this.showbasic = false
         this.showtotal = false
-        // 显示列表数据
-        this.showData = true
-        // 显示分页
-        this.$refs.query.$refs.cp.pager = true
-        // 调用查询
-        this.$refs.query.$refs.cp.$refs.cri.search()
+        this.topheight = '100%'
+        this.botheight = '0%'
+        this.$refs.queryuser.$refs.cp.$refs.cri.search()
+        this.$refs.queryuser.$refs.cp.pager = true
+      },
+      'hidden' (criteriaShow) {
+        if (!this.showtotal && !criteriaShow) {
+
+        }
+        if (!this.showtotal && criteriaShow) {
+
+        }
+        if (this.showtotal && !criteriaShow) {
+          this.topheight = '20%'
+          this.botheight = '80%'
+        }
+        if (this.showtotal && criteriaShow) {
+          this.topheight = '10%'
+          this.botheight = '90%'
+        }
+
       }
     },
 

package/src/components/product/{Supervisory → Apply/Supervisory}/SupervisoryList.vue

@@ -22,11 +22,11 @@
                      condition="f_contract_number = '{}'">
             </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_search button_spacing" @click="search(),$parent.$parent.close()" 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"
+                @click="$parent.$parent.hidden()"
                 class="button_spacing"
                 style="float: right">
               </div>
@@ -76,7 +76,7 @@
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd 00:00:00'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
                           condition="f_apply_date >= '{}'">
               </datepicker>
@@ -87,7 +87,7 @@
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd 23:59:59'"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
                           :show-reset-button="true"
                           condition="f_apply_date <= '{}'">
               </datepicker>
@@ -95,7 +95,7 @@
           </div>
         </div>
       </criteria>
-      <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
+      <data-grid :model="model" partial='list' v-ref:grid class="list_area table_sy">
         <template partial='head'>
           <tr>
             <th style="white-space: nowrap;">序号</th>
@@ -151,10 +151,9 @@
 <script>
   import {PagedList} from 'vue-client'
   import {HttpResetClass} from 'vue-client'
-  import {isEmpty} from '../../Util'
+  import {isEmpty} from '../../../Util'
   export default {
     title: '勘探详情',
-    props: ['showData'],
     data () {
       return {
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
@@ -170,18 +169,14 @@
     },
     ready () {
       // 调用查询
-      this.search()
+      this.$refs.cp.$refs.cri.search()
     },
     events: {
     },
     methods: {
-      // 查询
-      search () {
-        this.$dispatch('search')
-      },
       clear () {
         Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
-          this.$refs.cp.$refs.cri.model[key] = []
+          this.$refs.cp.$refs.cri.model[key] = null
         })
       },
       applyTypeChange () {
@@ -196,8 +191,15 @@
           this.defnames = [{label: '全部', value: ''}]
         }
       },
+      hidden () {
+        this.$dispatch('hidden', this.criteriaShow)
+        this.criteriaShow = !this.criteriaShow
+      },
       check (val) {
         this.$dispatch('apply', val)
+      },
+      close () {
+        this.$dispatch('close')
       }
     },
     computed: {

package/src/components/product/{Supervisory → Apply/Supervisory}/SupervisoryhCart.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="overflow: auto;background-color: #FFFFFF;margin-top: 20px">
+    <div style="overflow: auto;background-color: #FFFFFF">
       <div class="row" v-for="(i,row) in defnames">
         <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="getdefname(row)" >
           {{row.defname}}