address-client 3.2.3 → 3.2.6

package/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Dec 07 15:35:10 CST 2020
-gradle.version=5.2.1
+#Fri Aug 06 15:02:49 CST 2021
+gradle.version=3.5

package/.gradle/buildOutputCleanup/cache.properties.lock

@@ -0,0 +1 @@
+

package/AddressClient.iml

@@ -0,0 +1,13 @@
+<?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" external.system.module.group="" external.system.module.version="3.0.11" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/out" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/build/dev-server.js

@@ -1,125 +1,125 @@
-var express = require('express')
-var webpack = require('webpack')
-var config = require('./webpack.dev.conf')
-var proxyMiddleware = require('http-proxy-middleware')
-var httpProxy = require('http-proxy')
-
-var app = express()
-var compiler = webpack(config)
-var proxy = httpProxy.createProxyServer()
-
-// Define HTTP proxies to your custom API backend
-// https://github.com/chimurai/http-proxy-middleware
-var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
-var proxyTable = {
-
-  '/rs/logic/getLogin': {
-    target: str2
-  },
-  '/rs/vue': {
-    target: str2
-  },
-  '/rs/user': {
-    target: str2
-  },
-  '/rs/db': {
-    target: str2
-  },
-  '/rs/search': {
-    target: str2
-  },
-  '/rs/data': {
-    target: str2
-  },
-  '/rs/logic/getInitData': {
-    target: str2
-  },
-  '/rs/logic/getSaleInitData': {
-    target: str2
-  },
-  '/rs': {
-    // target: 'http://192.168.50.199:8300'
-    target: str
-  }
-}
-
-var devMiddleware = require('webpack-dev-middleware')(compiler, {
-  publicPath: config.output.publicPath,
-  stats: {
-    colors: true,
-    chunks: false
-  }
-})
-
-var hotMiddleware = require('webpack-hot-middleware')(compiler)
-// force page reload when html-webpack-plugin template changes
-compiler.plugin('compilation', function (compilation) {
-  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
-    hotMiddleware.publish({ action: 'reload' })
-    cb()
-  })
-})
-
-// proxy api requests
-Object.keys(proxyTable).forEach(function (context) {
-  var options = proxyTable[context]
-  if (typeof options === 'string') {
-    options = { target: options }
-  }
-  app.use(proxyMiddleware(context, options))
-})
-
-// handle fallback for HTML5 history API
-app.use(require('connect-history-api-fallback')())
-
-// serve webpack bundle output
-app.use(devMiddleware)
-
-// enable hot-reload and state-preserving
-// compilation error display
-app.use(hotMiddleware)
-
-// serve pure static assets
-app.use('/static', express.static('./static'))
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/reports'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/ldap'
-//   })
-// })
-// app.all('/excel/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:8081/charge'
-//   })
-// })
-
-// app.all('/rs/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82/charge'
-//   })
-// })
-
-// app.all('/*', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-// app.all('/rs/user', function (req, res) {
-//   proxy.web(req, res, {
-//     target: 'http://127.0.0.1:82'
-//   })
-// })
-
-module.exports = app.listen(8085, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8085')
-})
+var express = require('express')
+var webpack = require('webpack')
+var config = require('./webpack.dev.conf')
+var proxyMiddleware = require('http-proxy-middleware')
+var httpProxy = require('http-proxy')
+
+var app = express()
+var compiler = webpack(config)
+var proxy = httpProxy.createProxyServer()
+
+// Define HTTP proxies to your custom API backend
+// https://github.com/chimurai/http-proxy-middleware
+var str = 'http://127.0.0.1:8078', str2= 'http://192.168.50.4:8400/'
+var proxyTable = {
+
+  '/rs/logic/getLogin': {
+    target: str2
+  },
+  '/rs/vue': {
+    target: str2
+  },
+  '/rs/user': {
+    target: str2
+  },
+  '/rs/db': {
+    target: str2
+  },
+  '/rs/search': {
+    target: str2
+  },
+  '/rs/data': {
+    target: str2
+  },
+  '/rs/logic/getInitData': {
+    target: str2
+  },
+  '/rs/logic/getSaleInitData': {
+    target: str2
+  },
+  '/rs': {
+    // target: 'http://192.168.50.199:8300'
+    target: str2
+  }
+}
+
+var devMiddleware = require('webpack-dev-middleware')(compiler, {
+  publicPath: config.output.publicPath,
+  stats: {
+    colors: true,
+    chunks: false
+  }
+})
+
+var hotMiddleware = require('webpack-hot-middleware')(compiler)
+// force page reload when html-webpack-plugin template changes
+compiler.plugin('compilation', function (compilation) {
+  compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) {
+    hotMiddleware.publish({ action: 'reload' })
+    cb()
+  })
+})
+
+// proxy api requests
+Object.keys(proxyTable).forEach(function (context) {
+  var options = proxyTable[context]
+  if (typeof options === 'string') {
+    options = { target: options }
+  }
+  app.use(proxyMiddleware(context, options))
+})
+
+// handle fallback for HTML5 history API
+app.use(require('connect-history-api-fallback')())
+
+// serve webpack bundle output
+app.use(devMiddleware)
+
+// enable hot-reload and state-preserving
+// compilation error display
+app.use(hotMiddleware)
+
+// serve pure static assets
+app.use('/static', express.static('./static'))
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/reports'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/ldap'
+//   })
+// })
+// app.all('/excel/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:8081/charge'
+//   })
+// })
+
+// app.all('/rs/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82/charge'
+//   })
+// })
+
+// app.all('/*', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+// app.all('/rs/user', function (req, res) {
+//   proxy.web(req, res, {
+//     target: 'http://127.0.0.1:82'
+//   })
+// })
+
+module.exports = app.listen(8085, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8085')
+})

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "address-client",
-  "version": "3.2.3",
+  "version": "3.2.6",
   "description": "地址管理前台组件",
   "author": "wanbochao",
   "license": "ISC",

package/src/components/AddressList.vue

@@ -295,6 +295,7 @@
           f_pcd_id:'',
           f_street_id:'',
           f_residential_area:'',
+          f_residential_area_id:''
         },
         //初始化省市区数据
         pcdslist:[],
@@ -403,11 +404,15 @@
         this.f_filialeids = val[0]
       },
       async modifyBatch () {
-        if(this.$refs.paged.$refs.grid.getRowData().length != 0){
-          this.areamodel.f_pcd_id = this.$refs.paged.$refs.grid.getRowData()[0].f_pcd_id
-          this.showModify = true
+        if (this.f_filialeids) {
+          if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
+            this.areamodel.f_pcd_id = this.$refs.paged.$refs.grid.getRowData()[0].f_pcd_id
+            this.showModify = true
+          } else {
+            this.$showAlert('请至少选择一项！', 'warning', 2000)
+          }
         }else {
-          this.$showAlert('请至少选择一项！', 'warning', 2000)
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
         }
       },
       confirmModify () {
@@ -415,14 +420,10 @@
         this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
           this.userInfos[n] = {
             userid: row.id,
-            userBuilding: row.f_building,
-            userBuildingSuffix: row.f_building_suffix,
-            userUnit: row.f_unit,
-            userUnitSuffix: row.f_unit_suffix,
-            userFloor: row.f_floor,
-            userFloorSuffix: row.f_floor_suffix,
-            userRoom: row.f_room,
-            userRoomSuffix: row.f_room_suffix
+            f_residential_area: row.f_residential_area,
+            f_street: row.f_street,
+            f_address: row.f_address,
+            f_address_rest: row.f_street + row.f_residential_area + (row.f_building?row.f_building+row.f_building_suffix:'') + (row.f_unit?row.f_unit+row.f_unit_suffix:'') + (row.f_floor?row.f_floor+row.f_floor_suffix:'') + (row.f_room?row.f_room+row.f_room_suffix:'')
           }
         })
         let modifyBatchData = {
@@ -435,13 +436,14 @@
           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_depname: this.$login.f.deps,
+          f_filialeid: this.f_filialeids
         }
         this.$resetpost('rs/logic/modifyBatch',modifyBatchData)
         this.initpcds(`f_filialeid = '${this.f_filialeids}'`)
         this.showModify = false
         this.$refs.paged.$refs.grid.selectInit()
-        this.search()
+        this.$refs.paged.$refs.cri.search()
       },
       cancelModify() {
         this.initpcds(`f_filialeid = '${this.f_filialeids}'`)

package/src/components/AreaList.vue

@@ -40,6 +40,7 @@
             </div>
             <div class="col-sm-4 form-group button-range">
               <button class="button_search button_spacing" @click="search()" >查询</button>
+              <button class="button_search button_spacing" @click="$parent.$parent.batchDelete()">批量删除</button>
               <button v-if="!$parent.$parent.f_special" class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add('小区')">添加小区</button>
               <button v-if="$parent.$parent.f_special"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>
@@ -97,12 +98,10 @@
             </div>
           </div>
         </div>
-
-
       </criteria>
-      <data-grid  :model="model" partial='list'  class="list_area table_sy" v-ref:grid>
+
+      <data-grid  :model="model" partial='list'  class="list_area table_sy" :optional="true" v-ref:grid>
         <template partial='head'>
-          <tr>
             <th><nobr>序号</nobr></th>
             <th v-if="false"><nobr>省份</nobr></th>
             <th v-if="false"><nobr>城市</nobr></th>
@@ -127,11 +126,8 @@
             <th><nobr>操作日期</nobr></th>
             <th title="该小区下现有的地址数"><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" v-if="false"><nobr>{{row.f_province}}</nobr></td>
             <td style="text-align:center" v-if="false"><nobr>{{row.f_city}}</nobr></td>
@@ -157,12 +153,34 @@
               <button v-if="!row.f_residential_area_id" type="button" name="button" class="btn btn-danger"
                       style="padding: 5px 12px"
                       @click.stop="$parent.$parent.$parent.delete(row)">删除</button>
-            </nobr></td>
-          </tr>
+                </nobr>
+            </td>
         </template>
         <template partial='foot'></template>
       </data-grid>
     </criteria-paged>
+    <modal :show="showDelete"  large backdrop="false" :width="900">
+        <header slot="modal-header" class="modal-header">
+          <p class="bg-info text-center" style="padding: 8px;">请选择目标小区</p>
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <validator name='v'>
+            <div  class="col-sm-6 form-group ">
+              <label class="font_normal_body">小区名称</label>
+              <input type="text" style="width:41%" v-show="false" v-validate:f_residential_area_id='{required: true }' v-model="areamodel.f_residential_area_id">
+              <v-select :value.sync="areamodel.f_residential_area_id" :value-single="true"
+                        @change="areaChange"
+                        :options='areaslist' placeholder='请选择'
+                        close-on-select search="true">
+              </v-select>
+            </div>
+          </validator>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button v-show="showDelete" type="button" class="button_search button_spacing" @click='confirmDelete()' :disabled='!$v.valid'>确认</button>
+          <button v-show="showDelete" type="button" class="button_clear button_spacing" @click='cancelDelete()'>取消</button>
+        </footer>
+    </modal>
   </div>
 </template>
 
@@ -176,7 +194,18 @@
 
     data () {
       return {
+        showDelete: false,
         criteriaShow: false,
+        // 目标小区数据
+        areamodel: {
+          f_residential_area_id: '',
+          f_pcd: '',
+          f_pcd_id: '',
+          f_street: '',
+          f_street_id: '',
+          f_slice_area: '',
+          f_residential_area: ''
+        },
         model: new PagedList('rs/sql/address_getarealist',20),
         addflag: false,
         addtitle:'',
@@ -184,6 +213,8 @@
         // 公司下拉
         curorgid: [this.$login.f.orgid],
         f_orgid: '',
+        //初始化小区数据
+        areaslist:[],
         config: {
           // 导出列要和查询列相同
           excelHeaders: {
@@ -280,7 +311,89 @@
       getorg (val) {
         this.f_orgid = this.$login.convertToIn(val)
         this.f_filialeids = val[0]
-      }
+      },
+      async batchDelete () {
+        if (this.f_filialeids) {
+          if (this.$refs.paged.$refs.grid.getRowData().length != 0) {
+            this.showDelete = true
+            let condition = `a.f_orgid = '${this.f_filialeids}'`
+            let req = await this.$resetpost('rs/sql/address_getresidential', {
+              data: {
+                condition: condition
+              }
+            }, {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
+          } else {
+            this.$showAlert('请至少选择一项！', 'warning', 2000)
+          }
+        }else {
+          this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
+        }
+      },
+      confirmDelete () {
+        let msg = {
+          resolveMsg: '批量删除成功',
+          rejectMsg: '批量删除失败！'
+        }
+        let oldAreaIds = []
+        // 获取要批量删除的小区数据
+        this.$refs.paged.$refs.grid.getRowData().forEach((row,n) => {
+          oldAreaIds[n] = row.id
+        })
+        this.$resetpost('rs/logic/batchDelete',{
+          data:{
+                areamodel:this.areamodel,
+                oldAreaIds:oldAreaIds,
+                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
+          }
+        },msg)
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+        this.areamodel.f_residential_area_id = ''
+        this.showDelete = false
+      },
+      cancelDelete () {
+        this.$refs.paged.$refs.grid.selectInit()
+        this.$refs.paged.$refs.cri.search()
+        this.areamodel.f_residential_area_id = ''
+        this.showDelete = false
+      },
+      areaChange(val){
+        console.log("小区变化",val)
+        let selectArea // 选中的小区数据
+        for (let row of this.areaslist) {
+          if (val == row.value) {
+            selectArea = row.data
+            break
+          }
+        }
+        if (selectArea) {
+          this.areamodel.f_residential_area_id = selectArea.id
+          this.areamodel.f_pcd = selectArea.f_pcd
+          this.areamodel.f_pcd_id = selectArea.f_pcd_id
+          this.areamodel.f_street = selectArea.f_street
+          this.areamodel.f_street_id = selectArea.f_street_id
+          this.areamodel.f_slice_area = selectArea.f_slice_area
+          this.areamodel.f_residential_area = selectArea.f_residential_area
+        }
+        this.$nextTick(() => {
+          this.$resetValidation()
+        })
+      },
     },
     watch:{