Browse Source

2023-10-12

master
guoxing 2 years ago
parent
commit
c182040d2a
  1. 2
      supervise-organizational-ui/src/views/organizational/userManageAdd.vue
  2. 44
      supervise-organizational-ui/src/views/organizational/userManageList.vue
  3. 2
      supervise-uniapp/App.vue
  4. 4
      supervise-uniapp/common/config.js
  5. 8
      supervise-uniapp/common/request.api.js
  6. 3
      supervise-uniapp/manifest.json
  7. 9
      supervise-uniapp/pages.json
  8. 13
      supervise-uniapp/pages/home/UserFragment.vue
  9. 1
      supervise-uniapp/pages/home/WorkFragment.vue
  10. 4
      supervise-uniapp/pages/login/fwxy.vue
  11. 2
      yxt-portal-ui/.env.development
  12. 14
      yxt-portal-ui/src/views/Home/Home.vue

2
supervise-organizational-ui/src/views/organizational/userManageAdd.vue

@ -1,5 +1,5 @@
<template> <template>
<div> <div class="main-content">
<el-card class="box-card"> <el-card class="box-card">
<table class="e-table" cellspacing="0"> <table class="e-table" cellspacing="0">
<tr> <tr>

44
supervise-organizational-ui/src/views/organizational/userManageList.vue

@ -1,5 +1,5 @@
<template> <template>
<div> <div class="main-content">
<div class="tab-header"> <div class="tab-header">
<el-form ref="form" :inline="true" :model="search" label-width="80px"> <el-form ref="form" :inline="true" :model="search" label-width="80px">
<el-row :gutter="20"> <el-row :gutter="20">
@ -15,11 +15,7 @@
</el-form-item> </el-form-item>
<el-form-item label="用户类型"> <el-form-item label="用户类型">
<el-select v-model="search.personTypeKey" style="width:300px"> <el-select v-model="search.personTypeKey" style="width:300px">
<el-option <el-option v-for="(item, i) in userTypeData" :key="i" :label="item.name" :value="item.value">
v-for="(item, i) in userTypeData"
:key="i"
:label="item.name"
:value="item.value">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -46,10 +42,12 @@
<el-button @click="initPwd(scope.row)" type="danger" size="mini"> <el-button @click="initPwd(scope.row)" type="danger" size="mini">
初始化密码 初始化密码
</el-button> </el-button>
<el-button @click="userinfoChange(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'" type="primary" size="mini"> <el-button @click="userinfoChange(scope.row)"
:disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'" type="primary" size="mini">
修改 修改
</el-button> </el-button>
<el-button @click="del(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'" type="danger" size="mini"> <el-button @click="del(scope.row)" :disabled="scope.row.sid=='e73f6e2c-1bda-4a4d-8390-ac7a2bf25854'"
type="danger" size="mini">
删除 删除
</el-button> </el-button>
</template> </template>
@ -78,7 +76,8 @@
</template> </template>
</el-table-column> --> </el-table-column> -->
</el-table> </el-table>
<pagination :total="page.total" :page.sync="page.current" :limit.sync="page.size" @pagination="pagination" /> <pagination style="margin-bottom: 50px;" :total="page.total" :page.sync="page.current" :limit.sync="page.size"
@pagination="pagination" />
<!-- 角色设置 --> <!-- 角色设置 -->
<el-dialog title="设置角色" :visible.sync="roleDialog" width="30%"> <el-dialog title="设置角色" :visible.sync="roleDialog" width="30%">
<el-form :model="roleForm" :rules="rules" ref="roleForm"> <el-form :model="roleForm" :rules="rules" ref="roleForm">
@ -127,7 +126,7 @@
<tr> <tr>
<td>用户类型</td> <td>用户类型</td>
<td> <td>
<el-select v-model="form.userTypeKey" @change="$forceUpdate()" style="width:300px"> <el-select v-model="form.userTypeKey" @change="selectChanged" value-key="value" style="width:300px">
<el-option v-for="(item, i) in userTypeData" :key="i" :label="item.name" :value="item.value"> <el-option v-for="(item, i) in userTypeData" :key="i" :label="item.name" :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
@ -257,6 +256,7 @@
// //
bm_Dialog: false, bm_Dialog: false,
sysStaffPost: '', sysStaffPost: '',
sysStaffOrg: {},
bm_Form: { bm_Form: {
departmentSid: '' departmentSid: ''
}, },
@ -400,6 +400,10 @@
console.log("form>>>>", this.form) console.log("form>>>>", this.form)
// var type = this.userTypeData.find(item => item.value === this.form.userTypeKey)
// console.log("type>>>>", type.name)
// this.form.userType = this.form.userTypeKey;
this.form.userType = this.form.userTypeKey; this.form.userType = this.form.userTypeKey;
userUpdata(this.form).then(res => { userUpdata(this.form).then(res => {
if (res.code === '200') { if (res.code === '200') {
@ -436,9 +440,12 @@
var sysStaffPost = row.sysStaffPost var sysStaffPost = row.sysStaffPost
this.editDialog = true this.editDialog = true
this.form = Object.assign({}, row) this.form = Object.assign({}, row)
this.form.sysStaffOrg = this.sysStaffOrg
this.sysStaffPost = sysStaffPost this.sysStaffPost = sysStaffPost
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.Tree.setChecked(this.form.departmentSid, true, true) this.$refs['Tree'].setChecked(this.form.departmentSid, true, true)
}) })
// this.$emit('status',true) // this.$emit('status',true)
// this.$emit('item',row) // this.$emit('item',row)
@ -452,8 +459,7 @@
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
}).then(() => { }).then(() => {
delUser(row.sid delUser(row.sid).then(res => {
).then(res => {
this.$message({ this.$message({
type: 'success', type: 'success',
message: res.msg message: res.msg
@ -500,11 +506,21 @@
orgCode: data.orgCode, orgCode: data.orgCode,
manageType: "", manageType: "",
} }
this.sysStaffOrg = {
orgSid: data.sid,
orgName: data.name,
orgSidPath: data.orgSidPath,
orgNamePath: "",
orgCode: data.orgCode,
manageType: "",
}
return return
} }
}, },
selectChanged(value){
console.log(value)
},
getPost(orgSid) { getPost(orgSid) {
let params = { let params = {
sid: orgSid sid: orgSid

2
supervise-uniapp/App.vue

@ -3,7 +3,7 @@
export default { export default {
globalData: { globalData: {
// wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin", // wxSilentLoginURL: "https://supervise.yxtsoft.com/portal/v1/wxuser/wxSilentLogin",
wxSilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/wxSilentLogin", wxSilentLoginURL: "http://192.168.1.107:8112/portal/v1/wxuser/wxSilentLogin",
// wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin", // wxSilentLoginURL: "http://192.168.1.110:8112/portal/v1/wxuser/wxSilentLogin",
wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin", wxAuthLoginURL: "https://supervise.yxtsoft.com/api/portal//v1/wxuser/wxAuthLogin",
SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",// SilentLoginURL: "https://supervise.yxtsoft.com/api/portal/v1/wxuser/SilentLogin",//

4
supervise-uniapp/common/config.js

@ -7,8 +7,8 @@
*/ */
module.exports = { module.exports = {
// baseUrl: 'https://jianguan.yyundong.com/api', // baseUrl: 'https://jianguan.yyundong.com/api',
baseUrl: 'https://supervise.yxtsoft.com', // baseUrl: 'https://supervise.yxtsoft.com',
// baseUrl: 'http://192.168.1.193:8112', baseUrl: 'http://192.168.1.107:8112',
// baseUrl: 'http://192.168.1.110:8112', // baseUrl: 'http://192.168.1.110:8112',
tokenName: "Authorization", // 请求头中token的名字,与服务器端对应 tokenName: "Authorization", // 请求头中token的名字,与服务器端对应
loginTimeoutCode: "5001", // 登录超时或失效的情况下,服务器端返回的错误码 loginTimeoutCode: "5001", // 登录超时或失效的情况下,服务器端返回的错误码

8
supervise-uniapp/common/request.api.js

@ -11,12 +11,12 @@ export default {
useropenid: (params = {}) => request.post("/api/portal/useropenid/save", params), useropenid: (params = {}) => request.post("/api/portal/useropenid/save", params),
// 获取 验证码 // 获取 验证码
sendVerificationCode: (params = {}) => request.get("/api/portal/v1/wxuser/sendVerificationCode/" + params.phone + sendVerificationCode: (params = {}) => request.get("/portal/v1/wxuser/sendVerificationCode/" + params.phone +
"/" + "/" +
params.type, params), params.type, params),
// 绑定手机号 // 绑定手机号
wxBindMobile: (params = {}) => request.post("/api/portal/v1/wxuser/wxBindMobile", params), wxBindMobile: (params = {}) => request.post("/portal/v1/wxuser/wxBindMobile", params),
// 查看预警信息 // 查看预警信息
selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params), selectBusinessRiskInfo: (params = {}) => request.post("/wxmpapi/v1/businessData/selectBusinessRiskInfo", params),
@ -83,7 +83,7 @@ export default {
// 获取首页面数据 // 获取首页面数据
getWorkData: (params = {}) => request.get("/reportwxmpapi/messagepushlog/numberOfJobs/" + params, params), getWorkData: (params = {}) => request.get("/report/messagepushlog/numberOfJobs/" + params, params),
// 获取消息类型列表 // 获取消息类型列表
messageTypeList: (params = {}) => request.post("/reportwxmpapi/MessageType/list ", params), messageTypeList: (params = {}) => request.post("/reportwxmpapi/MessageType/list ", params),
@ -130,7 +130,7 @@ export default {
storeHouseDetail: (params = {}) => request.get("/api/portal/v1/flow/fetchDetailsBySid/" + params, params), storeHouseDetail: (params = {}) => request.get("/api/portal/v1/flow/fetchDetailsBySid/" + params, params),
// 获取我的项目 // 获取我的项目
getProjectByUserSid: (params = {}) => request.get("/api/crm/v1/projectinformation/getProjectByUserSid/" + params, getProjectByUserSid: (params = {}) => request.get("/crm/v1/projectinformation/getProjectByUserSid/" + params,
params), params),
// 获取我的项目详情 // 获取我的项目详情

3
supervise-uniapp/manifest.json

@ -176,5 +176,6 @@
} }
}, },
"domain" : "" "domain" : ""
} },
"vueVersion" : "2"
} }

9
supervise-uniapp/pages.json

@ -372,6 +372,15 @@
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
},
{
"path" : "pages/index/interestAccount",
"style" :
{
"navigationBarTitleText": "",
"enablePullDownRefresh": false
}
} }
], ],
"lazyCodeLoading": "requiredComponents", "lazyCodeLoading": "requiredComponents",

13
supervise-uniapp/pages/home/UserFragment.vue

@ -27,6 +27,12 @@
<UserItem src='https://supervise.yxtsoft.com/img/user/sz.png' text="设置" @click="click" clickId="2"> <UserItem src='https://supervise.yxtsoft.com/img/user/sz.png' text="设置" @click="click" clickId="2">
</UserItem> </UserItem>
</view> </view>
<view class="user-item-bg">
<UserItem src='https://supervise.yxtsoft.com/img/user/wdxm.png' text="关注公众号" @click="click" clickId="8">
</UserItem>
</view>
<!-- #ifdef APP-PLUS --> <!-- #ifdef APP-PLUS -->
<!-- <view class="user-item-bg"> --> <!-- <view class="user-item-bg"> -->
<!-- <UserItem src='https://supervise.yxtsoft.com/img/user/zzjg.png' text="组织结构" @click="click" clickId="3"></UserItem> <!-- <UserItem src='https://supervise.yxtsoft.com/img/user/zzjg.png' text="组织结构" @click="click" clickId="3"></UserItem>
@ -158,6 +164,13 @@
case "7": case "7":
APPUpdate(true); APPUpdate(true);
break; break;
case "8":
uni.navigateTo({
url: '../index/interestAccount'
})
break;
} }
}, },

1
supervise-uniapp/pages/home/WorkFragment.vue

@ -327,6 +327,7 @@
uni.navigateTo({ uni.navigateTo({
url: '../index/WaitingProcessed' url: '../index/WaitingProcessed'
}); });
break; break;
case "2": case "2":
// //

4
supervise-uniapp/pages/login/fwxy.vue

@ -3,8 +3,8 @@
<!-- <rich-text :nodes="ysfw" space="emsp"></rich-text> --> <!-- <rich-text :nodes="ysfw" space="emsp"></rich-text> -->
<!-- <div v-html='ysfw'></div> --> <!-- <div v-html='ysfw'></div> -->
<p style="text-align:center"> <p style="text-align:center">
<span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 21px">汇融云仓贷后服务协议</span></strong> <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 21px">汇融云仓贷后服务协议</span>
<span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 21px"></span></strong> <span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 21px"></span>
</p> </p>
<p style="text-indent:28px; margin-top: 20rpx"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;</span></p> <p style="text-indent:28px; margin-top: 20rpx"><span style="font-family: 微软雅黑;letter-spacing: 0;font-size: 14px">&nbsp;</span></p>
<p style="text-indent:28px"> <p style="text-indent:28px">

2
yxt-portal-ui/.env.development

@ -5,5 +5,5 @@ ENV = 'development'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
VUE_APP_URL = "http://192.168.1.193:8112" VUE_APP_URL = "http://192.168.1.107:8112"
#VUE_APP_URL = "http://8.130.39.13:8112" #VUE_APP_URL = "http://8.130.39.13:8112"

14
yxt-portal-ui/src/views/Home/Home.vue

@ -443,8 +443,8 @@
// window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank') // window.open('http://127.0.0.1:9531/#/' + '?token=' + getStorage(), '_blank')
window.open('/customer/#/' + '?token=' + getStorage(), '_blank') window.open('/customer/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 1) { } else if (index === 1) {
// window.open('http://192.168.3.8:9531#/' + '?token=' + getStorage(), '_blank') window.open('http://192.168.1.119:9531#/' + '?token=' + getStorage(), '_blank')
window.open('/report/#/' + '?token=' + getStorage(), '_blank') // window.open('/report/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 2) { } else if (index === 2) {
window.open('/business/#/' + '?token=' + getStorage(), '_blank') window.open('/business/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 3) { } else if (index === 3) {
@ -457,13 +457,13 @@
} else if (index === 6) { } else if (index === 6) {
window.open('/message/#/' + '?token=' + getStorage(), '_blank') window.open('/message/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 7) { } else if (index === 7) {
// window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank') window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank')
window.open('/organizational/#/' + '?token=' + getStorage(), '_blank') // window.open('/organizational/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 8) { } else if (index === 8) {
// window.open('http://192.168.3.8:9531/#/' + '?token=' + getStorage(), '_blank') window.open('http://192.168.1.101:9531/#/' + '?token=' + getStorage(), '_blank')
window.open('/crm/#/' + '?token=' + getStorage(), '_blank') // window.open('/crm/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 9) { } else if (index === 9) {
// window.open('http://192.168.3.8:9532/#/' + '?token=' + getStorage(), '_blank') // window.open('http://192.168.1.102:9531/#/' + '?token=' + getStorage(), '_blank')
window.open('/warehouse/#/' + '?token=' + getStorage(), '_blank') window.open('/warehouse/#/' + '?token=' + getStorage(), '_blank')
} else if (index === 10) { } else if (index === 10) {
// //

Loading…
Cancel
Save