MrShi
2024-03-17 c9fc6df4f99d82aa9a41d82ba2bb83c062144276
mrshi
已修改10个文件
55 ■■■■ 文件已修改
admin/src/components/business/OperaMemberCardWindow.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/cardOpeningRecord.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/plugins/messagebox.js 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/deletePersonnel.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/empower.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/internalMember.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/memberCard.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/visitEvent.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/vue.config.js 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
h5/main.js 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaMemberCardWindow.vue
@@ -17,7 +17,7 @@
                    <el-option
                        v-for="item in member"
                        :key="item.id"
                        :label="item.name"
                        :label="item.name + ' - ' + item.companyName"
                        :value="item.id">
                    </el-option>
                </el-select>
@@ -75,12 +75,18 @@
        api: '/business/memberCard',
        'field.id': 'id'
      })
      this.getMember()
      // this.getMember()
    },
    methods: {
      open (title, target) {
        this.title = title
        this.visible = true
        if (target.isType === 1) {
          this.getMember()
          this.form.memberId = target.memberId
          console.log(this.form.memberId)
          return
        }
        // 新建
        if (target == null) {
          this.$nextTick(() => {
admin/src/components/business/cardOpeningRecord.vue
@@ -1,11 +1,12 @@
<template>
    <GlobalWindow
        :title="title"
        width="70%"
        width="100%"
        :visible.sync="visible"
        :withFooter="false"
    >
        <ul style="width: 100%; display: flex; align-items: center; margin-bottom: 20px;">
            <li style="margin-right: 10px;"><el-button type="primary" @click="$refs.operaMemberCardWindow.open('新建人员开卡', { memberId: memberId, isType: 1 })" v-permissions="['business:membercard:create']">新建</el-button></li>
            <li style="margin-right: 10px;"><el-button type="primary" @click="batchLossReporting">挂失</el-button></li>
            <li><el-button type="primary" @click="batchDecoupling">解挂</el-button></li>
        </ul>
@@ -49,19 +50,23 @@
                </template>
            </el-table-column>
        </el-table>
        <!-- 新建/修改 -->
        <OperaMemberCardWindow ref="operaMemberCardWindow" @success="search()"/>
    </GlobalWindow>
</template>
<script>
  import BaseOpera from '@/components/base/BaseOpera'
  import GlobalWindow from '@/components/common/GlobalWindow'
  import OperaMemberCardWindow from '@/components/business/OperaMemberCardWindow'
  import { refundCard, batchLoss, batchUnLoss, fetchList } from '@/api/business/memberCard'
  export default {
    name: 'cardOpeningRecord',
    extends: BaseOpera,
    components: { GlobalWindow },
    components: { GlobalWindow, OperaMemberCardWindow },
    data () {
      return {
        memberId: null,
        list: [],
        tableData: {
          selectedRows: []
admin/src/plugins/messagebox.js
@@ -10,6 +10,13 @@
      type: 'warning'
    })
  },
  actionConfirm (message, title) {
    return MessageBox.confirm(message, title, {
      confirmButtonText: '确认',
      cancelButtonText: '取消',
      type: 'warning'
    })
  },
  resetConfirm (message) {
    return MessageBox.confirm(message, '重置提醒', {
      confirmButtonText: '确认重置',
admin/src/views/business/deletePersonnel.vue
@@ -2,8 +2,8 @@
    <TableLayout :permissions="['business:member:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <el-form-item label="姓名" prop="name">
                <el-input v-model="searchForm.name" placeholder="请输入姓名" @keypress.enter.native="search"></el-input>
            <el-form-item label="姓名/手机号" prop="keyword">
                <el-input v-model="searchForm.keyword" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="组织名称" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
@@ -87,7 +87,7 @@
        // 搜索
        searchForm: {
          companyName: '',
          name: '',
          keyword: '',
          type: '2',
          isdeleted: 1
        },
admin/src/views/business/empower.vue
@@ -45,7 +45,7 @@
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
                <li><el-button type="primary" v-permissions="['business:empower:create']">导出</el-button></li>
                <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">导出</el-button></li>
<!--                <li><el-button type="primary" v-permissions="['business:empower:create']">立即下发</el-button></li>-->
<!--                <li><el-button type="primary" v-permissions="['business:empower:create']">取消下发</el-button></li>-->
            </ul>
admin/src/views/business/internalMember.vue
@@ -191,15 +191,17 @@
    getfindCompanyTreePage () {
      fetchList(1)
        .then(res => {
          if (res && res.length > 0) {
          res[0].fsStatus = 1
          this.companyTree = res
          // this.searchForm.erpOrgId = res[0].erpId
          this.search()
          }
        })
    },
    // 同步信息
    async synchronous () {
      this.$dialog.actionConfirm('操作确认提醒', '您确认同步全部信息吗?')
      this.$dialog.actionConfirm('该操作降触发全员信息更新和重新下发!请谨慎操作', '您确认全量同步内部人员信息吗?')
        .then(() => {
          this.loading = true
          memberSync({})
admin/src/views/business/memberCard.vue
@@ -30,7 +30,7 @@
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:membercard:create']">
                <li><el-button type="primary" @click="$refs.operaMemberCardWindow.open('新建用户卡片绑定信息表')" icon="el-icon-plus" v-permissions="['business:membercard:create']">新建</el-button></li>
                <li><el-button type="primary" @click="$refs.operaMemberCardWindow.open('新建人员开卡')" icon="el-icon-plus" v-permissions="['business:membercard:create']">新建</el-button></li>
                <li><el-button type="primary" @click="batchLossReporting">挂失</el-button></li>
                <li><el-button type="primary" @click="batchDecoupling">解挂</el-button></li>
            </ul>
admin/src/views/business/visitEvent.vue
@@ -8,8 +8,8 @@
            <el-form-item label="车牌号" prop="carNo">
                <el-input v-model="searchForm.carNo" placeholder="请输入车牌号" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="公司名称" prop="companyName">
                <el-input v-model="searchForm.companyName" placeholder="请输入公司名称" @keypress.enter.native="search"></el-input>
            <el-form-item label="公司名称" prop="visitorWorkUint">
                <el-input v-model="searchForm.visitorWorkUint" placeholder="请输入公司名称" @keypress.enter.native="search"></el-input>
            </el-form-item>
            <el-form-item label="事件类型" prop="eventType">
                <el-select v-model="searchForm.eventType" placeholder="请选择">
@@ -97,7 +97,7 @@
        startTime: '',
        endTime: '',
        eventType: '',
        companyName: '',
        visitorWorkUint: '',
        radio: '0'
      },
      time: []
admin/vue.config.js
@@ -19,7 +19,9 @@
        // http://10.10.99.63/admin_interface/  最新测试服(内网)
        // http://218.23.218.228:8018/admin_interface   最新测试服(外网)
        // target: 'http://218.23.218.228:8018/admin_interface',
        target: 'http://218.23.218.228:8018/admin_interface',
        // http://218.23.218.228:9912/admin_interface
        // http://facepay.huasunsolar.com/admin_interface
        target: 'http://facepay.huasunsolar.com/admin_interface',
        changeOrigin: true,
        pathRewrite: {
          [`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
h5/main.js
@@ -7,9 +7,10 @@
Vue.config.productionTip = false
Vue.prototype.$baseUrl = 'http://192.168.0.111:10027/';
// Vue.prototype.$baseUrl = 'http://192.168.0.111:10027/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
// Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
Vue.prototype.$baseUrl = 'http://facepay.huasunsolar.com/web_interface/';
// Vue.prototype.$baseUrl = 'http://218.23.218.228:9912/web_interface/'
Vue.prototype.$store = store;
App.mpType = 'app'