| admin/src/components/system/user/OperaUserWindow.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/business/empower.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/business/internalMember.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/business/visitorSources.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/src/views/system/user.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| admin/vue.config.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/main.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/userinfo/userinfo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| h5/pages/visitorApplication/visitorApplication.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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> 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() }, 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> 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 }) } }), 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> 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]}`]: '' 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' 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' 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))
