manage-client 3.2.69 → 3.2.70-aode

package/src/components/sale/businessquery/{AccountQuery/TransactionSummary.vue → toolCardMakeQuery.vue}

@@ -1,12 +1,13 @@
 <template>
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search">
-      <div class="flex" v-if="!show">
+      <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">
+                <res-select-group :show-component="$parent.$parent.shouc" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes"></res-select-group>
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -14,245 +15,223 @@
                               :value.sync="model.startDate"
                               :format="'yyyy-MM-dd HH:mm:ss'"
                               :show-reset-button="true"
-                              condition="n.f_hand_date>='{}'">
+                              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="n.f_hand_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="n.f_userinfo_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"
+                  <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
                                 :field="$parent.$parent.getfield"
-                                :footer="$parent.$parent.footer"
-                                :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile"
-                                sql-name="TransactionSummary"
-                                template-name='交易汇总导出'
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="rs/logic/exportfile" sql-name="toolcardquery" template-name='工具卡制作日志导出'
                                 :choose-col="true"></export-excel>
-                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
-                              :defaultfield="$parent.$parent.defaultfield" print-name="交易汇总打印"
-                              :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">客户类型</label>
-                  <v-select :value.sync="model.f_user_type"
-                            :options='$parent.$parent.usertypes'
-                            @change="$parent.$parent.userTypeChange()"
-                            placeholder='请选择' v-model="model.f_user_type"
-                            condition="n.f_user_type = '{}'"
-                            close-on-select></v-select>
+                  <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>
-                  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
-                            :options='$parent.$parent.gasproperties' placeholder='请选择'
-                            condition="n.f_gasproperties = '{}'"
+                  <label class="font_normal_body">卡&nbsp;品&nbsp;&nbsp;牌</label>
+                  <v-select :value.sync="model.name"
+                            v-model="model.name"
+                            :options='$parent.$parent.cardbrands' placeholder='请选择'
+                            condition="name = '{}'"
                             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_whether_pay" v-model='model.f_whether_pay'
-                            style="width:60%"
-                            :options='$parent.$parent.whetherpaies' placeholder='是否缴费'
-                            close-on-select
-                            condition="n.f_whether_pay = '{}'"></v-select>
+                  <label class="font_normal_body">卡&nbsp;类&nbsp;&nbsp;型</label>
+                  <v-select :value.sync="model.cardtype"
+                            v-model="model.cardtype"
+                            :options='$parent.$parent.cardtypes' placeholder='请选择'
+                            condition="cardtype = '{}'"
+                            close-on-select></v-select>
                 </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 :classname="$parent.classname">
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
             <template partial='head'>
               <tr>
                 <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>
+                  <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_userinfo_code}}</nobr>
+                <nobr>{{row.name}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_user_name}}</nobr>
+                <nobr>{{row.cardtype}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_type}}</nobr>
+                <nobr>{{row.f_state}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_price}}</nobr>
+                <nobr>{{row.f_operate_date}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_oughtamount}}</nobr>
+                <nobr>{{row.f_orgname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_oughtfee}}</nobr>
+                <nobr>{{row.f_depname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_whether_pay}}</nobr>
+                <nobr>{{row.f_operator}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_hand_date}}</nobr>
+                <nobr>{{row.cardjson}}</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_oughtamount}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              金额合计:&emsp;{{sumsmodel.f_oughtfee}}
-            </td>
-          </tr>
-        </table>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  import {PagedList, HttpResetClass} from 'vue-client'
-  import defaultPrint from '../../config/DefaultPrint'
-  import exportConfig from '../../config/exportConfig'
+  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.$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.$getConfig(self, 'HandplanQuery')
-    console.log('抄表查询获取默认配置', self.config)
-    self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
-    console.log('开始初始化参数', self.defaultfield)
-    await self.$MagLoadParams.loadParam()
-    // await self.$MagLoadParams.loadParam()
-    // self.initParams()
-    console.log('开始查询')
+    //await self.$MagLoadParams.loadParam()
+   // self.initParams()
+
     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
   }
   export default {
     data() {
       return {
+        shouc:['company','department','operator'],
+        selectfields:[],
         data: {},
-        other:[],
-        footer:[],
-        model: new PagedList('rs/sql/TransactionSummary', 20, {},{
-          f_oughtamount:0,
-          f_oughtfee:0
-        }),
-        gasproperties:[],
+        model: new PagedList('rs/sql/toolcardquery', 20),
+        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_cardfees", "f_operate_date", "f_operator", "f_depname", "f_orgname"],
+
+        orgCondtionStr: '',
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
           user:[],
         },
-        show:false,
-        rowdata:{},
-        criteriaShow: false,
-        residentialArea: [],
-        orgCondtionStr: '',
         modelval: [],
-        inputtouPerson: [],
         printshow: false,
         all: false,
         fields: {},
         thead: '',
         tfoot: '',
+        gasproperties:[],
+        meterbrands: [],
+        // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
 
-        // 下拉框
-
+        show:false,
+        rowdata:{},
         //合计数据
-        sumsmodel: {},
-        defaultfield: [],
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name']
-        },
-        batchmoneyShow:false
+        sumsmodel: {}
       }
     },
+    props:['selectorg'],
     ready() {
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.toolcardconfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      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]}`);
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.$refs.cri.model !==null) {
+          this.$refs.paged.$refs.cri.model.f_gasproperties=''
+
+          console.log(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
         }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
       },
       search(){
         this.$refs.paged.$refs.cri.search()
       },
+      cancel() {
+        this.show = false
+      },
       selfSearch(args) {
-        args.condition = `${args.condition} ` +'and n.'+this.orgCondtionStr.trim().substring(4)
+        args.condition = `${args.condition}` + this.orgCondtionStr
         this.model.search(args.condition, args.model)
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
+
+      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() {
         //清空部门和人员
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
@@ -260,7 +239,7 @@
         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] = []
+          this.$refs.paged.$refs.cri.model[key] = ''
         })
       },
       show() {
@@ -269,8 +248,15 @@
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
-      getRes(obj) {
-        this.orgCondtionStr = obj
+      getRes(condition) {
+        this.orgCondtionStr = condition
+      },
+      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
@@ -284,7 +270,7 @@
       put() {
         // 对Modelval进行排序
         this.sortModelval()
-        this.thead = `<tr><th colspan=${this.modelval.length}>收费查询统计报表</th></tr><tr>`
+        this.thead = `<tr><th colspan=${this.modelval.length}>补卡查询统计报表</th></tr><tr>`
         for (let key of this.modelval) {
           this.thead += '<th>' + this.fields[key] + '</th>'
         }
@@ -294,13 +280,6 @@
         this.$refs.print.PrintAsFile()
         this.printshow = false
       },
-      dealmsg(val) {
-        console.log('---------------dealmsg')
-        this.rowdata=val
-        this.show=true
-        val.model = this.model.model
-        this.$dispatch('deal-msg', val)
-      },
       close() {
         this.printshow = false
         this.all = false
@@ -316,15 +295,9 @@
         this.modelval = sortModel
         console.log('选择的打印的字段', this.modelval)
       },
-      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: ''}]
-        }
+      async updateParams() {
+        await this.$MagLoadParams.loadParam(this.f_filialeid)
+        this.initParams()
       },
     },
     watch: {
@@ -339,35 +312,29 @@
       'modelval.length'() {
         this.put()
       },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.selectorg = res[1]
+          this.f_filialeid = res[1]
+         // this.updateParams()
+        }
       }
     },
     computed: {
       getCondition() {
-        return {
-          startDate: this.$refs.paged.$refs.cri.model.startDate,
-          endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: this.$refs.paged.$refs.cri.condition
-        }
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
-        return exportConfig.TransactionSummaryConfig
+        return exportConfig.toolcardconfig
       },
-      whetherpaies () {
-        return [
-          {label: '全部', value: ''},
-          {label: '已缴费', value: '是'},
-          {label: '未缴费', value: '否'}
-        ]
+      cardbrands() {
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('工具卡品牌')]
       },
-      usertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
+      cardtypes() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('工具卡类型')]
       }
-
     }
   }
 </script>

package/src/components/sale/common/TabButton.vue

@@ -1,7 +1,7 @@
 <template>
   <div class='flex foot_tabset1'>
     <!-- Nav tabs -->
-    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%">
+    <ul class="nav nav-{{navStyle}}" role="tablist" style="margin-left: 1%;width: 100%; overflow: scroll;">
       <li style="margin-right: 10px"
           :id="'vc-tabset-li-'+attach +'-'+$index"
           v-for="r in renderData"
@@ -71,10 +71,7 @@
     },
     methods: {
       handleTabListClick (index, el) {
-        // 没有打开过, 则添加显示
-        if (!this.$parent.show.includes(el.header)) {
-          this.$parent.show.push(el.header)
-        }
+        this.$parent.show[index] = true
         if (el.comp._scope && el.comp._scope.tab) {
           this.$dispatch('tab-changed', el.comp._scope.tab.comp.name)
         }
@@ -148,8 +145,5 @@
     border-radius: 4px;
     color: #fff;
   }
-  .foot_tabset1 > .nav {
-    overflow-x: scroll;
-    white-space: nowrap;
-  }
+
 </style>

package/src/components/sale/common/Tabs.vue

@@ -1,7 +1,7 @@
 <template>
   <div role="tabpanel" class="tab-pane"
        v-bind:class="{hide:!show}"
-       v-show="show"
+       v-if="show"
        :transition="transition"
   >
     <slot></slot>