manage-client 3.2.1 → 3.2.2

package/src/filiale/WEINAN/ReportDataQuery.vue

@@ -1,249 +1,249 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
-      <div class="flex">
-        <criteria-paged :model="model" v-ref:paged>
-          <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 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">-->
-                <!--                  <label class="font_normal_body">组织机构</label>-->
-                <!--                  <res-select :initresid="$parent.$parent.org"-->
-                <!--                              style="width:60%"-->
-                <!--                              @res-select="$parent.$parent.getorg"-->
-                <!--                              restype='organization'>-->
-                <!--                  </res-select>-->
-
-                <!--                </div>-->
-                <div class="col-sm-2">
-                  <label class="font_normal_body">&emsp;公司&emsp;</label>
-                  <right-tree @re-res="$parent.$parent.getorg"
-                              :initresid='$parent.$parent.org'></right-tree>
-                </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>
-                  <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">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
-                         condition="f_meternumber like '%{}%'" placeholder='表号'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表品牌</label>
-                  <v-select
-                    placeholder='气表品牌'
-                    :value.sync="model.f_meter_brand"
-                    v-model="model.f_meter_brand"
-                    :options='$parent.$parent.meterbrands'
-                    close-on-select
-                    condition="f_meter_brand='{}'">
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group" >
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select
-                    placeholder='气表类型'
-                    :value.sync="model.f_meter_classify"
-                    v-model="model.f_meter_classify"
-                    :options='$parent.$parent.metertypes'
-                    close-on-select
-                    condition="f_meter_classify='{}'">
-                  </v-select>
-                </div>
-                <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 00:00:00'"
-                              :show-reset-button="true"
-                              condition="f_insert_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
-                  <datepicker id="endDate" placeholder="回传时间" style="width:60%"
-                              v-model="model.endDate"
-                              :value.sync="model.endDate"
-                              :format="'yyyy-MM-dd 23:59:59'"
-                              :show-reset-button="true"
-                              condition="f_insert_date <= '{}'">
-                  </datepicker>
-                </div>
-              </div>
-
-            </div>
-          </criteria>
-
-          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
-            <template partial='head'>
-              <tr>
-                <th v-for="row in $parent.$parent.$parent.headData">
-                  <nobr>{{row}}</nobr>
-                </th>
-              </tr>
-            </template>
-            <template partial='body'>
-              <tr v-for="row in $parent.$parent.$parent.model.rows">
-                <td style="text-align: center;" v-for="item in $parent.$parent.$parent.config.fieldMapping">
-                  <nobr>{{row[item]}}</nobr>
-                </td>
-              </tr>
-            </template>
-            <template partial='foot'></template>
-          </data-grid>
-        </criteria-paged>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-  import {HttpResetClass, PagedList} from 'vue-client'
-  import tableConfig from './config/tableConfig'
-  import plugins from '../../plugins/GetLoginInfoService'
-  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
-
-  let readySomething = async function (self) {
-    await self.$MagLoadParams.loadParam()
-    self.initParams()
-    // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
-  }
-  export default {
-    title: '上报数据查询',
-    data() {
-      return {
-        model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {}),
-        criteriaShow: false,
-        config: {
-          fieldMapping: {
-            f_userinfo_code: '客户编号',
-            f_user_name: '客户名称'
-          }
-        },
-        WarningType: [
-          {label: '全部', value: ''}
-        ],
-        Warningstyles: [
-          {label: '全部', value: ''}
-        ],
-        styles:false,
-        headData: [],
-        bodyData: [],
-        orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
-        resshow:['company'],
-        org:[this.$login.f.orgid],
-        meterbrands:[]
-      }
-    },
-    created () {
-      this.config.fieldMapping=tableConfig.ReportDataQuery
-      console.log("========================")
-      console.log(this.config.fieldMapping)
-      var item="用户编号"
-      console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
-      console.log(this.config.fieldMapping[item])
-      this.headData=Object.keys(this.config.fieldMapping)
-      // for(var i=0;i<this.config.fieldMapping;i++){
-      //   this.headData.push(this.config.fieldMapping[i])
-      // }
-
-    },
-    ready() {
-      this.$refs.paged.$refs.cri.search()
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
-    },
-    methods: {
-      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]
-        //初始化气表价格
-        this.prices = this.$MagGetSaleParam.getPrices();
-      },
-      showMeterStyle() {
-        this.styles = true
-      },
-      search() {
-        this.$refs.paged.$refs.cri.search()
-      },
-      async selfSearch(args) {
-        args.condition = `${args.condition}` + this.orgCondtionStr
-        await this.model.search(args.condition, args.model)
-        // 查询到数据进行处理
-        // if (this.model.rows.length > 0) {
-        //   this.bodyData =  Object.keys(this.model.rows[0])
-        // }
-      },
-      getorg(obj) {
-        if (obj.resids.length>0) {
-          this.orgCondtionStr = " and f_filialeid in " + plugin.convertToIn(obj.resids)
-        }else
-        {
-          this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
-        }
-      },
-      // getorg(obj) {
-      //   // if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
-      //   //   this.orgCondtionStr = " and f_filialeid in " + plugins.convertToIn(obj)
-      //   // }else{
-      //   //   this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
-      //   // }
-      //   // this.orgname = obj.res
-      // },
-      clear() {
-        //清空部门和人员
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
-        this.$refs.paged.$refs.cri.$refs.sel.$children[2].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] = []
-        })
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-
-      // getRes(obj) {
-      //   this.orgCondtionStr = obj
-      // }
-    },
-    watch: {
-    },
-    computed: {
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
-    }
-  }
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <div class="flex">
+        <criteria-paged :model="model" v-ref:paged>
+          <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 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">-->
+                <!--                  <label class="font_normal_body">组织机构</label>-->
+                <!--                  <res-select :initresid="$parent.$parent.org"-->
+                <!--                              style="width:60%"-->
+                <!--                              @res-select="$parent.$parent.getorg"-->
+                <!--                              restype='organization'>-->
+                <!--                  </res-select>-->
+
+                <!--                </div>-->
+                <div class="col-sm-2">
+                  <label class="font_normal_body">&emsp;公司&emsp;</label>
+                  <right-tree @re-res="$parent.$parent.getorg"
+                              :initresid='$parent.$parent.org'></right-tree>
+                </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>
+                  <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">表&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_meternumber"
+                         condition="f_meternumber like '%{}%'" placeholder='表号'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">气表品牌</label>
+                  <v-select
+                    placeholder='气表品牌'
+                    :value.sync="model.f_meter_brand"
+                    v-model="model.f_meter_brand"
+                    :options='$parent.$parent.meterbrands'
+                    close-on-select
+                    condition="f_meter_brand='{}'">
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group" >
+                  <label class="font_normal_body">气表类型</label>
+                  <v-select
+                    placeholder='气表类型'
+                    :value.sync="model.f_meter_classify"
+                    v-model="model.f_meter_classify"
+                    :options='$parent.$parent.metertypes'
+                    close-on-select
+                    condition="f_meter_classify='{}'">
+                  </v-select>
+                </div>
+                <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 00:00:00'"
+                              :show-reset-button="true"
+                              condition="f_insert_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" class="font_normal_body">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;至&nbsp;&nbsp;&nbsp;&nbsp;</label>
+                  <datepicker id="endDate" placeholder="回传时间" style="width:60%"
+                              v-model="model.endDate"
+                              :value.sync="model.endDate"
+                              :format="'yyyy-MM-dd 23:59:59'"
+                              :show-reset-button="true"
+                              condition="f_insert_date <= '{}'">
+                  </datepicker>
+                </div>
+              </div>
+
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
+            <template partial='head'>
+              <tr>
+                <th v-for="row in $parent.$parent.$parent.headData">
+                  <nobr>{{row}}</nobr>
+                </th>
+              </tr>
+            </template>
+            <template partial='body'>
+              <tr v-for="row in $parent.$parent.$parent.model.rows">
+                <td style="text-align: center;" v-for="item in $parent.$parent.$parent.config.fieldMapping">
+                  <nobr>{{row[item]}}</nobr>
+                </td>
+              </tr>
+            </template>
+            <template partial='foot'></template>
+          </data-grid>
+        </criteria-paged>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {HttpResetClass, PagedList} from 'vue-client'
+  import tableConfig from './config/tableConfig'
+  import plugins from '../../plugins/GetLoginInfoService'
+  import plugin from 'system-clients/src/plugins/GetLoginInfoService'
+
+  let readySomething = async function (self) {
+    await self.$MagLoadParams.loadParam()
+    self.initParams()
+    // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+  }
+  export default {
+    title: '上报数据查询',
+    data() {
+      return {
+        model: new PagedList('rs/sql/manage_getReportDataQuery', 20, {}),
+        criteriaShow: false,
+        config: {
+          fieldMapping: {
+            f_userinfo_code: '客户编号',
+            f_user_name: '客户名称'
+          }
+        },
+        WarningType: [
+          {label: '全部', value: ''}
+        ],
+        Warningstyles: [
+          {label: '全部', value: ''}
+        ],
+        styles:false,
+        headData: [],
+        bodyData: [],
+        orgCondtionStr: " and f_filialeid in (" + this.$login.f.orgid+")",
+        resshow:['company'],
+        org:[this.$login.f.orgid],
+        meterbrands:[]
+      }
+    },
+    created () {
+      this.config.fieldMapping=tableConfig.ReportDataQuery
+      console.log("========================")
+      console.log(this.config.fieldMapping)
+      var item="用户编号"
+      console.log("~~~~~~~~~~~~~~~~~~~~~~~~~~~~")
+      console.log(this.config.fieldMapping[item])
+      this.headData=Object.keys(this.config.fieldMapping)
+      // for(var i=0;i<this.config.fieldMapping;i++){
+      //   this.headData.push(this.config.fieldMapping[i])
+      // }
+
+    },
+    ready() {
+      this.$refs.paged.$refs.cri.search()
+      readySomething(this).then(() => {
+        this.$emit('ready')
+      }).catch((error) => {
+        this.$emit('error', error)
+      })
+    },
+    methods: {
+      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]
+        //初始化气表价格
+        this.prices = this.$MagGetSaleParam.getPrices();
+      },
+      showMeterStyle() {
+        this.styles = true
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        await this.model.search(args.condition, args.model)
+        // 查询到数据进行处理
+        // if (this.model.rows.length > 0) {
+        //   this.bodyData =  Object.keys(this.model.rows[0])
+        // }
+      },
+      getorg(obj) {
+        if (obj.resids.length>0) {
+          this.orgCondtionStr = " and f_filialeid in " + plugin.convertToIn(obj.resids)
+        }else
+        {
+          this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
+        }
+      },
+      // getorg(obj) {
+      //   // if(plugins.convertToIn(obj)!==null&&plugins.convertToIn(obj)!==''){
+      //   //   this.orgCondtionStr = " and f_filialeid in " + plugins.convertToIn(obj)
+      //   // }else{
+      //   //   this.orgCondtionStr = " and f_filialeid = " + this.$login.f.orgid
+      //   // }
+      //   // this.orgname = obj.res
+      // },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].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] = []
+        })
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+
+      // getRes(obj) {
+      //   this.orgCondtionStr = obj
+      // }
+    },
+    watch: {
+    },
+    computed: {
+      metertypes() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
+      },
+    }
+  }
+</script>

package/src/filiale/WEINAN/config/tableConfig.js

@@ -1,19 +1,18 @@
-export default{
-  //查询页面的字段名和中文对应
-  ReportDataQuery:
-    {
-      "用户编号":"f_userinfo_code",
-      "用户名称":"f_user_name",
-      "表号":"f_meternumber",
-      "开户日期":"f_open_date",
-      "本次抄表底数":"f_tablebase",
-      "上次抄表底数":"f_last_tablebase",
-      "用气量":"f_oughtamount",
-      "单价":"f_price",
-      "用气金额":"f_oughtfee",
-      "表内剩余余额":"f_jval",
-      "回传时间":"f_insert_date",
-      "上次回传日期":"f_last_insertdate"
-    }
-
-}
+export default{
+  //查询页面的字段名和中文对应
+  ReportDataQuery:
+    {
+      "用户编号":"f_userinfo_code",
+      "用户名称":"f_user_name",
+      "气表品牌":"f_meter_brand",
+      "气表编号":"f_meternumber",
+      "上次抄表底数":"f_last_tablebase",
+      "本次抄表底数":"f_tablebase",
+      "用气量":"f_oughtamount",
+      "表内剩余余额":"f_jval",
+      "抄表日期":"f_insert_date",
+      "上次抄表日期":"f_last_insertdate",
+      "阀门开启状态":"f_valvestate"
+    }
+
+}

package/src/filiale/WEINAN/sale.js

@@ -1,29 +1,29 @@
-// 分公司特殊组件页面注册
-let specialComp = {
-  // 收费查询
-  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
-  // 其他收费查询
-  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
-  // 用户稽查查询
-  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
-  //换表查询
-  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
-  //补气查询
-  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
-  //表具查询
-  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
-  //表具档案综合查询
-  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
-  // 业务查询
-  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
-  // 换表查询
-  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
-// 上报数据查询
-  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)}
-
-}
-exports.specialComp = specialComp
-
-
-
-
+// 分公司特殊组件页面注册
+let specialComp = {
+  // 收费查询
+  'charge-query': (resolve) => { require(['./ChargeQuery'], resolve) },
+  // 其他收费查询
+  'other-charge-query': (resolve) => { require(['./OtherChargeQuery'], resolve) },
+  // 用户稽查查询
+  'inspect-list-user': (resolve) => {require(['./InspectListUser'], resolve)},
+  //换表查询
+  'meter-change-meter-query': (resolve) => {require(['./ChangeMeterQuery'], resolve)},
+  //补气查询
+  'fill-gas-query': (resolve) => {require(['./FillGasQuery'], resolve)},
+  //表具查询
+  'meter-query': (resolve) => {require(['./MeterQuery'], resolve)},
+  //表具档案综合查询
+  'record-info-query': (resolve) => {require(['./RecordInfoQuery'], resolve)},
+  // 业务查询
+  'business-manage':(resolve) => {require(['./BusinessManage'], resolve)},
+  // 换表查询
+  'change-meter-query':(resolve) => {require(['./manage/ChangeMeterQuery'], resolve)},
+// 上报数据查询
+  'report-data-query':(resolve) => {require(['./ReportDataQuery'], resolve)}
+
+}
+exports.specialComp = specialComp
+
+
+
+