apply-clients 7.1.36-yuchuan-4 → 7.1.36-yuchuan-5

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/Ignition/IgnitionListManage.vue

@@ -569,7 +569,7 @@ export default {
       });
     },
     searchCondition(args) {
-      args.condition = args.condition + ` and ir.id is null`;
+      args.condition = args.condition + ` and ir.id is   null`;
       console.log("this.showDatade", this.showData);
       // args.condition = args.condition + ` and ui.f_process_id = '${this.showData.f_process_id}'`
       args.condition = args.condition + ` and ui.f_process_id is not null`;

package/src/components/product/Ignition/IgnitionRecord.vue

@@ -127,6 +127,28 @@
                             condition="ir.f_date <= '{}'">
                 </datepicker>
               </div>
+              <div class="form-group col-sm-3">
+                <label  for="startFireDate" class="font_normal_body"><strong>点火时间：</strong></label>
+                <datepicker id="startFireDate" placeholder="开始日期"
+                            style="width: 60%!important;"
+                            v-model="model.startFireDate"
+                            :value.sync="model.startFireDate"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            :show-reset-button="true"
+                            condition="ir.f_ignition_date>= '{}'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-3">
+                <label for="endFireDate" class="font_normal_body"><strong>点火时间：</strong></label>
+                <datepicker id="endFireDate" placeholder="结束日期"
+                            style="width: 60%!important;"
+                            v-model="model.endFireDate"
+                            :value.sync="model.endFireDate"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            :show-reset-button="true"
+                            condition="ir.f_ignition_date <= '{}'">
+                </datepicker>
+              </div>
             </div>
           </div>
         </criteria>

package/src/components/product/List/OldShowDevices.vue

@@ -0,0 +1,271 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <criteria-paged :model="model" v-ref:cp>
+        <criteria partial='criteria' @condition-changed='search' v-ref:cri>
+          <div class="form-horizontal select-overspread container-fluid auto" partial>
+            <div class="row">
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body"><strong>报建编号：</strong></label>
+                <input type="text" class="input_search" style="width: 60%" v-model="model.f_apply_num"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="u.f_apply_num like '%{}%'"
+                       placeholder='报建编号'>
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body"><strong>用户名称：</strong></label>
+                <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="u.f_user_name like '%{}%'"
+                       placeholder='用户名称'>
+              </div>
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body"><strong>电&emsp;&emsp;话：</strong></label>
+                <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone"
+                       v-on:keyup.enter="$parent.$parent.search()" condition="u.f_phone 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>
+                <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                <export-excel :data="$parent.$parent.getCondition"
+                              :field="$parent.$parent.getfield"
+                              sqlurl="rs/logic/applyExportfile"
+                              sql-name="getOldDevices"
+                              template-name='设备记录信息导出'
+                              :choose-col="true"></export-excel>
+                <div
+                  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
+                  @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"
+                  class="button_spacing"
+                  style="float: right">
+                </div>
+              </div>
+            </div>
+            <div class="row" v-show="$parent.$parent.criteriaShow">
+              <div class="form-group col-sm-2">
+                <label class="font_normal_body"><strong>报建类型：</strong></label>
+                <v-select
+                  v-model="model.f_apply_type"
+                  placeholder='请选择'
+                  condition="u.f_apply_type = '{}'"
+                  :value.sync="model.f_apply_type"
+                  :options='$parent.$parent.applytype'
+                  class="select select_list"
+                  :value-single="true"
+                  close-on-select></v-select>
+              </div>
+              <div class="form-group col-sm-2">
+                <label for="startDate" class="font_normal_body"><strong>开始时间：</strong></label>
+                <datepicker id="startDate" placeholder="开始日期"
+                            style="width: 60%!important;"
+                            v-model="model.startDate"
+                            :value.sync="model.startDate"
+                            :format="'yyyy-MM-dd 00:00:00'"
+                            :show-reset-button="true"
+                            condition="ct.f_create_date >= '{}'">
+                </datepicker>
+              </div>
+              <div class="form-group col-sm-2">
+                <label for="endDate" class="font_normal_body"><strong>结束时间：</strong></label>
+                <datepicker id="endDate" placeholder="结束日期"
+                            style="width: 60%!important;"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            :format="'yyyy-MM-dd 23:59:59'"
+                            :sho w-reset-button="true"
+                            condition="ct.f_create_date <= '{}'">
+                </datepicker>
+              </div>
+            </div>
+          </div>
+        </criteria>
+        <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
+          <template partial='head'>
+            <tr>
+              <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>
+              <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;">单位(KW)</th>
+              <th style="white-space: nowrap;">锅炉单位(MW)</th>
+              <th style="white-space: nowrap;">锅炉吨位(T)</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>
+            </tr>
+          </template>
+          <template partial='body'>
+            <tr>
+              <td style="text-align: center;">
+                <nobr><font>{{ $index + 1 }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_user_name }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_entrust_contract_number }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_contract_number }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_phone }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.huoyan }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.xiaohuoyan }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.bigualu }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.jiayongzao }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.reshuiqi }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.cainuanlu }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.chashuilu }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.zhengche }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.zhengqifashengqi }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.zaoju }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.yasuoji }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.mokuailu }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.danweikw }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.danweimw }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.dunwei }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_apply_num }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_contract_state }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_apply_type }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_apply_nature }}</font></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><font>{{ row.f_install_count }}</font></nobr>
+              </td>
+            </tr>
+          </template>
+        </data-grid>
+      </criteria-paged>
+    </div>
+  </div>
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+export default {
+  title: '原报建设备列表',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getOldDevices', 20, {
+        data: {
+          f_filiale: this.$login.f.f_fengongsi
+        }
+      }),
+      applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
+      criteriaShow: false,
+      getfield: {
+        'f_apply_num': ' 报 建 编 号 ',
+        'f_user_name': ' 用 户 名 称 ',
+        'f_contact': '  联 系 人  ',
+        'f_address': '      地        址     ',
+        'f_phone': '  电      话  ',
+        'f_apply_type': ' 报 建 类 型 ',
+        'f_apply_nature': ' 报建性质 ',
+        'f_install_count': ' 安装处数 ',
+        'huoyan': ' 火眼 ',
+        'xiaohuoyan': ' 小火眼 ',
+        'bigualu': ' 壁挂炉 ',
+        'jiayongzao': ' 家用灶 ',
+        'reshuiqi': ' 热水器 ',
+        'cainuanlu': ' 采暖炉 ',
+        'chashuilu': ' 茶水炉 ',
+        'zhengche': ' 蒸车 ',
+        'zhengqifashengqi': ' 蒸汽发生器 ',
+        'zaoju': ' 灶具 ',
+        'yasuoji': ' 压缩机 ',
+        'mokuailu': ' 模块炉 ',
+        'danweikw': ' 锅炉单位(KW) ',
+        'danweimw': ' 锅炉单位(MW) ',
+        'dunwei': ' 锅炉吨位(T) ',
+        'f_entrust_contract_number': '施工合同编号',
+        'f_contract_number': '供气合同编号',
+        'f_create_date': '合同创建日期',
+        'f_due_money': ' 合同金额 ',
+        'f_contract_state': '合同状态'
+
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = []
+      })
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          f_filiale: this.$login.f.f_fengongsi
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>