manage-client 3.1.22 → 3.1.23-aode

package/src/components/sale/businessquery/toolCardMakeQuery.vue

@@ -0,0 +1,334 @@
+<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">
+                <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%"
+                              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="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" :defaultselect="$parent.$parent.selectfields"
+                                :field="$parent.$parent.getfield"
+                                :defaultselect="$parent.$parent.selectfields"
+                                sqlurl="rs/logic/exportfile" sql-name="toolcardquery" 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 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">卡&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">卡&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>
+
+              </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>
+                  <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>{{row.name}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.cardtype}}</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_orgname}}</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>
+
+        </criteria-paged>
+
+      </div>
+    </div>
+  </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.$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.initParams()
+
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    data() {
+      return {
+        shouc:['company','department','operator'],
+        selectfields:[],
+        data: {},
+        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:[],
+        },
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        gasproperties:[],
+        meterbrands: [],
+        // tablestate: [{label: '全部', value: ''}, {label: '正常', value: '正常'}, {label: '停用', value: '停用'}],
+
+        show:false,
+        rowdata:{},
+        //合计数据
+        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: {
+      userTypeChange () {
+        this.gasproperties=[]
+        if(this.$refs.paged.model.model !==null) {
+          this.$refs.paged.model.model.f_gasproperties=''
+
+          console.log(this.$refs.paged.model.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.model.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
+        }
+        else{
+          this.gasproperties =[{label: '全部', value: ''}]
+        }
+      },
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      cancel() {
+        this.show = false
+      },
+      selfSearch(args) {
+        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 = []
+        //部门和人员变为全选
+        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(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
+        //默认选择要打印的列
+        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()
+      },
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+      '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 {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      },
+      getfield() {
+        return exportConfig.toolcardconfig
+      },
+      cardbrands() {
+        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,67 +1,67 @@
-<template>
-  <div role="tabpanel" class="tab-pane"
-       v-bind:class="{hide:!show}"
-       v-show="show"
-       :transition="transition"
-  >
-    <slot></slot>
-  </div>
-</template>
-
-<script>
-  import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
-
-  export default {
-    props: {
-      header: {
-        type: String
-      },
-      disabled: {
-        type: Boolean,
-        coerce: coerceBoolean,
-        default: false
-      }
-    },
-    data () {
-      return {
-        index: 0,
-        show: false
-      }
-    },
-    watch: {
-      'header' (val) {
-        // header变化时，通知tabset
-        let data = this.$parent.renderData.find((v) => v.comp === this)
-        data.header = val
-      }
-    },
-    computed: {
-      show () {
-        return (this.$parent.active === this.index)
-      },
-      transition () {
-        return this.$parent.effect
-      }
-    },
-    created () {
-      this.$parent.renderData.push({
-        comp: this,
-        header: this.header,
-        disabled: this.disabled
-      })
-    },
-    ready () {
-      // 找到当前tab的索引
-      this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
-    },
-    beforeDestroy () {
-      this.$parent.renderData.splice(this.index, 1)
-    }
-  }
-</script>
-
-<style scoped>
-  .tab-content > .tab-pane {
-    display: block;
-  }
-</style>
+<template>
+  <div role="tabpanel" class="tab-pane"
+       v-bind:class="{hide:!show}"
+       v-if="show"
+       :transition="transition"
+  >
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+  import coerceBoolean from 'vue-client/src/vue-strap/src/utils/coerceBoolean.js'
+
+  export default {
+    props: {
+      header: {
+        type: String
+      },
+      disabled: {
+        type: Boolean,
+        coerce: coerceBoolean,
+        default: false
+      }
+    },
+    data () {
+      return {
+        index: 0,
+        show: false
+      }
+    },
+    watch: {
+      'header' (val) {
+        // header变化时，通知tabset
+        let data = this.$parent.renderData.find((v) => v.comp === this)
+        data.header = val
+      }
+    },
+    computed: {
+      show () {
+        return (this.$parent.active === this.index)
+      },
+      transition () {
+        return this.$parent.effect
+      }
+    },
+    created () {
+      this.$parent.renderData.push({
+        comp: this,
+        header: this.header,
+        disabled: this.disabled
+      })
+    },
+    ready () {
+      // 找到当前tab的索引
+      this.index = this.$parent.$children.findIndex((v) => v.$el === this.$el)
+    },
+    beforeDestroy () {
+      this.$parent.renderData.splice(this.index, 1)
+    }
+  }
+</script>
+
+<style scoped>
+  .tab-content > .tab-pane {
+    display: block;
+  }
+</style>

package/src/components/sale/config/DefaultPrint.js

@@ -1,6 +1,6 @@
-export default{
-  //把打印需要默认选中的字段名放在config数组中
-  config: [
-    "f_userinfo_code","f_user_name","f_user_phone","f_pregas","f_preamount","f_collection","f_balance","f_curbalance","f_idnumber"
-  ]
-}
+export default{
+  //把打印需要默认选中的字段名放在config数组中
+  config: [
+    "f_userinfo_code","f_user_name","f_user_phone","f_pregas","f_preamount","f_collection","f_balance","f_curbalance","f_idnumber"
+  ]
+}