mkm/OfficeApp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of http://git.excellentkk.cn/mkm/OfficeApp

Browse Source
This commit is contained in:
THK3121 2023-08-21 15:50:20 +08:00
commit 44d04c8a9f
6 changed files with 100 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/company/company.vue
View File

@ -500,7 +500,8 @@
height: 100rpx;
line-height: 30rpx;
display: flex;
// justify-content: space-between;
justify-content: left;
align-items: center;
}
.cards_content {

11
components/mybtn/mybtn.vue
View File

@ -1,7 +1,11 @@
<template>
<view>
<button @click.stop="click"
:class="{'my_btn_new_btn': position, 'my_btn_no_positon': !position, 'my_btn_disabled': my_btn_disabled}">{{text}}</button>
class="button"
:class="{'my_btn_new_btn': position, 'my_btn_no_positon': !position, 'my_btn_disabled': my_btn_disabled}">
<slot></slot>
{{text}}
</button>
</view>
</template>
@ -35,6 +39,11 @@
</script>
<style lang="scss" scoped>
.button{
display: flex;
justify-content: center;
align-items: center;
}
.my_btn_new_btn {
position: fixed;
bottom: 0;

2
pages.json
View File

@ -282,7 +282,7 @@
"path": "personnelDetails/personnelDetails",
"style": {
"navigationBarTitleText": "人员详细信息",
"enablePullDownRefresh": false,
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#0122C7",
"navigationBarTextStyle": "white"
}

2
pages/oaHome/oaHome.vue
View File

@ -42,7 +42,7 @@
</view>
<!-- 占位 -->
<view style="height: 130rpx"></view>
<view style="height: 150rpx"></view>
<!-- 任务状态 -->
<!-- <view class="task_panel">
<block v-for="(item,index) in assessData" :key="index">

8
subpkg/companyInfo/companyInfo.vue
View File

@ -90,11 +90,13 @@
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
<!-- <mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')"></mybtn> -->
<u-button class="btns" @click="navTo('/subpkg/companyUnsign/companyUnsign')">
<mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')">
<u-icon name="plus" color="white" size="18" style="margin-right: 10rpx;"></u-icon>
</mybtn>
<!-- <u-button class="btns" @click="navTo('/subpkg/companyUnsign/companyUnsign')">
<u-icon name="plus" color="white" size="18" style="margin-right: 10rpx;"></u-icon>
新建签约
</u-button>
</u-button> -->
<!-- <u-button class="btns" type="primary" icon="plus" text="新建签约"></u-button> -->
</view>
<view class="company_info" v-show="current==2">

93
subpkg/personnelDetails/personnelDetails.vue
View File

@ -266,7 +266,7 @@
</view>
<u-line color="#999999FF" style="margin: 31rpx 0"></u-line>
<view class="bottom">
<button class="send_btn" @click="addContract" v-if="timerCount == 0">
<button class="send_btn" @click="clickContract(2)" v-if="timerCount == 0">
发送合同
</button>
<button class="send_btn tips_center" v-else>
@ -311,6 +311,7 @@
</view>
</block>
</view>
<u-modal :show="modelShow" title="提醒" :content="modelType==1?'请检查信息无误后再生成合同':'请检查合同无误后再发送'" closeOnClickOverlay showCancelButton cancel-text="我再看看" confirm-text="确认无误" close="modelShow=false" @cancel="modelShow=false" @confirm="modelType==1?createContract():addContract();modelShow=false"></u-modal>
</view>
</template>
@ -357,7 +358,10 @@
contract: {},
roles: {}
},
contractTypeList: []
contractTypeList: [],
modelShow: false,
modelType: 1,
nowContractType: -1
}
},
onLoad(options) {
@ -377,6 +381,11 @@
return this.timerCount;
}
},
onPullDownRefresh(){
this.loadUserDetail().then(()=>{
uni.stopPullDownRefresh()
});
},
methods: {
// 查看合同
naviToContract(contract_no) {
@ -421,12 +430,14 @@
}
},
changeType(e) {
// console.log(this.contractTypeList[e.detail.value]);
this.createContract({
party_b: this.userInfo.id,
contract_type: this.contractTypeList[e.detail.value].id,
type: 2 //1-公司,2-个人
})
// console.log(this.contractTypeList[]);
this.nowContractType = e.detail.value;
this.clickContract(1);
// this.createContract({
// party_b: this.userInfo.id,
// contract_type: this.contractTypeList[e.detail.value].id,
// type: 2 //1-公司,2-个人
// })
},
// 初始化合同类型
async initContractTypeList() {
@ -438,41 +449,39 @@
})
this.contractTypeList = res.data;
},
clickContract(e){
this.modelType = e;
this.modelShow = true;
},
// 生成合同
createContract(data) {
uni.showModal({
content: '请检查信息无误后再生成合同',
confirmText: '确认无误',
cancelText: '我再看看',
confirmColor: '#3175f9',
success: async (e) => {
if (e.confirm) {
async createContract() {
uni.showLoading({
title: '合同生成中',
mask: true
})
let res = await userInitiateContract({
party_b: data.party_b,
contract_type: data.contract_type,
type: data.type
party_b: this.userInfo.id,
contract_type: this.contractTypeList[this.nowContractType].id,
type: 2
})
this.loadUserDetail();
uni.hideLoading();
Toast('合同已生成');
this.navTo('/subpkg/submit/submit?type=' + 1);
}
}
})
// uni.showModal({
// content: '请检查信息无误后再生成合同',
// confirmText: '确认无误',
// cancelText: '我再看看',
// confirmColor: '#3175f9',
// success: async (e) => {
// if (e.confirm) {
// }
// }
// })
},
// 发送合同
async addContract(data) {
uni.showModal({
content: '请检查合同无误后再发送',
confirmText: '确认无误',
cancelText: '我再看看',
confirmColor: '#3175f9',
success: async (e) => {
if (e.confirm) {
async addContract() {
try {
uni.showLoading({
title: '合同发送中',
@ -490,9 +499,17 @@
uni.hideLoading();
Toast(e.msg || '合同发送失败');
}
}
}
})
// uni.showModal({
// content: '请检查合同无误后再发送',
// confirmText: '确认无误',
// cancelText: '我再看看',
// confirmColor: '#3175f9',
// success: async (e) => {
// if (e.confirm) {
// }
// }
// })
},
// 发送短信
async getPostsms() {
@ -526,14 +543,13 @@
}
}, 1000);
},
loadUserDetail() {
async loadUserDetail() {
if (!this.id) return;
companyUserDetail({
let res = await companyUserDetail({
id: this.id
}).then(res => {
})
this.userInfo = res.data;
this.skeleton = false;
})
},
previewImg(urls, index = 0) {
uni.previewImage({
@ -541,9 +557,6 @@
current: index
})
}
},
onPullDownRefresh() {
uni.stopPullDownRefresh()
}
}
</script>