manage-client 3.2.133 → 3.2.136

package/src/filiale/WEINAN/NewAccountQuery.vue

@@ -0,0 +1,432 @@
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main">
+      <div class="flex" v-if="!showinfo">
+
+        <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'"
+                              :show-reset-button="true"
+                              condition="f_open_date >= '{} 00:00:00'">
+                  </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'"
+                              :show-reset-button="true"
+                              condition="f_open_date <= '{} 23:59:59'">
+                  </datepicker>
+                </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>-->
+
+                                <!--v-if="$parent.$parent.authArr.includes('开户查询导出')"-->
+                  <export-excel :data="$parent.$parent.getCondition"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile" sql-name="newAccountQuery" template-name='开户查询导出'
+                                :choose-col="true"></export-excel>
+
+                  <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">客户编号</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">客户名称</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>
+                  <v-select :value.sync="model.f_user_type"
+                            @change="$parent.$parent.userTypeChange()"
+                            :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">用气性质</label>
+                  <v-select :value.sync="model.f_gasproperties"
+                            v-model="model.f_gasproperties"
+                            :options='$parent.$parent.gasproperties' placeholder='请选择'
+                            condition=" f_gasproperties = '{}'"
+                            close-on-select></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气价类型</label>
+                  <v-select :value.sync="model.pricetype" v-model="model.pricetype"
+                            placeholder='气价类型' :options="$parent.$parent.pricetypes"
+                            condition="f_price_type = '{}'"
+                            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_meter_brand"
+                            v-model="model.f_meter_brand"
+                            :options='$parent.$parent.meterbrands' placeholder='请选择'
+                            condition="f_meter_brand = '{}'"
+                            close-on-select></v-select>
+                </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">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
+                         condition="f_residential_area like '%{}%'" placeholder="小区"/>
+                </div>
+                <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" 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>
+                  <nobr>客户编号</nobr>
+                </th>
+                <th>
+                  <nobr>客户名称</nobr>
+                </th>
+                <th>
+                  <data-order field="f_address" name="客户地址"></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>
+                </th>
+                <th>
+                  <nobr>通气时间</nobr>
+                </th>
+                <th>
+                  <nobr>用气性质</nobr>
+                </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;">
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_address}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_user_phone}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_idnumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_price_name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_open_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas_person}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gas_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_gasproperties}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_total_gas}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_meter_brand}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.isbgl}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+      <div v-if="showinfo">
+        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+      </div>
+    </div>
+  </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.$login.toStandardDateString()
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString()
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    title: '开户查询',
+    data() {
+      return {
+        data: {},
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        orderFields: {
+          f_address: 'no'
+        },
+        orderDefault: "'f_open_date desc'",
+        model: new PagedList('rs/sql/newAccountQuery', 20,{orderitem: "'f_open_date desc'"}),
+        f_orgid: this.$login.f.orgid,
+        criteriaShow: false,
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        orgCondtionStr: '(' + this.$login.f.orgid + ')',
+        // orgCondtionStr: ` and f_orgid = '${this.$login.f.orgid}'`,
+        meterbrands: [],
+        showinfo:false,
+        rowdata:{},
+        //合计数据
+        sumsmodel: {},
+        gasproperties:[],
+      }
+    },
+    ready() {
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      cancel() {
+        this.showinfo = false
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      getRes(obj) {
+        console.log(obj,"========")
+        this.orgCondtionStr = obj
+      },
+      selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      },
+      showmsg(obj){
+        this.rowdata=obj
+        this.showinfo=true
+      },
+      initParams() {
+        // 初始化气表品牌
+        let brandArr = []
+        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
+          let temp = {}
+          temp.label = item.label
+          temp.value = item.value.f_meter_brand
+          brandArr.push(temp)
+        })
+        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
+      },
+
+      clear() {
+        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
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      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)
+      },
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
+      },
+      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.orderDefault}'`
+        } else {
+          this.model.paramSource.orderitem = `'${field} ${rule}'`
+        }
+
+        this.search()
+      },
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      }
+    },
+    computed: {
+      authArr () {
+        return this.$login.r ? this.$login.r : []
+      },
+      getCondition () {
+        var con = ""
+        if (this.orgCondtionStr) {
+          con = `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr
+        }
+        else {
+          con = `${this.$refs.paged.$refs.cri.condition} and f_orgid in ('${this.$login.f.orgid}' )`
+        }
+        return {
+          condition: con
+        }
+      },
+      getfield() {
+        return exportConfig.NewAccountConfig
+      },
+      usertypes() {
+        return this.$appdata.getParam('用户类型')
+      },
+      pricetypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
+      },
+      gaspropertyTypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
+      }
+    }
+  }
+</script>

package/src/filiale/WEINAN/sale.js

@@ -33,8 +33,10 @@ let specialComp = {
   // 销户查询
   'cancellation-query':(resolve) => {require(['./CancellationQuery'], resolve)},
   // 汇总查询
-  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)
-}
+  'collect-manage':(resolve) => {require(['./CollectManage'], resolve)},
+  // 开户查询
+  'new-account-query':(resolve) => {require(['./NewAccountQuery'], resolve)
+  }
 }
 exports.specialComp = specialComp
 

package/src/filiale/macheng/WebmeterSettlementAnalysis.vue

@@ -1,12 +1,12 @@
 <template>
-  <div class="flex-row" v-show="!showdetail">
+  <div class="flex-row" v-if="!isShowDetailInfo" v-show="!showdetail">
     <div id='app1' class="basic-main">
       <criteria-paged :model="model" :pager='true' v-ref:paged>
         <criteria partial='criteria' @condition-changed='$parent.search' v-ref:cri>
           <div novalidate class="form-horizontal select-overspread container-fluid auto" novalidate partial>
             <div class="row">
               <div class="col-sm-2 form-group">
-                <label class="font_normal_body">客户   11编号</label>
+                <label class="font_normal_body">客户编号</label>
                 <input @keyup.enter="search" style="width:60%" type="text" class="input_search"
                        v-model="model.f_userinfo_code" placeholder='客户编号'
                        condition="f_userinfo_code like '%{}%'" v-el:xq v-next-el='userinfocode' v-el:username
@@ -158,7 +158,7 @@
           </template>
           <template partial='body'>
             <td style="text-align: center;">
-              <nobr>{{ row.f_userinfo_code }}</nobr>
+              <span @click="$parent.$parent.$parent.dealmsg(row)"><a><b>{{row.f_userinfo_code}}</b></a></span>
             </td>
             <td style="text-align:center">
               <nobr>{{ row.f_user_name }}</nobr>
@@ -209,6 +209,9 @@
       </table>
     </div>
   </div>
+  <div v-if="isShowDetailInfo">
+    <user-info-detail-manage-new :f_userinfo_id="rowData.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+  </div>
 </template>
 
 <script>
@@ -230,7 +233,7 @@ export default {
         'f_address': '客户地址', 'f_user_type': '客户类型', 'f_gasproperties': '用气性质',
         'f_meternumber': '表号',
         'f_meter_brand': '气表品牌', 'f_meter_style': '气表型号', 'f_orgname': '组织机构',
-        'f_balance_amount': '账户余额', 'f_jval': '最后上报余额',
+        'f_jval': '最后上报余额','f_balance_amount': '账户余额',
         'f_state': '分析状态', 'exception_val': '结算异常金额'
       },
       showdetail: false,
@@ -239,6 +242,8 @@ export default {
       endDate: '',
       criteriaShow: false,
       outlets: [],
+      isShowDetailInfo: false,
+      rowData: {},
       gasproperties: [{label: '全部', value: ''}],
       operator: [],
       sumsmodel: {},
@@ -257,6 +262,22 @@ export default {
   },
   methods: {
 
+    /**
+     * 退出用户详细信息页面
+     */
+    cancel () {
+      this.isShowDetailInfo = false
+    },
+    /**
+     * 展示用户详细信息
+     * @param obj 传递的row
+     */
+    dealmsg (obj) {
+      console.log('==================>', obj)
+      debugger
+      this.isShowDetailInfo = true
+      this.rowData = obj
+    },
     userTypeChange() {
       this.gasproperties = [{label: '全部', value: ''}]
       if (this.$refs.paged.$refs.cri.model && this.$refs.paged.$refs.cri.model.f_user_type) {
@@ -296,10 +317,10 @@ export default {
 
       })
       this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-      this.states = [{label: '全部', value: ''}, {label: '上报金额大于余额', value: '上报大于余额'}, {
+      this.states = [{label: '全部', value: ''}, {label: '上报金额大于余额', value: '上报金额大于余额'}, {
         label: '上报金额小于余额',
-        value: '余额大于上报'
-      }, {label: '上报金额与余额相等', value: '上报与余额相等'}]
+        value: '上报金额小于余额'
+      }, {label: '上报金额与余额相等', value: '上报金额与余额相等'}]
     },
     search(args) {
       this.condition = args.condition = this.$refs.paged.$refs.cri.condition + `${this.orgCondtionStr}`

package/src/index.js

@@ -1,11 +1,11 @@
-import saleManage from './saleManage'
-import repotManage from './reportManage'
-import webmeterManage from './webmeterManage'
-import newmanage from './newmanage'
-
-export {
-  saleManage,
-  repotManage,
-  webmeterManage,
-  newmanage
-}
+import saleManage from './saleManage'
+import repotManage from './reportManage'
+import webmeterManage from './webmeterManage'
+import newmanage from './newmanage'
+
+export {
+  saleManage,
+  repotManage,
+  webmeterManage,
+  newmanage
+}

package/src/main.js

@@ -43,13 +43,12 @@ all()
 // sale()
 ldap()
 system(false)
-// 新打包写法
-Vue.use(saleManage, {filiale: 'macheng'})
-Vue.use(webmeterManage, {filiale: 'macheng'})
-Vue.use(reportManage, {filiale: 'macheng'})
-Vue.use(newmanage, {filiale: null})
-Vue.use(ManageHome, {filiale: null})
 
+saleManage()
+webmeterManage()
+ManageHome()
+newmanage()
+reportManage()
 require('system-clients/src/styles/less/bootstrap.less')
 require('./components/qinhua/Style/qinhuaStyle.less')
 // require('./bootstrap/less/manageStyle/manageChile.less')