apply-clients 3.4.88-4 → 3.4.88-41

package/build/dev-server.js

@@ -1,119 +1,119 @@
-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()
-// var ldap = 'http://121.36.79.201:8400'
-// var applyinstall = 'http://121.36.79.201:8400'
-var ldap = 'http://221.193.244.147:8400'
-var applyinstall = 'http://221.193.244.147:8400'
-
-var proxyTable = {
-  '/rs/logic/getSaleInitData': {
-    target: ldap
-  },
-  '/rs/workflow': {
-    target: applyinstall
-  },
-  '/rs/vue': {
-    target: ldap
-  },
-  // 查找资源服务数据
-  '/rs/search': {
-    target: ldap
-  },
-  // 街道查询
-  '/rs/sql/address_getstreetlist': {
-    target: ldap
-  },
-  // 创建街道
-  '/rs/logic/address_updatestreet': {
-    target: ldap
-  },
-  // 创建小区
-  '/rs/logic/address_updatearea': {
-    target: ldap
-  },
-  // 用户登录服务地址
-  '/rs/user': {
-    target: ldap
-  },
-  '/rs/logic/getInitData': {
-    target: ldap?ldap:applyinstall
-  },
-  '/rs/logic/getLogin': {
-    target: ldap
-  },
-  '/rs/file': {    // 文件上传
-    target: applyinstall
-  },
-  '/project': {    // 文件回显
-    target: applyinstall
-  },
-  '/rs': {
-    target: applyinstall
-  },
-  '/ws': {
-    target: applyinstall,
-    ws: true // 代理webSocket
-  }
-}
-
-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')())
-// app.use(function (req, res, next) {
-//   res.header('Access-Control-Allow-Origin', '*')
-//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
-//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
-//   res.header('X-Powered-By', '3,2,1')
-//   res.header('Access-Control-Allow-Credentials', 'true')
-//   res.header('Content-Type', 'application/json;charset=utf-8')
-//   next()
-// })
-
-// 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'))
-
-module.exports = app.listen(8300, function (err) {
-  if (err) {
-    console.log(err)
-    return
-  }
-  console.log('Listening at http://localhost:8300')
-})
+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()
+// var ldap = 'http://121.36.79.201:8400'
+// var applyinstall = 'http://121.36.79.201:8400'
+var ldap = 'http://221.193.244.147:8400'
+var applyinstall = 'http://221.193.244.147:8400'
+
+var proxyTable = {
+  '/rs/logic/getSaleInitData': {
+    target: ldap
+  },
+  '/rs/workflow': {
+    target: applyinstall
+  },
+  '/rs/vue': {
+    target: ldap
+  },
+  // 查找资源服务数据
+  '/rs/search': {
+    target: ldap
+  },
+  // 街道查询
+  '/rs/sql/address_getstreetlist': {
+    target: ldap
+  },
+  // 创建街道
+  '/rs/logic/address_updatestreet': {
+    target: ldap
+  },
+  // 创建小区
+  '/rs/logic/address_updatearea': {
+    target: ldap
+  },
+  // 用户登录服务地址
+  '/rs/user': {
+    target: ldap
+  },
+  '/rs/logic/getInitData': {
+    target: ldap?ldap:applyinstall
+  },
+  '/rs/logic/getLogin': {
+    target: ldap
+  },
+  '/rs/file': {    // 文件上传
+    target: applyinstall
+  },
+  '/project': {    // 文件回显
+    target: applyinstall
+  },
+  '/rs': {
+    target: applyinstall
+  },
+  '/ws': {
+    target: applyinstall,
+    ws: true // 代理webSocket
+  }
+}
+
+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')())
+// app.use(function (req, res, next) {
+//   res.header('Access-Control-Allow-Origin', '*')
+//   res.header('Access-Control-Allow-Headers', 'X-Requested-With')
+//   res.header('Access-Control-Allow-Methods', 'PUT, POST, GET,DELETE, OPTIONS')
+//   res.header('X-Powered-By', '3,2,1')
+//   res.header('Access-Control-Allow-Credentials', 'true')
+//   res.header('Content-Type', 'application/json;charset=utf-8')
+//   next()
+// })
+
+// 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'))
+
+module.exports = app.listen(8300, function (err) {
+  if (err) {
+    console.log(err)
+    return
+  }
+  console.log('Listening at http://localhost:8300')
+})

package/package.json

@@ -1,116 +1,116 @@
-{
-  "name": "apply-clients",
-  "version": "3.4.88-4",
-  "description": "报建前端模块",
-  "main": "src/index.js",
-  "directories": {
-    "example": "examples",
-    "test": "test"
-  },
-  "scripts": {
-    "unit": "karma start test/unit/karma.conf.js",
-    "example": "node build/example-server.js",
-    "dev": "node build/dev-server.js",
-    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
-    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
-    "e2e": "node test/e2e/runner.js",
-    "release": "bash build/release.sh",
-    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://gitee.com/aote/ApplyInstall.git"
-  },
-  "keywords": [
-    "ApplyInstall"
-  ],
-  "author": "zx <939981212@qq.com>",
-  "license": "ISC",
-  "dependencies": {
-    "@logicflow/core": "^0.4.3",
-    "co": "4.6.0",
-    "dingtalk-jsapi": "^2.13.68",
-    "jsencrypt": "^3.0.0-rc.1",
-    "less": "^2.7.1",
-    "less-loader": "^2.2.3",
-    "lib-flexible": "^0.3.2",
-    "px2rem-loader": "^0.1.9",
-    "qrcodejs2": "0.0.2",
-    "vue": "^1.0.17",
-    "vue-bubble": "^1.0.3"
-  },
-  "devDependencies": {
-    "crypto-js": "^4.1.1",
-    "babel-core": "^6.0.0",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-transform-runtime": "^6.0.0",
-    "babel-preset-es2015": "^6.0.0",
-    "babel-preset-stage-2": "^6.0.0",
-    "chai": "^3.5.0",
-    "connect-history-api-fallback": "^1.1.0",
-    "cross-env": "^1.0.7",
-    "cross-spawn": "^2.1.5",
-    "css-loader": "^0.23.0",
-    "echarts": "^4.1.0",
-    "eslint": "^2.0.0",
-    "eslint-config-standard": "^5.1.0",
-    "eslint-friendly-formatter": "^1.2.2",
-    "eslint-loader": "^1.3.0",
-    "eslint-plugin-html": "^1.3.0",
-    "eslint-plugin-promise": "^1.0.8",
-    "eslint-plugin-standard": "^1.3.2",
-    "eslint-plugin-vue": "^0.1.1",
-    "eventsource-polyfill": "^0.9.6",
-    "express": "^4.17.0",
-    "extract-text-webpack-plugin": "^1.0.1",
-    "file-loader": "^0.8.4",
-    "form-create": "^1.6.6",
-    "function-bind": "^1.0.2",
-    "html-webpack-plugin": "^2.8.1",
-    "http-proxy-middleware": "^0.11.0",
-    "inject-loader": "^2.0.1",
-    "isparta-loader": "^2.0.0",
-    "jasmine-core": "^2.4.1",
-    "jquery": "^3.3.1",
-    "json-loader": "^0.5.4",
-    "karma": "^1.4.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-mocha": "^1.3.0",
-    "karma-sinon-chai": "^1.3.1",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.31",
-    "karma-webpack": "^2.0.2",
-    "ldap-clients": "3.0.18",
-    "material-client": "^1.1.2",
-    "mkdirp": "^0.5.1",
-    "mocha": "^3.2.0",
-    "ncp": "^2.0.0",
-    "nightwatch": "^0.8.18",
-    "rimraf": "^2.5.0",
-    "sale-client": "^1.4.33",
-    "selenium-server": "2.52.0",
-    "sinon": "^2.1.0",
-    "sinon-chai": "^2.8.0",
-    "style": "0.0.3",
-    "style-loader": "^0.20.3",
-    "system-clients": "3.2.63",
-    "system-phone": "1.2.80-49",
-    "url-loader": "^0.5.7",
-    "vue-client": "1.24.80",
-    "vue-hot-reload-api": "^1.2.0",
-    "vue-html-loader": "^1.0.0",
-    "vue-loader": "^8.2.1",
-    "vue-resource": "^1.5.0",
-    "vue-router": "^0.7.13",
-    "vue-strap": "^1.0.9",
-    "vue-style-loader": "^1.0.0",
-    "vue-validator": "^2.1.7",
-    "vux": "^2.9.4",
-    "webpack": "^1.12.2",
-    "webpack-dev-middleware": "^1.4.0",
-    "webpack-hot-middleware": "^2.6.0",
-    "webpack-merge": "^0.8.3",
-    "weixin-js-sdk": "^1.2.0"
-  }
-}
+{
+  "name": "apply-clients",
+  "version": "3.4.88-41",
+  "description": "报建前端模块",
+  "main": "src/index.js",
+  "directories": {
+    "example": "examples",
+    "test": "test"
+  },
+  "scripts": {
+    "unit": "karma start test/unit/karma.conf.js",
+    "example": "node build/example-server.js",
+    "dev": "node build/dev-server.js",
+    "lint": "eslint src/**.js test/e2e/**.js test/unit/specs/** build/**.js",
+    "build": "rimraf dist && mkdirp dist && ncp static dist/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prod.conf.js",
+    "e2e": "node test/e2e/runner.js",
+    "release": "bash build/release.sh",
+    "make": "rimraf dist-android && mkdirp dist-android && ncp static dist-android/static && cross-env NODE_ENV=production webpack --progress --hide-modules --config build/webpack.prodandroid.conf.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://gitee.com/aote/ApplyInstall.git"
+  },
+  "keywords": [
+    "ApplyInstall"
+  ],
+  "author": "zx <939981212@qq.com>",
+  "license": "ISC",
+  "dependencies": {
+    "@logicflow/core": "^0.4.3",
+    "co": "4.6.0",
+    "dingtalk-jsapi": "^2.13.68",
+    "jsencrypt": "^3.0.0-rc.1",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "lib-flexible": "^0.3.2",
+    "px2rem-loader": "^0.1.9",
+    "qrcodejs2": "0.0.2",
+    "vue": "^1.0.17",
+    "vue-bubble": "^1.0.3"
+  },
+  "devDependencies": {
+    "crypto-js": "^4.1.1",
+    "babel-core": "^6.0.0",
+    "babel-loader": "^6.0.0",
+    "babel-plugin-transform-runtime": "^6.0.0",
+    "babel-preset-es2015": "^6.0.0",
+    "babel-preset-stage-2": "^6.0.0",
+    "chai": "^3.5.0",
+    "connect-history-api-fallback": "^1.1.0",
+    "cross-env": "^1.0.7",
+    "cross-spawn": "^2.1.5",
+    "css-loader": "^0.23.0",
+    "echarts": "^4.1.0",
+    "eslint": "^2.0.0",
+    "eslint-config-standard": "^5.1.0",
+    "eslint-friendly-formatter": "^1.2.2",
+    "eslint-loader": "^1.3.0",
+    "eslint-plugin-html": "^1.3.0",
+    "eslint-plugin-promise": "^1.0.8",
+    "eslint-plugin-standard": "^1.3.2",
+    "eslint-plugin-vue": "^0.1.1",
+    "eventsource-polyfill": "^0.9.6",
+    "express": "^4.17.0",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.8.4",
+    "form-create": "^1.6.6",
+    "function-bind": "^1.0.2",
+    "html-webpack-plugin": "^2.8.1",
+    "http-proxy-middleware": "^0.11.0",
+    "inject-loader": "^2.0.1",
+    "isparta-loader": "^2.0.0",
+    "jasmine-core": "^2.4.1",
+    "jquery": "^3.3.1",
+    "json-loader": "^0.5.4",
+    "karma": "^1.4.1",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.1",
+    "karma-mocha": "^1.3.0",
+    "karma-sinon-chai": "^1.3.1",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-spec-reporter": "0.0.31",
+    "karma-webpack": "^2.0.2",
+    "ldap-clients": "3.0.18",
+    "material-client": "^1.1.2",
+    "mkdirp": "^0.5.1",
+    "mocha": "^3.2.0",
+    "ncp": "^2.0.0",
+    "nightwatch": "^0.8.18",
+    "rimraf": "^2.5.0",
+    "sale-client": "^1.4.33",
+    "selenium-server": "2.52.0",
+    "sinon": "^2.1.0",
+    "sinon-chai": "^2.8.0",
+    "style": "0.0.3",
+    "style-loader": "^0.20.3",
+    "system-clients": "3.2.63",
+    "system-phone": "1.2.80-49",
+    "url-loader": "^0.5.7",
+    "vue-client": "1.24.80",
+    "vue-hot-reload-api": "^1.2.0",
+    "vue-html-loader": "^1.0.0",
+    "vue-loader": "^8.2.1",
+    "vue-resource": "^1.5.0",
+    "vue-router": "^0.7.13",
+    "vue-strap": "^1.0.9",
+    "vue-style-loader": "^1.0.0",
+    "vue-validator": "^2.1.7",
+    "vux": "^2.9.4",
+    "webpack": "^1.12.2",
+    "webpack-dev-middleware": "^1.4.0",
+    "webpack-hot-middleware": "^2.6.0",
+    "webpack-merge": "^0.8.3",
+    "weixin-js-sdk": "^1.2.0"
+  }
+}

package/src/apply.js

@@ -97,7 +97,10 @@ export default function (filiale) {
   // 点火界面
   Vue.component('ignition-list-manage', (resolve) => { require(['./components/product/ignition/IgnitionListManage.vue'], resolve) })
   Vue.component('ignition-record', (resolve) => { require(['./components/product/ignition/IgnitionRecord.vue'], resolve) })
-
+  // 材料查看
+  Vue.component('material-manger', (resolve) => { require(['./components/product/Material/Materialmanger'], resolve) })
+  Vue.component('material-user', (resolve) => { require(['./components/product/Material/Materialuser'], resolve) })
+  Vue.component('apply-material-list', (resolve) => { require(['./components/product/Material/Materiallist'], resolve) })
 
   Vue.component('business-apply', (resolve) => { require(['./components/product/Business/BusinessApply'], resolve) })
   Vue.component('civil-apply', (resolve) => { require(['./components/product/Business/CivilApply'], resolve) })

package/src/components/android/AppSign.vue

@@ -40,7 +40,6 @@ export default {
       this.$emit('sign-clean')
     },
     sign () {
-      debugger
       this.type='手机签字'
       console.log('==============签字打印this============',this)
       this.delAudioFile(this.f_sign_path)

package/src/components/android/Ignition/VentilationIgnition.vue

@@ -1,25 +1,6 @@
 <template>
   <div>
     <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab" :active.sync="active">
-      <tab header='任务地图'>
-        <div class="auto tip">
-          <p>当前任务数量：{{ tasknumber }}</p>
-          <p>当前任务点：{{labelmarksarray.length}}</p>
-        </div>
-        <amap-location
-          :islocation="true"
-          :locationzoomcenter="false"
-          :usenative="true"
-          :isshowsearch="false"
-          :mylocationinfo="false"
-          :islocationclearmark="false"
-          :isshowmapmodel="false"
-          :locationwindow="false"
-          mapmodel="dragMarker"
-          :labelmarksarray="labelmarksarray"
-          @diyspotmouseclick="diyspotmouseclick"
-        ></amap-location>
-      </tab>
       <tab header='任务列表'>
         <div class="p-10">
           <criteria-paged :model="model" v-ref:cp>
@@ -122,13 +103,6 @@
                     <p class="col-xs-3 text-left font"><b>地&emsp;&emsp;址：</b></p>
                     <p class="col-xs-9 text-left input-font">{{ row.f_address }}</p>
                   </div>
-                  <div class="col-xs-12">
-                    <p class="col-xs-3 text-left font"><b>定位地址：</b></p>
-                    <p class="col-xs-9 text-left input-font">
-                      {{ row.f_location_address }}
-                      <svg v-if="row.f_location_address" @click.prevent="$parent.$parent.$parent.$parent.$parent.openAmap(row)" style="width: 25px;height: 25px;position: absolute;" t="1628575336648" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3201" width="200" height="200"><path d="M512 956h-1.1c-10.9 0-20.5-6.9-24.7-17L369.9 654.1 85 537.8c-10.1-4.1-16.8-13.7-17.2-24.6-0.4-10.9 5.6-21 15.3-25.9l833-416.5c10.7-5.3 23.6-3.2 32.1 5.2s10.5 21.4 5.2 32.1L536.8 940.9c-4.7 9.4-14.3 15.1-24.8 15.1zM162.7 509.6l239 97.6c6.9 2.8 12.4 8.3 15.2 15.2l97.6 239 351.9-703.8-703.7 352z" fill="#666666" p-id="3202"></path></svg>
-                    </p>
-                  </div>
                   <div class="col-xs-12">
                     <p class="col-xs-3 text-left font"><b>报建类型：</b></p>
                     <p class="col-xs-9 text-left input-font">
@@ -163,8 +137,6 @@ export default {
       model: new PagedList(`${this.$androidUtil.getProxyUrl()}/rs/sql/getWaitIgnitionTaskApp`, 20, null),
       // model: new PagedList(`rs/sql/getWaitIgnitionTask`, 20, null),
       criteriaShow: false,
-      tasknumber: 0,
-      labelmarksarray: [],
       active: 0,
       f_lat: null,
       f_lng: null,
@@ -177,7 +149,6 @@ export default {
   },
   methods: {
     refresh () {
-      this.getWaitIgnitionTaskDot()
       this.getArea()
       this.search()
     },
@@ -193,7 +164,7 @@ export default {
       row.f_apply_type = '通气点火'
       // row.f_process_id = row.f_blobid
       console.log('----------------------++++++++++++++++++',row.f_process_id)
-      this.$goto('ventilation-ignition-handle', {selectdata: row}, 'self', _this.refresh)
+      this.$goto('app-ignition-handle', {selectdata: row}, 'self', _this.refresh)
     },
     dialNumber (tel) {
       this.$showMessage(`是否拨打电话：${tel}`, ['confirm']).then((res) => {
@@ -202,68 +173,6 @@ export default {
         }
       })
     },
-    // 导航
-    openAmap (row) {
-      HostApp.openThirdPartyMap({
-        lon: row.f_lng,
-        lat: row.f_lat,
-        address: row.f_location_address
-      })
-    },
-    diyspotmouseclick (data) {
-      console.log('************************************')
-      console.log(data)
-      this.f_lat = data.f_lat
-      this.f_lng = data.f_lng
-      this.search()
-
-      this.active = 1
-    },
-    async getWaitIgnitionTaskDot () {
-      this.tasknumber = 0
-      let http = new HttpResetClass()
-      let data = {
-        userid: Vue.user.id
-        // userid: this.$login.f.id
-      }
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/getWaitIgnitionTaskDot`,
-        // `rs/sql/getWaitIgnitionTaskDot`,
-        {data: data},
-        {
-          resolveMsg: null,
-          rejectMsg: '任务点获取失败！！！'
-      })
-      this.labelmarksarray = res.data.map(item => {
-        this.tasknumber += item.count
-        return {
-          data: {
-            data: item,
-            content: `<p>任务数：${item.count}</p>`
-          },
-          position: [item.f_lng, item.f_lat],
-          isclearmarker: false,
-          islabel: false
-        }
-      })
-      // for (const item of res.data) {
-      //   this.tasknumber += item.count
-      //   if (isEmpty(item.f_lng) || isEmpty(item.f_lat)) {
-      //     continue
-      //   }
-      //
-      //   this.labelmarksarray.push({
-      //     data: {
-      //       data: item,
-      //       content: `<p>任务数：${item.count}</p>`
-      //     },
-      //     position: [item.f_lng, item.f_lat],
-      //     isclearmarker: true,
-      //     islabel: false
-      //   })
-      // }
-    },
     searchCondition (args) {
       args.condition += `and ir.f_ignition_operator_id = '${Vue.user.id}' and ir.f_state = '正在进行'`
       // args.condition += `and ir.f_ignition_operator_id = '${this.$login.f.id}' and ir.f_state = '正在进行'`
@@ -272,13 +181,8 @@ export default {
         // args.condition = args.condition.replace(`ir.f_ignition_operator_id = \'${this.$login.f.id}\'`, 'ir.f_shared_dispatch = \'是\'');
         args.condition = args.condition.replace(`ir.f_ignition_operator_id = \'${Vue.user.id}\'`, 'ir.f_shared_dispatch = \'是\'');
       }
-      if (!isEmpty(this.f_lat) && !isEmpty(this.f_lng)) {
-        args.condition += `and ui.f_lat = '${this.f_lat}' and ui.f_lng = '${this.f_lng}'`
-      }
       this.model.search(args.condition, args.model)
 
-      this.f_lng = null
-      this.f_lat = null
     },
     // 查询
     search () {
@@ -313,14 +217,14 @@ export default {
     async getArea () {
       let data = {
         tablename: 't_area_address',
-        condition: `f_filiale = '${Vue.user.f_fengongsi}' and f_area_status = '启用'`
+        condition: `f_filiale = '${Vue.user.orgid}' and f_area_status = '启用'`
         // condition: `f_filiale = '${this.$login.f.f_fengongsi}' and f_area_status = '启用'`
       }
       let http = new HttpResetClass()
       let res = await http.load(
         'POST',
         // `rs/sql/applySingleTable`,
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/applySingleTable`,
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/apply_singleTable`,
         {data: data},
         {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
       )