apply-clients 3.3.106 → 3.3.107

package/build/dev-server.js

@@ -9,8 +9,8 @@ var compiler = webpack(config)
 // var ldap = 'http://121.36.79.201:8400'
 // var applyinstall = 'http://121.36.79.201:8400'
 var ldap = 'http://192.168.20.28:8400'
-var applyinstall = 'http://192.168.20.28:8400'
-// var applyinstall = 'http://127.0.0.1:8081'
+// var applyinstall = 'http://192.168.20.28:8400'
+var applyinstall = 'http://127.0.0.1:8081'
 var proxyTable = {
   '/wx': {
     target: ldap

package/package.json

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

package/src/apply.js

@@ -94,4 +94,6 @@ export default function () {
   Vue.component('res-area-select', (resolve) => { require(['./components/product/AreaSelect/ResAreaSelect'], resolve) })
   Vue.component('res-area-select-group', (resolve) => { require(['./components/product/AreaSelect/ResAreaSelectGroup'], resolve) })
   Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
+  // 地图组件
+  Vue.component('gaode-map', (resolve) => { require(['./components/product/GaoDeMapComponents/GaoDeMap'], resolve) })
 }

package/src/applyAndroid.js

@@ -1,40 +1,42 @@
-import Vue from 'vue'
-import { all } from 'vue-client'
-Vue.config.silent = true
-import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
-import ApplyLoadParams from './stores/ApplyLoadParams'
-/** ****************服务插件*********************/
-
-export default function () {
-  Vue.use(ApplyGetSaleParam)
-  Vue.use(ApplyLoadParams)
-  /** ***************************报建模块*********************************/
-  // 报建 总入口
-  Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
-  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
-  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
-  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
-  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
-  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
-
-  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
-  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
-  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
-  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
-
-  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
-  Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
-  Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
-  Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
-  // 选择用户信息
-  Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
-  // 选择报建项目
-  Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
-  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
-
-  // 区域 地址下拉框联动组件
-  Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
-  Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
-  Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
-  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
-}
+import Vue from 'vue'
+import { all } from 'vue-client'
+Vue.config.silent = true
+import ApplyGetSaleParam from './stores/ApplyGetSaleParams'
+import ApplyLoadParams from './stores/ApplyLoadParams'
+/** ****************服务插件*********************/
+
+export default function () {
+  Vue.use(ApplyGetSaleParam)
+  Vue.use(ApplyLoadParams)
+  /** ***************************报建模块*********************************/
+  // 报建 总入口
+  Vue.component('app-exploration-user', (resolve) => { require(['./components/android/Process/AppExplorationUser'], resolve) })
+  Vue.component('app-service-control', (resolve) => { require(['./components/android/Process/AppServiceControl'], resolve) })
+  Vue.component('app-process-supervisory', (resolve) => { require(['./components/android/Supervisory/AppProcessSupervisory'], resolve) })
+  Vue.component('app-supervisory-cart', (resolve) => { require(['./components/android/Supervisory/AppSupervisoryCart'], resolve) })
+  Vue.component('app-istall-function', (resolve) => { require(['./components/android/Function/AppInstallFunction'], resolve) })
+  Vue.component('app-function-service-control', (resolve) => { require(['./components/android/Function/AppFunctionServiceControl'], resolve) })
+
+  Vue.component('app-sign', (resolve) => { require(['./components/android/AppSign'], resolve) })
+  Vue.component('app-take-pic', (resolve) => { require(['./components/android/AppTakePic'], resolve) })
+  Vue.component('app-service-view', (resolve) => { require(['./components/android/AppServiceView'], resolve) })
+  Vue.component('app-onetomany', (resolve) => { require(['./components/android/AppOnetomany'], resolve) })
+
+  Vue.component('app-installation-details', (resolve) => { require(['./components/android/Process/Processes/AppInstallationDetails'], resolve) })
+  Vue.component('app-apply-devices-management', (resolve) => { require(['./components/android/Process/Processes/AppDevicesManagement'], resolve) })
+  Vue.component('app-charge-management', (resolve) => { require(['./components/android/Process/Processes/AppChargeManagement'], resolve) })
+  Vue.component('app-supplemental-agreement', (resolve) => { require(['./components/android/Process/Processes/AppSupplementalAgreement'], resolve) })
+  // 选择用户信息
+  Vue.component('select-userinfo', (resolve) => { require(['./components/android/Process/Processes/selectUserinfo'], resolve) })
+  // 选择报建项目
+  Vue.component('select-apply', (resolve) => { require(['./components/android/Process/Processes/selectApply'], resolve) })
+  Vue.component('app-build-sign', (resolve) => { require(['./components/android/Process/Processes/AppBuildSign'], resolve) })
+
+  // 区域 地址下拉框联动组件
+  Vue.component('app-res-area-select', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelect'], resolve) })
+  Vue.component('app-res-area-select-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaSelectGroup'], resolve) })
+  Vue.component('area-select', (resolve) => { require(['./components/product/AreaSelect/MyAreaSelect'], resolve) })
+  Vue.component('apply-print-charge', (resolve) => { require(['./components/product/Process/Processes/Print/printCharge'], resolve) })
+  //地图组件
+  Vue.component('app-res-area-map-group', (resolve) => { require(['./components/android/AreaSelect/AppResAreaMapGroup'], resolve) })
+}

package/src/components/android/AppServiceView.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="form-horizontal select-overspread">
     <validator name='v' @valid="$emit('valid')" @invalid="$emit('invalid')">
-    <form>
+    <!--<form>-->
     <div v-for="(index,item) in data.fields">
       <!--input-->
       <div :style="item.style ? item.style : ''"
@@ -320,7 +320,7 @@
         </button>
       </footer>
     </modal>
-</form>
+<!--</form>-->
   </div>
 </template>
 <script>

package/src/components/android/AppSign.vue

@@ -109,12 +109,6 @@ export default {
 
       this.$emit('sign-success', fileUrl)
 
-
-      HostApp.__this__.getFiles()
-      console.log('----------------查询回调结束-------------------')
-
-      HostApp.__callback__ = null
-      HostApp.__this__ = null
     },
     delAudioFile (signPath) {
       if (!signPath) {

package/src/components/android/AppTakePic.vue

@@ -1,145 +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) {
-      debugger
-      console.log('==============签字打印this============',this)
-      // 拍照成功回调
-      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/AreaSelect/AppResAreaMapGroup.vue

@@ -0,0 +1,127 @@
+<template>
+
+  <list :model="model" partial='list'>
+    <div partial class="auto app-text panel">
+      <div class="panel-body panel-self">
+        <div class="row">
+          <p class="col-xs-3 text-left font"><b>经&emsp;&emsp;度</b></p>
+          <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_bjq_gaode_lng }}</p>
+        </div>
+        <div class="row">
+          <p class="col-xs-3 text-left font"><b>纬&emsp;&emsp;度</b></p>
+          <p class="col-xs-8 col-xs-offset-1 text-left input-font">{{ row.f_bjq_gaode_lat }}</p>
+        </div>
+
+
+      </div>
+    </div>
+  </list>
+
+  <div class="row text-right">
+    <button
+      type="button"
+      class="btn btn-info"
+      @click="openModalApp()"
+    >
+      选择定位
+    </button>
+  </div>
+  <modal :show.sync="mapShowApp" v-if="mapShowApp"  v-ref:modal :large="true" :backdrop="fals e" title="设置坐标" width="95%" >
+    <header slot="modal-header" class="modal-header">
+    </header>
+    <article slot="modal-body" class="modal-body" >
+      <amap-location :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></amap-location>
+      <!--        <app-onetomanymap :islocationclearmark="false"  dom="addboxmap" v-ref:positionInfo @getmylocation="getmylocation"></app-onetomanymap>-->
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+      <button v-show="mapShowApp" type="button" class="btn btn-primary" @click='closeModalApp'>取消</button>
+      <button v-show="mapShowApp" type="button" class="btn btn-primary" @click='confirmLocation'>确认</button>
+    </footer>
+  </modal>
+</template>
+<script>
+
+import { HttpResetClass } from 'vue-client'
+import Vue from "vue";
+export default {
+  title: '地图定位',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      model: {
+        rows: null
+      },
+      templng: '',  //  临时经度
+      templat: '', //  临时纬度
+      userfile: null,
+      mapShowApp: false
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods:{
+    //地图调试
+    openModalApp () {
+      this.mapShowApp = true
+    },
+    closeModalApp () {
+      this.mapShowApp = false
+    },
+    getmylocation (res) {
+      this.templng = res.position.lng
+      this.templat = res.position.lat
+    },
+    async confirmLocation() {
+      let data = {
+        f_bjq_gaode_lat: this.templat,
+        f_bjq_gaode_lng: this.templng,
+        selectdata: this.selectdata,
+        userfile: this.userfile
+
+      }
+      console.log(data)
+      let res = await this.$resetpost(
+        `${this.$androidUtil.getProxyUrl()}/rs/logic/applyBjqMap`,
+        {data: data},
+        {resolveMsg: null, rejectMsg: '坐标添加失败！！！'}
+      )
+      this.mapShowApp = false
+
+
+      this.$dispatch('breakControl')
+    },
+    async search () {
+      let http = new HttpResetClass()
+      console.log('=================================')
+     let data = {
+        condition: `f_process_id = '${this.selectdata.f_process_id}'`
+       }
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/sql/getapplyBjqMap`, {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '获取坐标失败！！！'
+      })
+      console.log(res)
+
+      this.model.rows = res.data
+
+    },
+  },
+  watch: {
+
+  }
+}
+</script>
+<style lang="less">
+#addboxmap {
+  height: 300px;
+}
+</style>