From 8776f8e1fbb124fb814ea46bca20b5b05f08381d Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Thu, 10 Aug 2023 14:13:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 2 +-
components/company/company.vue | 4 +-
components/companyFinance/companyFinance.vue | 8 ++--
components/task/index.vue | 4 +-
components/task/taskItem.vue | 6 +--
pages.json | 5 ++-
pages/oaMy/oaMy.vue | 12 +++---
pages/office_app/oaMy/oaMy.vue | 4 +-
subpkg/blockTransaction/blockTransaction.vue | 4 +-
subpkg/companyInfo/companyInfo.vue | 6 +--
subpkg/companySign/companySign.vue | 6 +--
subpkg/companyUnsign/companyUnsign.vue | 4 +-
subpkg/contract/contract.vue | 4 +-
subpkg/contractDetail/contractDetail.vue | 2 +-
subpkg/finance/finance.vue | 10 ++---
subpkg/fixedAssets/fixedAssets.vue | 4 +-
subpkg/noticeList/noticeList.vue | 44 +++++++++++---------
subpkg/personnel/personnel.vue | 14 ++++++-
subpkg/personnelDetails/personnelDetails.vue | 6 +--
subpkg/submit/submit.vue | 4 +-
subpkg/taskAdmin/taskAdmin.vue | 4 +-
21 files changed, 86 insertions(+), 71 deletions(-)
diff --git a/App.vue b/App.vue
index 2aae610..813dd8b 100644
--- a/App.vue
+++ b/App.vue
@@ -25,7 +25,7 @@
/*每个页面公共css */
@import 'static/css/base.css';
@import 'static/css/style.scss';
-
+
view {
box-sizing: border-box;
}
diff --git a/components/company/company.vue b/components/company/company.vue
index e469723..00379d8 100644
--- a/components/company/company.vue
+++ b/components/company/company.vue
@@ -50,7 +50,7 @@
-
+
查看
@@ -164,7 +164,7 @@
this.initContract(this.$props.id, this.$props.type || null);
},
methods: {
- naviTo(contract_no) {
+ navTo(contract_no) {
download_file({ applyNo: contract_no }).then(res => {
if (res.code != 1) {
Toast(res.msg)
diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index 098a5b8..b299648 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -1,12 +1,12 @@
-
+
公司账户余额(元)
{{cCount(company.deposit)}}
0.00
-
+
公司收益金额(元)
{{cCount(company.company_money)}}
0.00
@@ -17,7 +17,7 @@
日账单
月账单
- 更多
+ 更多
@@ -72,7 +72,7 @@
})
},
methods:{
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url,
diff --git a/components/task/index.vue b/components/task/index.vue
index 3d85245..772b2aa 100644
--- a/components/task/index.vue
+++ b/components/task/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -44,7 +44,7 @@
};
},
methods: {
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url
diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index b942d5c..555de9a 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -52,7 +52,7 @@ import { Toast } from '../../libs/uniApi';
};
},
methods:{
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url,
@@ -61,8 +61,8 @@ import { Toast } from '../../libs/uniApi';
clickTask(){
console.log('点击');
if(this.$props.datas.type==1){
- this.naviTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
- }else this.naviTo('');
+ this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
+ }else this.navTo('');
}
}
}
diff --git a/pages.json b/pages.json
index 5316a7d..e1e3b02 100644
--- a/pages.json
+++ b/pages.json
@@ -25,7 +25,7 @@
"path": "pages/business/business",
"style": {
"navigationBarTitleText": "商机信息",
- "enablePullDownRefresh": false,
+ "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#3175f9",
"navigationBarTextStyle": "white"
}
@@ -43,6 +43,7 @@
"path": "pages/oaExamine/oaExamine",
"style": {
"navigationBarTitleText": "审批",
+ "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#3175f9",
"navigationBarTextStyle": "white"
}
@@ -318,7 +319,7 @@
"path": "noticeList/noticeList",
"style": {
"navigationBarTitleText": "公告列表",
- "enablePullDownRefresh": false,
+ "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#3175f9",
"navigationBarTextStyle": "white"
}
diff --git a/pages/oaMy/oaMy.vue b/pages/oaMy/oaMy.vue
index daf648b..aa0a005 100644
--- a/pages/oaMy/oaMy.vue
+++ b/pages/oaMy/oaMy.vue
@@ -34,25 +34,25 @@
-
-
+
*
{{oaUserInfo.user_money||'0.00'}}
****
账户余额(元)
-
-
+
*
{{oaUserInfo.income||'0.00'}}
@@ -65,7 +65,7 @@
-
+
@@ -142,7 +142,7 @@
const res = await userInfo();
this.$store.commit('setUserInfo', res.data);
},
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url,
diff --git a/pages/office_app/oaMy/oaMy.vue b/pages/office_app/oaMy/oaMy.vue
index feb4308..bb4f263 100644
--- a/pages/office_app/oaMy/oaMy.vue
+++ b/pages/office_app/oaMy/oaMy.vue
@@ -45,7 +45,7 @@
-
+
{{ item.name }}
@@ -91,7 +91,7 @@
console.log(res,'111');
this.oaUserInfo = res
},
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url
diff --git a/subpkg/blockTransaction/blockTransaction.vue b/subpkg/blockTransaction/blockTransaction.vue
index 8ec5122..1c9969f 100644
--- a/subpkg/blockTransaction/blockTransaction.vue
+++ b/subpkg/blockTransaction/blockTransaction.vue
@@ -19,7 +19,7 @@
- 历史账单
+ 历史账单
@@ -69,7 +69,7 @@
onLoad() {},
onShow() {},
methods: {
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url,
diff --git a/subpkg/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 4ff3189..bcf1fc8 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -10,7 +10,7 @@
-
+
{{item.company_name}}
{{item.company_type_name}}
@@ -39,7 +39,7 @@
-
+
@@ -119,7 +119,7 @@
}
this.companyList = [...this.companyList, ...res.data?.data]
},
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url
diff --git a/subpkg/companySign/companySign.vue b/subpkg/companySign/companySign.vue
index 8f90061..37d6b28 100644
--- a/subpkg/companySign/companySign.vue
+++ b/subpkg/companySign/companySign.vue
@@ -140,7 +140,7 @@
}
uni.hideLoading();
Toast('合同已发送');
- this.naviTo('/subpkg/submit/submit');
+ this.navTo('/subpkg/submit/submit');
}catch(e){
uni.hideLoading();
Toast('发送失败');
@@ -161,10 +161,10 @@
id: this.id
})
Toast('短信已发送');
- this.naviTo('/subpkg/submit/submit');
+ this.navTo('/subpkg/submit/submit');
}
},
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url
diff --git a/subpkg/companyUnsign/companyUnsign.vue b/subpkg/companyUnsign/companyUnsign.vue
index 6c9b2ac..2336d53 100644
--- a/subpkg/companyUnsign/companyUnsign.vue
+++ b/subpkg/companyUnsign/companyUnsign.vue
@@ -2,7 +2,7 @@
-
+
{{item.company_name}}
{{item.company_type_name}}
@@ -77,7 +77,7 @@ export default {
}
this.companyList = [...this.companyList, ...res.data?.data]
},
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url
diff --git a/subpkg/contract/contract.vue b/subpkg/contract/contract.vue
index d33e160..b40e1cf 100644
--- a/subpkg/contract/contract.vue
+++ b/subpkg/contract/contract.vue
@@ -40,7 +40,7 @@
已签订
-
+
@@ -79,7 +79,7 @@
})
},
methods: {
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url
diff --git a/subpkg/contractDetail/contractDetail.vue b/subpkg/contractDetail/contractDetail.vue
index 74b7c1d..2ba0182 100644
--- a/subpkg/contractDetail/contractDetail.vue
+++ b/subpkg/contractDetail/contractDetail.vue
@@ -25,7 +25,7 @@
},
onShow() {},
methods: {
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 52d4629..65131df 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -2,7 +2,7 @@
-
+
{{userInfo.nickname}}
@@ -12,7 +12,7 @@
{{userInfo.nickname}}
-
@@ -28,7 +28,7 @@
可提现金额****元
-
+
账户余额(元)
{{userInfo.user_money||0.00}}
@@ -93,7 +93,7 @@
-
+
@@ -149,7 +149,7 @@ export default {
},
methods: {
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url
diff --git a/subpkg/fixedAssets/fixedAssets.vue b/subpkg/fixedAssets/fixedAssets.vue
index 8717ace..6032171 100644
--- a/subpkg/fixedAssets/fixedAssets.vue
+++ b/subpkg/fixedAssets/fixedAssets.vue
@@ -50,7 +50,7 @@
-
+
查看
@@ -72,7 +72,7 @@
onLoad() {},
onShow() {},
methods: {
- naviTo(contract_no) {
+ navTo(contract_no) {
download_file({ applyNo: contract_no }).then(res => {
if (res.code != 1) {
Toast(res.msg)
diff --git a/subpkg/noticeList/noticeList.vue b/subpkg/noticeList/noticeList.vue
index 0a7b7a2..46d0aee 100644
--- a/subpkg/noticeList/noticeList.vue
+++ b/subpkg/noticeList/noticeList.vue
@@ -1,7 +1,8 @@
-
+
搜索
@@ -42,49 +43,49 @@
},
}
},
- onLoad() {},
- onShow() {
+ onLoad() {
this.initConfig()
- this.loadNotice()
},
+ onShow() {},
methods: {
initConfig() {
this.list = [];
this.loadConfig.page = 1;
this.loadConfig.status = 'loadmore';
+ this.loadNotice();
},
async loadNotice() {
- if(this.loadConfig.status=="nomore")return;
- this.loadConfig.status="loading"
+ if (this.loadConfig.status == "nomore") return;
+ this.loadConfig.status = "loading"
const res = await noticeList({
sort: 'new',
keyword: this.searchText,
page_no: this.loadConfig.page,
page_size: this.loadConfig.limit
})
- this.loadConfig.status="loadmore"
- if(res.data.lists.length{uni.stopPullDownRefresh()})
}
}
@@ -99,7 +100,7 @@
align-items: center;
justify-content: space-between;
padding: 0 28rpx;
-
+
.screening {
margin-left: 10px;
width: 149rpx;
@@ -112,12 +113,13 @@
color: #666;
font-size: 28rpx;
}
-
+
.choose_style {
background-color: #3274F9;
color: #fff;
}
}
+
.notice_list {
padding: 28rpx;
@@ -148,6 +150,7 @@
text-overflow: ellipsis;
/* 使用省略号表示被截断的文本 */
overflow: hidden;
+
&::before {
content: '公告';
display: inline-block;
@@ -159,14 +162,15 @@
}
}
}
-
- .bottom{
+
+ .bottom {
display: flex;
justify-content: space-between;
font-size: 25rpx;
margin-top: 10rpx;
color: #99a3bd;
- .click{
+
+ .click {
display: flex;
align-items: center;
}
diff --git a/subpkg/personnel/personnel.vue b/subpkg/personnel/personnel.vue
index 300e48e..6515a69 100644
--- a/subpkg/personnel/personnel.vue
+++ b/subpkg/personnel/personnel.vue
@@ -45,8 +45,8 @@
-->
-
-
+
+
@@ -112,6 +112,16 @@
this.loadConfig.page++;
}
this.userList = [...this.userList, ...res.data?.data]
+ },
+ // 点击已签约或未签约按钮
+ changeSign(data){
+ if(data.is_contract)Toast('已完成签约');
+ else uni.showModal({
+ content:'该人员还未签约,是否立即签约?',
+ success: (e) => {
+ if(e.confirm)this.navTo('/subpkg/personnelDetails/personnelDetails?id='+data.id);
+ }
+ })
}
},
onPullDownRefresh() {
diff --git a/subpkg/personnelDetails/personnelDetails.vue b/subpkg/personnelDetails/personnelDetails.vue
index f322dc2..cbb0a2d 100644
--- a/subpkg/personnelDetails/personnelDetails.vue
+++ b/subpkg/personnelDetails/personnelDetails.vue
@@ -255,7 +255,7 @@
})
})
},
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url,
@@ -328,7 +328,7 @@
}
uni.hideLoading();
Toast('合同已发送');
- this.naviTo('/subpkg/submit/submit');
+ this.navTo('/subpkg/submit/submit');
}catch(e){
uni.hideLoading();
Toast('合同发送失败');
@@ -349,7 +349,7 @@
id: this.userInfo.id
})
Toast('短信已发送');
- this.naviTo('/subpkg/submit/submit');
+ this.navTo('/subpkg/submit/submit');
}
},
loadUserDetail() {
diff --git a/subpkg/submit/submit.vue b/subpkg/submit/submit.vue
index b895f3f..bf53296 100644
--- a/subpkg/submit/submit.vue
+++ b/subpkg/submit/submit.vue
@@ -7,7 +7,7 @@
您的签约请求已提交，正在生成合同。
请耐心等待，合同生成完毕后将会以短信方式通知您。
-
+
@@ -22,7 +22,7 @@ export default {
onLoad() {},
onShow() {},
methods: {
- naviTo(){
+ navTo(){
uni.navigateBack();
}
},
diff --git a/subpkg/taskAdmin/taskAdmin.vue b/subpkg/taskAdmin/taskAdmin.vue
index dcd12a0..87dd6e1 100644
--- a/subpkg/taskAdmin/taskAdmin.vue
+++ b/subpkg/taskAdmin/taskAdmin.vue
@@ -11,7 +11,7 @@
-
+
@@ -78,7 +78,7 @@
let m = e.detail.value.split('-')[1];
this.nowDate.m = m < 10 ? +m : m;
},
- naviTo(url) {
+ navTo(url) {
url ?
uni.navigateTo({
url: url