address-client 3.0.24-9 → 3.0.24-aode

package/src/components/areauser/AreaUser.vue

@@ -0,0 +1,233 @@
+<template>
+  <div class="flex">
+    <criteria-paged :model="model" 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="form-group col-sm-4" >
+              <label class="font_normal_body">客户编号</label>
+              <input type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" placeholder='客户编号'
+                     condition="f_userinfo_code = '{}'" @keyup.enter="search()">
+            </div>
+            <div class="form-group col-sm-4 button-range" >
+              <button class="button_search" style="margin-right: 10px" v-if="this.$login.r.includes('批量调小区')"  @click="$parent.$parent.changearea()" v-el:cba>批量调小区</button>
+              <button class="button_search" style="margin-right: 10px"  @click="search()" v-el:cba>查询</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid :model="model" class="table_sy"  partial='list' v-ref:grid >
+        <template partial='head' >
+          <tr>
+            <th><nobr>序号</nobr></th>
+            <th><nobr>客户编号</nobr></th>
+            <th><nobr>客户名称</nobr></th>
+            <th><nobr>客户地址</nobr></th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <tr >
+            <td style="text-align:center;">{{$index+1}}</td>
+            <td style="text-align:center"><span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></td>
+            <td style="text-align:center">{{row.f_user_name}}</td>
+            <td style="text-align:center;white-space: nowrap;">{{row.f_address}}</td>
+          </tr>
+        </template>
+        <template partial='foot'></template>
+      </data-grid>
+    </criteria-paged>
+
+
+    <modal :show.sync="show" width="40%" backdrop="false">
+
+      <header slot="modal-header" class="modal-header">
+        <h4 class="modal-title" style="text-align: center;">小区调整</h4>
+      </header>
+      <article slot="modal-body" class="modal-body">
+        <div class="panel panel-primary datapanel">
+          <form class="form-horizontal select-overspread">
+            <div class="form-group">
+              <div class="row bg-info text-center text-center" style="height:35px">
+                <div style="float: left">
+                  <label class="font_normal_body">旧小区信息</label>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%">
+                <div class="col-sm-6 flex-row ">
+                  <label class="control-label">小区名称</label>
+                  <p class="form-control-static">{{model.rows[0].f_residential_area}}</p>
+                </div>
+                <div class="col-sm-6 flex-row ">
+                  <label class="control-label">可调整用户数</label>
+                  <p class="form-control-static">{{model.count}}</p>
+                </div>
+              </div>
+              <div class="row bg-info text-center text-center" style="height:35px">
+                <div style="float: left">
+                  <label class="font_normal_body">新小区信息</label>
+                </div>
+              </div>
+              <div class="row" style="margin-top: 2%">
+
+                <div class="col-sm-6 flex-row" >
+                  <label class="control-label">小区名称</label>
+                  <v-select :value.sync="newinfo.residential_id" v-model="newinfo.residential_id"
+                            placeholder='小区名称' :options="areaslist" value-single
+                            close-on-select  v-ref:name></v-select>
+                </div>
+
+              </div>
+            </div>
+          </form>
+        </div>
+
+
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+        <button :disabled="battchbuttonClick" class="button_search" @click="modifyUser">确认</button>
+        <button type="button" class="button_clear" @click='close'>取消</button>
+      </footer>
+
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+
+
+  let loadParamGem = async function (self) {
+    console.log('执行了')
+    await self.initareas(` f_filialeid = '${self.f_filialeid}'`)
+  }
+  export default {
+    title: '小区使用人',
+    data () {
+      return {
+         model: new PagedList('rs/sql/getareauser', 20, {}),
+        condition:'',
+        getfield: {},
+        show:false,
+        gasproperties: [],
+        newinfo:{
+          residential_id:''
+        },
+        battchbuttonClick:false,  //批量调整确认按钮
+        areaslist:[]
+      }
+    },
+    props: ['f_residential_area_id','f_residential_area','f_filialeid'],
+    ready () {
+      this.search()
+      loadParamGem(this)
+    },
+    methods: {
+      async initareas(pconditon){
+        // if(this.usertype){
+        //   pconditon=pconditon+` and  f_special='1' `
+        // }
+        this.areaslist = []
+        let HttpReset = new HttpResetClass()
+        let req = await HttpReset.load('POST', 'rs/sql/address_singleTableOrderBy?pageNo=1&pageSize=9999999', {
+          data: {
+            items: '*',
+            tablename: 't_area',
+            orderitem: 'id',
+            condition: pconditon
+          }
+        }, {resolveMsg: null, rejectMsg: '获取地址失败!'})
+        let redata = []
+        req.data.forEach((row) => {
+          redata.push({
+            label: row.f_residential_area,
+            value: row.id,
+            data: row,
+            id: row.id
+          })
+        })
+        this.areaslist=redata
+      },
+      close() {
+        this.show = false
+        this.newinfo = {
+          residential_id:''
+        }
+      },
+      async modifyUser () {
+        if(this.newinfo.residential_id == ''){
+          this.$showAlert('请选择新小区后进行点击!','warning',1000)
+          return;
+        }
+        if(this.f_filialeid ==''){
+          this.$showAlert('请选择组织后进行点击!','warning',1000)
+          return;
+        }
+        //将调整按钮改为不可点击
+        this.battchbuttonClick = true
+        let param={
+          f_oldresidential_area_id: this.f_residential_area_id,
+          f_oldresidential_area: this.model.rows[0].f_residential_area,
+          f_filialeid:this.f_filialeid,
+          f_operator : this.$login.f.name,
+          f_operatorid : this.$login.f.id,
+          f_orgid : this.$login.f.orgid,
+          f_orgname : this.$login.f.orgs,
+          f_depid :this.$login.f.depids,
+          f_depname : this.$login.f.deps,
+          f_residential_area_id:this.newinfo.residential_id
+        }
+
+        let res =  await this.$resetpost('rs/logic/changeareaUser', {data: param}, {resolveMsg: '更新成功', rejectMsg: '更新失败'})
+        this.$showMessage(`成功批量修改了${res.data}位用户的小区`)
+        this.criteriaShow = false
+        this.close()
+        this.search ()
+      },
+      search() {
+        this.$refs.paged.$refs.criteria.search()
+      },
+      changearea(){
+        this.battchbuttonClick=false
+        this.show=true
+      },
+      selfSearch(args) {
+        if(this.f_filialeid==null || this.f_filialeid == ''){
+          this.$showAlert("请选择组织进行操作!!",'warning',2000);
+          return;
+        }
+        args.condition = `${args.condition} and id = '${this.f_residential_area_id}' and f_orgid = ${this.f_filialeid}`
+        this.condition = args.condition
+        this.model.search(args.condition, args.model)
+      },
+      dealmsg (val) {
+        this.$parent.f_userinfo_id=val.f_userinfo_id
+        this.$parent.listpage=false
+      },
+      getPricenames () {
+        console.log('气价。，。。', this.newinfo.pricetype, this.newinfo.f_user_type, this.newinfo.f_gasproperties)
+        let rs = []
+        if (this.newinfo.f_user_type.length === 1 && this.newinfo.f_gasproperties.length === 1 && this.newinfo.pricetype.length === 1) {
+          let params = {
+            f_user_type: this.newinfo.f_user_type[0],
+            f_gasproperties: this.newinfo.f_gasproperties[0],
+            f_price_type: this.newinfo.pricetype[0],
+            filter: this.f_filialeid
+          }
+          rs = this.$GetSaleParam.getPrice(params)
+        }
+        if (rs.length === 0) {
+          this.newinfo.f_price_name = ''
+        }
+        return rs
+      },
+    },
+    watch:{
+      'f_residential_area_id'(){
+        this.search()
+      },
+      'f_filialeid' (val) {
+        loadParamGem(this)
+      }
+    }
+  }
+</script>

package/src/main.js

@@ -9,7 +9,7 @@ Vue.config.silent = true
 
 /** **************************通用组件******************************/
 all()
-address('rongcheng')
+address()
 system(false)
 sale()
 require('system-clients/src/styles/less/bootstrap.less')

package/.npmignore

@@ -1,10 +0,0 @@
-src/bootstrap
-.idea/
-.DS_Store
-node_modules/
-dist/static/*.map
-npm-debug.log
-selenium-debug.log
-test/unit/coverage
-test/e2e/reports
-yarn.lock

package/AddressClient.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="AddressClient" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/build/.npmignore

@@ -1 +0,0 @@
-

package/src/filiale/rongcheng/AddressList.vue

@@ -1,308 +0,0 @@
-<template>
-  <div class="flex" @keyup.enter="search">
-    <criteria-paged :model="model" v-ref:paged>
-      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
-          <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
-
-          <div class="row">
-
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">组织机构</label>
-              <res-select
-                restype='organization'
-                          @res-select="$parent.$parent.getorg"
-                          is-mul="false"
-                          :initresid='$parent.$parent.curorgid'
-              >
-              </res-select>
-            </div>
-            <div :class="$parent.$parent.style" v-if="$parent.$parent.showrightchange">
-              <label class="font_normal_body">用户编号</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
-                      condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
-            </div>
-            <div v-if="$parent.$parent.showrightchange" :class="$parent.$parent.style">
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
-                      condition="a.f_residential_area like '%{}%'" placeholder="小区"
-                      :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
-            </div>
-            <!--<div v-if="$parent.$parent.showrightchange" :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.useraddressShow">-->
-
-            <div :class="$parent.$parent.style" v-if="$parent.$parent.$parent.showrightchange">
-              <label class="font_normal_body">楼&emsp;&emsp;号</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
-                      condition="a.f_building like '%{}%'" placeholder="楼号"
-                      :size="model.f_building ? model.f_building.length*2 : 6"/>
-            </div>
-            <div class="col-sm-4 form-group button-range" >
-              <button class="button_search button_spacing" @click="search()" >查询</button>
-              <button class="button_new button_spacing"  style="width: max-content" @click="$parent.$parent.add('民用')">添加民用</button>
-              <button class="button_new button_spacing" style="width: max-content" @click="$parent.$parent.add('非民用')">添加特殊地址</button>
-              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-              <button class="button_export button_spacing"  @click="$parent.$parent.importAddress">导入地址</button>
-              <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
-            </div>
-          </div>
-          <div class="row" v-show="$parent.$parent.criteriaShow">
-            <div :class="$parent.$parent.style" v-if="!$parent.$parent.showrightchange">
-              <label class="font_normal_body">用户编号</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_userinfo_code" style="width:60%"
-                      condition="f_userinfo_code = '{}'" placeholder="用户编号"/>
-            </div>
-            <div v-if="!$parent.$parent.showrightchange" :class="$parent.$parent.style">
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
-                      condition="a.f_residential_area like '%{}%'" placeholder="小区"
-                      :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
-            </div>
-            <div :class="$parent.$parent.style" v-if="!$parent.$parent.$parent.showrightchange">
-              <label class="font_normal_body">楼&emsp;&emsp;号</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_building" style="width:60%"
-                      condition="a.f_building like '%{}%'" placeholder="楼号"
-                      :size="model.f_building ? model.f_building.length*2 : 6"/>
-            </div>
-            <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">单&emsp;&emsp;元</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_unit" style="width:60%"
-                      condition="a.f_unit like '%{}%'" placeholder="单元"
-                      :size="model.f_unit ? model.f_unit.length*2 : 6"/>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">楼&emsp;&emsp;层</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_floor" style="width:60%"
-                      condition="a.f_floor like '%{}%'" placeholder="楼层"
-                      :size="model.f_floor ? model.f_floor.length*2 : 6"/>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">门&ensp;牌&ensp;号</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_room" style="width:60%"
-                      condition="a.f_room like '%{}%'" placeholder="门牌号"
-                      :size="model.f_room ? model.f_room.length*2 : 6"/>
-            </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">小&emsp;&emsp;区</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_residential_arearea" style="width:60%"
-                      condition="a.f_residential_area like '%{}%'" placeholder="小区"
-                      :size="model.f_residential_arearea ? model.f_residential_arearea.length*2 : 8"/>
-            </div>
-
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">地址&emsp;ID</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.id" style="width:60%"
-                      condition="a.id = '{}'" placeholder="地址ID"
-              />
-            </div>
-            <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">详细地址</label>
-              <input  type="text" class="input_search" style="width:60%" v-model="model.f_address" style="width:60%"
-                      condition="a.f_address like '%{}%'" placeholder="详细地址"
-                      :size="model.f_address ? model.f_address.length*2 : 8"/>
-            </div>
-            <div :class="$parent.$parent.style" >
-              <label class="font_normal_body">地址状态</label>
-              <v-select :value.sync="model.f_address_state"
-                        class="select_list select"
-                        v-model="model.f_address_state"
-                        condition="a.f_address_state = '{}'"
-                        :options='$parent.$parent.getaddresstate' placeholder='地址状态'
-                        close-on-select>
-              </v-select>
-            </div>
-          </div>
-        </div>
-      </criteria>
-      <data-grid  :model="model" partial='list' style="overflow: auto" class="list_area table_sy"  v-ref:grid>
-        <template partial='head'>
-          <tr>
-            <th><nobr>序号</nobr></th>
-            <th><nobr>用户编号</nobr></th>
-            <th><nobr>区/县</nobr></th>
-            <th><nobr>片区</nobr></th>
-            <th><nobr>区域</nobr></th>
-            <th><nobr>小区域</nobr></th>
-            <th><nobr>小区(单位)</nobr></th>
-            <th><nobr>楼号</nobr></th>
-            <th><nobr>单元</nobr></th>
-            <th><nobr>楼层</nobr></th>
-            <th><nobr>门牌号</nobr></th>
-            <th><nobr>详细地址</nobr></th>
-            <th><nobr>地址状态</nobr></th>
-            <th><nobr>时间</nobr></th>
-            <th><nobr>操作</nobr></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_userinfo_code}}</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_small_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_residential_area}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_building}}{{row.f_building_suffix}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_unit}}{{row.f_unit_suffix}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_floor}}{{row.f_floor_suffix}}</nobr></td>
-            <td style="text-align:center"><nobr>{{row.f_room}}{{row.f_room_suffix}}</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_create_date}}</nobr></td>
-            <td style="text-align:center">
-             <!-- <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.modify(row)">修改</button>-->
-              <button type="button" name="button" class="btn btn-link"
-                      @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
-            </td>
-          </tr>
-        </template>
-        <template partial='foot'></template>
-      </data-grid>
-    </criteria-paged>
-  </div>
-  <modal :show.sync="showFile" v-ref:modal backdrop="true">
-    <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'
-
-  export default {
-    data () {
-      return {
-        criteriaShow: false,
-        model: new PagedList('rs/sql/address_getAddress',20,{tablename: `'t_user_address'`,items: `'*'`,orderitem: `'id desc'`}),
-        addflag: false,
-        addtitle:'',
-
-        // 公司下拉
-        curorgid: [this.$login.f.orgid],
-        f_orgid: '',
-
-        //文件上传弹框
-        showFile: false,
-        showrightchange:true
-      }
-    },
-    title: '地址列表',
-    props:{
-      f_filialeids:{
-        type: String
-      },
-      style: {
-        type: String,
-        default: 'col-sm-2 '
-      }
-    },
-    ready(){
-      this.search()
-    },
-    methods: {
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      //添加方法
-      add(val){
-        if (this.f_filialeids) {
-          this.$refs.paged.$refs.grid.selectStore.selected = null
-          this.$dispatch('add',val)
-          this.showrightchange = false;
-        } else {
-          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
-        }
-      },
-      importAddress(){
-        this.showFile = true
-      },
-      // 关闭文件上传对话框
-      closeFile() {
-        this.showFile = false
-        // 将选的文件清空
-        this.$refs.file.$el.querySelector('input').value = ''
-      },
-      //修改
-      modify(val){
-        this.$refs.paged.$refs.grid.selectStore.selected = null
-        this.$dispatch('modify',val)
-      },
-      async delete(row){
-        if(row.id){
-          var id = row.id
-          let userfiles = await this.$resetpost('rs/sql/address_singleTable', {data: {items: 'f_useraddress_id',tablename: 't_userfiles',condition: `f_useraddress_id='${id}' and f_table_state = '正常'`}},{resolveMsg: null, rejectMsg: null})
-          if(userfiles.data.length){
-            this.$showAlert('该地址下已有正常表具档案,无法删除！','warning',1000)
-          }else{
-            this.$resetdelete('rs/entity/t_user_address', {id: id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-              this.$dispatch('cancel')
-            })
-          }
-        }
-      },
-
-      search () {
-        this.$refs.paged.$refs.cri.search()
-      },
-
-      selfSearch (args) {
-
-        if (!this.f_orgid) {
-          this.getorg([this.$login.f.orgid])
-        }
-
-        args.condition =  `${args.condition} and a.f_filialeid = '${this.f_filialeids}'`
-        this.model.search(args.condition, args.model)
-      },
-
-      //清空
-      clear(){
-        this.$refs.paged.$refs.cri.model = {}
-      },
-      getorg (val) {
-        this.f_orgid = this.$login.convertToIn(val)
-        this.f_filialeids = val[0]
-      }
-    },
-    events: {
-      onFileUpload: async function (file, res) {
-        console.log("上传完毕"+JSON.stringify(res))
-        let data = {
-          filepath: res.f_downloadpath,
-          user:this.$login.f
-        }
-        console.log("filepath="+JSON.stringify(data))
-        await this.$resetpost(`rs/logic/address_useraddressimport`,data, {resolveMsg: null, rejectMsg: '导入失败', silent: true}, 0).then((res)=>{
-          if(res.data.type=="success"){
-            this.$showAlert("导入信息:"+res.data.msg, res.data.type, 2000);
-          }else{
-            this.$showMessage(res.data.msg);
-          }
-
-          //关闭上传框
-          this.closeFile()
-          //重新查询
-          this.init()
-        })
-      },
-      'onFileError'(error) {
-        this.$showAlert(error, 'warning', 2000)
-      }
-    },
-    computed: {
-      //地址状态下拉框
-      getaddresstate() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('地址状态')]
-      }
-    }
-
-  }
-</script>