manage-client 3.2.131 → 3.2.134

package/src/filiale/WEINAN/EnableQuery.vue

@@ -0,0 +1,456 @@
+<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" v-show="false">
+                  <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"
+                                :field="$parent.$parent.getfield"
+                                :header="$parent.$parent.other"
+                                sqlurl="rs/logic/exportfile" sql-name="enableQuery" template-name='启用查询导出'
+                                :choose-col="true"></export-excel>
+                  <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
+                               :defaultfield="$parent.$parent.defaultfield"
+                              titletable="启用记录"
+                              :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">
+                <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 class="col-sm-2 form-group" v-show="false">
+                  <label class="font_normal_body">小&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;区</label>
+                  <v-select class="select_list select"
+                            v-model="model.f_residential_area"
+                            :value.sync="model.f_residential_area"
+                            :options='$parent.$parent.residentialarea'
+                            style="width: 60%"
+                            placeholder='选择小区'
+                            condition="f_residential_area = '{}'"
+                            close-on-select>
+
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group" v-show="false">
+                  <label class="font_normal_body">具体地址</label>
+                  <div class="btn-group select_list select" style="width: 60%;">
+                    <input type="text" style="width: 27%;" placeholder="楼号" class="input_search" v-model="model.f_building" condition="f_building = '{}'"/>&nbsp;-&nbsp;
+                    <input type="text" style="width: 20%;" placeholder="单元" class="input_search" v-model="model.f_unit" condition="f_unit = '{}'"/>&nbsp;-&nbsp;
+                    <input type="text" style="width: 36%;" placeholder="室号" class="input_search" v-model="model.f_room" condition="f_room = '{}'" />
+                  </div>
+                </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_user_name"
+                         condition=" f_user_name like '%{}%'" placeholder='客户名称'
+                         :size="model.f_user_name ? model.f_user_name.length * 2 : 1">
+                </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_operat_type"
+                            v-model="model.f_operat_type"
+                            :options='$parent.$parent.operattype' placeholder='请选择'
+                            condition="f_operat_type = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showCom" @re-res="$parent.$parent.getRes"  :cascade =true v-ref:sel></res-select-group>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th>
+                  <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>
+                </th>
+                <th>
+                  <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>
+                  <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>
+                <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_user_type}}</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_enable_reason}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_othereason}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operat_type}}</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>-->
+<!--          </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 './config/DefaultPrint'
+  import exportConfig from './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'
+    // await self.$refs.paged.$refs.cri.search()
+    await self.$MagLoadParams.loadParam()
+    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    props:['data','residentialarea'],
+    title: '启用查询',
+    data() {
+      return {
+        data: {},
+        other: [],
+        footer: [],
+        model: new PagedList('rs/sql/enableQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}),
+        criteriaShow: false,
+        headData: ["客户编号", "客户名称", "操作人", "操作日期", "启用状态", "停用原因", "其他停用原因", "同步状态"],
+        bodyData: ["f_userinfo_id", "f_user_name", "f_operator", "f_operate_date", "f_state", "f_comments", "f_othereason", "f_sendsuccess"],
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        config: {
+          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_enable_reason', 'f_othereason', 'f_state', 'f_operate_date', 'f_operat_type', 'f_operator']
+        },
+        //排序
+        orderitem:'f_operate_date desc',
+        orderFields: {
+          f_operate_date: 'no'
+        },
+        //默认打印列
+        defaultfield: [],
+        initres: {
+          org: [this.$login.f.orgid],
+          dep: [],
+          user: [],
+        },
+
+        show: false,
+        rowdata: {},
+        thead: '',
+        showupload:false,
+        selected:{},
+        tfoot: '',
+        //合计数据
+        sumsmodel: {},
+        operattype:[{label: '全部', value: ''},{label: '启用', value: '启用'},{label: '复拆表', value: '复拆表'}],
+        showCom:['company','department','operator']
+      }
+    },
+    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
+        args.condition = args.condition.replace(/f_zones/, "f_slice_area")
+        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] = []
+        })
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata = val
+        this.show = true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      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()
+      },
+      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.enableConfig
+      }
+    }
+  }
+</script>

package/src/filiale/WEINAN/FillGasQuery.vue

@@ -258,7 +258,7 @@
         data: {},
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/fillGasQuery', 20, {}, {f_pregas: 0,f_preamount: 0}),
+        model: new PagedList('rs/sql/fillGasQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`}, {f_pregas: 0,f_preamount: 0}),
         criteriaShow: false,
         headData: ["客户编号", "客户名称", "客户电话", "身份证号", "地址", "补气类型", "表编号", "卡号", "气表品牌", "气表状态", "补气量", "补气日期", "操作员", "部门", "公司"],
         bodyData: ["f_userinfo_code", "f_user_name", "f_user_phone", "f_idnumber", "address", "f_type", "f_user_id", "f_card_id", "f_meter_brand", "f_table_state", "f_fillgas", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
@@ -266,6 +266,7 @@
         config: {
           defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_user_phone', 'f_idnumber', 'f_type', 'f_meter_brand', 'f_fillgas','f_operate_date', 'f_operator']
         },
+        orderitem:'f_operate_date desc',
         //默认打印列
         defaultfield: [],
         modelval: [],
@@ -441,7 +442,10 @@
     },
     computed: {
       getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+        return {
+          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
+        }
       },
       getfield() {
         return exportConfig.fillgasConfig

package/src/filiale/WEINAN/OtherChargeQuery.vue

@@ -27,12 +27,12 @@
                               condition="f_operate_date <= '{}'">
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group">
+                <div class="col-sm-2 form-group" v-show="false">
                   <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">
+                <div class="col-sm-2 form-group" v-show="false">
                   <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="客户名称">
@@ -52,8 +52,8 @@
               </div>
 
               <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <div class="col-sm-2 form-group">
+                <res-select-group :initres="$parent.$parent.initres" :show-component="$parent.$parent.showCom"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="col-sm-2 form-group" v-show="false">
                   <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='客户地址'>
@@ -288,8 +288,8 @@
 
 <script>
   import {PagedList} from 'vue-client'
-  import defaultPrint from '../../components/sale/config/DefaultPrint'
-  import exportConfig from '../../components/sale/config/exportConfig'
+  import defaultPrint from './config/DefaultPrint'
+  import exportConfig from './config/exportConfig'
   import OtherChargeDetailQuery from "../../components/sale/businessquery/OtherChargeDetailQuery";
 
   let readySomething = async function (self) {
@@ -340,7 +340,8 @@
         // 品名规格
         typeNameList: [],
         // 型号
-        typenumberList: []
+        typenumberList: [],
+        showCom:['company','department','operator']
       }
     },
     ready() {

package/src/filiale/WEINAN/RecordInfoQuery.vue

@@ -693,7 +693,7 @@
         isSingleUser: null,
         other:[],
         footer:[],
-        model: new PagedList('rs/sql/compreQuerys', 20,{items: this.orderitem?'"' + this.orderitem + ' "':`'f_userfiles_id desc'`}),
+        model: new PagedList('rs/sql/compreQuerys', 20,{orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_userfiles_id desc'`}),
         criteriaShow: false,
         orgCondtionStr:'',
         residentialArea: [],
@@ -1168,7 +1168,10 @@
       },
       getCondition(){
 
-        return {condition:this.conditon2}
+        return {
+          condition:this.conditon2,
+          orderitem: this.orderitem?`${this.orderitem}`: "f_userfiles_id desc"
+        }
       },
       getfield(){
         let data = {}