diff --git a/common/http.api.js b/common/http.api.js
index 25db38f..f088b07 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -32,6 +32,7 @@ const install = (Vue, vm) => {
let getDickey = (params = {}) => vm.$u.get('/system/dict/', params); //查询字典
let userList = (params = {}) => vm.$u.get('/system/user/', params); ///system/permission/codes/
let deptList = (params = {}) => vm.$u.get('/system/dept/', params); //
+ let passChange = (params = {})=>vm.$u.put('/system/user/password/', params);
let permissions = (params = {}) => vm.$u.get('/system/permission/codes/', params); //获取全部权限标识
let hrmUserInfo = (params = {}) => vm.$u.get('/hrm/employee/info/', params); //用户信息
@@ -132,6 +133,7 @@ const install = (Vue, vm) => {
bindSecret,
loginSecret,
apkCheck,
+ passChange,
userList,
deptList,
diff --git a/manifest.json b/manifest.json
index fd6ea64..bc198b2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "曲阳金隅EHS",
"appid" : "__UNI__B00D419",
"description" : "曲阳金隅EHS",
- "versionName" : "1.01.12",
- "versionCode" : 101012,
+ "versionName" : "1.01.15",
+ "versionCode" : 101015,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index 149d7b1..3363c66 100644
--- a/pages.json
+++ b/pages.json
@@ -378,6 +378,14 @@
"enablePullDownRefresh": false
}
},
+ {
+ "path": "pages/my/passwordChange",
+ "style": {
+ "navigationBarTitleText": "修改密码",
+ "navigationStyle": "custom",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/workSpace/visit/visitor",
"style": {
diff --git a/pages/home/home_.vue b/pages/home/home_.vue
index 60aae83..c7120e9 100644
--- a/pages/home/home_.vue
+++ b/pages/home/home_.vue
@@ -40,6 +40,7 @@
{{item.title}}
+ 工单名称:{{item.ticket_data.name}}
所属工作流:{{item.workflow_.name}}
工单状态:{{item.state_.name}}
提交时间:{{item.create_time}}
@@ -82,6 +83,7 @@
{{item.title}}
+ 工单名称:{{item.ticket_data.name}}
所属工作流:{{item.workflow_.name}}
工单状态:{{item.state_.name}}
提交时间:{{item.create_time}}
@@ -203,6 +205,7 @@
category: 'cc'
};
that.$u.api.getTickets(params).then(res => {
+ that.copyCount = res.count;
that.copyList = res.results.splice(0, 2);
})
},
diff --git a/pages/my/my.vue b/pages/my/my.vue
index f60d804..f3aa578 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -24,7 +24,7 @@
- {{vuex_version}}
+ {{vuex_version}}
@@ -58,6 +58,12 @@
我的人员库
+
+
+ 修改密码
+
+
@@ -119,6 +125,11 @@
url: '/pages/workSpace/rpj/remployee'
})
}
+ else if (type == "password") {
+ uni.navigateTo({
+ url: '/pages/my/passwordChange'
+ })
+ }
},
getUserInfo() {
var promise;
@@ -200,6 +211,87 @@
url:'/pages/login/login_?autoLoading=no'
})
})
+ },
+ checkVersion(){
+ let that = this;
+ uni.getSystemInfo({
+ success(res) {
+ that.$u.vuex('vuex_version', res.appVersion)
+ // #ifdef APP-PLUS
+ if (res.platform == 'android') {
+ that.$u.vuex('vuex_version', res.appVersion)
+ that.$u.api.apkCheck().then(res1 => {
+ if (res.appVersion < res1.version) {
+ uni.showModal({
+ title: "发现新版本",
+ content: "有新的版本发布, 请下载新版本",
+ confirmText: '立即更新',
+ success: (res2) => {
+ if (res2.confirm) {
+ if(res1.file.indexOf("http") == 0){
+ // this.appdownLoad(res1.file);
+ plus.runtime.openURL(res1.file)
+ }else{
+ // this.appdownLoad(that.vuex_host + res1.file);
+ plus.runtime.openURL(that.vuex_host + res1.file)
+ }
+ } else {
+ return false
+ }
+ }
+ })
+ }else{
+ uni.showModal({
+ title: "版本检测",
+ content: "当前版本("+res.appVersion+")已是最新版本",
+ confirmText: '确定',
+ success: (res2) => {
+
+ }
+ })
+ }
+ })
+ }
+ // #endif
+ }
+ })
+ },
+
+ //执行下载app
+ appdownLoad(url) {
+ var that = this;
+ uni.showLoading({
+ title: '安装包下载中……'
+ })
+ const downloadTask = uni.downloadFile({
+ url: url, //服务器 app 的下载地址
+ success: (downloadResult) => {
+ uni.hideLoading();
+ console.log(downloadResult)
+ if (downloadResult.statusCode === 200) {
+ uni.showModal({
+ title: '',
+ content: '下载成功,安装新版本',
+ confirmText: '确定',
+ showCancel: false,
+ success: function(res) {
+ if (res.confirm == true) {
+ plus.runtime.install( //安装
+ downloadResult.tempFilePath, {
+ force: true
+ },
+ function(res) {
+ utils.showToast('更新成功,重启中');
+ plus.runtime.restart();
+ }
+ );
+ }
+ }
+ });
+ }
+ }
+ });
+
}
}
}
diff --git a/pages/my/passwordChange.vue b/pages/my/passwordChange.vue
new file mode 100644
index 0000000..5b1df6f
--- /dev/null
+++ b/pages/my/passwordChange.vue
@@ -0,0 +1,194 @@
+
+
+
+
+
+ 密码修改:
+
+
+
+ *旧密码
+
+
+
+
+
+ *新密码
+
+
+
+
+
+ *确认新密码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/workSpace/rpj/rpjCreate.vue b/pages/workSpace/rpj/rpjCreate.vue
index 5a189f8..0f70ef9 100644
--- a/pages/workSpace/rpj/rpjCreate.vue
+++ b/pages/workSpace/rpj/rpjCreate.vue
@@ -215,7 +215,7 @@
that.$u.api.rpjUpdate(that.rpj, that.formData).then(res => {
if (res.err_msg) {
} else {
- let params = `?rpj=${that.rpj}&rparty=${that.formData.rparty}`;
+ let params = `?rpj=${that.rpj}&rparty=${that.formData.rparty}&rpjName=${that.formData.name}`;
uni.navigateTo({
url: '/pages/workSpace/rpj/rpjFiles' + params
})
@@ -225,7 +225,8 @@
that.$u.api.rpjCreate(that.formData).then(res => {
debugger;
if (res.err_msg) {} else {
- let params = `?rpj=${res.id}&rparty=${that.formData.rparty}`;
+ that.rpj = res.id;
+ let params = `?rpj=${res.id}&rparty=${that.formData.rparty}&rpjName=${that.formData.name}`;
uni.navigateTo({
url: '/pages/workSpace/rpj/rpjFiles' + params
})
diff --git a/pages/workSpace/rpj/rpjFiles.vue b/pages/workSpace/rpj/rpjFiles.vue
index 6a87839..240ab56 100644
--- a/pages/workSpace/rpj/rpjFiles.vue
+++ b/pages/workSpace/rpj/rpjFiles.vue
@@ -78,7 +78,8 @@
uploadImgsList: [],
fileList :[],
rpj:'',
- rparty:''
+ rparty:'',
+ rpjName:''
}
},
@@ -87,6 +88,7 @@
if (params.rpj) {
this.rpj = params.rpj;
this.rparty = params.rparty;
+ this.rpjName = params.rpjName;
}
this.showBtns = true;
},
@@ -183,7 +185,7 @@
nextStep() {
let that = this;
- let params = `?rpj=${that.rpj}&rparty=${that.rparty}`;
+ let params = `?rpj=${that.rpj}&rparty=${that.rparty}&rpjName=${that.rpjName}`;
uni.navigateTo({
url: '/pages/workSpace/rpj/rpjWorkers' + params
})
diff --git a/pages/workSpace/rpj/rpjWorkers.vue b/pages/workSpace/rpj/rpjWorkers.vue
index f22b706..caad831 100644
--- a/pages/workSpace/rpj/rpjWorkers.vue
+++ b/pages/workSpace/rpj/rpjWorkers.vue
@@ -114,6 +114,7 @@
this.rpj = params.rpj;
this.formData.rpj = params.rpj;
this.rparty = params.rparty;
+ this.rpjName = params.rpjName;
},
onShow() {
this.workerList = [];
@@ -229,7 +230,8 @@
let ticket = {};
ticket.workflow = that.initform.workflow;
ticket.ticket_data = {
- rpj: that.rpj
+ rpj: that.rpj,
+ name:that.rpjName
};
ticket.transition = id;
that.$u.api.ticketCreate(ticket).then((res) => {
diff --git a/pages/workSpace/visit/visitCreate.vue b/pages/workSpace/visit/visitCreate.vue
index af60b92..e53c5ab 100644
--- a/pages/workSpace/visit/visitCreate.vue
+++ b/pages/workSpace/visit/visitCreate.vue
@@ -192,7 +192,6 @@
}
},
onShow() {
- // this.getUserRange();
},
methods: {
showDcoordinatorPicker(){
@@ -237,13 +236,12 @@
if (!that.paramsCheck()) {
return;
} else {
- // debugger;
if (that.formData.id) {
that.$u.api.visitUpdate(that.formData.id, that.formData).then(res => {
if (res.err_msg) {
} else {
- let params = `?visit=${that.formData.id}`;
+ let params = `?visit=${that.formData.id}&visitName=${that.formData.name}`;
uni.navigateTo({
url: '/pages/workSpace/visit/vpeopleList'+params
})
@@ -253,7 +251,8 @@
that.$u.api.visitCreate(that.formData).then(res => {
if (res.err_msg) {
} else {
- let params = `?visit=${res.id}`;
+ that.visit = res.id;
+ let params = `?visit=${res.id}&visitName=${that.formData.name}`;
uni.navigateTo({
url: '/pages/workSpace/visit/vpeopleList'+params
})
diff --git a/pages/workSpace/visit/vpeopleList.vue b/pages/workSpace/visit/vpeopleList.vue
index 473c35f..72d19a3 100644
--- a/pages/workSpace/visit/vpeopleList.vue
+++ b/pages/workSpace/visit/vpeopleList.vue
@@ -42,6 +42,7 @@
name: "vpeopleList",
data() {
return {
+ visitName:'',
visitorCount:0,
initform: {},
vpeopleList: [],
@@ -52,6 +53,7 @@
},
onLoad(params) {
this.visitId = params.visit;
+ this.visitName = params.visitName;
},
onShow() {
this.getVpeopleList();
@@ -116,7 +118,8 @@
let ticket = {};
ticket.workflow = this.initform.workflow;
ticket.ticket_data = {
- visit: this.visitId
+ visit: this.visitId,
+ name: this.visitName
};
ticket.transition = id;
this.$u.api.ticketCreate(ticket).then((res) => {