apply-clients 3.3.106 → 3.3.107-366

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>

package/src/components/android/AreaSelect/AppResAreaSelect.vue

@@ -1,108 +1,108 @@
-<template>
-  <!--<v-select :options='options' placeholder='请选择'-->
-  <!--          :value.sync="selectres"-->
-  <!--          :multiple="isMul"-->
-  <!--          :search="issearch"-->
-  <!--          :close-on-select="!isMul"-->
-  <!--          @change="resChange"-->
-  <!--          :value-single="true"-->
-  <!--&gt;-->
-  <!--</v-select>-->
-  <area-select :options='options' placeholder='请选择'
-               :value.sync="selectres"
-               :multiple="!isMul"
-               :search="issearch"
-               :close-on-select="isMul"
-               @change="resChange"
-               :value-single="true"
-  >
-  </area-select>
-</template>
-<script>
-import {HttpResetClass} from 'vue-client'
-
-export default {
-  title: '资源管理',
-  props: {
-
-    //资源类型
-    restype:'',
-    //资源数据
-    resObj:{},
-    options:[],
-    isMul: {
-      type: Boolean,
-      default: true
-    },
-    issearch: {
-      type: Boolean,
-      default: true
-    },
-    //资源初始化数据 默认选中值
-    initresid: {
-      type: Array,
-      default() { return [] },
-    },
-    //父层id
-    parentresid: {
-      type: Array,
-      default() { return [] },
-    },
-  },
-  data () {
-    return {
-      //资源数据
-      resObj:{},
-      //资源数据列表
-      resoptions:[],
-      //选中资源数据
-      selectres: [],
-    }
-  },
-  ready () {
-    //获取资源列表
-    this.getResList()
-  },
-  methods:{
-    //资源改变
-    resChange(val){
-      let orgnames=[]
-      Object.keys(this.options).forEach((key) => {
-        if(this.selectres.includes(this.options[key].value))
-          orgnames.push(this.options[key].label)
-      })
-      // console.log("资源变化:",this.selectres, orgnames,this.options)
-      this.$dispatch('res-select', this.selectres, orgnames,this.options)
-    },
-    //获取资源数据
-    async getResList() {
-      this.dealdata()
-    },
-    dealdata(){
-      //赋值资源数据选中初始值
-      let arryselect=[]
-      this.options.forEach((item) => {
-        if(this.initresid.length>0){
-          this.initresid.forEach((init) => {
-            if(item.value==init){
-              arryselect.push(item.value)
-            }
-          })
-        }
-      })
-      //赋值资源选中初始值
-      this.selectres=arryselect
-    }
-  },
-  watch: {
-    //监听初始化资源id
-    'initresid.length'(){
-      this.dealdata()
-    },
-    //监听初始化资源id
-    'parentresid'(){
-      this.dealdata()
-    },
-  },
-}
-</script>
+<template>
+  <!--<v-select :options='options' placeholder='请选择'-->
+  <!--          :value.sync="selectres"-->
+  <!--          :multiple="isMul"-->
+  <!--          :search="issearch"-->
+  <!--          :close-on-select="!isMul"-->
+  <!--          @change="resChange"-->
+  <!--          :value-single="true"-->
+  <!--&gt;-->
+  <!--</v-select>-->
+  <area-select :options='options' placeholder='请选择'
+               :value.sync="selectres"
+               :multiple="!isMul"
+               :search="issearch"
+               :close-on-select="isMul"
+               @change="resChange"
+               :value-single="true"
+  >
+  </area-select>
+</template>
+<script>
+import {HttpResetClass} from 'vue-client'
+
+export default {
+  title: '资源管理',
+  props: {
+
+    //资源类型
+    restype:'',
+    //资源数据
+    resObj:{},
+    options:[],
+    isMul: {
+      type: Boolean,
+      default: true
+    },
+    issearch: {
+      type: Boolean,
+      default: true
+    },
+    //资源初始化数据 默认选中值
+    initresid: {
+      type: Array,
+      default() { return [] },
+    },
+    //父层id
+    parentresid: {
+      type: Array,
+      default() { return [] },
+    },
+  },
+  data () {
+    return {
+      //资源数据
+      resObj:{},
+      //资源数据列表
+      resoptions:[],
+      //选中资源数据
+      selectres: [],
+    }
+  },
+  ready () {
+    //获取资源列表
+    this.getResList()
+  },
+  methods:{
+    //资源改变
+    resChange(val){
+      let orgnames=[]
+      Object.keys(this.options).forEach((key) => {
+        if(this.selectres.includes(this.options[key].value))
+          orgnames.push(this.options[key].label)
+      })
+      // console.log("资源变化:",this.selectres, orgnames,this.options)
+      this.$dispatch('res-select', this.selectres, orgnames,this.options)
+    },
+    //获取资源数据
+    async getResList() {
+      this.dealdata()
+    },
+    dealdata(){
+      //赋值资源数据选中初始值
+      let arryselect=[]
+      this.options.forEach((item) => {
+        if(this.initresid.length>0){
+          this.initresid.forEach((init) => {
+            if(item.value==init){
+              arryselect.push(item.value)
+            }
+          })
+        }
+      })
+      //赋值资源选中初始值
+      this.selectres=arryselect
+    }
+  },
+  watch: {
+    //监听初始化资源id
+    'initresid.length'(){
+      this.dealdata()
+    },
+    //监听初始化资源id
+    'parentresid'(){
+      this.dealdata()
+    },
+  },
+}
+</script>

package/src/components/android/AreaSelect/AppResAreaSelectGroup.vue

@@ -1,142 +1,142 @@
-<template>
-  <div :class="style">
-    <label :class="labelstyle" :style="shijifontColors">市&emsp;&emsp;县</label>
-    <app-res-area-select
-                :options = options
-                @res-select="getXian"
-                :issearch = "false"
-    >
-    </app-res-area-select>
-  </div>
-  <div :class="style">
-    <label :class="labelstyle" :style="xianfontColors">街道乡镇</label>
-    <app-res-area-select
-      :options = xian_options
-      @res-select="getjdao"
-      :issearch = "false"
-    >
-    </app-res-area-select>
-  </div>
-  <div :class="style">
-    <label :class="labelstyle" :style="shequfontColors">社&emsp;&emsp;区</label>
-    <app-res-area-select
-      :options = jdao_options
-      @res-select="getshequ"
-      :issearch = "false"
-    >
-    </app-res-area-select>
-  </div>
-</template>
-<script>
-
-import { HttpResetClass } from 'vue-client'
-import Vue from "vue";
-export default {
-  title: '区域选择分组',
-  props: {
-    style: {
-      type: String,
-      default: 'col-xs-12 form-group app-input'
-    },
-    labelstyle: {
-      type: String,
-      default: 'font_normal_title'
-    },
-    mul: {
-      type: Boolean,
-      default: true
-    },
-    //初始值 默认选中值
-    initres: {
-      type: Object,
-      default: null,
-    }
-  },
-  data () {
-    return {
-      options:[],
-      initres: [],
-      xianginitres: [],
-      jdaoinitres: [],
-      xian_options:[],
-      jdao_options:[],
-      shijifontColors:"color: #cd5c5c",//红色
-      xianfontColors:"color: #cd5c5c",//红色
-      shequfontColors:"color: #cd5c5c",//红色
-      pubColors:"color: #0c2e4d",// 黑色
-      pub2Colors:"color: #cd5c5c"// 红色
-    }
-  },
-  ready () {
-    this.getResList();
-  },
-  methods:{
-    //获取区域地址
-    async getResList() {
-      let http = new HttpResetClass()
-      // let req = await http.load('POST', '/rs/logic/resAreaSelect', {
-      let req = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/resAreaSelect`, {
-          userid: Vue.user.id,
-          orgid: Vue.user.orgid
-        }, {resolveMsg: null, rejectMsg: '获取区域地址失败'})
-      this.options = []
-      this.options = req.data
-    },
-    async getXian(value,lable,obj) {
-      this.xian_options = []
-      this.jdao_options = []
-      let newFilArr = obj.filter( (item,i) =>{
-         if(item.value == value){
-            return item
-         }
-      } )
-      if (newFilArr.length>0){
-        this.xian_options = newFilArr[0].children
-      }
-      if (value !=null && value.length!=0){
-        this.shijifontColors = this.pubColors
-      }else {
-        this.shijifontColors = this.pub2Colors
-        this.xianfontColors = this.pub2Colors
-        this.shequfontColors = this.pub2Colors
-      }
-      this.$parent.$parent.$parent.areaData.sjvalue = value
-      this.$parent.$parent.$parent.disableButton()
-      // this.$dispatch('shiji-select', value, lable)
-    },
-    async getjdao(value,lable,obj) {
-      this.jdao_options = []
-      let newFilArr = obj.filter( (item,i) =>{
-        if(item.value == value){
-          return item
-        }
-      } )
-      if (newFilArr.length>0){
-        this.jdao_options = newFilArr[0].children
-      }
-      if (value !=null && value.length!=0){
-        this.xianfontColors = this.pubColors
-      }else {
-        this.xianfontColors = this.pub2Colors
-        this.shequfontColors = this.pub2Colors
-      }
-      this.$parent.$parent.$parent.areaData.xianvalue = value
-      this.$parent.$parent.$parent.disableButton()
-      // this.$dispatch('xian-select',value, lable)
-    },
-    async getshequ(value,lable,obj) {
-      if (value !=null && value.length!=0){
-        this.shequfontColors = this.pubColors
-      }else {
-        this.shequfontColors = this.pub2Colors
-      }
-      this.$parent.$parent.$parent.areaData.sqvalue = value
-      this.$parent.$parent.$parent.disableButton()
-      // this.$dispatch('shequ-select',value, lable)
-    }
-  },
-  watch: {
-
-  }
-}
-</script>
+<template>
+  <div :class="style">
+    <label :class="labelstyle" :style="shijifontColors">市&emsp;&emsp;县</label>
+    <app-res-area-select
+                :options = options
+                @res-select="getXian"
+                :issearch = "false"
+    >
+    </app-res-area-select>
+  </div>
+  <div :class="style">
+    <label :class="labelstyle" :style="xianfontColors">街道乡镇</label>
+    <app-res-area-select
+      :options = xian_options
+      @res-select="getjdao"
+      :issearch = "false"
+    >
+    </app-res-area-select>
+  </div>
+  <div :class="style">
+    <label :class="labelstyle" :style="shequfontColors">社&emsp;&emsp;区</label>
+    <app-res-area-select
+      :options = jdao_options
+      @res-select="getshequ"
+      :issearch = "false"
+    >
+    </app-res-area-select>
+  </div>
+</template>
+<script>
+
+import { HttpResetClass } from 'vue-client'
+import Vue from "vue";
+export default {
+  title: '区域选择分组',
+  props: {
+    style: {
+      type: String,
+      default: 'col-xs-12 form-group app-input'
+    },
+    labelstyle: {
+      type: String,
+      default: 'font_normal_title'
+    },
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    //初始值 默认选中值
+    initres: {
+      type: Object,
+      default: null,
+    }
+  },
+  data () {
+    return {
+      options:[],
+      initres: [],
+      xianginitres: [],
+      jdaoinitres: [],
+      xian_options:[],
+      jdao_options:[],
+      shijifontColors:"color: #cd5c5c",//红色
+      xianfontColors:"color: #cd5c5c",//红色
+      shequfontColors:"color: #cd5c5c",//红色
+      pubColors:"color: #0c2e4d",// 黑色
+      pub2Colors:"color: #cd5c5c"// 红色
+    }
+  },
+  ready () {
+    this.getResList();
+  },
+  methods:{
+    //获取区域地址
+    async getResList() {
+      let http = new HttpResetClass()
+      // let req = await http.load('POST', '/rs/logic/resAreaSelect', {
+      let req = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/resAreaSelect`, {
+          userid: Vue.user.id,
+          orgid: Vue.user.orgid
+        }, {resolveMsg: null, rejectMsg: '获取区域地址失败'})
+      this.options = []
+      this.options = req.data
+    },
+    async getXian(value,lable,obj) {
+      this.xian_options = []
+      this.jdao_options = []
+      let newFilArr = obj.filter( (item,i) =>{
+         if(item.value == value){
+            return item
+         }
+      } )
+      if (newFilArr.length>0){
+        this.xian_options = newFilArr[0].children
+      }
+      if (value !=null && value.length!=0){
+        this.shijifontColors = this.pubColors
+      }else {
+        this.shijifontColors = this.pub2Colors
+        this.xianfontColors = this.pub2Colors
+        this.shequfontColors = this.pub2Colors
+      }
+      this.$parent.$parent.$parent.areaData.sjvalue = value
+      this.$parent.$parent.$parent.disableButton()
+      // this.$dispatch('shiji-select', value, lable)
+    },
+    async getjdao(value,lable,obj) {
+      this.jdao_options = []
+      let newFilArr = obj.filter( (item,i) =>{
+        if(item.value == value){
+          return item
+        }
+      } )
+      if (newFilArr.length>0){
+        this.jdao_options = newFilArr[0].children
+      }
+      if (value !=null && value.length!=0){
+        this.xianfontColors = this.pubColors
+      }else {
+        this.xianfontColors = this.pub2Colors
+        this.shequfontColors = this.pub2Colors
+      }
+      this.$parent.$parent.$parent.areaData.xianvalue = value
+      this.$parent.$parent.$parent.disableButton()
+      // this.$dispatch('xian-select',value, lable)
+    },
+    async getshequ(value,lable,obj) {
+      if (value !=null && value.length!=0){
+        this.shequfontColors = this.pubColors
+      }else {
+        this.shequfontColors = this.pub2Colors
+      }
+      this.$parent.$parent.$parent.areaData.sqvalue = value
+      this.$parent.$parent.$parent.disableButton()
+      // this.$dispatch('shequ-select',value, lable)
+    }
+  },
+  watch: {
+
+  }
+}
+</script>