manage-client 4.0.21 → 4.0.23

package/src/filiale/tongchuan/HandplanQuery.vue

@@ -81,11 +81,12 @@
                   class="form-group">
                   <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;域</label>
                   <v-select
+                    :multiple="true"
                     v-model="model.f_pcd"
                     placeholder='选择区域'
                     :value.sync="model.f_pcd"
                     :options='$parent.$parent.pcdslist'
-                    condition="f_pcd_id = '{}'"
+                    condition="f_pcd_id in {}"
                     style="width: 60%"
                     close-on-select >
                   </v-select>

package/src/filiale/tongchuan/PriceChangeQuery.vue

@@ -73,27 +73,30 @@
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;旧&nbsp;气&nbsp;价</label>
                   <v-select :value.sync="model.f_used_content"
+                            :multiple="true"
                             v-model="model.f_used_content"
                             :options='$parent.$parent.price' placeholder='请选择'
-                            condition="f_used_content = '{}'"
+                            condition="f_used_content in {}"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">&nbsp;新&nbsp;气&nbsp;价</label>
                   <v-select :value.sync="model.f_new_content"
+                            :multiple="true"
                             v-model="model.f_new_content"
                             :options='$parent.$parent.price ' placeholder='请选择'
-                            condition="f_new_content = '{}'"
+                            condition="f_new_content in {}"
                             close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;域</label>
                   <v-select
                     v-model="model.f_pcd"
+                    :multiple="true"
                     placeholder='选择区域'
                     :value.sync="model.f_pcd"
                     :options='$parent.$parent.pcdslist'
-                    condition="f_pcd_id = '{}'"
+                    condition="f_pcd_id in {}"
                     style="width: 60%"
                     close-on-select >
                   </v-select>

package/src/filiale/tongchuan/ReverseQuery.vue

@@ -0,0 +1,450 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex" v-if="!show">
+
+        <criteria-paged :model="model" v-ref:paged @sort="sort">
+          <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+            <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+              <div class="row">
+                <div class="col-sm-2 form-group">
+                  <label for="startDate" class="font_normal_body">开始日期</label>
+                  <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                              v-model="model.startDate"
+                              :value.sync="model.startDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">结束日期</label>
+                  <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd HH:mm:ss'"
+                              :show-reset-button="true"
+                              condition="f_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body" title="旧客户编号">档案编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_olduserinfo_code"
+                         condition="f_olduserinfo_code = '{}' " placeholder="档案编号">
+                </div>
+
+                <div class="span" style="float:right;">
+                  <button class="button_search button_spacing" @click="search()">查询</button>
+                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
+                                sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="reverseQuery" template-name='冲正查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+
+                              titletable="冲正记录" :defaultfield="$parent.$parent.defaultfield"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
+                </div>
+              </div>
+
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <res-select-group :initres="$parent.$parent.initres"  :cascade =true  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户地址</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
+                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">冲正类型</label>
+                  <v-select :value.sync="model.f_type" multiple
+                            v-model="model.f_type"
+                            :options='$parent.$parent.correctTypes' placeholder='请选择'
+                            condition="f_type in {}"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户类型</label>
+                  <v-select :value.sync="model.f_user_type"
+                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
+                            condition="f_user_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">表&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber = '{}'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">卡&emsp;&emsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_card_id"
+                         condition="f_card_id = '{}'" placeholder='卡号'>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list'  class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+<!--                  <nobr>客户编号</nobr>-->
+                  <data-order field="f_userinfo_code" name="客户编号"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                </th>
+                <th>
+                  <nobr>客户名称</nobr>
+                </th>
+                <th>
+                  <nobr>档案编号</nobr>
+                </th>
+                <th>
+<!--                  <nobr>客户地址</nobr>-->
+                  <data-order field="f_address" name="客户地址"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                </th>
+                <th>
+                  <nobr>表号</nobr>
+                </th>
+                <th>
+                  <nobr>冲正类型</nobr>
+                </th>
+                <th>
+                  <nobr>冲正气量</nobr>
+                </th>
+                <th>
+                  <nobr>冲正金额</nobr>
+                </th>
+                <th>
+                  <nobr>冲正收款</nobr>
+                </th>
+                <th>
+<!--                  <nobr>冲正日期</nobr>-->
+                  <data-order field="f_operate_date" name="冲正日期"
+                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                </th>
+                <th>
+                  <nobr>人员</nobr>
+                </th>
+                <th>
+                  <nobr>部门</nobr>
+                </th>
+                <th>
+                  <nobr>公司</nobr>
+                </th>
+                <th><nobr>附件</nobr></th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <td style="text-align: center;">
+                <nobr>
+                  <span @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_olduserinfo_code}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_type}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_pregas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_preamount}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_collection}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;"><nobr>
+                <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
+              </nobr></td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+
+        </criteria-paged>
+
+        <table class="table-hover">
+          <tr style="position: relative" class="table-bordered">
+            <td
+              style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
+              汇总信息
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              冲正气量合计:&emsp;{{sumsmodel.f_pregas}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              冲正金额合计:&emsp;{{sumsmodel.f_preamount}}
+            </td>
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+              收款合计:&emsp;{{sumsmodel.f_collection}}
+            </td>
+          </tr>
+        </table>
+
+      </div>
+      <div class="flex" v-if="show">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
+    </div>
+    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
+      <article slot="modal-body">
+        <upload :blodid="selected.f_userinfo_id" v-ref:upload isupload="false" takeimg="false"  fusetype="冲正" :isremark="false" style="width:auto" ></upload>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+  </div>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../../components/sale/config/DefaultPrint'
+  import exportConfig from '../../components/sale/config/exportConfig'
+
+  let readySomething = async function (self) {
+    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    // await self.$refs.paged.$refs.cri.search()
+    await self.$MagLoadParams.loadParam(self.$login.f)
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    props:['data'],
+    title: '冲正查询',
+    data() {
+      return {
+        data: {},
+        other:[],
+        footer:[],
+        model: new PagedList('api/af-revenue/sql/reverseQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_pregas: 0, f_preamount: 0, f_collection: 0}),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        show:false,
+        rowdata:{},
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        //默认打印列
+        defaultfield: [],
+        config: {
+          defaultPrint: ['f_userinfo_code','f_user_name', 'f_address']
+        },
+        showupload:false,
+        selected:{},
+        tfoot: '',
+        //合计数据
+        sumsmodel: {}
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      view(row){
+        this.showupload = true
+        this.selected= row
+      },
+      getotherfooter(){
+        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
+        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
+        this.other=[];
+        this.footer=[];
+        let exportdata = this.getCondition;
+        let otherInData=[];
+        otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+        let footerData=[],exportfield=this.getfield;
+        footerData.push("合计");
+        let self = this;
+        for(var field in self.sumsmodel){
+          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
+        }
+        this.footer.push(footerData);
+        this.other.push(otherInData);
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      selfSearch(args) {
+        if (this.data) {
+          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
+          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
+        }
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        //部门和人员变为全选
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = []
+        })
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        this.printshow = true
+        this.put()
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      put() {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>冲正查询统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print() {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      sort (field, rule) {
+        // 将所有排序方式设为不排序，实现相互排斥
+        for (let key in this.orderFields) {
+          if (key === field) {
+            this.orderFields[key] = rule
+          } else {
+            this.orderFields[key] = 'no'
+          }
+        }
+        // 如果新规则不排序，还原为默认排序
+        if (rule === 'no') {
+          this.model.paramSource.orderitem = `'${this.orderitem}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+      'modelval.length'() {
+        this.put()
+      },
+    },
+    computed: {
+      getCondition() {
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"}
+      },
+      getfield() {
+        return exportConfig.reverseConfig
+      },
+      defaultexport() {
+        return exportConfig.reverseexportConfig
+      },
+      usertypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+      },
+      correctTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费类型')]
+      }
+    }
+  }
+</script>

package/src/filiale/tongchuan/UserDeviceQuery.vue

@@ -81,11 +81,12 @@
                   <div class="col-sm-2 form-group">
                     <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;域</label>
                     <v-select
+                      :multiple="true"
                       v-model="model.f_pcd"
                       placeholder='选择区域'
                       :value.sync="model.f_pcd"
                       :options='$parent.$parent.pcdslist'
-                      condition="f_pcd_id = '{}'"
+                      condition="f_pcd_id in {}"
                       style="width: 60%"
                       close-on-select >
                     </v-select>
@@ -99,9 +100,10 @@
                   <div class="col-sm-2 form-group" >
                     <label class="font_normal_body">设备类型</label>
                     <v-select :value.sync="model.f_devices_type"
+                              :multiple="true"
                               v-model="model.f_devices_type"
                               :options='$parent.$parent.deviceTypes' placeholder='请选择'
-                              condition="f_userinfodevices_type = '{}'"
+                              condition="f_userinfodevices_type in {}"
                               close-on-select></v-select>
                   </div>
 <!--                  <div class="col-sm-2 form-group" >-->

package/src/filiale/tongchuan/UserQuery.vue

@@ -261,11 +261,12 @@
                     class="form-group">
                     <label class="font_normal_body">区&nbsp;&nbsp;&nbsp;&nbsp;域</label>
                     <v-select
+                      :multiple="true"
                       v-model="model.f_pcd"
                       placeholder='选择区域'
                       :value.sync="model.f_pcd"
                       :options='$parent.$parent.pcdslist'
-                      condition="f_pcd_id = '{}'"
+                      condition="f_pcd_id in {}"
                       style="width: 60%"
                       close-on-select >
                     </v-select>