apply-clients 3.4.3 → 3.4.4

package/src/components/product/Function/InstallFunction.vue

@@ -15,7 +15,7 @@
                           :isdelete="true"
                           :isusetype="true"
                           :isremark = "true"
-                          :takeimg="false"
+                          :takeimg="true"
                           :issearch="true"
                           :defname="show_data.defname"
             >
@@ -39,7 +39,7 @@
         showData: true     // 控制列表数据
       }
     },
-    ready () {
+    created () {
       this.getConfig()
     },
     methods: {
@@ -60,6 +60,7 @@
         let data = {
           condition: `u.id = ${servicedata.id}`,
           data: {
+            id: this.$login.f.id,
             orgid: this.$login.f.orgid
           }
         }

package/src/components/product/Function/InstallInfoSelect.vue

@@ -14,15 +14,15 @@
               ></res-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">报建编号：</label>
-              <input type="text" style="width:60%" class="input_search" placeholder='报建编号' v-model="model.f_apply_num"
+              <label class="font_normal_body">工程编号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='工程编号' v-model="model.f_apply_num"
                      v-on:keyup.enter="$parent.$parent.search()"
                      condition="f_apply_num = '{}'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">项目名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_entry_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_entry_name like '%{}%'" placeholder='项目名称'>
+              <label class="font_normal_body">客户名称：</label>
+              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
             </div>
             <div class="form-group col-sm-3 button-range">
               <button class="button_search button_spacing" @click="$parent.$parent.search()" v-el:cx>查询</button>
@@ -38,14 +38,16 @@
           </div>
           <div class="row" v-show="$parent.$parent.criteriaShow">
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">客户名称：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_user_name like '%{}%'" placeholder='客户名称'>
+              <label class="font_normal_body">联系电话：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_phone like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">联&ensp;系&ensp;人：</label>
-              <input type="text" style="width:60%" class="input_search" v-model="model.f_contact"
-                     v-on:keyup.enter="$parent.$parent.search()" condition="f_contact like '%{}%'" placeholder='联系人'>
+              <label class="font_normal_body">身份证号：</label>
+              <input type="text" style="width:60%" class="input_search" placeholder='身份证号' v-model="model.f_idnumber"
+                     v-on:keyup.enter="$parent.$parent.search()"
+                     condition="f_idnumber like '%{}%'">
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">合同编号：</label>
@@ -58,7 +60,7 @@
               <v-select
                 v-model="model.f_apply_type"
                 placeholder='报建类型'
-                condition="f_apply_type like '%{}%'"
+                condition="f_apply_type = '{}'"
                 :value.sync="model.f_apply_type"
                 :options='$parent.$parent.applytype'
                 class="select select_list"
@@ -79,10 +81,16 @@
                 close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-3">
-              <label class="font_normal_body">联系电话：</label>
-              <input type="text" style="width:60%" class="input_search" placeholder='联系电话' v-model="model.f_phone"
-                     v-on:keyup.enter="$parent.$parent.search()"
-                     condition="f_phone like '%{}%'">
+              <label class="font_normal_body">报建性质：</label>
+              <v-select
+                v-model="model.f_apply_nature"
+                placeholder='报建性质'
+                condition="f_apply_nature = '{}'"
+                :value.sync="model.f_apply_nature"
+                :options='$parent.$parent.applyNatures'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
             </div>
             <div class="form-group col-sm-3">
               <label class="font_normal_body">用户地址：</label>
@@ -96,7 +104,7 @@
                           style="width: 60%!important;"
                           v-model="model.startDate"
                           :value.sync="model.startDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 00:00:00'"
                           :show-reset-button="true"
                           condition="f_apply_date >= '{}'">
               </datepicker>
@@ -107,7 +115,7 @@
                           style="width: 60%!important;"
                           v-model="model.endDate"
                           :value.sync="model.endDate"
-                          :format="'yyyy-MM-dd HH:mm:ss'"
+                          :format="'yyyy-MM-dd 23:59:59'"
                           :show-reset-button="true"
                           condition="f_apply_date <= '{}'">
               </datepicker>
@@ -119,11 +127,12 @@
         <template partial='head'>
           <tr class="title">
             <th style="white-space: nowrap;">序号</th>
-            <th style="white-space: nowrap;">报建编号</th>
-            <th style="white-space: nowrap;">项目名称/客户名称/联系人</th>
+            <th style="white-space: nowrap;">工程编号</th>
+            <th style="white-space: nowrap;">客户名称</th>
             <th style="white-space: nowrap;">合同编号</th>
             <th style="white-space: nowrap;">电话</th>
             <th style="white-space: nowrap;">地址</th>
+            <th style="white-space: nowrap;">身份证号</th>
             <th style="white-space: nowrap;">报建类型</th>
             <th style="white-space: nowrap;">办理环节</th>
             <th style="white-space: nowrap;">流程状态</th>
@@ -140,7 +149,7 @@
               <nobr>{{row.f_apply_num}}</nobr>
             </td>
             <td style="text-align: center;">
-              <nobr>{{row.f_entry_name}}/{{row.f_user_name}}/{{row.f_contact}}</nobr>
+              <nobr>{{row.f_user_name}}</nobr>
             </td>
             <td style="text-align: center;">
               <nobr>{{row.f_contract_number}}</nobr>
@@ -151,6 +160,9 @@
             <td style="text-align: center;">
               <nobr>{{row.f_address}}</nobr>
             </td>
+            <td style="text-align: center;">
+              <nobr>{{row.f_idnumber}}</nobr>
+            </td>
             <td style="text-align: center;">
               <nobr>{{row.f_apply_type}}</nobr>
             </td>
@@ -198,6 +210,7 @@
         curorgid: [this.$login.f.orgid],
         applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
         defnames: [{label: '全部', value: ''}], // 流程节点
+        applyNatures: [{label: '全部', value: ''}], // 报建性质
         criteriaShow: false
       }
     },
@@ -236,6 +249,9 @@
           if (item.device && item.device !== 'pc') {
             continue
           }
+          // if (item.device || item.device !== 'pc') {
+          //   continue
+          // }
           this.funcs.push(item)
         }
       },
@@ -274,8 +290,12 @@
           )
 
           this.defnames = [{label: '全部', value: ''}, ...res.data]
+
+          this.applyNatures = isEmpty(this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)) ? [{label: '全部', value: ''}] : [{label: '全部', value: ''}, ...this.$appdata.getParam(`${this.$refs.cp.$refs.cri.model.f_apply_type}性质`)]
         } else {
           this.defnames = [{label: '全部', value: ''}]
+
+          this.applyNatures = [{label: '全部', value: ''}]
         }
       },
       clear () {

package/src/components/product/Function/Service/FunctionServiceControl.vue

@@ -4,13 +4,15 @@
 <script>
   import {HttpResetClass} from 'vue-client'
   import Vue from 'vue'
+  import {isEmpty} from "../../../Util";
   export default {
     title: '报建功能业务控制层',
     props: ['selectdata'],
     data () {
       return {
         show_data: null, // 给通用页面显示的数据
-        showview: false // 控制通用页面
+        showview: false, // 控制通用页面
+        config: {}
       }
     },
     ready () {
@@ -151,32 +153,6 @@
           this.showview = true
         })
       },
-      // 金额转大写
-      smalltoBIG(n) {
-        let fraction = ['角', '分'];
-        let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-        let unit = [['元', '万', '亿'], ['', '拾', '佰', '仟']];
-        let head = n < 0 ? '欠' : '';
-        n = Math.abs(n);
-
-        let s = '';
-
-        for (var i = 0; i < fraction.length; i++) {
-          s += (digit[Math.floor(n * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
-        }
-        s = s || '整';
-        n = Math.floor(n);
-
-        for (var i = 0; i < unit[0].length && n > 0; i++) {
-          let p = '';
-          for (var j = 0; j < unit[1].length && n > 0; j++) {
-            p = digit[n % 10] + unit[1][j] + p;
-            n = Math.floor(n / 10);
-          }
-          s = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + s;
-        }
-        return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
-      },
       getLableValue(label) {
         for (const item of this.show_data.fields) {
           if (item.label === label && item.type !== 'number') {
@@ -223,20 +199,6 @@
           }
         }
       },
-      showButtons(...buttons) {
-        for (const item of this.show_data.buttons) {
-          if (buttons.includes(item.button_name)) {
-            item.hidden = false
-          }
-        }
-      },
-      hideButtons(...buttons) {
-        for (const item of this.show_data.buttons) {
-          if (buttons.includes(item.button_name)) {
-            item.hidden = true
-          }
-        }
-      },
       requiredLabels(...labels) {
         for (const item of this.show_data.fields) {
           if (labels.includes(item.label)) {
@@ -266,42 +228,78 @@
             item.disabled = false
           }
         }
-      },
-      disabledButtons(...buttons) {
-        for (const item of this.show_data.buttons) {
-          if (buttons.includes(item.button_name)) {
-            item.disabled = true
+      }
+    },
+    events: {
+      // 信息修改初始化
+      'modifyInfoReadyEvent' () {
+        this.$getConfig(this, 'UserAddress')
+
+        let f_address_type = this.show_data.f_address_type
+
+        for (const item of this.show_data.fields) {
+          if (f_address_type === '民用市区') {
+            if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+              item.hidden = false
+              item.required = true
+            }
+            if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+              item.hidden = false
+              item.required = false
+            }
+            if (item.label === '地址') {
+              item.readonly = true
+            }
           }
-        }
-      },
-      enableButtons(...buttons) {
-        for (const item of this.show_data.buttons) {
-          if (buttons.includes(item.button_name)) {
-            item.disabled = false
+          if (f_address_type === '民用乡镇') {
+            if (item.label === '区/县' || item.label === '街道/乡镇' || item.label === '集收单位' || item.label === '门牌号') {
+              item.hidden = false
+              item.required = true
+            }
+            if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层') {
+              item.hidden = false
+              item.required = false
+            }
+            if (item.label === '楼层') {
+              item.hidden = true
+              item.required = false
+            }
+            if (item.label === '地址') {
+              item.readonly = true
+            }
+          }
+          if (f_address_type === '特殊地址') {
+            if (item.label === '区/县' || item.label === '街道/乡镇') {
+              item.hidden = false
+              item.required = true
+            }
+            if (item.label === '集收单位') {
+              item.hidden = false
+              item.required = false
+            }
+            if (item.label === '楼号/组' || item.label === '单元/排' || item.label === '楼层' || item.label === '门牌号') {
+              item.hidden = true
+              item.required = false
+            }
+            if (item.label === '地址') {
+              item.readonly = false
+            }
           }
         }
       },
-      async checkDuplicate(index) {
-        let http = new HttpResetClass()
-        let data = {
-          tablename: 't_apply',
-          condition: `${this.show_data.fields[index].field} = '${this.show_data.fields[index].value}'`
-        }
-        let res = await http.load('POST', 'rs/sql/singleTable', {data: data}, {
-          resolveMsg: null,
-          rejectMsg: `${this.show_data.fields[index].label}查询失败`
-        })
-        if (res.data.length > 0) {
-          this.show_data.fields[index].value = null
-          this.$showAlert(`${this.show_data.fields[index].label}已存在！！！`, 'warning', 3000)
-        }
-      }
-    },
-    events: {
+      // 信息修改
+      async 'modifyInfo' () {
+        let res = await this.$resetpost(
+          `rs/logic/modifyUserInfo`,
+          this.show_data,
+          {resolveMsg: null, rejectMsg: '用户信息修改失败！！！'}
+        )
+        this.$dispatch('loadPage')
+      },
       async 'stopApply' () {
 
         let data = {
-          apply: this.show_data,
+          data: this.show_data,
           user: this.$login.f
         }
 
@@ -316,7 +314,7 @@
       async 'pauseApply' () {
 
         let data = {
-          apply: this.show_data,
+          data: this.show_data,
           user: this.$login.f
         }
 
@@ -341,6 +339,33 @@
       },
       // 失去焦点出触发事件
       'onchange' (index) {
+        if (this.show_data.title === '信息修改') {
+          if (
+            this.show_data.fields[index].label === '区/县' ||
+            this.show_data.fields[index].label === '街道/乡镇' ||
+            this.show_data.fields[index].label === '集收单位' ||
+            this.show_data.fields[index].label === '楼号/组' ||
+            this.show_data.fields[index].label === '单元/排' ||
+            this.show_data.fields[index].label === '楼层' ||
+            this.show_data.fields[index].label === '门牌号'
+          ) {
+
+            let f_pcd = this.getLableValue('区/县') || ''
+            let f_street = this.getLableValue('街道/乡镇') || ''
+            let f_residential_area = this.getLableValue('集收单位') || ''
+            let f_building = this.getLableValue('楼号/组') || ''
+            let f_building_suffix = f_building ? this.config.f_building_suffix : ''
+            let f_unit = this.getLableValue('单元/排') || ''
+            let f_unit_suffix = f_unit ? this.config.f_unit_suffix : ''
+            let f_floor = this.getLableValue('楼层') || ''
+            let f_floor_suffix = f_floor ? this.config.f_floor_suffix : ''
+            let f_room = this.getLableValue('门牌号') || ''
+            let f_room_suffix = f_room ? this.config.f_room_suffix : ''
+
+            let f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
+            this.setLabelValue("地址", f_address)
+          }
+        }
       },
       'onblur' (index) {},
       'oninput' (index) {},

package/src/components/product/GaoDeMapComponents/GaoDeMap.vue

@@ -0,0 +1,231 @@
+<template>
+  <div id="gaoDeMap" class="display:flex">
+    <div :class="style">
+      <label :class="labelstyle" :style="lngColors">经度</label>
+      <div class="col-sm-6">
+        <input class="form-control input_view" style=""
+               type="input"
+               v-model="gaodetemplng"
+               placeholder="经度"
+               :readonly="readonly"
+               :disabled="disabled"
+        />
+      </div>
+    </div>
+    <div :class="style">
+      <label :class="labelstyle" :style="latColors">纬度</label>
+      <div class="col-sm-6">
+        <input class="form-control input_view" style=""
+               type="input"
+               v-model="gaodetemplat"
+               placeholder="纬度"
+               :readonly="readonly"
+               :disabled="disabled"
+        />
+      </div>
+      <button v-el:btn type="button" class="btn btn-default dropdown-toggle select-style margin-left:20px"
+              @click="openModal"
+              @blur="show = (search ? show : false)"
+              v-bind="{disabled: disabled}"
+      >
+        <span class="glyphicon glyphicon-map-marker" style="color: blue">获取位置</span>
+      </button>
+    </div>
+
+    <div>
+      <modal :show.sync="mapShow" v-if="mapShow" large backdrop="false" :width="900">
+        <header slot="modal-header" class="modal-header">
+        </header>
+        <article slot="modal-body" class="modal-body">
+          <amap-location :islocationclearmark="false" dom="gaodeaddboxmap" v-ref:positionInfo
+                         @getmylocation="getmylocation"></amap-location>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button v-show="mapShow" type="button" class="button_clear btn-gn" @click='closeModal'>取消</button>
+          <button v-show="mapShow" type="button" class="button_clear btn-gn" @click='confirmLocation'>确认</button>
+        </footer>
+      </modal>
+    </div>
+  </div>
+</template>
+<script>
+
+import {HttpResetClass} from 'vue-client'
+import Vue from "vue";
+
+export default {
+  title: '高德地图',
+  props: {
+    style: {
+      type: String,
+      default: 'col-sm-3 form-group'
+    },
+    labelstyle: {
+      type: String,
+      default: 'control-label-justify control-label col-sm-2'
+    },
+    mul: {
+      type: Boolean,
+      default: true
+    },
+    readonly: {
+      type: Boolean,
+      default: true
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+    //初始值 默认选中值
+    // initres: {
+    //   type: Object,
+    //   default: null,
+    // }
+  },
+  data() {
+    return {
+      orgresid: [this.$login.f.orgid],
+      options: [],
+      initres: [],
+      lngColors: "color: #cd5c5c",//红色
+      latColors: "color: #cd5c5c",//红色
+      pubColors: "color: #0c2e4d",// 黑色
+      pub2Colors: "color: #cd5c5c",// 红色
+      mapShow: false,//弹窗
+      gaodetemplng: "",//临时经度
+      gaodetemplat: "",//临时纬度
+      baidutemplng: "",
+      baidutemplat: ""
+    }
+  },
+  ready() {
+    this.getResList();
+  },
+  methods: {
+    async getResList() {
+    },
+    openModal() {
+      this.mapShow = true
+    },
+    closeModal() {
+      this.mapShow = false
+    },
+    getmylocation(res) {
+      this.GdMapTransBMap(res.position.lng, res.position.lat)
+    },
+    confirmLocation() {
+      // console.log("这是确认的位置信息:", this.gaodetemplng, this.gaodetemplat)
+      // this.row.f_userfiles_lat = this.templat
+      // this.row.f_userfiles_lng = this.templng
+      this.mapShow = false
+    },
+    // 提交前进行 经纬度坐标装换 高德转百度
+    async GdMapTransBMap(lng, lat) {
+      try {
+        var lnglattemp = {
+          'lnglat': lng + ',' + lat
+        }
+        var lnglat = await this.$resetpost(
+          // `rs/logic/gdMapTransBMap`,
+          `ncc/rs/logic/gdMapTransBMap`,
+          {data: lnglattemp},
+          {resolveMsg: null, rejectMsg: '地图坐标转换失败了'}
+        )
+        console.log("地图坐标转换请求返回值:",lnglat)
+        if (lnglat.data.status != 0) {
+          this.gaodetemplng = ""
+          this.gaodetemplat = ""
+          this.baidutemplng = ""
+          this.baidutemplat = ""
+          this.$showMessage("地图坐标转换失败: "+lnglat.data.message)
+          return
+        }
+        this.gaodetemplng = lng
+        this.gaodetemplat = lat
+        this.baidutemplng = lnglat.data.result[0].x
+        this.baidutemplat = lnglat.data.result[0].y
+        console.log("转换后的坐标:", lnglat.data.result[0].x, lnglat.data.result[0].y)
+      } catch (error) {
+      }
+    }
+  },
+  watch: {
+    'gaodetemplng'(val) {
+      if (val.toString() != null && val.toString() != 0) {
+        this.lngColors = this.pubColors
+      } else {
+        this.lngColors = this.pub2Colors
+      }
+      this.$parent.templatlng.gaodetemplng = this.gaodetemplng
+      this.$parent.disableButton()
+    },
+    'gaodetemplat'(val) {
+      if (val.toString() != null && val.toString() != 0) {
+        this.latColors = this.pubColors
+      } else {
+        this.latColors = this.pub2Colors
+      }
+      this.$parent.templatlng.gaodetemplat = this.gaodetemplat
+      this.$parent.disableButton()
+    },
+    'baidutemplng'(val) {
+      this.$parent.templatlng.baidutemplng = this.baidutemplng
+      this.$parent.disableButton()
+    },
+    'baidutemplat'(val) {
+      this.$parent.templatlng.baidutemplat = this.baidutemplat
+      this.$parent.disableButton()
+    }
+  }
+}
+</script>
+<style lang="less">
+#gaoDeMap {
+  #gaodeaddboxmap {
+    height: 300px;
+  }
+
+  .glyphicon-map-marker:hover {
+    color: red;
+  }
+
+  .glyphicon-map-marker {
+    color: blue;
+    cursor: pointer;
+  }
+
+  //.col-sm-4 {
+  //  .font_normal_body {
+  //    width: 73px;
+  //    overflow: auto;
+  //    white-space: nowrap;
+  //    // 指滚动条两边的按钮
+  //    &::-webkit-scrollbar-button {
+  //      display: none;
+  //    }
+  //
+  //    // 滚动条的宽度
+  //    &::-webkit-scrollbar {
+  //      width: 5px !important;
+  //      height: 5px !important;
+  //    }
+  //
+  //    // 滚动条的设置
+  //    &::-webkit-scrollbar-thumb {
+  //      background-color: #ddd;
+  //      background-clip: padding-box;
+  //    }
+  //
+  //    &::-webkit-scrollbar-thumb:hover {
+  //      background-color: #bbb;
+  //    }
+  //
+  //    &::-webkit-scrollbar-track {
+  //      /*滚动条里面轨道*/
+  //      box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  //      background: #ededed;
+  //    }
+  //  }
+  //}
+}
+</style>