apply-clients 7.1.36-yuchuan-3 → 7.1.36-yuchuan-4.1

package/src/components/product/ApplyMap/ApplyMapLocation.vue

@@ -222,7 +222,12 @@ export default {
         zindex: 99999
       })
       // eslint-disable-next-line no-undef
-      AMap.event.addListener(this.map, 'complete', this.mapInitSuccess())
+      // AMap.Event.addListener(this.map, 'complete', this.mapInitSuccess ())     // AMap.Event.addListener(this.map, 'complete', this.mapInitSuccess())
+      if (AMap.Event){
+        AMap.Event.addListener(this.map, 'complete',this.mapInitSuccess () )
+      } else {
+        AMap.event.addListener(this.map, 'complete',this.mapInitSuccess () )
+      }
       window.map = this.map
       // 异步加载地图插件
       // eslint-disable-next-line no-undef
@@ -254,8 +259,14 @@ export default {
             })
             thas.map.addControl(geolocation)
             geolocation.getCurrentPosition()
-            AMap.event.addListener(geolocation, 'complete', thas.onComplete)
-            AMap.event.addListener(geolocation, 'error', thas.onError)
+            if (AMap.Event){
+              AMap.Event.addListener(geolocation, 'complete', thas.onComplete)
+              AMap.Event.addListener(geolocation, 'error', thas.onError)
+            } else {
+              AMap.event.addListener(geolocation, 'complete', thas.onComplete)
+              AMap.event.addListener(geolocation, 'error', thas.onError)
+            }
+
           }
         })
     },
@@ -308,7 +319,7 @@ export default {
       this.myMarker = marker
       // 对marker绑定点击时事件
       // eslint-disable-next-line no-undef
-      AMap.event.addListener(marker, 'click', mkOnclick)
+      AMap.Event.addListener(marker, 'click', mkOnclick)
 
       function mkOnclick (result) {
         console.log('事件触发')
@@ -345,6 +356,7 @@ export default {
                 city: result.adcode
               })
               var lnglat = result.rectangle.split(';')[0].split(',')
+              console.log("shujushi1"+lnglat)
               geocoder.getAddress(lnglat, function (status, data) {
                 if (status === 'complete' && data.info === 'OK') {
                   // result为对应的地理位置详细信息
@@ -553,7 +565,7 @@ export default {
         this.map.clearMap();
       }
       var marker = new AMap.Marker({
-        position: _position,
+        position:new AMap.LngLat(_position.lng,_position.lat),
         icon: _icon,
         map: this.map
       });
@@ -570,7 +582,7 @@ export default {
       });
       if (!/(iPhone|iPad|iPod|iOS|Android)/i.test(navigator.userAgent)) {
         // 鼠标移动到点触发
-        AMap.event.addListener(marker, 'mouseover', (row) => {
+        AMap.Event.addListener(marker, 'mouseover', (row) => {
           // 打开信息窗体
           if (_ismoseOpen) {
             infoWindow.setContent(_data.content)
@@ -580,7 +592,7 @@ export default {
           this.$emit("diyspotmouseover", _data.data)
         })
         // 鼠标离开改点触发
-        AMap.event.addListener(marker, 'mouseout', (row) => {
+        AMap.Event.addListener(marker, 'mouseout', (row) => {
           // 关闭信息窗体
           if (_ismoseOpen) {
             infoWindow.close();
@@ -591,7 +603,7 @@ export default {
 
       } else {
         // 触摸开始时触发事件，仅适用移动设备
-        AMap.event.addListener(marker, 'touchstart', (row) => {
+        AMap.Event.addListener(marker, 'touchstart', (row) => {
           // 打开信息窗体
           if (_ismoseOpen) {
             infoWindow.setContent(_data.content)
@@ -601,7 +613,7 @@ export default {
           this.$emit("diyspottouchstart", _data.data)
         })
         // 触摸结束触发
-        AMap.event.addListener(marker, 'touchend', (row) => {
+        AMap.Event.addListener(marker, 'touchend', (row) => {
 
           // 关闭信息窗体  （移动端长按时间离开后触发）
           if (_ismoseOpen) {
@@ -614,7 +626,7 @@ export default {
         })
       }
       // 鼠标点击触发
-      AMap.event.addListener(marker, 'click', (row) => {
+      AMap.Event.addListener(marker, 'click', (row) => {
         this.$emit("diyspotmouseclick", _data.data)
       })
       this.map.setFitView();

package/src/components/product/ChongZheng/ApplyChongZhengList.vue

@@ -25,7 +25,7 @@
               <export-excel :data="$parent.$parent.getCondition"
                             :field="$parent.$parent.getfield"
                             sqlurl="rs/logic/applyExportfile"
-                            sql-name="getApplyCharge"
+                            sql-name="getApplyChongZheng"
                             template-name='冲正记录信息导出'
                             :choose-col="true"></export-excel>
               <div

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

@@ -10,20 +10,104 @@
     data () {
       return {
         show_data: null, // 给通用页面显示的数据
-        showview: false // 控制通用页面
+        showview: false, // 控制通用页面
+        recording: 0, // 是否有缴费记录
       }
     },
     ready () {
       this.refurbish()
     },
     methods: {
+      // 判断是否有缴费记录
+        getCheckPayRecording () {
+        let http = new HttpResetClass()
+        let data = {
+          f_process_id: this.selectdata.f_process_id,
+          user: this.$login.f,
+          paynum:'',
+        }
+        let res =  http.load('POST', 'rs/logic/getCheckPay', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '缴费记录查询失败！！！'
+        })
+        // 有缴费记录
+        if (res.data> 0) {
+          this.recording = 1
+
+        }
+      },
+     modifData(fields,falg){
+      fields.forEach(item => {
+      if((item.label=='工程费单价'||item.label=='应交总金额'|| item.label=='未结总金额')&&falg==1){
+        this.readwriteLabels(item.label)
+      }
+        if((item.label=='工程费单价'||item.label=='应交总金额'|| item.label=='未结总金额')&&falg==0){
+          this.readonlyLabels(item.label)
+        }
+    })
+  },
+      //根据缴费记录判断是否可编辑
+      async getCheckPay (fields, defname,type) {
+        console.log(fields)
+        let http = new HttpResetClass()
+        let data = {
+          f_process_id: this.selectdata.f_process_id,
+          user: this.$login.f,
+          paynum:'',
+        }
+        let res = await http.load('POST', 'rs/logic/getCheckPay', {data:data}, {
+          resolveMsg: null,
+          rejectMsg: '缴费记录查询失败！！！'
+        })
+        // 有缴费记录
+        if (res.data> 0) {
+        if(type=='非民用报建'||type=='设备变更'){
+          if(defname=='报装缴费'){
+            fields.forEach(item => {
+              if(item.label=='收费标准备注'){
+                this.showLabels(item.label)
+              }
+            })
+          }
+        }
+          //使用foreach遍历fields
+          if(defname=='报装缴费'){
+            fields.forEach(item => {
+              if(item.label=='收费标准备注'||item.label=='票据类型'||item.label=='报警器'||item.label=='购货单位识别号'||item.label=='购货单位名称'||item.label=='购货单位开户'||item.label=='购货单位地址电话'||item.label=='购货单位银行账号'){
+                this.readonlyLabels(item.label)
+              }else{
+                this.readonlyLabels(item.label)
+              }
+            })
+          }
+        }else{ //无缴费记录
+          if(type=='非民用报建'||type=='设备变更'){
+            if(defname=='报装缴费'){
+              fields.forEach(item => {
+                if(item.label=='收费标准备注'){
+                 this.showLabels(item.label)
+                }
+              })
+            }
+          }
+          if(defname=='报装缴费'){
+            fields.forEach(item => {
+              if(item.label=='收费标准备注'||item.label=='票据类型'||item.label=='报警器'||item.label=='购货单位识别号'||item.label=='购货单位名称'||item.label=='购货单位开户'||item.label=='购货单位地址电话'||item.label=='购货单位银行账号'){
+
+                this.readwriteLabels(item.label)
+              }else{
+                this.readonlyLabels(item.label)
+              }
+            })
+          }
+        }
+      },
       async refurbish () {
         // fields 字段填充值
         for (const item of this.selectdata.fields) {
           if (!item.value) {
             item.value = null
           }
-
           if (!item.value && (item.default || item.default === 0) && item.type !== 'datepicker') {
             if (item.eval) {
               item.value = eval(item.default)
@@ -31,7 +115,6 @@
               item.value = item.default
             }
           }
-
           if (this.selectdata[item.field]) {
             // 将json字符串格式化赋值给value
             if (String(this.selectdata[item.field]).startsWith("{")) {
@@ -57,7 +140,6 @@
               if (temp && temp.length > 0) {
                 item.options = temp
               }
-
               if (item.paramLabel) {
                 temp = this.$appdata.getParam(item.paramLabel)
                 if (temp && temp.length > 0) {
@@ -65,13 +147,10 @@
                 }
               }
             }
-
             if (item.ready) {
               item.options = await this[item.ready]()
             }
           }
-
-
           if (item.type === 'checkbox') {
             if (this.selectdata[item.field]) {
               item.value = JSON.parse(this.selectdata[item.field])
@@ -80,14 +159,12 @@
             }
           }
         }
-
         // 控制组件
         if (this.selectdata.components) {
           this.selectdata.components.forEach(item => {
             item.mark = 2
           })
         }
-
         // 初始化onetomany
         if (this.selectdata.onetomany) {
           for (const item of this.selectdata.onetomany) {
@@ -105,9 +182,7 @@
                 {resolveMsg: null, rejectMsg: 'onetomany查询失败'}
               )
             }
-
             item.rows = res.data
-
             // 初始化onetomany中的fields
             for (const field of item.fields) {
               if (!field.value) {
@@ -142,14 +217,29 @@
             }
           }
         }
-
         // 消除双向绑定，避免子组件（显示层）数据更改，父组件（控制层）也更改
         let temp = JSON.parse(JSON.stringify(this.selectdata))
-
         this.show_data = temp
         this.$nextTick(() => {
           this.showview = true
         })
+        const defname = this.selectdata.defname
+        const type = this.selectdata.f_apply_type
+        const  title=this.selectdata.title
+         if(title=='信息修改' ||title=='信息变更'){
+           this.getCheckPay(this.selectdata.fields, defname, type)
+         }
+        if( type=='非民用报建'  && title=='费用调整'){
+          if(defname=='报装缴费'){
+            this.getCheckPayRecording()
+            if(this.recording ==1){ //收费了
+              this.modifData(this.selectdata.fields,0)
+            }
+            if(this.recording ==0){  //没收费
+              this.modifData(this.selectdata.fields,1)
+            }
+          }
+        }
       },
       // 金额转大写
       smalltoBIG(n) {
@@ -346,7 +436,28 @@
               }
             })
             throw '用户已缴费，无法修改！！！'
+          }else{
+            let datas = {
+              data: this.show_data,
+              user: this.$login.f
+            }
+            let http = new HttpResetClass()
+            let res = http.load('POST', 'rs/logic/modifyRecords', {data:datas}, {
+              resolveMsg: null,
+              rejectMsg: '保存修改记录失败！！！'
+            })
+          }
+        }
+        if(this.selectdata.title === '费用调整'){
+          let data = {
+            data: this.show_data,
+            user: this.$login.f
           }
+          let http = new HttpResetClass()
+          let res = http.load('POST', 'rs/logic/modifyRecords', {data:data}, {
+            resolveMsg: null,
+            rejectMsg: '保存修改记录失败！！！'
+          })
         }
         console.log("保存数据")
         let res = await this.$resetpost(
@@ -354,7 +465,6 @@
           this.show_data,
           {resolveMsg: null, rejectMsg: '数据保存失败！！！'}
         )
-
         this.$dispatch('loadPage')
       },
       //身份证号码校验
@@ -470,6 +580,7 @@
       }
     },
     watch:{
+      deep: true
     }
   }
 </script>

package/src/components/product/GongJianPush/ApplyPushDispose.vue

@@ -0,0 +1,182 @@
+<template>
+  <div class="auto">
+    <validator name='a' @valid="addressValid(true)" @invalid="addressValid(false)">
+      <form class="form-horizontal">
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_user_name ? 'has-error' : '']">
+            <label class="font_normal_body">用户姓名</label>
+            <input type="text" v-model="model.f_user_name" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_phone ? 'has-error' : '']">
+            <label class="font_normal_body">用户电话</label>
+            <input type="text" v-model="model.f_phone" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_address ? 'has-error' : '']">
+            <label class="font_normal_body">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</label>
+            <input type="text" v-model="model.f_address" disabled=disabled style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_apply_num ? 'has-error' : '']">
+            <label class="font_normal_body">工程编号</label>
+            <input type="text" v-model="model.f_apply_num" style="width: 60%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_apply_type ? 'has-error' : '']">
+            <label class="font_normal_body">报装类型</label>
+            <input type="text" v-model="model.f_apply_type" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_apply_source ? 'has-error' : '']">
+            <label class="font_normal_body">报装来源</label>
+            <input type="text" v-model="model.f_apply_source" style="width: 60%" class="input_search">
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_apply_nature ? 'has-error' : '']">
+            <label class="font_normal_body">报建性质</label>
+            <input type="text" v-model="model.f_apply_nature" style="width: 60%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.defname ? 'has-error' : '']">
+            <label class="font_normal_body">办理环节</label>
+            <input type="text" v-model="model.defname" style="width: 60%" class="input_search"
+                   v-validate:f_status='{required: true}'>
+          </div>
+          <div class="col-sm-6" :class="[!model.f_sub_state ? 'has-error' : '']">
+            <label class="font_normal_body">流程状态</label>
+            <input type="text" v-model="model.f_sub_state" style="width: 60%" class="input_search"
+                   v-validate:f_dispose_phone='{required: true}'>
+          </div>
+          <div class="col-sm-6" :class="[!model.f_apply_date ? 'has-error' : '']">
+            <label class="font_normal_body">报建日期</label>
+            <datepicker id="f_bill_date" placeholder="报建日期" style="width:60%"
+                        v-model="model.f_apply_date"
+                        :value.sync="model.f_apply_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true"
+                        v-validate:f_apply_date='{required: true}'>
+            </datepicker>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-6" :class="[!model.f_project_name ? 'has-error' : '']">
+            <label class="font_normal_body">项目名称</label>
+            <input type="text" v-model="model.f_project_name" style="width: 48%" class="input_search">
+          </div>
+          <div class="col-sm-6">
+            <label class="font_normal_body">土地获取方式</label>
+            <v-select :value.sync="model.f_land_acquisition_methods" v-model="model.f_land_acquisition_methods"
+                      placeholder='土地获取方式'
+                      value-single="true"
+                      :options='$parent.$parent.landMethods'
+                      close-on-select
+            ></v-select>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm-12" :class="[!model.f_total_investment ? 'has-error' : '']">
+            <label class="font_normal_body">总投资(万元)</label>
+            <input type="text" v-model="model.f_total_investment"  style="width: 30%"
+                   class="input_search">
+          </div>
+
+        </div>
+        <div class="row">
+          <div class="col-sm-12" :class="[!model.f_land_area ? 'has-error' : '']">
+            <label class="font_normal_body">用地面积</label>
+            <input type="text" v-model="model.f_land_area"  style="width: 30%" class="input_search">
+          </div>
+          <div class="col-sm-6" :class="[!model.f_open_date ? 'has-error' : '']">
+            <label class="font_normal_body">拟开工时间</label>
+            <datepicker id="f_bill_date" placeholder="拟开工时间" style="width:60%"
+                        v-model="model.f_open_date"
+                        :value.sync="model.f_open_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true"
+                        v-validate:f_open_date='{required: true}'>
+            </datepicker>
+          </div>
+          <div class="col-sm-6" :class="[!model.f_success_date ? 'has-error' : '']">
+            <label class="font_normal_body">拟建成时间</label>
+            <datepicker id="f_bill_date" placeholder="拟建成时间" style="width:60%"
+                        v-model="model.f_success_date"
+                        :value.sync="model.f_success_date"
+                        :format="'yyyy-MM-dd HH:mm:ss'"
+                        :show-reset-button="true"
+                        v-validate:f_success_date='{required: true}'>
+            </datepicker>
+          </div>
+          <div class="col-sm-12" :class="[!model.f_national_standard_industry ? 'has-error' : '']">
+            <label class="font_normal_body">国标行业</label>
+            <input type="text" v-model="model.f_national_standard_industry"  style="width: 30%" class="input_search">
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm-12" :class="[!model.f_construction_content ? 'has-error' : '']">
+            <label class="font_normal_body">建设规模及内容</label>
+            <input type="text" v-model="model.f_construction_content" style="width: 60%" class="input_search"
+                   v-validate:f_explain='{required: true}'>
+          </div>
+        </div>
+      </form>
+    </validator>
+
+    <div style="float: right">
+      <button
+        type="button"
+        class="btn button_search"
+        :disabled="!isFormComplete()"
+        @click="save">提交</button>
+      <button class="button_clear" @click="cancel">取消</button>
+    </div>
+  </div>
+</template>
+
+<script>
+
+export default {
+  title: '报警处置',
+
+  data () {
+    return {
+      landMethods: [{label: '划拨用地', value: '划拨用地'}, {label: '自有用地', value: '自有用地'}, {label: '公开出让用地', value: '公开出让用地'}, {label: '协议出让用地', value: '协议出让用地'}, {label: '其他', value: '其他'}]
+    }
+  },
+
+  props: {
+    model: {
+      type: Object
+    }
+  },
+  methods: {
+    isFormComplete () {
+      const model = this.model
+      return (
+        model.f_user_name && model.f_user_phone && model.f_address && model.f_device_code && model.f_latest_alarm_value &&
+        model.f_alarm_type && model.f_latest_alarm_level && model.f_latest_alarm_time && model.f_dispose_status &&
+        model.f_dispose_person && model.f_dispose_phone && model.f_status && model.f_dispose_time && model.f_explain
+      )
+    },
+    cancel () {
+      this.$dispatch('close')
+    },
+    addressValid (val) {
+      console.log(val)
+    },
+    save () {
+      this.$resetpost('rs/logic/pushAlarmDispose', {data: this.model}).then((res) => {
+        console.log('this.model', this.model)
+      })
+      this.$dispatch('close')
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>