apply-clients 3.5.5-8 → 3.5.5-80

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>

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

@@ -43,7 +43,7 @@
               <nobr>{{row.f_pcd}}</nobr>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_slice_area}}</nobr>
+              <nobr>{{row.f_community}}</nobr>
             </td>
             <td style="text-align: center;">
               <nobr>{{row.f_street}}</nobr>

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

@@ -4,6 +4,45 @@
       <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%"
@@ -54,7 +93,7 @@
             </th>
           </tr>
           <tr>
-            <th :colspan='$parent.spans' style="font-weight: normal; text-align: center;">
+            <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>
@@ -70,9 +109,9 @@
           </tr>
           <tfoot>
           </tfoot>
-        </table>
+      </table>
       </div>
-    </criteria-paged>
+    </criteria-page d>
   </div>
 </template>
 <script>
@@ -83,6 +122,9 @@ export default {
   data () {
     return {
       printTime: this.$login.toStandardTimeString(),
+      curorgid: [this.$login.f.orgid],
+      curdepid: [],
+      curuserid: [],
       depresid: [],
       userresid: [],
       f_orgid: this.$login.f.orgid,
@@ -98,40 +140,70 @@ export default {
       orgCondtionStr: '1=1',
       model: new DataModel('rs/report/fgChargeRecord', {
         startDate: 'this.model.startDate', endDate: 'this.model.endDate',
-        f_orgid: 'this.model.f_orgid'
+        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'
-    this.searchData()
   },
   created () {
   },
   methods: {
-    searchData () {
-      this.$refs.paged.$refs.criteria.search()
-    },
     selfSearch(args) {
-      console.log(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)
     },
-    getRes (obj) {
-      this.orgname = obj.res[0]
-      this.f_orgid = obj.resids
+    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)
-    },
-    'this.$refs.paged.$refs.criteria.model.f_insurance_company' (val) {
-      console.log(val)
     }
   }
 }

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

@@ -1,17 +1,19 @@
-import Vue from 'vue'
-
-let specialComp = {
-  'service-control': (resolve) => { require(['./pc/ServiceControl'], resolve) },
-  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect'], resolve) },
-  'installation-details': (resolve) => { require(['./pc/InstallationDetails'], resolve) },
-  'add-material-science': (resolve) => { require(['./pc/addMaterialScience'], resolve) },
-  'apply-address-userinfo-management': (resolve) => { require(['./pc/addressAndUserinfoManagement'], resolve) },
-  'apply-replacement': (resolve) => { require(['./pc/AddReplacement'], resolve) },
-  'apply-devices-management': (resolve) => { require(['./pc/devicesManagement'], resolve) },
-  'apply-charge-report': (resolve) => { require(['./pc/chargeReport'], resolve) },
-  '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) }
-}
-exports.specialComp = specialComp
+import Vue from 'vue'
+
+let specialComp = {
+  'service-control': (resolve) => { require(['./pc/ServiceControl'], resolve) },
+  'exploration-select': (resolve) => { require(['./pc/ExplorationSelect'], resolve) },
+  'installation-details': (resolve) => { require(['./pc/InstallationDetails'], resolve) },
+  'add-material-science': (resolve) => { require(['./pc/addMaterialScience'], resolve) },
+  'apply-address-userinfo-management': (resolve) => { require(['./pc/addressAndUserinfoManagement'], resolve) },
+  'apply-replacement': (resolve) => { require(['./pc/AddReplacement'], resolve) },
+  'apply-devices-management': (resolve) => { require(['./pc/devicesManagement'], resolve) },
+  'apply-charge-report': (resolve) => { require(['./pc/chargeReport'], resolve) },
+  'service-view': (resolve) => { require(['./pc/serviceview'], resolve) },
+  'apply-charge-list': (resolve) => { require(['./pc/ApplyChargeList'], resolve) },
+  'apply-print-chargepc': (resolve) => { require(['./pc/printChargepc'], 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