vue2-client 1.9.139 → 1.9.140

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.9.139",
+  "version": "1.9.140",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/BillPrint/Demo.vue

@@ -0,0 +1,32 @@
+<script>
+import PrintBill from './PrintBill.vue'
+
+export default {
+  name: 'Demo',
+  components: { PrintBill },
+  methods: {
+    print () {
+      this.$refs.print.print({
+          reprint: '正常',
+          billUrl: 'card_bill',
+          operator: `张三丰`,
+          condition: '21952838'
+      })
+    },
+    printOk () {
+      console.log('打印成功')
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <a-button @click="print">打印</a-button>
+    <print-bill ref="print" @ok="printOk" :autoPrint="true"></print-bill>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

package/src/base-client/components/common/BillPrint/OpenInvoice.vue

@@ -0,0 +1,21 @@
+<script>
+// 开电子票
+export default {
+  name: 'OpenInvoice',
+  data () {
+    return {
+      show: false
+    }
+  }
+}
+</script>
+
+<template>
+  <a-modal v-model="show">
+    <h4>功能暂未实现</h4>
+  </a-modal>
+</template>
+
+<style scoped>
+
+</style>

package/src/base-client/components/common/BillPrint/PrintBill.vue

@@ -0,0 +1,311 @@
+<template>
+  <div>
+    <a-modal
+      v-model="showModal"
+      title="收费发票"
+      width="60vw"
+      @ok="printGen"
+      @cancel="cancel"
+      style="min-width: 800px">
+      <div
+        style="display: flex;justify-content: center;"
+        id="normal-bill"
+        v-if="bill.data"
+        v-html="bill.data">
+      </div>
+      <a-skeleton v-else active/>
+    </a-modal>
+    <div
+      style="display: flex;justify-content: center;"
+      id="normal-bill"
+      v-show="false"
+      v-html="bill.data">
+    </div>
+  </div>
+</template>
+<script>
+
+import DataModel from '@/services/DataModel'
+import getLodop from '@/services/LodopFuncs'
+import { mapState } from 'vuex'
+
+export default {
+  title: '收费发票',
+  data () {
+    return {
+      model: {},
+      bill: {},
+      showModal: false,
+      id: 'normal-bill'
+    }
+  },
+  props: {
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
+    },
+    autoPrint: {
+      type: Boolean,
+      default: false
+    },
+    top: {
+      type: String,
+      default: '5mm'
+    },
+    left: {
+      type: String,
+      default: '5mm'
+    },
+    width: {
+      type: String,
+      default: '90%'
+    },
+    height: {
+      type: String,
+      default: '80%'
+    },
+    extra: {
+      type: Object,
+      default: function () {
+        return {
+          count: 0,
+          tops: []
+        }
+      }
+    },
+    customStyle: {
+      type: String,
+      default: ''
+    },
+  },
+  ready () {
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  methods: {
+    cancel () {
+      this.showModal = false
+      this.$emit('ok')
+    },
+    async getBillData (data) {
+      //   {
+      //   reprint: "'正常'",
+      //   billUrl: "card_bill",
+      //   operator: `'${this.currUser.name}'`,
+      //   condition: id
+      // }
+      this.bill = new DataModel({ serviceName: this.serviceName, ...data, })
+      await this.bill.search()
+    },
+    async print (data) {
+      if (!this.autoPrint) {
+        this.showModal = true
+      }
+      await this.getBillData(data).catch(
+          _err => {
+            this.showModal = false
+            this.$message.error('获取发票信息失败')
+          }
+        )
+      if (this.autoPrint) {
+        this.printGen()
+      }
+    },
+    printGen () {
+      this.$nextTick(() => {
+        this.refreshData()
+      })
+      const lodop = getLodop()
+      if (!lodop) {
+        this.$emit('ok', this.id)
+        return
+      }
+      let selfStyle = '<style>'
+      // var style = '<link rel="stylesheet/less" type="text/less" href="../client.less"/>'
+      if (this.customStyle) {
+        selfStyle += this.customStyle
+      } else {
+        selfStyle += 'td {border-width: 2px;padding: 0.5px;border-style: solid; border-color:#000000;  }  \n' +
+          'table{border-collapse:collapse; border}\n' +
+          '.noborder{border-width: 0px;}\n' +
+          '.tdleft{text-align: left;}\n' +
+          '.tdright{text-align: right;}  \n' +
+          '.tdcenter{text-align: center;}\n' +
+          '.fs10{font-size: 0.4em;}\n' +
+          '.fs11{font-size: 0.5em;}\n' +
+          '.fs12{font-size: 0.6em;}\n' +
+          '.fs13{font-size: 0.7em;}\n' +
+          '.fs15{font-size: 0.9em;}\n' +
+          '.fs17{font-size: 1.1em;}\n' +
+          '.fs19{font-size: 1.2em;}\n' +
+          '.fs24{font-size: 1.5em;}\n' +
+          '.fs26{font-size: 1.6em;}\n' +
+          '.b{font-weight: bold;}\n' +
+          '.td-border-right{BORDER-RIGHT: #000000 1px solid; }\n' +
+          '.td-border-top{BORDER-TOP: #000000 1px solid; }\n' +
+          '.td-border-left{BORDER-LEFT: #000000 1px solid;}\n' +
+          '.td-border-bottom{BORDER-BOTTOM: #000000 1px solid;}'
+      }
+      selfStyle += '</style>'
+      const strFormHtml = selfStyle + document.getElementById(this.id).innerHTML
+      lodop.PRINT_INIT('报表打印')
+      // lodop.SET_PRINT_PAGESIZE(1, 0, 0, 'A4')
+      lodop.ADD_PRINT_HTM(this.top, this.left, this.width, this.height, strFormHtml)
+
+      // 支持一张纸打印多份
+      for (let i = 0; i < this.extra.count; i++) {
+        lodop.ADD_PRINT_HTM(this.extra.tops[i], this.left, this.width, this.height, strFormHtml)
+      }
+
+      // lodop.SET_PRINT_MODE("CATCH_PRINT_STATUS",true)
+      const that = this
+      // 这个设置 针式打印机打印纸张会超出界限导致右侧打不全
+      // lodop.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Full-Width')
+      if (lodop.CVERSION) {
+        lodop.On_Return = function (TaskID, Value) {
+          // 当直接打印时，Value值为true和false
+          // 当走打印预览是，Value值为1和0
+          switch (Value) {
+            case '1':
+            case true:
+              that.$emit('ok', Value)
+              break
+            case '0':
+            case false:
+              that.$emit('print-error', Value)
+              break
+          }
+        }
+        // lodop.PREVIEW()
+        if (this.preview) {
+          lodop.PREVIEW()
+        } else {
+          lodop.PRINT()
+        }
+      }
+      this.$emit('ok', this.id)
+    },
+    refreshData () { // 让innerHTML获取的内容包含input和select(option)的最新值
+      const obj = document.getElementById(this.id)
+      let allInputObject = null
+      if (obj) {
+        allInputObject = obj.getElementsByTagName('input')
+      }
+      for (let i = 0; i < allInputObject.length; i++) {
+        if (allInputObject[i].type === 'checkbox') {
+          if (allInputObject[i].checked) {
+            allInputObject[i].setAttribute('checked', 'checked')
+          } else {
+            allInputObject[i].removeAttribute('checked')
+          }
+        } else if (allInputObject[i].type === 'radio') {
+          if (allInputObject[i].checked) {
+            allInputObject[i].setAttribute('checked', 'checked')
+          } else {
+            allInputObject[i].removeAttribute('checked')
+          }
+        } else {
+          allInputObject[i].setAttribute('value', allInputObject[i].value)
+        }
+      }
+      for (let i = 0; i < document.getElementsByTagName('select').length; i++) {
+        const sl = document.getElementsByTagName('select')[i]
+        for (let j = 0; j < sl.options.length; j++) {
+          if (sl.options[j].selected) {
+            sl.options[j].setAttribute('selected', 'selected')
+          } else {
+            sl.options[j] = new Option(sl.options[j].text, sl.options[j].value)
+          }
+        }
+      }
+    }
+  },
+  watch: {}
+}
+</script>
+<style scoped>
+
+#normal-bill >>> td {
+  padding: 0.5px;
+  border: 2px solid #000000;
+}
+
+#normal-bill >>> table {
+  border-collapse: collapse;
+  border: solid;
+}
+
+#normal-bill >>> .noborder {
+  border: 1px dashed #ccc;
+}
+
+#normal-bill >>> .tdleft {
+  text-align: left;
+}
+
+#normal-bill >>> .tdright {
+  text-align: right;
+}
+
+#normal-bill >>> .tdcenter {
+  text-align: center;
+}
+
+#normal-bill >>> .fs10 {
+  font-size: 0.4em;
+}
+
+#normal-bill >>> .fs11 {
+  font-size: 0.5em;
+}
+
+#normal-bill >>> .fs12 {
+  font-size: 0.6em;
+}
+
+#normal-bill >>> .fs13 {
+  font-size: 0.7em;
+}
+
+#normal-bill >>> .fs15 {
+  font-size: 0.9em;
+}
+
+#normal-bill >>> .fs17 {
+  font-size: 1.1em;
+}
+
+#normal-bill >>> .fs19 {
+  font-size: 1.2em;
+}
+
+#normal-bill >>> .fs24 {
+  font-size: 1.5em;
+}
+
+#normal-bill >>> .fs26 {
+  font-size: 1.6em;
+}
+
+#normal-bill >>> .b {
+  font-weight: bold;
+}
+
+#normal-bill >>> .td-border-right {
+  border-right: #000000 1px solid;
+}
+
+#normal-bill >>> .td-border-top {
+  border-top: #000000 1px solid;
+}
+
+#normal-bill >>> .td-border-left {
+  border-left: #000000 1px solid;
+}
+
+#normal-bill >>> .td-border-bottom {
+  border-bottom: #000000 1px solid;
+}
+
+</style>

package/src/base-client/components/common/BillPrint/index.vue

@@ -0,0 +1,97 @@
+<script>
+import PrintBill from './PrintBill.vue'
+import OpenInvoice from './OpenInvoice.vue'
+import { getConfigByNameAsync } from '@vue2-client/services/api/common'
+export default {
+  name: 'BillPrint',
+  components: { OpenInvoice, PrintBill },
+  data () {
+    return {}
+  },
+  props: {
+    autoPrint: {
+      type: Boolean,
+      default: false
+    },
+    serviceName: {
+      type: String,
+      default: process.env.VUE_APP_SYSTEM_NAME
+    },
+  },
+  methods: {
+    async print ({ id, billUrl, operator, billType, billStyle, autoPrint, reprint = '正常' }) {
+      // 获取票据格式
+      // {
+      //   "value": [
+      //   {
+      //     "label": "普通收据",
+      //     "value": "普通收据"
+      //   },
+      //   {
+      //     "label": "电子发票",
+      //     "invoice": true,
+      //     "value": "电子发票"
+      //   }
+      // ]
+      // }
+      getConfigByNameAsync('打印格式Dic', this.serviceName).then(async res => {
+        // 判断当前 billStyle 是否是电子票
+        const isInvoice = res.value.find(item => item.value === billStyle && item.invoice)
+        if (isInvoice) {
+          // todo 电子票功能暂未实现
+          // this.$refs.invoice.print({
+          //   reprint: '正常',
+          //   billUrl: billUrl,
+          //   operator: operator,
+          //   condition: id
+          // })
+        } else {
+          // 如果没有 billurl 通过 billtype 获取链接
+          if (!billUrl) {
+            if (billType) {
+              // 获取 类型对应的配置
+              await getConfigByNameAsync('票据类型Url映射Config', this.serviceName).then(res => {
+                if (res[billType]) {
+                  billUrl = res[billType]
+                  this.$refs['print-bill'].print({
+                    reprint: reprint,
+                    condition: id,
+                    billUrl,
+                    operator
+                  })
+                } else {
+                  this.$message.error(`未找到${billType}对应的票据映射，请检查`)
+                }
+              })
+            } else {
+              this.$message.error('未找到票据格式，请检查')
+            }
+          } else {
+            await this.$refs['print-bill'].print({
+              reprint: reprint,
+              condition: id,
+              billUrl,
+              operator
+            })
+          }
+        }
+      })
+    },
+    printOk () {
+      console.log('打印成功')
+      this.$emit('ok')
+    }
+  }
+}
+</script>
+
+<template>
+  <div>
+    <print-bill :serviceName="serviceName" ref="print-bill" @ok="printOk" :autoPrint="autoPrint"/>
+    <open-invoice :serviceName="serviceName" ref="invoice" @ok="printOk" :autoPrint="autoPrint"/>
+  </div>
+</template>
+
+<style scoped>
+
+</style>

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -66,6 +66,7 @@
             :show-pagination="showPagination"
             :customDelete="customDelete"
             :extraHeight="extraHeight"
+            :serviceName="serviceName"
             @add="add"
             @move="move"
             @edit="edit"
@@ -77,6 +78,7 @@
             @selectRow="selectRow"
             @afterQuery="afterQuery"
             @columnClick="columnClick"
+            @gotoUserDetail="gotoUserDetail"
             @editButtonStateDataClick="editButtonStateDataClick"
             @importExcelOk="importExcelOk">
             <template slot="leftButton" slot-scope="{selectedRowKeys, selectedRows}">
@@ -110,6 +112,7 @@
         </template>
       </div>
     </a-col>
+    <UserInfoDetailManage ref="userInfo" @close="refresh(false)"/>
   </a-row>
 </template>
 <script>
@@ -128,10 +131,12 @@ import { mapState } from 'vuex'
 import XTreePro from '@vue2-client/base-client/components/common/XTree/XTreePro.vue'
 import { executeStrFunctionByContext } from '@vue2-client/utils/runEvalFunction'
 import util, { getRealKeyData } from '@vue2-client/utils/util'
+import UserInfoDetailManage from '@vue2-client/pages/userInfoDetailManage/index.vue'
 
 export default {
   name: 'XFormTable',
   components: {
+    UserInfoDetailManage,
     XTreePro,
     XTable,
     XForm,
@@ -191,7 +196,7 @@ export default {
     // 配置所属命名空间
     serviceName: {
       type: String,
-      default: undefined
+      default: process.env.VUE_APP_SYSTEM_NAME
     },
     // 查询配置文件Json，用于查询配置生成器的预览
     queryParamsJson: {
@@ -338,7 +343,9 @@ export default {
     columnClick (key, value, record) {
       this.$emit('columnClick', key, value, record)
     },
-
+    gotoUserDetail (key, value, record) {
+      this.$refs.userInfo.init(getRealKeyData(record))
+    },
     // 获取主表的数据内容，去掉主表别名
     getPrimaryData (rows) {
       const alias = this.realQueryConfig.tableAliasName // 获取主表的别名
@@ -454,7 +461,6 @@ export default {
             item.sorter = false
           })
         }
-        console.log(JSON.stringify(res.columnJson))
         const initTable = () => {
           // 初始化 xTable 子组件
           this.$refs.xTable.init({

package/src/base-client/components/common/XTable/XTable.vue

@@ -179,6 +179,10 @@
           <span v-else-if="item.slotType === 'link'" :key="'link-' + c_index">
             <a @click="columnClick(item.dataIndex,text,record)">{{ text }}</a>
           </span>
+          <!--    跳转用户详情      -->
+          <span v-else-if="item.slotType === 'gotoUserDetail'" :key="'gotoUserDetail-' + c_index">
+            <a @click="gotoUserDetail(item.dataIndex,text,record)">{{ text }}</a>
+          </span>
           <!-- 文本溢出省略(ellipsis) -->
           <span v-else-if="item.slotType === 'ellipsis'" :key="'ellipsis-' + c_index">
             <ellipsis :length="item.slotValue" tooltip>{{ text === '' ? '--' : text }}</ellipsis>
@@ -402,7 +406,7 @@ export default {
         })
         requestParameters.conditionParams = conditionParams
         requestParameters.queryParamsName = this.queryParamsName
-        requestParameters.queryParams = this.queryParams
+        requestParameters.queryParams = this.queryParams && Object.keys(this.queryParams).length > 0 ? this.queryParams : undefined
         this.requestParameters = requestParameters
         // 加载数据
         return this.loadTableData(requestParameters)
@@ -432,8 +436,6 @@ export default {
       isDelete: false,
       // 是否允许选择
       isChoose: false,
-      // 服务名称
-      serviceName: undefined,
       // 选中用于修改的id
       selectId: undefined,
       // 是否显示展示列抽屉
@@ -493,6 +495,13 @@ export default {
         return ''
       }
     },
+    // 查询配置文件名
+    serviceName: {
+      type: String,
+      default: () => {
+        return ''
+      }
+    },
     // 查询配置文件Json
     queryParamsJson: {
       type: Object,
@@ -550,6 +559,9 @@ export default {
     columnClick (key, value, record) {
       this.$emit('columnClick', key, value, record)
     },
+    gotoUserDetail (key, value, record) {
+      this.$emit('gotoUserDetail', key, value, record)
+    },
     getFromItem (model, text, record, index) {
       const aa = this.formItems.find(item => item.model === model && item.editRow)
       if (aa) {
@@ -671,9 +683,7 @@ export default {
     changeViewMode () {
       this.isTableMode = !this.isTableMode
       // 看板切换回表格模式 刷新列表
-      if (this.isTableMode) {
-        this.refresh(true)
-      }
+      this.refresh(true)
     },
     /**
      * 初始化表格参数
@@ -690,7 +700,6 @@ export default {
         editButtonStateData = [],
         title,
         form,
-        serviceName,
         tableSummaryMap = {},
         customTableSummaryArray = [],
         viewMode,
@@ -766,7 +775,6 @@ export default {
       this.buttonPermissions = buttonPermissions
       this.editButtonStateData = editButtonStateData
       this.title = title
-      this.serviceName = serviceName
       this.env = env
       this.rowKey = this.getPrimaryKeyName()
       this.allowedCardMode = allowedCardMode
@@ -843,6 +851,7 @@ export default {
           })
         })
       } else {
+        console.log('====', this.serviceName)
         result = query(Object.assign(requestParameters, { userId: this.currUser?.id }), this.serviceName, this.env === 'dev')
       }
       if (this.isTableMode && !this.simpleMode) {
@@ -1055,7 +1064,7 @@ export default {
       }
       const requestParameters = {
         queryParamsName: this.queryParamsName,
-        queryParams: this.queryParams,
+        queryParams: this.queryParams && Object.keys(this.queryParams).length > 0 ? this.queryParams : undefined,
         conditionParams: {},
         pageNo: 1,
         pageSize: 1

package/src/config/CreateQueryConfig.js

@@ -204,7 +204,7 @@ module.exports = {
     {
       label: '不相等[!=]',
       key: '!=',
-      match: ['input', 'select']
+      match: ['input']
     },
     {
       label: '全模糊[like]',

package/src/pages/userInfoDetailManage/ChangeMeterRecordQuery/index.vue

@@ -0,0 +1,64 @@
+<template>
+  <a-card :bordered="false" v-if="currUserInfo">
+    <x-form-table
+      title="换表记录查询"
+      :queryParamsName="queryParamsName"
+      :fixedQueryForm="fixedQueryForm"
+      @action="action"
+      service-name="af-revenue"
+      ref="xFormTable">
+    </x-form-table>
+  </a-card>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  name: 'ChangeMeterRecordQuery',
+  components: {
+    XFormTable: () => import('@vue2-client/base-client/components/common/XFormTable/XFormTable.vue')
+  },
+  data () {
+    return {
+      // 查询配置名称
+      queryParamsName: 'ChangeMeterRecordQueryCRUD',
+      // 查询表单固定值
+      fixedQueryForm: { c_f_user_id: this.currUserInfo.f_user_id },
+      // 是否显示详情抽屉
+      detailVisible: false,
+      // 当前记录
+      record: {}
+    }
+  },
+  props: {
+    currUserInfo: {
+      type: Object,
+      default: () => undefined
+    }
+  },
+  mounted () {
+    this.$refs.xFormTable.refresh(true)
+  },
+  methods: {
+    action (record, id, actionType) {
+      this.detailVisible = true
+      console.log('触发了详情操作', record, id, actionType)
+    },
+    onClose () {
+      this.detailVisible = false
+      // 关闭详情之后重新查询表单
+      this.$refs.xFormTable.refreshTable(true)
+    }
+  },
+
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+    ...mapState('setting', { isMobile: 'isMobile' })
+  },
+}
+</script>
+
+<style scoped>
+
+</style>