From 4b21a465f3c48120f1d10a5a04921dfdce7a0143 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 01 三月 2024 10:37:12 +0800
Subject: [PATCH] mrshi
---
h5/pages/visitorApplication/visitorApplication.vue | 10 +-
admin/src/components/system/user/OperaUserWindow.vue | 24 ++++----
admin/src/views/business/visitorSources.vue | 4
h5/main.js | 4
admin/src/views/business/empower.vue | 36 ++++++------
admin/src/views/system/user.vue | 36 ++++++------
admin/vue.config.js | 2
admin/src/views/business/internalMember.vue | 2
h5/pages/userinfo/userinfo.vue | 6 +
9 files changed, 64 insertions(+), 60 deletions(-)
diff --git a/admin/src/components/system/user/OperaUserWindow.vue b/admin/src/components/system/user/OperaUserWindow.vue
index 149f02d..35d784c 100644
--- a/admin/src/components/system/user/OperaUserWindow.vue
+++ b/admin/src/components/system/user/OperaUserWindow.vue
@@ -25,24 +25,24 @@
<!-- <el-radio label="/avatar/woman.png" border><img src="/avatar/woman.png" alt=""></el-radio>-->
<!-- </el-radio-group>-->
<!-- </el-form-item>-->
- <el-form-item v-if="form.id == null" label="鍒濆瀵嗙爜" prop="password" required>
- <el-input v-model="form.password" type="password" placeholder="璇疯緭鍏ュ垵濮嬪瘑鐮�" maxlength="30" show-password/>
- </el-form-item>
- <el-form-item label="鎵�灞為儴闂�" prop="departmentId" required>
- <DepartmentSelect v-model="form.departmentId" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�灞為儴闂�" :inline="false" clearable/>
- </el-form-item>
- <el-form-item label="宀椾綅" prop="positionId">
- <PositionSelect v-model="form.positionIds" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�鍦ㄥ矖浣�" :inline="false" :multiple="true" clearable/>
- </el-form-item>
+<!-- <el-form-item v-if="form.id == null" label="鍒濆瀵嗙爜" prop="password" required>-->
+<!-- <el-input v-model="form.password" type="password" placeholder="璇疯緭鍏ュ垵濮嬪瘑鐮�" maxlength="30" show-password/>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="鎵�灞為儴闂�" prop="departmentId" required>-->
+<!-- <DepartmentSelect v-model="form.departmentId" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�灞為儴闂�" :inline="false" clearable/>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="宀椾綅" prop="positionId">-->
+<!-- <PositionSelect v-model="form.positionIds" placeholder="璇烽�夋嫨鐢ㄦ埛鎵�鍦ㄥ矖浣�" :inline="false" :multiple="true" clearable/>-->
+<!-- </el-form-item>-->
<el-form-item label="宸ュ彿" prop="empNo">
<el-input v-model="form.empNo" placeholder="璇疯緭鍏ュ伐鍙�" v-trim maxlength="50"/>
</el-form-item>
<el-form-item label="鎵嬫満鍙风爜" prop="mobile">
<el-input v-model="form.mobile" placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" v-trim maxlength="11"/>
</el-form-item>
- <el-form-item label="閭" prop="email">
- <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" v-trim maxlength="200"/>
- </el-form-item>
+<!-- <el-form-item label="閭" prop="email">-->
+<!-- <el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" v-trim maxlength="200"/>-->
+<!-- </el-form-item>-->
<el-form-item label="鐢熸棩" prop="birthday">
<el-date-picker v-model="form.birthday" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨鐢ㄦ埛鐢熸棩"/>
</el-form-item>
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index 61e70a2..f1c9acd 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -2,8 +2,8 @@
<TableLayout :permissions="['business:empower:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕鎵嬫満鍙�" prop="keyWords">
- <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="濮撳悕鎵嬫満鍙�" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="涓嬪彂鐘舵��" prop="sendStatus">
<el-select v-model="searchForm.sendStatus" placeholder="璇烽�夋嫨" @keypress.enter.native="search">
@@ -16,12 +16,8 @@
<el-option label="涓嶇鍚堜笅鍙戞潯浠�" value="6"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍏徃" prop="companyId">
- <el-select v-model="searchForm.companyId" placeholder="璇烽�夋嫨鍏徃" @keypress.enter.native="search">
- <el-option label="寰呬笅鍙�" value="0"></el-option>
- <el-option label="宸蹭笅鍙�" value="1"></el-option>
- <el-option label="宸插彇娑�" value="2"></el-option>
- </el-select>
+ <el-form-item label="鍏徃" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="涓嬪彂璧峰鏃堕棿" prop="startTime">
<el-date-picker
@@ -115,8 +111,10 @@
return {
// 鎼滅储
searchForm: {
- keyWords: '',
- companyId: '',
+ memberName: '',
+ companyName: '',
+ sendStartDate: '',
+ sendEndDate: '',
startTime: '',
endTime: '',
sendStatus: '',
@@ -132,28 +130,30 @@
'field.id': 'id',
'field.main': 'id'
})
+ this.changeRadio('0')
this.search()
},
methods: {
changeRadio (e) {
+ this.searchForm.radio = e
if (e === '0') {
- this.searchForm.startTime = timeForMat(0)[0]
- this.searchForm.endTime = timeForMat(0)[1]
+ this.searchForm.sendStartDate = timeForMat(0)[0]
+ this.searchForm.sendEndDate = timeForMat(0)[1]
this.time = timeForMat(0)
} else if (e === '1') {
- this.searchForm.startTime = timeForMat(6)[0]
- this.searchForm.endTime = timeForMat(6)[1]
+ this.searchForm.sendStartDate = timeForMat(6)[0]
+ this.searchForm.sendEndDate = timeForMat(6)[1]
this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startTime = timeForMat(29)[0]
- this.searchForm.endTime = timeForMat(29)[1]
+ this.searchForm.sendStartDate = timeForMat(29)[0]
+ this.searchForm.sendEndDate = timeForMat(29)[1]
this.time = timeForMat(29)
}
this.search()
},
seleTime (e) {
- this.searchForm.startTime = e[0]
- this.searchForm.endTime = e[1]
+ this.searchForm.sendStartDate = e[0]
+ this.searchForm.sendEndDate = e[1]
this.searchForm.radio = null
this.search()
},
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 0e69fe1..86224e9 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -45,7 +45,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:member:delete','business:member:sync']">
- <li><el-button type="primary">闂ㄧ鎺堟潈</el-button></li>
+<!-- <li><el-button type="primary">闂ㄧ鎺堟潈</el-button></li>-->
<li><el-button type="primary" v-permissions="['business:member:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:member:delete']">鍒犻櫎</el-button></li>
</ul>
diff --git a/admin/src/views/business/visitorSources.vue b/admin/src/views/business/visitorSources.vue
index 7cbddb7..9548afc 100644
--- a/admin/src/views/business/visitorSources.vue
+++ b/admin/src/views/business/visitorSources.vue
@@ -101,10 +101,10 @@
new Image({
uploadRequest (file) {
const fd = new FormData()
- fd.append('folder', 'visit')
+ fd.append('folder', 'visit/')
fd.append('file', file)
return upload(fd).then(res => {
- return res.url
+ return res.prefixPath + res.folder + res.halfPath
})
}
}),
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index 1209412..9d0513e 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -11,12 +11,12 @@
<el-form-item label="鎵嬫満鍙风爜" prop="mobile">
<el-input v-model="searchForm.mobile" v-trim placeholder="璇疯緭鍏ユ墜鏈哄彿鐮�" @keypress.enter.native="search"/>
</el-form-item>
- <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">
- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>
- </el-form-item>
- <el-form-item label="宀椾綅" prop="positionId">
- <PositionSelect v-model="searchForm.positionId" placeholder="璇烽�夋嫨宀椾綅" clearable/>
- </el-form-item>
+<!-- <el-form-item label="鎵�灞為儴闂�" prop="rootDeptId">-->
+<!-- <DepartmentSelect v-model="searchForm.rootDeptId" placeholder="璇烽�夋嫨鎵�灞為儴闂�" clearable/>-->
+<!-- </el-form-item>-->
+<!-- <el-form-item label="宀椾綅" prop="positionId">-->
+<!-- <PositionSelect v-model="searchForm.positionId" placeholder="璇烽�夋嫨宀椾綅" clearable/>-->
+<!-- </el-form-item>-->
<section>
<el-button type="primary" icon="el-icon-search" @click="search">鎼滅储</el-button>
<el-button @click="reset">閲嶇疆</el-button>
@@ -45,24 +45,24 @@
<el-table-column prop="realname" label="濮撳悕" min-width="100px" fixed="left"></el-table-column>
<el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column>
<el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
- <el-table-column prop="department" label="閮ㄩ棬" min-width="120px">
- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>
- </el-table-column>
- <el-table-column prop="position" label="宀椾綅" min-width="160px" class-name="table-column-strings">
- <template slot-scope="{row}">
- <ul>
- <li v-for="position in row.positions" :key="position.id">{{position.name}}</li>
- </ul>
- </template>
- </el-table-column>
+<!-- <el-table-column prop="department" label="閮ㄩ棬" min-width="120px">-->
+<!-- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>-->
+<!-- </el-table-column>-->
+<!-- <el-table-column prop="position" label="宀椾綅" min-width="160px" class-name="table-column-strings">-->
+<!-- <template slot-scope="{row}">-->
+<!-- <ul>-->
+<!-- <li v-for="position in row.positions" :key="position.id">{{position.name}}</li>-->
+<!-- </ul>-->
+<!-- </template>-->
+<!-- </el-table-column>-->
<el-table-column prop="sex" label="鎬у埆" sortable="custom" sort-by="SEX" min-width="80px">
<template slot-scope="{row}">
{{row.sex | sex}}
</template>
</el-table-column>
<el-table-column prop="mobile" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
- <el-table-column prop="email" label="閭" min-width="180px"></el-table-column>
- <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>
+<!-- <el-table-column prop="email" label="閭" min-width="180px"></el-table-column>-->
+<!-- <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>-->
<el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
<template slot-scope="{row}">
<ul>
diff --git a/admin/vue.config.js b/admin/vue.config.js
index e1300df..9a30f30 100644
--- a/admin/vue.config.js
+++ b/admin/vue.config.js
@@ -17,7 +17,7 @@
// http://192.168.0.129:10028 浠诲悍
// https://dmtest.ahapp.net/admin_api 娴嬭瘯鏈�
// http://10.10.99.63/admin_interface/ 鏈�鏂版祴璇曟湇
- target: 'http://10.10.99.63/admin_interface',
+ target: 'http://218.23.218.228:8018/admin_interface',
changeOrigin: true,
pathRewrite: {
[`^${[process.env.VUE_APP_API_PREFIX]}`]: ''
diff --git a/h5/main.js b/h5/main.js
index 7c2b469..881da17 100644
--- a/h5/main.js
+++ b/h5/main.js
@@ -7,9 +7,9 @@
Vue.config.productionTip = false
-Vue.prototype.$baseUrl = 'http://192.168.0.129:10027/';
+// Vue.prototype.$baseUrl = 'http://192.168.0.186:10027/';
// Vue.prototype.$baseUrl = 'https://dmtest.ahapp.net/h5_api/';
-// Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/';
+Vue.prototype.$baseUrl = 'http://218.23.218.228:8018/web_interface/';
Vue.prototype.$store = store;
App.mpType = 'app'
diff --git a/h5/pages/userinfo/userinfo.vue b/h5/pages/userinfo/userinfo.vue
index 73fc279..d328ee9 100644
--- a/h5/pages/userinfo/userinfo.vue
+++ b/h5/pages/userinfo/userinfo.vue
@@ -27,7 +27,7 @@
</view>
</view>
<view class="cell">
- <view class="title">鍏徃</view>
+ <view class="title">鍏徃<b>*</b></view>
<view class="content">
<input class="input" maxlength="50" placeholder-style="color: #999999;" v-model="visitorData.companyName" placeholder="璇疯緭鍏ユ偍鐨勫叕鍙稿悕绉�" />
</view>
@@ -129,6 +129,10 @@
icon: 'none'
})
}
+ if (!this.visitorData.companyName) return uni.showToast({
+ title: '鍏徃涓嶈兘涓虹┖',
+ icon: 'none'
+ })
if (!this.visitorData.faceImg) return uni.showToast({
title: '浜鸿劯鐓х墖涓嶈兘涓虹┖',
icon: 'none'
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 3b72e05..4b65e9c 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -53,7 +53,7 @@
<view class="list_item">
<view class="list_item_label">
<text>鎷滆浜嬬敱</text>
- <text></text>
+ <text>*</text>
</view>
<view class="list_item_content">
<input type="text" v-model="form1.reason" placeholder="璇疯緭鍏ユ潵璁夸簨鐢憋紝鎮ㄦ潵鍋氫粈涔堢殑" placeholder-style="color: #999999;" />
@@ -358,10 +358,10 @@
title: '璁块棶闂ㄧ涓嶈兘涓虹┖',
icon: 'none'
})
- // if (!this.form1.reason) return uni.showToast({
- // title: '鎷滆浜嬬敱涓嶈兘涓虹┖',
- // icon: 'none'
- // })
+ if (!this.form1.reason) return uni.showToast({
+ title: '鎷滆浜嬬敱涓嶈兘涓虹┖',
+ icon: 'none'
+ })
// this.form1.starttime = this.form1.starttime + ':00'
// this.form1.endtime = this.form1.endtime + ':00'
let data = JSON.parse(JSON.stringify(this.form1))
--
Gitblit v1.9.3