diff --git a/components/company/company.vue b/components/company/company.vue
index c9140be..ad9a987 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -1,10 +1,15 @@
-
-
-
-
-
-
-
+
+
+
+ 公司基本信息
+
+
+
+
+ 公司名称 :
+ {{ company.company_name }}
+
+
+ 社会代码 :
+ {{ company.organization_code }}
+
+
+ 公司类型 :
+ {{
+ company.company_type_name || company.company_type
+ }}
+
+
+ 负责区域 :
+ {{ c_address }}
+
+
+
+
+
+
-
- 公司基本信息
-
-
-
-
- 公司名称 :
- {{company.company_name}}
-
-
- 社会代码 :
- {{company.organization_code}}
-
-
- 公司类型 :
- {{company.company_type_name||company.company_type}}
-
-
- 负责区域 :
- {{c_address}}
-
-
-
-
-
-
-
-
- 公司联系人
-
-
-
-
- 法人姓名 :
- {{company.master_name}}
-
-
- 担任职务 :
- {{company.organization_code}}
-
-
- 联系电话 :
- {{company.master_phone}}
-
-
- 电子邮箱 :
- {{company.master_email}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 电子合同
-
-
-
-
- 甲方 :
- {{contract.party_a_name}}
-
-
- 乙方 :
- {{contract.party_b_name}}
-
-
- 合同类型 :
- {{contract.contract_type_name}}
-
-
- 合同编号 :
- {{contract.contract_no}}
-
-
-
-
-
-
-
-
-
-
-
-
- 合同
-
-
- {{contract.create_time}}
-
-
-
-
-
- 查看
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 公司资质信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ 电子合同
+
+
+
+ 甲方：{{ contract.party_a_name }}
+ 乙方：{{ contract.party_b_name }}
+ 合同类型：{{ contract.contract_type_name }}
+ 合同编号：{{ contract.contract_no }}
+
+
+
+
+
+
+
+ 合同
+
+
+ {{ contract.create_time }}
+
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+ 联系人管理
+
+
+
+
+
+
+
+ 主要联系人
+
+
+ 姓名：{{ company.master_name }}
+ 职位：{{ company.master_position }}
+
+ 联系电话：{{ company.master_phone }}
+
+ 邮箱：{{ company.master_email }}
+
+
+
+
+
+
+ 其他联系人
+
+
+ 姓名：{{ other.name }}
+ 职位：{{ other.position }}
+ 联系电话：{{ other.phone }}
+ 邮箱：{{ other.email }}
+
+
+
+
+
+
+
+
+ 资质信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index aa0a005..7b6e51c 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -75,8 +75,10 @@
- 退出登录
+ 退出登录
登录账号
+
+
@@ -96,6 +98,7 @@
return {
myOaData: myOaData,
src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+ modelShow: false
}
},
onReady() {
@@ -107,6 +110,9 @@
onShow() {
this.getOaUserInfo();
},
+ onHide() {
+ this.modelShow = false;
+ },
computed: {
eyeType() {
return this.$store.state.config.eyeType;
@@ -124,19 +130,19 @@
},
logout() {
let that = this;
- uni.showModal({
- content: '确定要退出登录吗',
- success: (e) => {
- if (e.confirm) {
+ // uni.showModal({
+ // content: '确定要退出登录吗',
+ // success: (e) => {
+ // if (e.confirm) {
uni.navigateTo({
url: '/pages/oaLogin/oaLogin?clear='+true,
success() {
that.$store.commit('CLEAR');
}
})
- }
- }
- })
+ // }
+ // }
+ // })
},
async getOaUserInfo() {
const res = await userInfo();
diff --git a/subpkg/archives/archives.vue b/subpkg/archives/archives.vue
index 90a6ddc..6437dd8 100644
--- a/subpkg/archives/archives.vue
+++ b/subpkg/archives/archives.vue
@@ -32,7 +32,10 @@
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-->
-
+
+
+
@@ -120,7 +123,6 @@
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
-
@@ -142,6 +144,12 @@
task_id: -1,
is_admin: false,
list: [],
+ current: 0,
+ tabLists: [{
+ name: '未更新',
+ }, {
+ name: '已更新'
+ }],
loadConfig: {
page: 1,
limit: 15,
@@ -167,7 +175,7 @@
title: '任务:信息更新'
})
}
- this.loadInformationList();
+ this.initLoad();
uni.$on('loadArchives', this.initLoad);
},
onShow() {
@@ -201,7 +209,7 @@
this.loadConfig.page = 1;
this.loadConfig.status = "loadmore";
this.list = [];
- this.is_admin ? null : await this.loadInformationList();
+ await this.loadInformationList();
uni.stopPullDownRefresh();
},
async loadInformationList() {
@@ -209,14 +217,19 @@
if (this.loadConfig.status == "nomore") return;
this.loadConfig.status = "loading"
let res = {};
- if (this.is_admin) res = await taskInformationgist({
- id: this.task_id
- });
- else res = await informationList({
- page: this.loadConfig.page,
- limit: this.loadConfig.limit,
- user_id: that.user_id
- })
+ if (this.is_admin) {
+ res = await taskInformationgist({
+ id: this.task_id
+ });
+ }
+ else {
+ res = await informationList({
+ page: this.loadConfig.page,
+ limit: this.loadConfig.limit,
+ user_id: that.user_id,
+ is_update: this.current
+ })
+ }
this.loadConfig.status = "loadmore"
if (res.data.length < this.loadConfig.limit) {
this.loadConfig.status = "nomore"
@@ -224,7 +237,11 @@
this.loadConfig.page++;
}
this.list = [...this.list, ...res.data];
- }
+ },
+ changeCurrent(e) {
+ this.current = e.index;
+ this.initLoad();
+ }
},
onPullDownRefresh() {
this.initLoad();