apply-clients 3.5.5-9 → 3.5.5-90

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

@@ -1,143 +1,215 @@
-<template>
-  <div class="basic-main"  style="height: 100%">
-    <criteria-paged :model="model" :pager='false' v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
-        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
-          <div class="row">
-            <div class="col-sm-2" >
-              <label class="font_normal_body" for="startDate">开始日期:</label>
-              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
-                          v-model="model.startDate"
-                          :value.sync="model.startDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          condition="cr.f_charge_date > '{}'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div>
-            <div class="col-sm-2" >
-              <label  class="font_normal_body" for="endDate">结束日期:</label>
-              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
-                          v-model="model.endDate"
-                          :value.sync="model.endDate"
-                          :disabled-days-of-Week="[]"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
-                          condition="cr.f_charge_date < '{}'"
-                          :show-reset-button="reset">
-              </datepicker>
-            </div><br>
-          </div>
-          <div class="span" style = "float:right;">
-            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
-            <report-print id='gasprice1' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
-            <report-excel id='gasprice1'></report-excel>
-          </div>
-        </div>
-      </criteria>
-      <div  partial='list' v-el:handcollect id='gasprice1' style="overflow-y: scroll">
-        <table class='tableprint' style="margin: 0px auto">
-          <thead>
-          <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
-              <h3 style="text-align: center">报建收费报表</h3>
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
-              开始时间：{{ $refs.criteria.model.startDate }}&nbsp;&nbsp;&nbsp;
-              结束时间：{{ $refs.criteria.model.endDate }}
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
-              打印时间：{{{$parent.printTime}}}
-            </th>
-          </tr>
-          <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
-              <div>
-                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
-                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
-                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
-              </div>
-            </th>
-          </tr>
-          </thead>
-          <tr>
-            <td :colspan='$parent.spans' class="norder">
-              {{{ model.data.substring(26,model.data.length-8) }}}
-            </td>
-          </tr>
-          <tfoot>
-          </tfoot>
-        </table>
-      </div>
-    </criteria-paged>
-  </div>
-</template>
-<script>
-import { DataModel } from 'vue-client'
-export default {
-  title: '报建收费报表',
-  props: ['data'],
-  data () {
-    return {
-      printTime: this.$login.toStandardTimeString(),
-      depresid: [],
-      userresid: [],
-      f_orgid: this.$login.f.orgid,
-      f_depid: this.$login.f.depids,
-      f_operatorid: this.$login.f.id,
-      operatorid: [],
-      depid: [],
-      orgname: '',
-      depname: '',
-      operatorname: '',
-      f_inputtor: [],
-      f_user_type: '',
-      orgCondtionStr: '1=1',
-      model: new DataModel('rs/report/fgChargeRecord', {
-        startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'
-      }),
-      reportStr: null,
-      spans: 0,
-    }
-  },
-  ready () {
-    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
-    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
-    this.searchData()
-  },
-  created () {
-  },
-  methods: {
-    searchData () {
-      this.$refs.paged.$refs.criteria.search()
-    },
-    selfSearch(args) {
-      console.log(args)
-      let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
-      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
-      this.$refs.paged.search(args)
-    },
-    getRes (obj) {
-      this.orgname = obj.res[0]
-      this.f_orgid = obj.resids
-    }
-  },
-  watch: {
-    'model.data' (val) {
-      this.spans = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
-    },
-    'this.$refs.paged.$refs.criteria.model.f_insurance_company' (val) {
-      console.log(val)
-    }
-  }
-}
-</script>
-<style scoped>
-.noborder {
-  border: none;
-}
-</style>
+<template>
+  <div class="basic-main"  style="height: 100%">
+    <criteria-paged :model="model" :pager='false' v-ref:paged>
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:criteria>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial >
+          <div class="row">
+            <div class="col-sm-2">
+              <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="col-sm-2">
+              <label class="font_normal_body">部&emsp;&emsp;门：</label>
+              <res-select
+                restype='department'
+                :parentresid="$parent.$parent.curorgid"
+                :initresid='$parent.$parent.curdepid'
+                @res-select="$parent.$parent.getdep"
+                :is-mul="true"
+              ></res-select>
+            </div>
+            <div class="col-sm-2">
+              <label class="font_normal_body">人&emsp;&emsp;员：</label>
+              <res-select
+                restype='user'
+                :parentresid="$parent.$parent.curdepid"
+                :initresid='$parent.$parent.curuserid'
+                @res-select="$parent.$parent.getuser"
+                :is-mul="true"></res-select>
+            </div>
+            <div class="col-sm-2" >
+              <label class="font_normal_body" for="startDate">分组项:</label>
+              <v-select
+                     :value.sync="model.f_public_group1"
+                        v-model="model.f_public_group1"
+                        v-ref:groupone
+                        :options='$parent.$parent.group1'
+                        placeholder='请选择'
+                        close-on-select
+              ></v-select>
+            </div>
+            <div class="col-sm-2" >
+              <label class="font_normal_body" for="startDate">开始日期:</label>
+              <datepicker id="startDate" placeholder="开始日期" style="width: 60%"
+                          v-model="model.startDate"
+                          :value.sync="model.startDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="cr.f_charge_date > '{}'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div>
+            <div class="col-sm-2" >
+              <label  class="font_normal_body" for="endDate">结束日期:</label>
+              <datepicker id="endDate" placeholder="结束日期" style="width: 60%"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :disabled-days-of-Week="[]"
+                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          condition="cr.f_charge_date < '{}'"
+                          :show-reset-button="reset">
+              </datepicker>
+            </div><br>
+          </div>
+          <div class="span" style = "float:right;">
+            <button class="button_search" @click="$parent.$parent.searchData()">查询</button>
+            <report-print id='gasprice1' top='1cm' left='0' width='100%' height='100%' :preview="true"></report-print>
+            <report-excel id='gasprice1'></report-excel>
+          </div>
+        </div>
+      </criteria>
+      <div  partial='list' v-el:handcollect id='gasprice1' style="overflow-y: scroll">
+        <table class='tableprint' style="margin: 0px auto">
+          <thead>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: left;">
+              <h3 style="text-align: center">报建收费报表</h3>
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              开始时间：{{ $refs.criteria.model.startDate }}&nbsp;&nbsp;&nbsp;
+              结束时间：{{ $refs.criteria.model.endDate }}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+              打印时间：{{{$parent.printTime}}}
+            </th>
+          </tr>
+          <tr>
+            <th :colspan='$par ent.spans' style="font-weight: normal; text-align: center;">
+              <div>
+                <span v-show="$parent.orgname.trim()!=''">公司：{{$parent.orgname}}</span>
+                <span v-show="$parent.depname.trim()!=''"> 部门：{{$parent.depname}}</span>
+                <span v-show="$parent.operatorname.trim()!=''">人员：{{$parent.operatorname}}</span>
+              </div>
+            </th>
+          </tr>
+          </thead>
+          <tr>
+            <td :colspan='$parent.spans' class="norder">
+              {{{ model.data.substring(26,model.data.length-8) }}}
+            </td>
+          </tr>
+          <tfoot>
+          </tfoot>
+      </table>
+      </div>
+    </criteria-page d>
+  </div>
+</template>
+<script>
+import { DataModel } from 'vue-client'
+export default {
+  title: '报建收费报表',
+  props: ['data'],
+  data () {
+    return {
+      printTime: this.$login.toStandardTimeString(),
+      curorgid: [this.$login.f.orgid],
+      curdepid: [],
+      curuserid: [],
+      depresid: [],
+      userresid: [],
+      f_orgid: this.$login.f.orgid,
+      f_depid: this.$login.f.depids,
+      f_operatorid: this.$login.f.id,
+      operatorid: [],
+      depid: [],
+      orgname: '',
+      depname: '',
+      operatorname: '',
+      f_inputtor: [],
+      f_user_type: '',
+      orgCondtionStr: '1=1',
+      model: new DataModel('rs/report/fgChargeRecord', {
+        startDate: 'this.model.startDate', endDate: 'this.model.endDate',
+        f_orgid: 'this.model.f_orgid',
+        f_public_group1: 'this.model.f_public_group1[0]',
+        group1Name: 'this.model.group1Name'
+      }),
+      reportStr: null,
+      spans: 0,
+      f_public_group1: '',
+      group1Name: ''
+    }
+  },
+  ready () {
+    this.$refs.paged.$refs.criteria.model.startDate = this.$login.toStandardDateString() + ' 00:00:00'
+    this.$refs.paged.$refs.criteria.model.endDate = this.$login.toStandardDateString() + ' 23:59:59'
+  },
+  created () {
+  },
+  methods: {
+    selfSearch(args) {
+      this.$refs.paged.$refs.criteria.model.group1Name = this.$refs.paged.$refs.criteria.$refs.groupone.selectedItems
+      if (this.curuserid.length > 0) {
+        args.condition = args.condition + ` and cr.f_charge_collectors_id in (${this.curuserid})`
+      }
+      let orgcondition = 'f_orgid in (' + this.f_orgid + ')'
+      let name1 = args.model.f_public_group1
+      if (name1 == null || name1 == ''){
+        alert("请选择分组项！！！")
+        return
+      }
+      this.$refs.paged.$refs.criteria.model.f_orgid = orgcondition
+      this.$refs.paged.search(args)
+    },
+    getuser (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curuserid = val
+    },
+    getdep (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curdepid = val
+      this.curuserid = []
+    },
+    getorg (val) {
+      if (val.length <= 0) {
+        return
+      }
+      this.curorgid = val
+      this.curdepid = []
+      this.curuserid = []
+    },
+    searchData () {
+      this.$refs.paged.$refs.criteria.search()
+    }
+  },
+  computed: {
+      group1() {
+        return [{label:'报建类型', value:'f_apply_type'}, {label:'报建性质', value:'f_apply_nature'}]
+      }
+  },
+  watch: {
+    'model.data' (val) {
+      this.spans = val.split('</tr>').map(item => item.split('</td>').length - 1).reduce((x, y) => x > y ? x : y)
+    }
+  }
+}
+</script>
+<style scoped>
+.noborder {
+  border: none;
+}
+</style>

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

@@ -414,6 +414,7 @@ export default {
       this.userfile = null
 
       this.search()
+      this.$dispatch('breakControl', this.selectdata)
     }
   },
   events: {

package/src/filiale/fugou/pc.js

@@ -12,6 +12,8 @@ let specialComp = {
   'service-view': (resolve) => { require(['./pc/serviceview'], resolve) },
   'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList'], resolve) },
   'apply-print-chargepc': (resolve) => { require(['./pc/printChargepc'], resolve) },
-  'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) }
+  'stop-apply-list': (resolve) => { require(['./pc/StopApplyList'], resolve) },
+  'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) },
+  'apply-batch-dispatch': (resolve) => { require(['./pc/Applybatchdispatch'], resolve) }
 }
 exports.specialComp = specialComp

package/src/filiale/gongyi/pc/addressAndUserinfoManagement.vue

@@ -0,0 +1,187 @@
+<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">
+              <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_create_date}}</nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_userinfo_comments}}</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
+          }
+        }
+      }
+    }
+  }
+</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/filiale/gongyi/pc.js

@@ -1,24 +1,25 @@
-import Vue from 'vue'
-
-let specialComp = {
-  'service-control': (resolve) => { require(['./pc/ServiceControl'], resolve) },
-  // 已完成的流程需要能够上传附件
-  'supervisory-control': (resolve) => { require(['./pc/SupervisoryControl'], resolve) },
-  // 删除附件需要权限
-  'apply-upload': (resolve) => { require(['./pc/ApplyUpload'], resolve) },
-  //  签到记录
-  'check-records': (resolve) => { require(['./pc/CheckRecords'], resolve) },
-  'add-material-science': (resolve) => { require(['./pc/addMaterialScience.vue'], resolve) },
-  'check-records-list': (resolve) => { require(['./pc/CheckRecordsList'], resolve) },
-  'hidden-trouble': (resolve) => { require(['./pc/HiddenTrouble'], resolve) },
-  'exploration-user': (resolve) => { require(['./pc/ExplorationUser'], resolve) },
-  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect'], resolve) },
-  'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) },
-  'supervisory-service-view': (resolve) => { require(['./pc/SupervisoryServiceView'], resolve) },
-  'pc-add-logs': (resolve) => { require(['./pc/PcAddLogs'], resolve) },
-  'apply-charge-management': (resolve) => { require(['./pc/chargeManagement'], resolve) },
-  'pc-disclosure-record': (resolve) => { require(['./pc/PcDisclosurerecord'], resolve) },
-  'pc-legacy-issues': (resolve) => { require(['./pc/PcLegacyIssues'], resolve) },
-  'supplemental-agreement': (resolve) => { require(['./pc/supplementalAgreement'], resolve) }
-}
-exports.specialComp = specialComp
+import Vue from 'vue'
+
+let specialComp = {
+  'service-control': (resolve) => { require(['./pc/ServiceControl'], resolve) },
+  // 已完成的流程需要能够上传附件
+  'supervisory-control': (resolve) => { require(['./pc/SupervisoryControl'], resolve) },
+  // 删除附件需要权限
+  'apply-upload': (resolve) => { require(['./pc/ApplyUpload'], resolve) },
+  //  签到记录
+  'check-records': (resolve) => { require(['./pc/CheckRecords'], resolve) },
+  'add-material-science': (resolve) => { require(['./pc/addMaterialScience.vue'], resolve) },
+  'check-records-list': (resolve) => { require(['./pc/CheckRecordsList'], resolve) },
+  'hidden-trouble': (resolve) => { require(['./pc/HiddenTrouble'], resolve) },
+  'exploration-user': (resolve) => { require(['./pc/ExplorationUser'], resolve) },
+  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect'], resolve) },
+  'supervisory-service-control': (resolve) => { require(['./pc/SupervisoryServiceControl'], resolve) },
+  'supervisory-service-view': (resolve) => { require(['./pc/SupervisoryServiceView'], resolve) },
+  'pc-add-logs': (resolve) => { require(['./pc/PcAddLogs'], resolve) },
+  'apply-charge-management': (resolve) => { require(['./pc/chargeManagement'], resolve) },
+  'pc-disclosure-record': (resolve) => { require(['./pc/PcDisclosurerecord'], resolve) },
+  'pc-legacy-issues': (resolve) => { require(['./pc/PcLegacyIssues'], resolve) },
+  'supplemental-agreement': (resolve) => { require(['./pc/supplementalAgreement'], resolve) },
+  'apply-address-userinfo-management': (resolve) => { require(['./pc/addressAndUserinfoManagement'], resolve) }
+}
+exports.specialComp = specialComp