From 912b46e5daf7983cd850443f6fca50f4d3e0b578 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 23 五月 2024 18:40:21 +0800
Subject: [PATCH] 更改头部
---
admin/src/api/business/member.js | 8 ++
admin/src/layouts/TableLayout.vue | 2
admin/src/views/business/internalCompany.vue | 2
admin/package-lock.json | 27 ++++++++
admin/vue.config.js | 2
admin/package.json | 1
admin/src/components/business/OperaCarsWindow.vue | 112 ++++++++++++++++++++++++-------------
7 files changed, 108 insertions(+), 46 deletions(-)
diff --git a/admin/package-lock.json b/admin/package-lock.json
index b5dd877..f3820ef 100644
--- a/admin/package-lock.json
+++ b/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",
diff --git a/admin/package.json b/admin/package.json
index 326225c..64369f9 100644
--- a/admin/package.json
+++ b/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",
diff --git a/admin/src/api/business/member.js b/admin/src/api/business/member.js
index 81cadca..3f40252 100644
--- a/admin/src/api/business/member.js
+++ b/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)
diff --git a/admin/src/components/business/OperaCarsWindow.vue b/admin/src/components/business/OperaCarsWindow.vue
index db06626..3e70371 100644
--- a/admin/src/components/business/OperaCarsWindow.vue
+++ b/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>
diff --git a/admin/src/layouts/TableLayout.vue b/admin/src/layouts/TableLayout.vue
index 2a12773..8b12acb 100644
--- a/admin/src/layouts/TableLayout.vue
+++ b/admin/src/layouts/TableLayout.vue
@@ -1,4 +1,4 @@
-<template>
+ <template>
<div class="table-layout">
<!-- 澶撮儴 -->
<!-- <div v-if="withBreadcrumb" class="table-header">
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 5a29df9..b875085 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -196,7 +196,7 @@
}
}
return null
- },
+ }
}
}
</script>
diff --git a/admin/vue.config.js b/admin/vue.config.js
index ee1ea41..c429385 100644
--- a/admin/vue.config.js
+++ b/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')
--
Gitblit v1.9.3