apply-clients 7.1.35 → 7.1.36-yuchuan-1

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

@@ -5,8 +5,8 @@
         <apply-charge-list v-ref:query ></apply-charge-list>
       </div>
       <p class="bg-info text-center" style="font-size: 20px;height: 5%">合计收费记录共
-        <span style="color: red">{{$refs.query.chargeAll.count}}</span>笔，
-        合计金额<span style="color: red">{{$refs.query.chargeAll.sum}}</span>元
+        <span style="color: red">{{$refs.query.model.count}}</span>笔，
+        合计金额<span style="color: red">{{$refs.query.model.sums.f_charge_money}}</span>元
       </p>
     </div>
   </div>

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>

package/src/components/product/ApplyGuanXian/GuanXianCaiLiao.vue

@@ -0,0 +1,235 @@
+<template>
+  <div class="col-sm-12" style="margin: 20px 0px;">
+    <data-grid :model="model" v-ref:grid class="list_area table_sy" style="padding: 0px">
+      <template partial='head'>
+        <tr>
+          <th class="textNoLineBreak">序号</th>
+          <th class="textNoLineBreak">支干线</th>
+          <th class="textNoLineBreak">管径</th>
+          <th class="textNoLineBreak">管材</th>
+          <th class="textNoLineBreak">起点</th>
+          <th class="textNoLineBreak">终点</th>
+          <th class="textNoLineBreak">长度</th>
+          <th class="textNoLineBreak">
+            <button
+              type="button"
+              class="btn btn-info head-but"
+              @click="$parent.$parent.showGuanXianModal()"
+              :disabled="$parent.$parent.mark===1"
+            >新增线路</button>
+          </th>
+        </tr>
+      </template>
+      <template partial='body'>
+        <tr>
+          <td style="text-align: center;">
+            <nobr>{{$index+1}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_branch_trunk}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_pipe_diameter}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_pipe_material}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_starting_point}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_end_point}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>{{row.f_pipe_length}}</nobr>
+          </td>
+          <td style="text-align: center;">
+            <nobr>
+              <button
+                type="button"
+                name="button"
+                class="btn btn-link"
+                @click="$parent.$parent.showGuanXianModal(row)"
+                :disabled="$parent.$parent.mark===1"
+              >修改</button>
+
+              <button
+                type="button" name="button" class="btn btn-link"
+                @click="$parent.$parent.deleteXianLu(row)"
+                :disabled="$parent.$parent.mark===1"
+              >删除</button>
+
+            </nobr>
+          </td>
+        </tr>
+      </template>
+    </data-grid>
+
+    <validator name="v">
+      <modal v-if="showGuanXian" :show.sync="showGuanXian" v-ref:modal :large="true" :backdrop="false" title="管线明细">
+        <header slot="modal-header" class="modal-header">
+          <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
+          <h4 class="modal-title">管线明细</h4>
+        </header>
+        <article slot="modal-body" class="modal-body clearfix">
+          <div class="form-group col-sm-6" :class="[$v.f_branch_trunk.required ? 'has-error' : '']">
+            <label class="col-sm-4 control-label">支干线：</label>
+            <div class="col-sm-8">
+              <input type="text" v-show="false" v-model="guanXian.f_branch_trunk" v-validate:f_payment_method = "['required']" >
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="guanXian.f_branch_trunk"
+                :value.sync="guanXian.f_branch_trunk"
+                :options='branchTrunks'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[$v.f_pipe_diameter.required ? 'has-error' : '']">
+            <label class="col-sm-4 control-label">管径：</label>
+            <div class="col-sm-8">
+              <input type="text" v-show="false" v-model="guanXian.f_pipe_diameter" v-validate:f_payment_method = "['required']" >
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="guanXian.f_pipe_diameter"
+                :value.sync="guanXian.f_pipe_diameter"
+                :options='pipeDiameters'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6" :class="[$v.f_pipe_material.required ? 'has-error' : '']">
+            <label class="col-sm-4 control-label">管材：</label>
+            <div class="col-sm-8">
+              <input type="text" v-show="false" v-model="guanXian.f_pipe_material" v-validate:f_payment_method = "['required']" >
+              <input-select
+                placeholder='请选择' width="100%"
+                v-model="guanXian.f_pipe_material"
+                :value.sync="guanXian.f_pipe_material"
+                :options='pipeMaterial'
+                class="select select_list"
+                :value-single="true"
+                close-on-select ></input-select>
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">长度：</label>
+            <div class="col-sm-8">
+              <input type="text" class="form-control input_view" style="width: 100%; height: 90%"
+                     v-model="guanXian.f_pipe_length" />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">起点：</label>
+            <div class="col-sm-8">
+              <input type="text" class="form-control input_view" style="width: 100%"
+                     v-model="guanXian.f_starting_point" />
+            </div>
+          </div>
+          <div class="form-group col-sm-6">
+            <label class="col-sm-4 control-label">终点：</label>
+            <div class="col-sm-8">
+              <input type="text" class="form-control input_view" style="width: 100%"
+                     v-model="guanXian.f_end_point" />
+            </div>
+          </div>
+        </article>
+        <footer slot="modal-footer" class="modal-footer">
+          <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="saveXianLu()">保存线路</button>
+        </footer>
+      </modal>
+    </validator>
+
+  </div>
+</template>
+
+<script>
+import {HttpResetClass} from "vue-client";
+
+export default {
+  title: '线路明细',
+  props: {
+    selectdata: {
+      type: Object
+    },
+    mark: {
+      type: Number,
+      default: 0
+    }
+  },
+  data () {
+    return {
+      showGuanXian: false,  // 展示支线明细
+      model: {
+        data: null
+      },       // 记录
+      branchTrunks: [{label: '支线', value: '支线'}, {label: '干线', value: '干线'}],
+      pipeDiameters: [...this.$appdata.getParam('管径')],
+      pipeMaterial: [...this.$appdata.getParam('管材')],
+      guanXian: {
+
+      }
+    }
+  },
+  ready () {
+    this.search()
+  },
+  methods: {
+    // 新增线路明细
+    async saveXianLu () {
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: this.selectdata.f_process_id,
+        user: this.$login.f,
+        guanXian: this.guanXian
+      }
+      let res = await http.load('POST', 'rs/logic/addApplyXianLu', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '新增线路失败！'
+      }).then((res) => {
+        this.guanXian = {}   
+
+        this.showGuanXian = false
+        this.$dispatch('breakControl', this.selectdata)
+      })
+    },
+    async deleteXianLu(row){
+      this.$resetdelete(`rs/entity/t_pipeline_material_apply`, {id: row.id}, {
+        resolveMsg: '删除成功',
+        rejectMsg: '删除失败'
+      }).then((res) => {
+        this.$dispatch("delResid", row.id)
+        this.$dispatch('breakControl', this.selectdata)
+      })
+    },
+    async search () {
+      let http = new HttpResetClass()
+      let data = {
+        f_process_id: this.selectdata.f_process_id
+      }
+      let res = await http.load('POST', 'rs/sql/getZhiXianMingXi', {data:data}, {
+        resolveMsg: null,
+        rejectMsg: '线路明细查询失败！！！'
+      })
+      this.model.data = res.data
+    },
+    showGuanXianModal(row){
+      this.guanXian = row
+      this.showGuanXian = !this.showGuanXian
+    },
+    closeModal() {
+      this.showGuanXian = false
+      this.guanXian = {}
+      this.search()
+    }
+  }
+}
+</script>
+
+<style scoped>
+.form-control{
+  padding: 8px 12px;
+}
+</style>