apply-clients 3.4.1 → 3.4.2-FuGu-4

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

@@ -1,207 +1,207 @@
-<template>
-  <work-busy :is-busy="showWork" v-show="showWork"></work-busy>
-
-  <div class="col-sm-12" style="margin: 20px 0px;">
-    <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>
-      </criteria>
-      <data-grid :model="model" v-ref:grid partial='list' class="list_area table_sy" style="padding: 0px">
-        <template partial='head'>
-          <tr>
-            <th class="textNoLineBreak">序号</th>
-            <th class="textNoLineBreak">区/县</th>
-            <th class="textNoLineBreak">片区</th>
-            <th class="textNoLineBreak">街道</th>
-            <th class="textNoLineBreak">小区</th>
-            <th class="textNoLineBreak">详细地址</th>
-            <th class="textNoLineBreak">地址状态</th>
-            <th class="textNoLineBreak">客户编号</th>
-            <th class="textNoLineBreak">用户姓名</th>
-            <th class="textNoLineBreak">电话</th>
-            <th class="textNoLineBreak">证件类型</th>
-            <th class="textNoLineBreak">证件号码</th>
-            <th class="textNoLineBreak">时间</th>
-            <th class="textNoLineBreak">
-              <button type="button" class="btn btn-info head-but"
-                      :disabled="$parent.$parent.$parent.mark === 1"
-                      @click="$parent.$parent.$parent.showFileModal()">导入</button>
-              <a type="button" class="btn btn-info head-but"
-                      href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>
-            </th>
-          </tr>
-        </template>
-        <template partial='body'>
-          <tr>
-            <td style="text-align: center;">
-              <nobr>{{$index+1}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_pcd}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_slice_area}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_street}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_residential_area}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_address}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_address_state}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_userinfo_code}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_user_name}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_user_phone}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_credentials}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_idnumber}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>{{row.f_create_date}}</nobr>
-            </td>
-            <td style="text-align: center;">
-              <nobr>
-
-              </nobr>
-            </td>
-          </tr>
-        </template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-  <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
-    <header slot="modal-header" class="modal-header">
-      <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
-      <h4 class="modal-title">选择文件</h4>
-    </header>
-    <article slot="modal-body" class="modal-body">
-      <div class="form-group">
-        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
-      </div>
-    </article>
-    <footer slot="modal-footer" class="modal-footer"></footer>
-  </modal>
-</template>
-<script>
-import {PagedList} from 'vue-client'
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '地址管理',
-  props: {
-    selectdata: {
-      type: Object
-    },
-    mark: {
-      type: Number,
-      default: 0        // 0：正常  1：禁用
-    }
-  },
-  data () {
-    return {
-      showFile: false,
-      model: new PagedList('rs/sql/getAddressAanUserinfo', 20, {
-        data: {
-          f_filialeid: this.$login.f.orgid,
-          f_process_id: this.selectdata.f_process_id
-        }
-      }),
-      showWork: false
-    }
-  },
-  ready () {
-    this.search()
-  },
-  methods: {
-    showFileModal() {
-      this.showFile = !this.showFile
-    },
-    async search () {
-      this.$refs.cp.$refs.cri.search()
-    },
-    // 关闭文件上传对话框
-    closeFile() {
-      this.showWork = false
-      this.showFile = false
-      // 将选的文件清空
-      this.$refs.file.$el.querySelector('input').value = ''
-      this.search()
-    }
-  },
-  events: {
-    'beforeFileUpload' (file) {
-      this.showWork = true
-    },
-    async 'onFileUpload'(file, result) {
-      let data = {
-        selectdata: this.selectdata,
-        filepath: result.f_downloadpath,
-        user: this.$login.f,
-        mark: this.mark
-      }
-
-      try {
-        let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data: data}, {
-          resolveMsg: null,
-          rejectMsg: '导入失败！！！',
-          silent: true
-        }, 0)
-      } catch (e) {
-        // this.closeFile()
-      } finally {
-        this.closeFile()
-      }
-
-    }
-  },
-  computed: {
-  },
-  watch: {
-    'model.count': {
-      handler: function () {
-        if (this.model.count != this.selectdata.f_apply_count) {
-          console.log(this.model.count)
-          console.log(this.selectdata.f_apply_count)
-          console.log(this.model.count !== this.selectdata.f_apply_count)
-          this.selectdata.f_apply_count = this.model.count
-
-          this.$resetpost(
-            'rs/entity/t_apply',
-            this.selectdata,
-            {resolveMsg: null, rejectMsg: '数据更新失败！！！'}
-          ).then(res => {
-            this.$dispatch('breakControl', this.selectdata)
-          })
-        }
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-  .textNoLineBreak {
-    white-space: nowrap;
-  }
-  .head-but{
-    margin-left: 5px;
-    height: 34px;
-    /*background-color: #6aa6e2;*/
-    border-radius: 4px;
-    font-family: PingFang;
-    color: #ffffff;
-  }
-</style>
+<template>
+  <work-busy :is-busy="showWork" v-show="showWork"></work-busy>
+
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <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>
+      </criteria>
+      <data-grid :model="model" v-ref:grid partial='list' class="list_area table_sy" style="padding: 0px">
+        <template partial='head'>
+          <tr>
+            <th class="textNoLineBreak">序号</th>
+            <th class="textNoLineBreak">区/县</th>
+            <th class="textNoLineBreak">片区</th>
+            <th class="textNoLineBreak">街道</th>
+            <th class="textNoLineBreak">小区</th>
+            <th class="textNoLineBreak">详细地址</th>
+            <th class="textNoLineBreak">地址状态</th>
+            <th class="textNoLineBreak">客户编号</th>
+            <th class="textNoLineBreak">用户姓名</th>
+            <th class="textNoLineBreak">电话</th>
+            <th class="textNoLineBreak">证件类型</th>
+            <th class="textNoLineBreak">证件号码</th>
+            <th class="textNoLineBreak">时间</th>
+            <th class="textNoLineBreak">
+              <button type="button" class="btn btn-info head-but"
+                      :disabled="$parent.$parent.$parent.mark === 1"
+                      @click="$parent.$parent.$parent.showFileModal()">导入</button>
+              <a type="button" class="btn btn-info head-but"
+                      href="/apply/download/excel/批量导入.xlsx" download>模板下载</a>
+            </th>
+          </tr>
+        </template>
+        <template partial='body'>
+          <tr>
+            <td style="text-align: center;">
+              <nobr>{{$index+1}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_pcd}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_slice_area}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_street}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_residential_area}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_address}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_address_state}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_userinfo_code}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_name}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_user_phone}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_credentials}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_idnumber}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_create_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>
+
+              </nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+  <modal :show.sync="showFile" v-ref:modal backdrop="true" title="选择文件">
+    <header slot="modal-header" class="modal-header">
+      <button type="button" class="close" @click="closeFile"><span>&times;</span></button>
+      <h4 class="modal-title">选择文件</h4>
+    </header>
+    <article slot="modal-body" class="modal-body">
+      <div class="form-group">
+        <file-upload class="my-file-uploader" name="useraddressUploadFile" action="rs/file/uploadFile" tagname="确定" multiple v-ref:file></file-upload>
+      </div>
+    </article>
+    <footer slot="modal-footer" class="modal-footer"></footer>
+  </modal>
+</template>
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '地址管理',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0        // 0：正常  1：禁用
+    }
+  },
+  data () {
+    return {
+      showFile: false,
+      model: new PagedList('rs/sql/getAddressAanUserinfo', 20, {
+        data: {
+          f_filialeid: this.$login.f.orgid,
+          f_process_id: this.selectdata.f_process_id
+        }
+      }),
+      showWork: false
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    showFileModal() {
+      this.showFile = !this.showFile
+    },
+    async search () {
+      this.$refs.cp.$refs.cri.search()
+    },
+    // 关闭文件上传对话框
+    closeFile() {
+      this.showWork = false
+      this.showFile = false
+      // 将选的文件清空
+      this.$refs.file.$el.querySelector('input').value = ''
+      this.search()
+    }
+  },
+  events: {
+    'beforeFileUpload' (file) {
+      this.showWork = true
+    },
+    async 'onFileUpload'(file, result) {
+      let data = {
+        selectdata: this.selectdata,
+        filepath: result.f_downloadpath,
+        user: this.$login.f,
+        mark: this.mark
+      }
+
+      try {
+        let res = await this.$resetpost(`rs/logic/importAddressAndUserinfo`, {data: data}, {
+          resolveMsg: null,
+          rejectMsg: '导入失败！！！',
+          silent: true
+        }, 0)
+      } catch (e) {
+        // this.closeFile()
+      } finally {
+        this.closeFile()
+      }
+
+    }
+  },
+  computed: {
+  },
+  watch: {
+    'model.count': {
+      handler: function () {
+        if (this.model.count != this.selectdata.f_apply_count) {
+          console.log(this.model.count)
+          console.log(this.selectdata.f_apply_count)
+          console.log(this.model.count !== this.selectdata.f_apply_count)
+          this.selectdata.f_apply_count = this.model.count
+
+          this.$resetpost(
+            'rs/entity/t_apply',
+            this.selectdata,
+            {resolveMsg: null, rejectMsg: '数据更新失败！！！'}
+          ).then(res => {
+            this.$dispatch('breakControl', this.selectdata)
+          })
+        }
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+  .textNoLineBreak {
+    white-space: nowrap;
+  }
+  .head-but{
+    margin-left: 5px;
+    height: 34px;
+    /*background-color: #6aa6e2;*/
+    border-radius: 4px;
+    font-family: PingFang;
+    color: #ffffff;
+  }
+</style>

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

@@ -140,7 +140,7 @@
           <div class="form-group col-sm-12" :class="[$v.f_charge_money.required ? 'has-error' : '']">
             <label class="col-sm-2 control-label">收费金额：</label>
             <div class="col-sm-10">
-              <input type="number"
+              <input type="input"
                      class="form-control input_view"
                      style="width: 100%"
                      placeholder="0.00"
@@ -477,7 +477,6 @@ export default {
         resolveMsg: null,
         rejectMsg: '缴费失败！！！'
       })
-      this.selectdata = res.data
 
       this.$dispatch('breakControl', this.selectdata)
     },
@@ -548,37 +547,33 @@ export default {
     },
     async getUserAddress() {
       let http = new HttpResetClass()
-      let data = {}
-      let url = null
-      if (this.selectdata.f_apply_type === '改管报建' || this.selectdata.f_apply_type === '增容报建') {
-        data = {
-          condition: `ui.f_userinfo_id = ${this.selectdata.f_userinfo_id}`
-        }
-        url = 'rs/sql/applyGetUserinfos'
-      } else {
-        data = {
-          condition: this.selectdata.f_apply_type === '散户集体报建' ? `nvl(cr.f_cumulative_payment_money, 0) < ${this.selectdata.f_price}` : '1=1',
-          f_process_id: this.selectdata.f_process_id
-        }
-        url = 'rs/sql/getAddresAndCumulativePayment'
+      let data = {
+        condition: '1=1',
+        f_process_id: this.selectdata.f_process_id
       }
-      let res = await http.load('POST', url, {data:data}, {
+      let res = await http.load('POST', 'rs/sql/getAddresAndCumulativePayment', {data: data}, {
         resolveMsg: null,
-        rejectMsg: '用户获取失败！！！'
+        rejectMsg: null
       })
 
-      if (res.data.length <= 0) {
-        this.$showAlert('暂无需要缴费用户！！！', 'warning', 3000)
-      }
-
-      this.useraddresList = res.data.map(item => {
-        return {
-          // 有用户姓名地址后拼接姓名
-          label: `${item.f_address} ${isEmpty(item.f_user_name) ? '' : '--- ' + item.f_user_name}`,
-          value: item
-        }
-      })
+      this.useraddressList = res.data
+      // if (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)
+      //   })
+      // }
 
+      if (this.useraddressList.length > 0) {
+        this.useraddressList = this.useraddressList.map(item => {
+          return {
+            // 有用户姓名地址后拼接姓名
+            label: `${item.f_address} ${isEmpty(item.f_user_name) ? '' : '--- ' + item.f_user_name}`,
+            value: item
+          }
+        })
+      }
     },
     async showChargeModal() {
       this.getUserAddress()