apply-clients 7.1.36-1 → 7.1.36-yuchuan-2

package/src/components/android/Task/UpBuild/UpJianLi.vue

@@ -1,95 +1,98 @@
-<template>
-  <div>
-    <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
-      <tab header='任务列表' style="width: auto">
-        <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
-      </tab>
-    </tabset>
-  </div>
-</template>
-<script>
-import {HttpResetClass, PagedList} from 'vue-client'
-import Vue from 'vue'
-
-export default {
-  title: '监理单位派工',
-  data () {
-    return {
-      labelmarksarray: [],
-      tasknumber: 0,
-      active: 0,
-      f_lat: null,
-      f_lng: null,
-      defname: '监理单位派工'
-    }
-  },
-  ready () {
-    console.log('进入监理单位派工')
-    this.getApplyTaskDot()
-  },
-  methods: {
-    diyspotmouseclick (data) {
-      this.f_lat = data.f_lat
-      this.f_lng = data.f_lng
-
-      this.active = 1
-    },
-    async getApplyTaskDot () {
-      console.log('==========查询任务点==============')
-      this.tasknumber = 0
-      let http = new HttpResetClass()
-      let data = {
-        defname: this.defname,
-        userid: Vue.user.id
-      }
-      let res = await http.load(
-        'POST',
-        `${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyTaskDot`,
-        {data: data},
-        {
-          resolveMsg: null,
-          rejectMsg: '任务点获取失败！！！'
-        })
-      this.labelmarksarray = res.data.map(item => {
-        this.tasknumber += item.count
-        return {
-          data: {
-            data: item,
-            content: `<p>任务数：${item.count}</p>`
-          },
-          position: [item.f_lng, item.f_lat],
-          isclearmarker: false,
-          islabel: false
-        }
-      })
-    }
-  },
-  events: {
-    'refreshDot' () {
-      this.getApplyTaskDot()
-    }
-  },
-  watch: {
-  },
-  computed: {
-  }
-}
-</script>
-<style scoped>
-.tip{
-  position: absolute;
-  z-index: 1000;
-  color: red;
-  font-size: 24px;
-  right: 30px;
-  padding-top: 20px;
-}
-</style>
-<style lang="less">
-.nav-apply-tab2 {
-  li {
-    width: 100%;
-    text-align: center;
-  }
-}
-</style>
+<template>
+  <div>
+    <tabset v-ref:tabs :close="false" nav-style="tabs nav-apply-tab2" :active.sync="active">
+      <tab header='报建' style="width: auto">
+        <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
+      </tab>
+      <tab header='管线' style="width: auto">
+        <app-exploration-user v-ref:exploration :defname="defname" :f_lat="f_lat" :f_lng="f_lng"></app-exploration-user>
+      </tab>
+    </tabset>
+  </div>
+</template>
+<script>
+import {HttpResetClass, PagedList} from 'vue-client'
+import Vue from 'vue'
+
+export default {
+  title: '监理单位派工',
+  data () {
+    return {
+      labelmarksarray: [],
+      tasknumber: 0,
+      active: 0,
+      f_lat: null,
+      f_lng: null,
+      defname: '监理单位派工'
+    }
+  },
+  ready () {
+    console.log('进入监理单位派工')
+    this.getApplyTaskDot()
+  },
+  methods: {
+    diyspotmouseclick (data) {
+      this.f_lat = data.f_lat
+      this.f_lng = data.f_lng
+
+      this.active = 1
+    },
+    async getApplyTaskDot () {
+      console.log('==========查询任务点==============')
+      this.tasknumber = 0
+      let http = new HttpResetClass()
+      let data = {
+        defname: this.defname,
+        userid: Vue.user.id
+      }
+      let res = await http.load(
+        'POST',
+        `${this.$androidUtil.getProxyUrl()}/rs/sql/getApplyTaskDot`,
+        {data: data},
+        {
+          resolveMsg: null,
+          rejectMsg: '任务点获取失败！！！'
+        })
+      this.labelmarksarray = res.data.map(item => {
+        this.tasknumber += item.count
+        return {
+          data: {
+            data: item,
+            content: `<p>任务数：${item.count}</p>`
+          },
+          position: [item.f_lng, item.f_lat],
+          isclearmarker: false,
+          islabel: false
+        }
+      })
+    }
+  },
+  events: {
+    'refreshDot' () {
+      this.getApplyTaskDot()
+    }
+  },
+  watch: {
+  },
+  computed: {
+  }
+}
+</script>
+<style scoped>
+.tip{
+  position: absolute;
+  z-index: 1000;
+  color: red;
+  font-size: 24px;
+  right: 30px;
+  padding-top: 20px;
+}
+</style>
+<style lang="less">
+.nav-apply-tab2 {
+  li {
+    width: 100%;
+    text-align: center;
+  }
+}
+</style>

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -51,6 +51,18 @@
                 :value-single="true"
                 close-on-select ></v-select>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">票据类型：</label>
+              <v-select
+                v-model="model.f_bill_style"
+                placeholder='请选择'
+                condition="cr.f_bill_style = '{}'"
+                :value.sync="model.f_bill_style"
+                :options='$parent.$parent.billStyles'
+                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>
               <input type="text" class="input_search" style="width: 60%" placeholder='收费人员' v-model="model.f_charge_collectors"
@@ -115,6 +127,19 @@
                           condition="cr.f_charge_date <= '{}'">
               </datepicker>
             </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">新旧报建：</label>
+              <v-select
+                v-model="model.f_house_type"
+                placeholder='保存状态'
+                condition="a.f_house_type {}"
+                :value.sync="model.f_house_type"
+                :options='$parent.$parent.houseType'
+                class="select select_list"
+                :value-single="true"
+                close-on-select >
+              </v-select>
+            </div>
           </div>
         </div>
       </criteria>
@@ -412,11 +437,13 @@ export default {
       }),
       applytype: [{label: '全部', value: ''}, ...this.$appdata.getParam('报建类型')],
       paymentMethod: [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')],
+      billStyles: [{label: '全部', value: ''}, {label: '电子票', value: '电子票'}, {label: '专票', value: '专票'}],
       chargingStatus: [
         {label: '全部', value: ''},
         {label: '有效', value: '有效'},
         {label: '作废', value: '作废'}
       ],
+      houseType:[{label: '全部', value: ''}, {label: '旧报建', value: ` = '旧报导入'`}, {label: '新报建', value: ' is null' }],
       criteriaShow: false,
       showStatus: true,
       getfield: {

package/src/components/product/ApplyGaiXianCharge/ApplyGaiXianChargeList.vue

@@ -0,0 +1,198 @@
+<template>
+    <criteria-paged :model="model" v-ref:cp>
+      <criteria partial='criteria' @condition-changed='$parent.searchCondition' v-ref:cri>
+        <div class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row">
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">报建编号：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_apply_num"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="ap.f_apply_num like '%{}%'" placeholder='报建编号'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">用户名称：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_user_name"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="ap.f_user_name like '%{}%'" placeholder='用户名称'>
+            </div>
+            <div class="form-group col-sm-3">
+              <label class="font_normal_body">电&emsp;&emsp;话：</label>
+              <input type="text" class="input_search" style="width: 60%" v-model="model.f_phone"
+                     v-on:keyup.enter="$parent.$parent.search()" condition="ap.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="getGaiXianList"
+                            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-3">
+              <label class="font_normal_body">改线状态：</label>
+              <v-select
+                v-model="$parent.$parent.showStatus"
+                placeholder='请选择'
+                :value.sync="$parent.$parent.showStatus"
+                :options='$parent.$parent.applytype'
+                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>
+              <v-select
+                v-model="model.f_dispatching_type"
+                placeholder='工队/维修'
+                condition="ap.f_dispatching_type = '{}'"
+                :value.sync="model.f_dispatching_type"
+                :options='$parent.$parent.dispatching'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></v-select>
+            </div>
+            <div class="form-group col-sm-3">
+              <label  for="startDate" class="font_normal_body">缴费时间：</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="cr.f_charge_date >= '{}'">
+              </datepicker>
+            </div>
+            <div class="form-group col-sm-3">
+              <label for="endDate" class="font_normal_body">缴费时间：</label>
+              <datepicker id="endDate" placeholder="结束日期"
+                          style="width: 60%!important;"
+                          v-model="model.endDate"
+                          :value.sync="model.endDate"
+                          :format="'yyyy-MM-dd 23:59:59'"
+                          :show-reset-button="true"
+                          condition="cr.f_charge_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>
+          </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_apply_num}}</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_phone}}</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_charge_money}}</font></nobr>
+            </td>
+            <td style="text-align: center;">
+              <nobr><font>{{row.f_charge_date}}</font></nobr>
+            </td>
+          </tr>
+        </template>
+      </data-grid>
+    </criteria-paged>
+
+</template>
+
+<script>
+import {PagedList} from 'vue-client'
+import {HttpResetClass} from 'vue-client'
+import {isEmpty} from '../../Util'
+import Vue from "vue";
+export default {
+  title: '改线记录列表',
+  data () {
+    return {
+      model: new PagedList('rs/sql/getGaiXianList', 30, null, {
+        f_charge_money: 0
+      }),
+      applytype: [{label: '已完工', value: false}, {label: '已缴费', value: true}],
+      dispatching:  [{label: '全部', value: ''}, {label: '施工工队', value: '施工工队'}, {label: '安检维修中心', value: '安检维修中心'}],
+      criteriaShow: false,
+      showStatus: true,
+      getfield: {
+        'f_apply_num': '报建编号',
+        'f_user_name': '用户名称',
+        'f_phone': '电话',
+        'f_apply_type': '报建类型',
+        'f_apply_nature': '报建性质',
+        'f_charge_money': '收费金额',
+        'f_charge_date': '收费日期'
+      }
+    }
+  },
+  ready () {
+    // 调用查询
+    this.search()
+  },
+  methods: {
+    clear () {
+      Object.keys(this.$refs.cp.$refs.cri.model).forEach((key) => {
+        this.$refs.cp.$refs.cri.model[key] = []
+      })
+    },
+    searchCondition (args) {
+      if (this.showStatus){
+        args.condition = args.condition + ` and act.defname = '工程派工'`
+      }else {
+        args.condition = args.condition + ` and act.defname = '完工'`
+      }
+      console.log("args.condition",args.condition)
+      this.model.search(args.condition, args.model)
+    },
+    // 查询
+    search () {
+      this.$refs.cp.$refs.cri.search()
+    }
+  },
+  computed: {
+    getCondition () {
+      return {
+        condition: this.$refs.cp.$refs.cri.condition,
+        data: {
+          orgid: this.$login.f.orgid
+        }
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+</style>

package/src/components/product/ApplyGaiXianCharge/ApplyGaiXianChargeSearch.vue

@@ -0,0 +1,30 @@
+<template>
+  <div class="flex-row">
+    <div class="basic-main">
+      <div style="height: 95%">
+        <apply-gai-xian-list v-ref:query ></apply-gai-xian-list>
+      </div>
+      <p class="bg-info text-center" style="font-size: 20px;height: 5%">合计收费记录共
+        <span style="color: red">{{$refs.query.model.count}}</span>笔，
+        合计金额<span style="color: red">{{$refs.query.model.sums.f_charge_money}}</span>元
+      </p>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  title: '改线记录列表',
+  data () {
+    return {
+    }
+  },
+  ready () {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style scoped>
+</style>