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

更新

Browse Source
This commit is contained in:
weipengfei 2023-08-07 10:19:52 +08:00
parent e50d7ed0e7
commit d89aca52ac
11 changed files with 544 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
App.vue
View File

@ -2,6 +2,15 @@
export default { export default {
onLaunch: function() { onLaunch: function() {
console.log('App Launch') console.log('App Launch')
try{
if(!this.$store.state.app.token)uni.redirectTo({
url: '/pages/oaLogin/oaLogin'
})
}catch(e){
uni.redirectTo({
url: '/pages/oaLogin/oaLogin'
})
}
}, },
onShow: function() { onShow: function() {
console.log('App Show') console.log('App Show')

42
components/company/company.vue
View File

@ -69,7 +69,8 @@
<view class="card"> <view class="card">
<view class="one"> <view class="one">
<view class="linkman"> <view class="linkman">
<view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;"></view> <view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;">
</view>
主要联系人 主要联系人
</view> </view>
<view class="info"> <view class="info">
@ -83,7 +84,9 @@
<view class="one" v-for="(other, index) in company.other_contacts" :key="index"> <view class="one" v-for="(other, index) in company.other_contacts" :key="index">
<block v-if="other.name!=''"> <block v-if="other.name!=''">
<view class="linkman"> <view class="linkman">
<view style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;"></view> <view
style="height: 30rpx;width: 6rpx;background-color: #3175f9;border-radius: 3rpx;margin-right: 8rpx;">
</view>
其他联系人 其他联系人
</view> </view>
<view class="info"> <view class="info">
@ -104,25 +107,27 @@
<view class="title">资质信息</view> <view class="title">资质信息</view>
<view class="image_box" style="background-color: #fff;border-radius: 7px 7px 7px 7px;"> <view class="image_box" style="background-color: #fff;border-radius: 7px 7px 7px 7px;">
<u--image class="image" @click="priview(company.qualification.business_license)" <u--image class="image" @click="priview(company.qualification.business_license)"
:src="company.qualification.business_license" v-if="company.qualification.business_license" :lazy-load="true"> :src="company.qualification.business_license" v-if="company.qualification.business_license"
:lazy-load="true">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#333"></u-loading-icon> <u-loading-icon color="#333"></u-loading-icon>
</template> </template>
</u--image> </u--image>
<u--image class="image" @click="priview(company.qualification.business_licenseB)" <u--image class="image" @click="priview(company.qualification.business_licenseB)"
:src="company.qualification.business_licenseB" v-if="company.qualification.business_licenseB" :lazy-load="true"> :src="company.qualification.business_licenseB" v-if="company.qualification.business_licenseB"
:lazy-load="true">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#333"></u-loading-icon> <u-loading-icon color="#333"></u-loading-icon>
</template> </template>
</u--image> </u--image>
<u--image class="image" @click="priview(company.qualification.bank_account)" <u--image class="image" v-for="item in company.qualification.bank_account" :key="item" @click="priview(item)"
:src="company.qualification.bank_account" v-if="company.qualification.bank_account" :lazy-load="true"> :src="item" v-if="company.qualification.bank_account" :lazy-load="true">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#333"></u-loading-icon> <u-loading-icon color="#333"></u-loading-icon>
</template> </template>
</u--image> </u--image>
<u--image class="image" @click="priview(company.qualification.bank_accountB)" <u--image class="image" v-for="item in company.qualification.bank_accountB" :key="item" @click="priview(item)"
:src="company.qualification.bank_accountB" v-if="company.qualification.bank_accountB" :lazy-load="true"> :src="item" v-if="company.qualification.bank_accountB" :lazy-load="true">
<template v-slot:loading> <template v-slot:loading>
<u-loading-icon color="#333"></u-loading-icon> <u-loading-icon color="#333"></u-loading-icon>
</template> </template>
@ -189,6 +194,13 @@
} }
this.company = res.data.company; this.company = res.data.company;
try{
if(Array.isArray(JSON.parse(this.company.qualification.bank_account))){
this.company.qualification.bank_account = JSON.parse(this.company.qualification.bank_account)
}
}catch(e){
}
uni.$emit('companyInfo', this.company); //发送全局事件 uni.$emit('companyInfo', this.company); //发送全局事件
this.user = res.data.user; this.user = res.data.user;
this.contract = res.data.contract; this.contract = res.data.contract;
@ -223,11 +235,11 @@
} }
}) })
}, },
copyPhone(str="", type="号码"){ copyPhone(str = "", type = "号码") {
if(str) uni.setClipboardData({ if (str) uni.setClipboardData({
data:str+"", data: str + "",
success: (e) => { success: (e) => {
Toast(type+'已复制') Toast(type + '已复制')
}, },
fail: (e) => { fail: (e) => {
Toast('复制失败') Toast('复制失败')
@ -309,9 +321,10 @@
color: #666666FF; color: #666666FF;
margin-top: 32rpx; margin-top: 32rpx;
.left{ .left {
display: flex; display: flex;
align-items: center; align-items: center;
.location { .location {
margin-left: 8rpx; margin-left: 8rpx;
} }
@ -411,7 +424,8 @@
border-radius: 20rpx; border-radius: 20rpx;
overflow: hidden; overflow: hidden;
margin-bottom: 28rpx; margin-bottom: 28rpx;
image{
image {
width: 650rpx; width: 650rpx;
height: 455rpx; height: 455rpx;
background-color: #7f7f7f; background-color: #7f7f7f;

19
pages.json
View File

@ -1,15 +1,6 @@
{ {
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/oaLogin/oaLogin",
"style": {
"navigationBarTitleText": "登录",
"app-plus": {
"titleNView": false
}
}
},
{ {
"path": "pages/oaHome/oaHome", "path": "pages/oaHome/oaHome",
"style": { "style": {
@ -20,6 +11,16 @@
} }
} }
}, },
{
"path": "pages/oaLogin/oaLogin",
"style": {
"navigationBarTitleText": "登录",
"app-plus": {
"titleNView": false
}
}
},
{ {
"path": "pages/business/business", "path": "pages/business/business",
"style": { "style": {

2
pages/oaHome/oaHome.vue
View File

@ -337,7 +337,7 @@
width: 100%; width: 100%;
// background-color: $theme-oa-color; // background-color: $theme-oa-color;
margin-bottom: 133.33rpx; margin-bottom: 133.33rpx;
background-image: url('../../static/img/home/head-bg.png'); background-image: url('../../static/img/home/home_bg.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: 100% 100%; background-size: 100% 100%;

33
pages/oaMy/oaMy.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view class="my"> <view class="my">
<view class="head_box"> <view class="head_box">
<image class="head_img" src="../../static/img/home/head-bg.png"></image> <!-- <image class="head_img" src="../../static/img/home/head-bg.png"></image> -->
<!-- #ifdef APP-PLUS||H5 --> <!-- #ifdef APP-PLUS||H5 -->
<view style="height: var(--status-bar-height);"></view> <view style="height: var(--status-bar-height);"></view>
<view style="height: 100rpx"></view> <view style="height: 100rpx"></view>
@ -34,10 +34,10 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="$store.state.app.token" class="compile" @click="naviTo()"> <!-- <view v-if="$store.state.app.token" class="compile" @click="naviTo()">
<view class="iconfont icon-bianji"></view> <view class="iconfont icon-bianji"></view>
<!-- <view class="">编辑</view> --> <view class="">编辑</view>
</view> </view> -->
</view> </view>
<view class="assess"> <view class="assess">
<view class="ass_cent flex_a_c_j_sb"> <view class="ass_cent flex_a_c_j_sb">
@ -173,15 +173,18 @@
width: 100vw; width: 100vw;
padding-top: 30rpx; padding-top: 30rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
background-image: url('../../static/img/home/my_bg.png');
background-size: 100% 100%;
background-repeat: no-repeat;
.head_img { // .head_img {
position: absolute; // position: absolute;
// z-index: -1; // // z-index: -1;
width: 100%; // width: 100%;
height: 100%; // height: 100%;
top: 0; // top: 0;
left: 0; // left: 0;
} // }
} }
} }
@ -208,13 +211,13 @@
.personage { .personage {
// position: relative; // position: relative;
padding: 42.11rpx 0 28.07rpx 0; padding-bottom: 28rpx;
border-radius: 12px; border-radius: 12px;
// background-color: #fff; // background-color: #fff;
color: #fff; color: #fff;
width: 694.74rpx; width: 694rpx;
margin-left: 50%; margin-left: 50%;
transform: translate(-50%, -43.86rpx); transform: translate(-50%, -31.58rpx);
.name_work { .name_work {
margin-left: 31.58rpx; margin-left: 31.58rpx;

BIN
static/img/home/home_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 195 KiB

BIN
static/img/home/my_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 226 KiB

2
subpkg/companyInfo/companyInfo.vue
View File

@ -256,9 +256,11 @@
.btn { .btn {
font-size: 25rpx; font-size: 25rpx;
font-weight: 400; font-weight: 400;
min-width: 80rpx;
color: #666666; color: #666666;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: right;
} }
} }

26
subpkg/companySign/companySign.vue
View File

@ -1,8 +1,9 @@
<template> <template>
<view class=""> <view class="">
<company :id="id" type="company"></company> <company :id="id" type="company"></company>
<view class="need_contract" v-if="!company.contract||!company.contract.status"> <view class="need_contract" v-if="!company.contract||!company.contract.status||!company.company.is_contract">
<picker v-if="!company.contract" :range="contractTypeList" range-key="name" @change="changeType"> <view class="title">电子合同</view>
<picker v-if="company.contract&&company.contract.check_status==0||!company.contract" :range="contractTypeList" range-key="name" @change="changeType">
<button class="btn">生成合同</button> <button class="btn">生成合同</button>
<!-- <mybtn text="生成合同" position="false"></mybtn> --> <!-- <mybtn text="生成合同" position="false"></mybtn> -->
</picker> </picker>
@ -103,20 +104,29 @@
}, },
// 生成合同 // 生成合同
async createContract(data) { async createContract(data) {
uni.showLoading({
title:'合同生成中',
mask: true
})
let res = await initiateContract({ let res = await initiateContract({
party_b: data.party_b, party_b: data.party_b,
contract_type: data.contract_type, contract_type: data.contract_type,
type: data.type type: data.type
}) })
Toast(res.msg || '合同已生成') // Toast(res.msg || '合同已生成')
this.initCompany(); this.initCompany();
uni.hideLoading()
}, },
// 发送合同 // 发送合同
async addContract(data) { async addContract(data) {
uni.showLoading({
title:'合同发送中',
mask: true
})
let res = await Draftingcontracts({ let res = await Draftingcontracts({
id: this.id id: this.id
}); });
Toast('合同已发送'); // Toast('合同已发送');
this.initCompany(); this.initCompany();
if (this.userInfo.contract.check_status == 3) { if (this.userInfo.contract.check_status == 3) {
this.timerCount = 60; this.timerCount = 60;
@ -128,6 +138,7 @@
} }
}, 1000); }, 1000);
} }
uni.hideLoading();
this.naviTo('/subpkg/submit/submit'); this.naviTo('/subpkg/submit/submit');
}, },
// 发送短信 // 发送短信
@ -164,6 +175,13 @@
<style lang="scss"> <style lang="scss">
.need_contract { .need_contract {
padding-bottom: 30rpx; padding-bottom: 30rpx;
.title{
font-size: 35rpx;
font-weight: 500;
color: #333333;
margin-bottom: 21rpx;
margin-left: 28rpx;
}
.card { .card {
padding-top: 0; padding-top: 0;

2
subpkg/companyUnsign/companyUnsign.vue
View File

@ -163,9 +163,11 @@ export default {
.btn { .btn {
font-size: 25rpx; font-size: 25rpx;
font-weight: 400; font-weight: 400;
min-width: 80rpx;
color: #666666; color: #666666;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: right;
} }
} }

16
subpkg/personnelDetails/personnelDetails.vue
View File

@ -135,7 +135,7 @@
</view> </view>
</view> </view>
</view> </view>
<picker v-if="!userInfo.is_contract&&!userInfo.contract" :range="contractTypeList" range-key="name" <picker v-if="!userInfo.is_contract&&!userInfo.contract||(userInfo.contract&&userInfo.contract.check_status==0)" :range="contractTypeList" range-key="name"
@change="changeType"> @change="changeType">
<button class="btn">生成合同</button> <button class="btn">生成合同</button>
</picker> </picker>
@ -290,20 +290,29 @@
}, },
// 生成合同 // 生成合同
async createContract(data) { async createContract(data) {
uni.showLoading({
title:'合同生成中',
mask: true
})
let res = await userInitiateContract({ let res = await userInitiateContract({
party_b: data.party_b, party_b: data.party_b,
contract_type: data.contract_type, contract_type: data.contract_type,
type: data.type type: data.type
}) })
Toast('合同已生成') // Toast('合同已生成');
this.loadUserDetail(); this.loadUserDetail();
uni.hideLoading();
}, },
// 发送合同 // 发送合同
async addContract(data) { async addContract(data) {
uni.showLoading({
title:'合同发送中',
mask: true
})
let res = await userDraftingcontracts({ let res = await userDraftingcontracts({
id: this.userInfo.id id: this.userInfo.id
}); });
Toast('合同已发送'); // Toast('合同已发送');
this.loadUserDetail(); this.loadUserDetail();
if (this.userInfo.contract.check_status == 3) { if (this.userInfo.contract.check_status == 3) {
this.timerCount = 60; this.timerCount = 60;
@ -315,6 +324,7 @@
} }
}, 1000); }, 1000);
} }
uni.hideLoading();
this.naviTo('/subpkg/submit/submit'); this.naviTo('/subpkg/submit/submit');
}, },
// 发送短信 // 发送短信