manage-client 3.2.161 → 3.2.164

package/src/filiale/WEINAN/ChargeQuery.vue

@@ -289,20 +289,11 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>收费类型</nobr>
-                </th>
-                <th>
-                  <nobr>备注</nobr>
-                </th>
-                <th>
-                  <nobr>补打次数</nobr>
-                </th>
-                <th>
-                  <data-order field="f_userinfo_code" name="客户编号"
+                  <data-order field="f_userinfo_code" name="用户编号"
                               :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
                 </th>
                 <th>
-                  <nobr>客户名称</nobr>
+                  <nobr>用户名称</nobr>
                 </th>
                 <th>
                   <nobr>用户表号</nobr>
@@ -339,35 +330,17 @@
                   <nobr>发票订单</nobr>
                 </th>
                 <th>
-                    <nobr>一阶气量</nobr>
-                </th>
-                <th>
-                    <nobr>一阶气费</nobr>
-                </th>
-                <th>
-                    <nobr>二阶气量</nobr>
-                </th>
-                <th>
-                    <nobr>二阶气费</nobr>
+                    <nobr>阶一气量</nobr>
                 </th>
                 <th>
-                    <nobr>三阶气量</nobr>
+                    <nobr>阶二气量</nobr>
                 </th>
                 <th>
-                    <nobr>三阶气费</nobr>
+                    <nobr>阶三气量</nobr>
                 </th>
               </tr>
             </template>
             <template partial='body'>
-              <td style="text-align: center;">
-                <nobr>{{row.f_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_comments}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.filltimes}}</nobr>
-              </td>
               <td style="text-align: center;"><nobr>
                 <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
               </nobr> </td>
@@ -410,21 +383,12 @@
               <td style="text-align: center;">
                   <nobr>{{row.f_stairamount1}}</nobr>
               </td>
-              <td style="text-align: center;">
-                  <nobr>{{(row.f_stair1fee - 0).toFixed(0)}}</nobr>
-              </td>
               <td style="text-align: center;">
                   <nobr>{{row.f_stair2amount}}</nobr>
               </td>
-              <td style="text-align: center;">
-                  <nobr>{{(row.f_stair2fee - 0).toFixed(0)}}</nobr>
-              </td>
               <td style="text-align: center;">
                   <nobr>{{row.f_stair3amount}}</nobr>
               </td>
-              <td style="text-align: center;">
-                  <nobr>{{(row.f_stair3fee - 0).toFixed(0)}}</nobr>
-              </td>
             </template>
             <template partial='foot'></template>
           </data-grid>

package/src/filiale/WEINAN/OtherChargeQuery.vue

@@ -152,28 +152,22 @@
             <template partial='head'>
               <tr>
                 <th>
-                  <nobr>收费类型</nobr>
+                  <nobr>用户编号</nobr>
                 </th>
                 <th>
-                  <nobr>状态</nobr>
-                </th>
-                <th>
-                  <nobr>备注</nobr>
+                  <nobr>用户姓名</nobr>
                 </th>
                 <th>
-                  <nobr>补打次数</nobr>
+                  <nobr>用户表号</nobr>
                 </th>
                 <th>
-                  <nobr>客户编号</nobr>
+                  <nobr>用户卡号</nobr>
                 </th>
                 <th>
-                  <nobr>客户名称</nobr>
+                  <nobr>用户地址</nobr>
                 </th>
                 <th>
-                  <nobr>客户地址</nobr>
-                </th>
-                <th>
-                <nobr>规格</nobr>
+                  <nobr>规格</nobr>
                 </th>
                 <th>
                   <nobr>型号</nobr>
@@ -185,8 +179,8 @@
                   <nobr>数量</nobr>
                 </th>
                 <th>
-                <nobr>金额</nobr>
-              </th>
+                  <nobr>缴费金额</nobr>
+                </th>
                 <th>
                   <nobr>付款方式</nobr>
                 </th>
@@ -194,29 +188,29 @@
                   <nobr>收费日期</nobr>
                 </th>
                 <th>
-                  <nobr>部门</nobr>
+                  <nobr>状态</nobr>
+                </th>
+                <th>
+                  <nobr>网点</nobr>
+                </th>
+                <th>
+                  <nobr>操作员</nobr>
                 </th>
               </tr>
             </template>
             <template partial='body'>
-              <td style="text-align: center;">
-                <nobr>{{row.f_brand_spec}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_state}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_comments}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.filltimes}}</nobr>
-              </td>
               <td style="text-align: center;"><nobr>
                 <span @click="$parent.$parent.$parent.showmsg(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_meternumber}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_card_id}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
@@ -241,9 +235,15 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_depname}}</nobr>
               </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
             </template>
             <template partial='foot'></template>
           </data-grid>
@@ -276,247 +276,247 @@
     </modal>
   </div>
 
-    <modal v-if="showdetail" :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
-      <article slot="modal-body" class="modal-body">
-        <other-charge-detail-query :otherchargeid="otherchargeid" ></other-charge-detail-query>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
+  <modal v-if="showdetail" :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body">
+      <other-charge-detail-query :otherchargeid="otherchargeid" ></other-charge-detail-query>
+    </article>
+    <footer slot="modal-footer" class="modal-footer">
+    </footer>
+  </modal>
 
 </template>
 
 <script>
-  import {PagedList} from 'vue-client'
-  import defaultPrint from './config/DefaultPrint'
-  import exportConfig from './config/exportConfig'
-  import OtherChargeDetailQuery from "../../components/sale/businessquery/OtherChargeDetailQuery";
+import {PagedList} from 'vue-client'
+import defaultPrint from './config/DefaultPrint'
+import exportConfig from './config/exportConfig'
+import OtherChargeDetailQuery from "../../components/sale/businessquery/OtherChargeDetailQuery";
 
-  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.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-    // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
-    // await self.$refs.paged.$refs.cri.search()
-    await self.$MagLoadParams.loadParam()
+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.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+  // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
+  // await self.$refs.paged.$refs.cri.search()
+  await self.$MagLoadParams.loadParam()
 
-    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
-  }
-  export default {
-    components: {
-      OtherChargeDetailQuery
+  self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+}
+export default {
+  components: {
+    OtherChargeDetailQuery
+  },
+  props:['data'],
+  title: '其他收费查询',
+  data() {
+    return {
+      data: {},
+      other:[],
+      footer:[],
+      model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0}),
+      criteriaShow: false,
+      orgCondtionStr: '',
+      modelval: [],
+      printshow: false,
+      all: false,
+      fields: {},
+      thead: '',
+      tfoot: '',
+      initres: {
+        org:[this.$login.f.orgid],
+        dep:[],
+        user:[],
+      },
+      show:false,
+      showdetail:false,
+      otherchargeid:'',
+      rowdata:{},
+      //合计数据
+      sumsmodel: {},
+      showupload:false,
+      selected:{},
+      // 用气性质
+      gasproperties: [],
+      // 品名规格
+      typeNameList: [],
+      // 型号
+      typenumberList: [],
+      showCom:['company','department','operator']
+    }
+  },
+  ready() {
+    readySomething(this).then(() => {
+      this.$emit('ready')
+    }).catch((error) => {
+      this.$emit('error', error)
+    })
+  },
+  methods: {
+    showmsg(obj){
+      this.rowdata=obj
+      this.show=true
+    },
+    view(row){
+      this.showupload = true
+      this.selected= row
     },
-    props:['data'],
-    title: '其他收费查询',
-    data() {
-      return {
-        data: {},
-        other:[],
-        footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0}),
-        criteriaShow: false,
-        orgCondtionStr: '',
-        modelval: [],
-        printshow: false,
-        all: false,
-        fields: {},
-        thead: '',
-        tfoot: '',
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
-        },
-        show:false,
-        showdetail:false,
-        otherchargeid:'',
-        rowdata:{},
-        //合计数据
-        sumsmodel: {},
-        showupload:false,
-        selected:{},
-        // 用气性质
-        gasproperties: [],
-        // 品名规格
-        typeNameList: [],
-        // 型号
-        typenumberList: [],
-        showCom:['company','department','operator']
+    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);
     },
-    ready() {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
+    search(){
+      this.$refs.paged.$refs.cri.search()
+    },
+    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] = []
       })
     },
-    methods: {
-      showmsg(obj){
-        this.rowdata=obj
-        this.show=true
-      },
-      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()
-      },
-      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
-      },
-      cancel() {
-        this.show = false
-      },
-      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)
-      },
-      showchargedetail(row){
-        this.showdetail=true
-        this.otherchargeid=row.id
-      },
-      userTypeChange (f_user_type) {
-        this.gasproperties = []
-        if (f_user_type) {
-          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: ''}]
-        }
-      },
-      setTypename (val) {
-        this.typenumberList = []
-        this.typeNameList = this.$appdata.getParam(val)
-      },
-      setTypenumber (val) {
-        this.typenumberList = this.$appdata.getParam(val)
+    show() {
+      this.criteriaShow = true
+    },
+    hidden() {
+      this.criteriaShow = !this.criteriaShow
+    },
+    getRes(obj) {
+      this.orgCondtionStr = obj
+    },
+    cancel() {
+      this.show = false
+    },
+    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
     },
-    watch: {
-      'all'(val) {
-        if (val) {
-          this.modelval = this.bodyData
-        } else {
-          this.modelval = defaultPrint.config
-          this.put()
+    // 对选择的列进行排序
+    sortModelval() {
+      let sortModel = []
+      Object.keys(this.fields).forEach((key) => {
+        if (this.modelval.includes(key)) {
+          sortModel.push(key)
         }
-      },
-      'modelval.length'() {
+      })
+      this.modelval = sortModel
+      console.log('选择的打印的字段', this.modelval)
+    },
+    showchargedetail(row){
+      this.showdetail=true
+      this.otherchargeid=row.id
+    },
+    userTypeChange (f_user_type) {
+      this.gasproperties = []
+      if (f_user_type) {
+        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: ''}]
+      }
+    },
+    setTypename (val) {
+      this.typenumberList = []
+      this.typeNameList = this.$appdata.getParam(val)
+    },
+    setTypenumber (val) {
+      this.typenumberList = this.$appdata.getParam(val)
+    }
+  },
+  watch: {
+    'all'(val) {
+      if (val) {
+        this.modelval = this.bodyData
+      } else {
+        this.modelval = defaultPrint.config
         this.put()
-      },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
       }
     },
-    computed: {
-      getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
-      },
-      service_person() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
-      },
-      getfield() {
-        return exportConfig.otherchargeConfig
-      },
-      chargetype() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('品名及规格')]
-      },
-      userTypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      chargeState() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    'modelval.length'() {
+      this.put()
+    },
+    sumsmodel:{
+      handler: function(val) {
+        this.getotherfooter();
       },
-      payments() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
-      }
+      deep: true
+    }
+  },
+  computed: {
+    getCondition() {
+      return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+    },
+    service_person() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
+    },
+    getfield() {
+      return exportConfig.otherchargeConfig
+    },
+    chargetype() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('品名及规格')]
+    },
+    userTypes() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
+    },
+    chargeState() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+    },
+    payments() {
+      return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
     }
   }
+}
 </script>