jiangping
2024-05-23 912b46e5daf7983cd850443f6fca50f4d3e0b578
更改头部
已修改7个文件
154 ■■■■ 文件已修改
admin/package-lock.json 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/package.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/api/business/member.js 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/components/business/OperaCarsWindow.vue 112 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/layouts/TableLayout.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/src/views/business/internalCompany.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/vue.config.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
admin/package-lock.json
@@ -10174,6 +10174,30 @@
      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
      "dev": true
    },
    "path": {
      "version": "0.12.7",
      "resolved": "https://registry.npmmirror.com/path/-/path-0.12.7.tgz",
      "integrity": "sha512-aXXC6s+1w7otVF9UletFkFcDsJeO7lSZBPUQhtb5O0xJe8LtYhj/GxldoL09bBj9+ZmE2hNoHqQSFMN5fikh4Q==",
      "requires": {
        "process": "^0.11.1",
        "util": "^0.10.3"
      },
      "dependencies": {
        "inherits": {
          "version": "2.0.3",
          "resolved": "https://registry.npmmirror.com/inherits/-/inherits-2.0.3.tgz",
          "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
        },
        "util": {
          "version": "0.10.4",
          "resolved": "https://registry.npmmirror.com/util/-/util-0.10.4.tgz",
          "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
          "requires": {
            "inherits": "2.0.3"
          }
        }
      }
    },
    "path-browserify": {
      "version": "0.0.1",
      "resolved": "https://registry.npm.taobao.org/path-browserify/download/path-browserify-0.0.1.tgz",
@@ -11044,8 +11068,7 @@
    "process": {
      "version": "0.11.10",
      "resolved": "https://registry.npm.taobao.org/process/download/process-0.11.10.tgz",
      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
      "dev": true
      "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
    },
    "process-nextick-args": {
      "version": "2.0.1",
admin/package.json
@@ -22,6 +22,7 @@
    "element-ui": "^2.3.6",
    "js-cookie": "^2.2.1",
    "js-file-download": "^0.4.12",
    "path": "^0.12.7",
    "qrcodejs2": "0.0.2",
    "vue": "^2.6.11",
    "vue-clipboard2": "^0.3.1",
admin/src/api/business/member.js
@@ -9,6 +9,14 @@
    trim: true
  })
}
export function allList (data) {
  // return request.post('/business/member/page', data, {
  //   trim: true
  // })
  return request.post('/visitsAdmin/cloudService/business/member/list', data, {
    trim: true
  })
}
// 部门信息同步
export function memberSync (data) {
  return request.post('/visitsAdmin/cloudService/business/member/syncAll', data)
admin/src/components/business/OperaCarsWindow.vue
@@ -6,41 +6,28 @@
        :confirm-working="isWorking"
        @confirm="confirm"
    >
        <el-form :model="form" ref="form" :rules="rules">
            <el-form-item label="车牌号" prop="code">
                <el-input v-model="form.code" placeholder="请输入车牌号" v-trim/>
            </el-form-item>
            <el-form-item label="用户类型" prop="code">
                <el-radio-group v-model="form.code">
                    <el-radio label="内部员工"></el-radio>
                    <el-radio label="劳务人员"></el-radio>
                </el-radio-group>
            </el-form-item>
            <el-form-item label="选择用户" prop="code">
                <el-select v-model="form.code" filterable placeholder="请选择">
                    <el-option
                        v-for="item in options"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value">
                    </el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="授权有效期" prop="code">
                <el-date-picker
                    v-model="form.code"
                    type="daterange"
                    range-separator="至"
                    start-placeholder="开始日期"
                    end-placeholder="结束日期">
                </el-date-picker>
            </el-form-item>
            <el-form-item label="授权停车场" prop="code">
                <el-radio-group v-model="form.code">
                    <el-radio label="全部停车场"></el-radio>
                    <el-radio label="部分停车场"></el-radio>
                </el-radio-group>
            </el-form-item>
      <el-form :model="form" ref="form" :rules="rules">
          <el-form-item label="车牌号" prop="code">
            <el-input v-model="form.code" placeholder="请输入车牌号" v-trim/>
          </el-form-item>
          <el-form-item label="车辆类型" prop="type">
            <el-radio-group v-model="form.type" >
              <el-radio :label="0"  >员工车辆</el-radio>
              <el-radio  :label="1"  >安泰公务车</el-radio>
              <el-radio  :label="2"  >安泰物流车</el-radio>
              <el-radio  :label="3"  >市公司公车</el-radio>
            </el-radio-group>
          </el-form-item>
          <el-form-item label="选择车主:" prop="memberId">
            <el-select v-model="form.memberId" filterable placeholder="请选择">
              <el-option
                  v-for="item in memberList"
                  :key="item.id"
                  :label="item.name"
                  :value="item.id">
              </el-option>
            </el-select>
          </el-form-item>
        </el-form>
    </GlobalWindow>
</template>
@@ -48,28 +35,73 @@
<script>
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import { allList } from '@/api/business/member'
export default {
  name: 'OperaCarsWindow',
  name: 'OperaInternalCompanyWindow',
  extends: BaseOpera,
  components: { GlobalWindow },
  data () {
    return {
      // 表单数据
      memberList: [],
      form: {
        id: null,
        code: ''
        code: null,
        memberId: null,
        type: 0
      },
      // 验证规则
      rules: {
      },
      options: []
        code: [
          { required: true, message: '请输入车牌号' }
        ],
        type: [
          { required: true, message: '请选择车辆类型' }
        ]
      }
    }
  },
  created () {
    this.config({
      api: '/business/parkBook',
      api: '/business/cars',
      'field.id': 'id'
    })
  },
  methods: {
    open (title, target) {
      this.title = title
      this.visible = true
      this.loadMember()
      // 新建组织
      if (target == null) {
        this.$nextTick(() => {
          this.$refs.form.resetFields()
          this.form[this.configData['field.id']] = null
          this.form.type=0
        })
        return
      }
      // 编辑
      this.$nextTick(() => {
        for (const key in this.form) {
          this.form[key] = target[key]
        }
      })
    },
    loadMember () {
      allList({
        type: 2
      })
        .then(res => {
          this.memberList = res
        })
        .catch(e => {
          this.$tip.apiFailed(e)
        })
        .finally(() => {
          this.isWorking = false
        })
    }
  }
}
</script>
admin/src/layouts/TableLayout.vue
@@ -1,4 +1,4 @@
<template>
 <template>
  <div class="table-layout">
    <!-- 头部 -->
<!--    <div v-if="withBreadcrumb" class="table-header">
admin/src/views/business/internalCompany.vue
@@ -196,7 +196,7 @@
        }
      }
      return null
    },
    }
  }
}
</script>
admin/vue.config.js
@@ -24,8 +24,6 @@
    }
  },
  configureWebpack: {
    // provide the app's title in webpack's name field, so that
    // it can be accessed in index.html to inject the correct title.
    resolve: {
      alias: {
        '@': resolve('src')