apply-clients 3.4.2-FuGu-15 → 3.4.2-FuGu-18

package/build/dev-server.js

@@ -6,10 +6,10 @@ var proxyMiddleware = require('http-proxy-middleware')
 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://192.168.50.4:8400'
-var applyinstall = 'http://127.0.0.1:8082'
+var ldap = 'http://124.70.12.19:8400'
+var applyinstall = 'http://124.70.12.19:8400'
+// var ldap = 'http://192.168.50.4:8400'
+// var applyinstall = 'http://127.0.0.1:8082'
 
 var proxyTable = {
   '/rs/logic/getSaleInitData': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "3.4.2-FuGu-15",
+  "version": "3.4.2-FuGu-18",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/android/AppTakePic.vue

@@ -1,143 +1,143 @@
-<template>
-  <div class="panel">
-    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
-      <div class="row form-group" style="height: 240px;overflow: scroll;">
-        <div class="col-xs-4 col-sm-3 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" v-for="(index,file) in fileList">
-          <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
-          <img v-if="isdelete" src="../../../src/assets/删除.png" style="width: 15px;margin-top: -80px" @click.prevent="delfile(file, index)">
-        </div>
-      </div>
-      <div class="row text-right form-group" v-if="istakepic">
-        <v-select
-          class="fileType"
-          placeholder="请选择使用类型"
-          v-if="istype"
-          :search="false"
-          close-on-select
-          value-single
-          :options="typeList"
-          v-model="type"
-          :value.sync="type"
-        ></v-select>
-        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import {HttpResetClass} from 'vue-client'
-import {guid, toStandardTimeString} from '../Util'
-import Vue from 'vue'
-export default {
-  title: '附件',
-  props: ['blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
-  data () {
-    return {
-      fileList: []
-    }
-  },
-  ready () {
-    this.getFiles()
-  },
-  methods: {
-    async getFiles () {
-      console.log('----------------开始查询图片----------------')
-      this.fileList = []
-
-      let http = new HttpResetClass()
-
-      let data = {
-        tablename: 't_files',
-        condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
-      }
-      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
-        // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
-        warnMsg: null,
-        resolveMsg: null
-      })
-
-      for (var i = 0; i < res.data.length; i++) {
-        console.log('-----------地址----------------')
-        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
-        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
-      }
-
-      this.fileList = res.data
-    },
-    delfile (file, index) {
-      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
-        this.$dispatch("delResid", file.id)
-        this.getFiles()
-      })
-    },
-    takePic (title) {
-      // 拍照成功回调
-      HostApp.__callback__ = this.cameraCallBack
-      HostApp.__this__ = this
-      let fileName = guid() + '.jpg'
-      // 打开相机
-      HostApp._open_a_page({
-        type: 'boomerang',
-        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
-        param: {
-          file: fileName,
-          requestCode: 200,
-          callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
-          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
-        }
-      })
-    },
-    cameraCallBack (fileName, fileUrl) {
-      console.log('-----------cameraCallBack-----------------')
-
-      let data = {
-        blodid: HostApp.__this__.blobid,
-        type: HostApp.__this__.type,
-        defname: HostApp.__this__.defname,
-        username: Vue.user.name,
-        fremarks: '手机拍照',
-        fileName: fileName,
-        fileUrl: fileUrl
-      }
-
-      console.log('-----------bzLogic-----------------')
-      HostApp.bzLogic({
-        'logic': 'appFileUpload',
-        'data': data
-      })
-
-      console.log('----------------开始回调查询-------------------')
-      HostApp.__this__.getFiles()
-      console.log('----------------查询回调结束-------------------')
-
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
-    }
-  },
-  computed: {
-    typeList () {
-      if (this.typelabel) {
-        return this.$appdata.getParam(this.typelabel)
-      }
-      return this.$appdata.getParam('使用类型')
-    }
-  },
-  events: {
-  }
-}
-</script>
-
-<style lang="less">
-.fileType {
-  float: left;
-  .select-style {
-    background: #f8f8f8;
-    border: 0px;
-  }
-  input {
-    border-left: none;
-    width: 100%;
-  }
-}
-</style>
+<template>
+  <div class="panel">
+    <div class="panel-body panel-self" style="background-color: #F8F8F8;">
+      <div class="row form-group" style="height: 240px;overflow: scroll;">
+        <div class="col-xs-4 col-sm-3 col-md-2 col-xs-offset-1 col-sm-offset-1 col-md-offset-1" v-for="(index,file) in fileList">
+          <img-self :src="file.f_downloadURL" :width="120" :height="170"></img-self>
+          <img v-if="isdelete" src="../../../src/assets/删除.png" style="width: 15px;margin-top: -80px" @click.prevent="delfile(file, index)">
+        </div>
+      </div>
+      <div class="row text-right form-group" v-if="istakepic">
+        <v-select
+          class="fileType"
+          placeholder="请选择使用类型"
+          v-if="istype"
+          :search="false"
+          close-on-select
+          value-single
+          :options="typeList"
+          v-model="type"
+          :value.sync="type"
+        ></v-select>
+        <button class="btn" style="background-color: #7dc1f4;border-radius: 5px;margin-right: 10px" @click.prevent="takePic(type)">拍照</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from 'vue-client'
+import {guid, toStandardTimeString} from '../Util'
+import Vue from 'vue'
+export default {
+  title: '附件',
+  props: ['blobid', 'type', 'defname', 'istype', 'typelabel', 'isdelete', 'istakepic'],
+  data () {
+    return {
+      fileList: []
+    }
+  },
+  ready () {
+    this.getFiles()
+  },
+  methods: {
+    async getFiles () {
+      console.log('----------------开始查询图片----------------')
+      this.fileList = []
+
+      let http = new HttpResetClass()
+
+      let data = {
+        tablename: 't_files',
+        condition: `f_blobid = '${this.blobid}' and fremarks = '手机拍照' order by f_uploaddate desc `
+      }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`, {data: data}, {
+        // let res = await http.load('POST', `rs/sql/singleTable`, {data: data}, {
+        warnMsg: null,
+        resolveMsg: null
+      })
+
+      for (var i = 0; i < res.data.length; i++) {
+        console.log('-----------地址----------------')
+        console.log(`${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`)
+        res.data[i].f_downloadURL = `${this.$androidUtil.getProxyUrl()}/${res.data[i].f_downloadpath.substring(res.data[i].f_downloadpath.lastIndexOf(":\\") + 2)}`
+      }
+
+      this.fileList = res.data
+    },
+    delfile (file, index) {
+      this.$resetdelete(`${this.$androidUtil.getProxyUrl()}/rs/entity/t_files`, {id: file.id}, {resolveMsg: '删除成功', rejectMsg: '删除失败'}).then((res) => {
+        this.$dispatch("delResid", file.id)
+        this.getFiles()
+      })
+    },
+    takePic (title) {
+      // 拍照成功回调
+      HostApp.__callback__ = this.cameraCallBack
+      HostApp.__this__ = this
+      let fileName = guid() + '.jpg'
+      // 打开相机
+      HostApp._open_a_page({
+        type: 'boomerang',
+        page: 'com.aofeng.hybrid.android.peripheral.CameraActivity',
+        param: {
+          file: fileName,
+          requestCode: 200,
+          callback: 'javascript:HostApp.__callback__("' + fileName + '", "%s");',
+          watermark: title + '\t时间：' + toStandardTimeString() + '\t' + Vue.user.name  // 水印
+        }
+      })
+    },
+    cameraCallBack (fileName, fileUrl) {
+      console.log('-----------cameraCallBack-----------------')
+
+      let data = {
+        blodid: HostApp.__this__.blobid,
+        type: HostApp.__this__.type,
+        defname: HostApp.__this__.defname,
+        username: Vue.user.name,
+        fremarks: '手机拍照',
+        fileName: fileName,
+        fileUrl: fileUrl
+      }
+
+      console.log('-----------bzLogic-----------------')
+      HostApp.bzLogic({
+        'logic': 'appFileUpload',
+        'data': data
+      })
+
+      console.log('----------------开始回调查询-------------------')
+      HostApp.__this__.getFiles()
+      console.log('----------------查询回调结束-------------------')
+
+      HostApp.__callback__ = null
+      HostApp.__this__ = null
+    }
+  },
+  computed: {
+    typeList () {
+      if (this.typelabel) {
+        return this.$appdata.getParam(this.typelabel)
+      }
+      return this.$appdata.getParam('文件类型')
+    }
+  },
+  events: {
+  }
+}
+</script>
+
+<style lang="less">
+.fileType {
+  float: left;
+  .select-style {
+    background: #f8f8f8;
+    border: 0px;
+  }
+  input {
+    border-left: none;
+    width: 100%;
+  }
+}
+</style>

package/src/components/android/Process/AppServiceControl.vue

@@ -282,14 +282,6 @@ export default {
           })
         }
       }
-      if (this.selectdata.f_apply_source === '微信公众号' && this.selectdata.defname === '现场勘察') {
-        for (const item of this.selectdata.fields) {
-          if (item.label==='预约地址' || item.label==='地址类型' || item.label==='片区' || item.label==='区/县' || item.label==='街道' || item.label==='小区') {
-            item.hidden = false
-            item.required = true
-          }
-        }
-      }
       // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
       let temp = JSON.parse(JSON.stringify(this.selectdata))
 
@@ -297,6 +289,20 @@ export default {
       this.$nextTick(() => {
         this.showview = true
       })
+      if (this.show_data.f_apply_source === '微信公众号' && this.show_data.defname === '现场勘察') {
+        for (const item of this.show_data.fields) {
+          if (item.label==='预约地址' || item.label==='地址类型' || item.label==='片区' || item.label==='区/县' || item.label==='街道' || item.label==='小区') {
+            item.hidden = false
+            item.required = true
+          }
+          if (item.label==='区/县' && item.value !== null && item.value !==''){
+            this.pcdChange()
+          }
+          if (item.label==='街道' && item.value !== null && item.value !==''){
+            this.streetChange()
+          }
+        }
+      }
     },
     // 金额转大写
     smalltoBIG(n) {
@@ -472,13 +478,11 @@ export default {
         }
       }))
     },
-    async 'streetChange' (index) {
+    async streetChange () {
       if (isEmpty(this.show_data.f_street)) {
         return
       }
 
-      this.setLabelValue('小区', null)
-
       let data = {
         tablename: 't_area',
         condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
@@ -498,31 +502,6 @@ export default {
         }
       }))
     },
-    // 搜索小区
-    async 'searchArea' (area, index) {
-      let data = {
-        tablename: 't_area',
-        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}' and f_residential_area like '%${area}%'`
-      }
-      let http = new HttpResetClass()
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
-        {data: data},
-        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
-      )
-
-      if (res.data.length === 0) {
-        return
-      }
-
-      this.setLabelOptions('小区', res.data.map(item => {
-        return {
-          label: item.f_residential_area,
-          value: item.f_residential_area
-        }
-      }))
-    },
     // 缴费前置
     chargeBefore () {
       if (Number(this.show_data.f_due_money) > Number(this.show_data.f_cumulative_payment_money) || Number(this.show_data.f_surplus_money) > 0) {
@@ -647,6 +626,57 @@ export default {
         }
       }
     },
+    async 'streetChange' (index) {
+      if (isEmpty(this.show_data.f_street)) {
+        return
+      }
+
+      this.setLabelValue('小区', null)
+
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+      )
+
+      this.setLabelOptions('小区', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
+    // 搜索小区
+    async 'searchArea' (area, index) {
+      let data = {
+        tablename: 't_area',
+        condition: `f_filialeid = '${Vue.user.orgid}' and f_street = '${this.show_data.f_street}' and f_residential_area like '%${area}%'`
+      }
+      let http = new HttpResetClass()
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/singleTable`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '小区查询失败！！！'}
+      )
+
+      if (res.data.length === 0) {
+        return
+      }
+
+      this.setLabelOptions('小区', res.data.map(item => {
+        return {
+          label: item.f_residential_area,
+          value: item.f_residential_area
+        }
+      }))
+    },
     // 打开模态框获取材料
     async 'getMaterialName' (index) {
       let data = {