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

页面修改

Browse Source
This commit is contained in:
THK3121 2023-08-21 11:35:12 +08:00
parent a6614b7f90
commit 64f7189963
34 changed files with 1506 additions and 1633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/company/company.vue
View File

@ -480,7 +480,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.cards_head {
padding: 28rpx;

13
components/logistiComptent/logistiCard/logistiBriefCard.vue
View File

@ -1,10 +1,13 @@
<template>
<view class="card" @click="goDetil(goodsInfo.id)">
<view class="card">
<view class="tit">
<view v-if="goodsInfo.status==0">取货点:&nbsp;&nbsp;{{goodsInfo.shop_name}}</view>
<view v-else>收货人:&nbsp;&nbsp;{{ fuzzyName(goodsInfo.receiver_name) }}</view>
<view style="float: right;">
<u-icon name="arrow-right" color="black" size="20"></u-icon>
</view>
<view class="content">
</view>
<view class="content" @click="callFn(goodsInfo.shop_phone)">
<view v-if="goodsInfo.status==0">
<view class="address">店主姓名:&nbsp;&nbsp;{{goodsInfo.shop_user}}</view>
<view @click.stop="callFn(goodsInfo.shop_phone)" class="address">
@ -24,12 +27,12 @@
</view>
</view>
<view class="qh_btn" v-if='goodsInfo.status==0'>
<view class="qh_btn" v-if='goodsInfo.status==0' @click.stop="goDetil(goodsInfo.id)">
<u-button type="primary" class="custom-style" style="background-color: #0122C7;border: 0;">
<u-icon name="scan" color="white" size="25" style="margin-right: 10rpx;"></u-icon>
待取货/点击查看</u-button>
</view>
<view class="" v-if='goodsInfo.status==1'>
<view class="" v-if='goodsInfo.status==1' @click.stop="goDetil(goodsInfo.id)">
<u-button type="primary" style="background-color: #FF7C32; border: 0;"><u-icon name="car-fill" color="white"
size="25" style="margin-right: 10rpx;"></u-icon> 待配送/点击查看</u-button>
</view>
@ -88,6 +91,8 @@
font-size: 30rpx;
font-weight: bold;
padding: 20rpx 15rpx;
display: flex;
justify-content: space-between
}
.content {

2
components/logistiComptent/logistiCard/logistiCard.vue
View File

@ -383,7 +383,7 @@
overflow: hidden;
margin: 2vh 2vw;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
/* box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); */
/* padding: 2vh 2vw; */
.tit {

5
components/task/taskItem.vue
View File

@ -29,7 +29,8 @@
<text>完成时间 :</text>
<text>{{datas.end_time}}</text>
</view>
<text v-if="datas.status==2||datas.status==1" style="background-color: #ff7c32;" class="status">进行中</text>
<text v-if="datas.status==2||datas.status==1" style="background-color: #ff7c32;"
class="status">进行中</text>
<text v-if="datas.status==3" style="background-color: #488F00;" class="status">已完成</text>
<text v-if="datas.status==5" style="background-color: #ccc;" class="status">已关闭</text>
</view>
@ -232,7 +233,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.cards_head {
padding: 28rpx;

2
pages/logistics/deliveryDetil.vue
View File

@ -105,6 +105,7 @@
export default {
data() {
return {
is_captain: 0,
mapClass: 'custom-map',
showLoading: true,
showPop: false,
@ -290,6 +291,7 @@
},
},
onLoad(options) {
console.log(JSON.parse(uni.getStorageSync("USER_INFO")).is_captain)
getDetil({
logistics_id: options.id
}).then(res => {

2
pages/logistics/logisticDetil.vue
View File

@ -346,7 +346,7 @@
overflow: hidden;
margin: 2vh 2vw;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.5);
/* box-shadow: 0 0 10px rgba(0, 0, 0, 0.5); */
/* padding: 2vh 2vw; */
.tit {

34
pages/oaHome/oaHome.vue
View File

@ -5,12 +5,12 @@
<view class="home_header" :class="!ApproveList.length > 0 ? 'home_header_no_data' : ''">
<!-- #ifdef APP-PLUS||H5 -->
<view style="height: var(--status-bar-height)"></view>
<view style="height: 100rpx"></view>
<view style="height: 30rpx"></view>
<!-- #endif -->
<view class="my_info">
<view class="head_img">
<view class="img_box">
<u--image :showLoading="true" width="131.43rpx" height="131.43rpx"
<u--image :showLoading="true" width="131.43rpx" height="131.43rpx" class="img_box_img"
:src="myOaInfo.avatar || '../../static/img/public/avatar.png'" shape="circle"></u--image>
</view>
@ -67,7 +67,7 @@
:key="index" @click="clickNotice(item.id)">
<view class="text">
<text class="text_time">{{
item.create_time.substring(0, 10)
item.create_time.substring(0, 10).replace(/-/g, ".")
}}</text>
{{ item.title }}
</view>
@ -95,7 +95,8 @@
<view class="fast_track">
<block v-for="(item, index) in oaHomeData" :key="index">
<view class="track_item" @click="navTwo(item.url, index)">
<u--image :showLoading="true" :src="item.icon" width="77.19rpx" height="77.19rpx"></u--image>
<u--image :showLoading="true" :src="iconList[index]" mode="widthFix" width="77.19rpx"
height="77.19rpx"></u--image>
<view class="title">{{ item.text }}</view>
</view>
</block>
@ -194,6 +195,15 @@
},
data() {
return {
iconList: [
"../../static/img/home/GSXX.png",
"../../static/img/home/RYGL.png",
"../../static/img/home/HTGL.png",
"../../static/img/home/RWGL.png",
"../../static/img/home/DAGL.png",
"../../static/img/home/GRCW.png",
],
notArr: [],
orderList: [],
oaHomeData: [],
@ -421,7 +431,7 @@
<style lang="scss">
.oa_home {
padding-bottom: 120rpx;
// padding-bottom: rpx;
}
.header_bg {
@ -457,12 +467,22 @@
box-sizing: border-box;
.img_box {
width: 131.43rpx;
height: 131.43rpx;
position: absolute;
left: -10rpx;
top: -15rpx;
width: 140rpx;
height: 140rpx;
background-color: white;
border-radius: 140rpx;
.img_box_img {
position: absolute;
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
// font-we

115
pages/oaLogin/oaLogin.vue
View File

@ -1,9 +1,6 @@
<template>
<view class="login">
<image
class="bg-iamge"
src="../../static/img/login/login_back_img.png"
></image>
<!-- <image class="bg-iamge" src="../../static/img/login/login_back_img.png"></image> -->
<!-- #ifdef APP-PLUS||H5 -->
<view style="height: var(--status-bar-height)"></view>
<!-- #endif -->
@ -12,49 +9,17 @@
<view class="login-card">
<view class="top">
<view class="text item">
<u-tabs
:list="tabList"
@click="changeTabs"
lineColor="#0122c7"
itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;font-size: 32rpx;"
></u-tabs>
<u-tabs :list="tabList" @click="changeTabs" lineColor="#0122c7"
itemStyle="padding-left: 15px; padding-right: 15px; height: 34px;font-size: 32rpx;"></u-tabs>
</view>
<input
v-if="current == 0"
@click="getId"
class="mobile item"
v-model="formData.account"
placeholder="输入账号"
/>
<input
v-if="current == 0"
@click="getId"
class="mobile item"
v-model="formData.password"
maxlength="26"
placeholder="输入密码"
password
type="safe-password"
/>
<input
v-if="current == 1"
class="mobile item"
v-model="formData.account"
placeholder="输入手机号"
/>
<input v-if="current == 0" @click="getId" class="mobile item" v-model="formData.account"
placeholder="输入账号" />
<input v-if="current == 0" @click="getId" class="mobile item" v-model="formData.password"
maxlength="26" placeholder="输入密码" password type="safe-password" />
<input v-if="current == 1" class="mobile item" v-model="formData.account" placeholder="输入手机号" />
<view v-if="current == 1" class="code item">
<input
placeholder="输入验证码"
v-model="formData.code"
maxlength="6"
/>
<u-code
:seconds="seconds"
@end="end"
@start="start"
ref="uCode"
@change="codeChange"
></u-code>
<input placeholder="输入验证码" v-model="formData.code" maxlength="6" />
<u-code :seconds="seconds" @end="end" @start="start" ref="uCode" @change="codeChange"></u-code>
<view class="get-code" @click="getCode">{{ tips }}</view>
</view>
<view class="btn">
@ -69,21 +34,21 @@
</template>
<script>
import {
import {
loginAccount,
userInfo,
test
} from "@/api/oaUser.js"
import {
} from "@/api/oaUser.js"
import {
Toast
} from "../../libs/uniApi";
// #ifdef APP-PLUS
var jpushModule = uni.requireNativePlugin("JG-JPush");
} from "../../libs/uniApi";
// #ifdef APP-PLUS
var jpushModule = uni.requireNativePlugin("JG-JPush");
// #endif
// #endif
export default {
data () {
export default {
data() {
return {
tabList: [{
@ -106,12 +71,12 @@ export default {
};
},
methods: {
changeTabs (e) {
changeTabs(e) {
this.current = e.index;
this.formData.scene = e.index + 1;
},
// 获取设备id
getId () {
getId() {
// #ifdef APP-PLUS
if (this.formData.register_id) return
jpushModule.initJPushService()
@ -123,7 +88,7 @@ export default {
})
// #endif
},
async login () {
async login() {
if (!this.formData.account) return Toast('账号不能为空');
if (this.formData.scene == 1 && !this.formData.password) return Toast('密码不能为空');
if (this.formData.scene == 2 && !this.formData.code) return Toast('验证码不能为空');
@ -160,7 +125,7 @@ export default {
url: '/pages/updatePasswprd/updatePasswprd'
});
},
initTerminal () {
initTerminal() {
// #ifndef APP-PLUS
this.formData.terminal = 6;
// #endif
@ -183,10 +148,10 @@ export default {
this.formData.terminal = 1;
// #endif
},
codeChange (text) {
codeChange(text) {
this.tips = text;
},
getCode () {
getCode() {
if (this.$refs.uCode.canGetCode) {
// 模拟向后端请求验证码
uni.showLoading({
@ -203,40 +168,42 @@ export default {
uni.$u.toast('倒计时结束后再发送');
}
},
end () {
end() {
// uni.$u.toast('倒计时结束');
},
start () {
start() {
// uni.$u.toast('倒计时开始');
},
//忘记密码
forgetPWD () {
forgetPWD() {
Toast('暂未开放')
}
},
mounted () {
mounted() {
this.initTerminal();
}
}
}
</script>
<style lang="scss">
.login {
.login {
width: 100vw;
height: 100vh;
position: relative;
background-color: $theme-oa-color;
/* #ifdef H5 */
background-image: url("../../static/img/login/login_back_img.png");
// background-image: url("../../static/img/login/login_back_img.png");
background-color: $theme-oa-color;
/* #endif */
.bg-iamge {
width: 100vw;
height: 100vh;
position: absolute;
z-index: -99;
}
// .bg-iamge {
// width: 100vw;
// height: 100vh;
// position: absolute;
// z-index: -99;
// }
.body {
display: flex;
@ -333,5 +300,5 @@ export default {
}
}
}
}
}
</style>

10
pages/oaMy/oaMy.vue
View File

@ -178,9 +178,11 @@
padding: 28rpx;
width: 100vw;
margin-bottom: 30rpx;
background-image: url('../../static/img/home/my_bg.png');
background-size: 100% 100%;
background-repeat: no-repeat;
// background-image: url('../../static/img/home/my_bg.png');
background-color: $theme-oa-color;
border-radius: 0 0 30rpx 30rpx;
// background-size 100% 100%;
// background-repeat: no-repeat;
// .head_img {
// position: absolute;
@ -326,7 +328,7 @@
margin-top: 84.21rpx;
width: 614.04rpx;
height: 84.21rpx;
background: #3274F9;
background: $theme-oa-color;
box-shadow: 0px 9px 26px 1px #E9EFF5;
}
</style>

BIN
static/img/company/DAGL.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

BIN
static/img/company/合同 (2)@2x.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 780 B

BIN
static/img/contract/FQHT.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 398 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
static/img/home/GRCW (2).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
static/img/home/GSXX (2).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.0 KiB

BIN
static/img/home/HTGL (2).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
static/img/home/RWGL (2).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
static/img/home/RYGL (2).png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.7 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.6 KiB

11
subpkg/archives/archives.vue
View File

@ -65,7 +65,7 @@
<view class="left">
<view class="cir">
<u--image class="u_avatar" :showLoading="true" :src=" '../../static/img/public/man.png'"
<u--image class="u_avatar" :showLoading="true" :src=" '../../static/img/company/DAGL.png'"
width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
</view>
</view>
@ -221,14 +221,13 @@
res = await taskInformationgist({
id: this.task_id
});
}
else {
} else {
let params = {
page: this.loadConfig.page,
limit: this.loadConfig.limit,
user_id: that.user_id,
};
this.task_id > 0 ? params.is_update = this.current:null;
this.task_id > 0 ? params.is_update = this.current : null;
res = await informationList(params);
}
this.loadConfig.status = "loadmore"
@ -279,7 +278,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.card_head {
padding: 28rpx;
@ -302,7 +301,7 @@
width: 160rpx;
background-color: $theme-oa-color;
// background-color: $theme-oa-color;
color: white;
border-radius: 40rpx;

2
subpkg/archivesDetail/archivesDetail.vue
View File

@ -459,7 +459,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.card_head {
padding: 28rpx;

2
subpkg/captain/captain.vue
View File

@ -198,7 +198,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.card_head {
padding: 28rpx;

55
subpkg/companySign/companySign.vue
View File

@ -3,8 +3,12 @@
<company :id="id" type="company"></company>
<view class="need_contract" v-if="!company.contract||!company.contract.status||!company.company.is_contract">
<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>
<picker v-if="company.contract&&company.contract.check_status==0||!company.contract"
:range="contractTypeList" range-key="name" @change="changeType">
<button class="btn">
<image src="../../static/img/contract/FQHT.png" width="35rpx" height="35rpx" mode="widthFix">
</image> 发起合同
</button>
<!-- <mybtn text="生成合同" position="false"></mybtn> -->
</picker>
<view v-if="company.contract&&company.contract.check_status==1">
@ -61,10 +65,21 @@
</template>
<script>
import { companyView, initiateContract, Draftingcontracts, postsms } from "@/api/company.js"
import { dictDataLists } from "@/api/oaPbulic.js"
import { Toast } from "../../libs/uniApi";
import {companyContractType} from "@/static/server/contract.js";
import {
companyView,
initiateContract,
Draftingcontracts,
postsms
} from "@/api/company.js"
import {
dictDataLists
} from "@/api/oaPbulic.js"
import {
Toast
} from "../../libs/uniApi";
import {
companyContractType
} from "@/static/server/contract.js";
export default {
data() {
return {
@ -83,12 +98,12 @@
this.initCompany();
this.initContractTypeList();
let time = uni.getStorageSync('ctime' + this.id);
if(time>0&&(time - Date.now())/1000>0){
this.startTimer((time - Date.now())/1000);
if (time > 0 && (time - Date.now()) / 1000 > 0) {
this.startTimer((time - Date.now()) / 1000);
}
},
onUnload() {
if(this.timerCount>0) uni.setStorageSync('ctime'+this.id, this.timerCount*1000+Date.now());
if (this.timerCount > 0) uni.setStorageSync('ctime' + this.id, this.timerCount * 1000 + Date.now());
},
computed: {
cTimerCount() {
@ -101,7 +116,8 @@
id: this.id,
})
this.company = res.data;
if (this.company.contract == [] || this.company.contract == {} || this.company.contract.length == 0) this
if (this.company.contract == [] || this.company.contract == {} || this.company.contract.length == 0)
this
.company.contract = null;
},
changeType(e) {
@ -123,8 +139,8 @@
let res = await dictDataLists({
type_id: 7
})
res.data = res.data.filter(item=>{
return companyContractType.find(t=>item.id==t);
res.data = res.data.filter(item => {
return companyContractType.find(t => item.id == t);
})
this.contractTypeList = res.data;
},
@ -138,7 +154,7 @@
success: async (e) => {
if (e.confirm) {
uni.showLoading({
title:'合同生成中',
title: '合同生成中',
mask: true
})
let res = await initiateContract({
@ -163,9 +179,9 @@
confirmColor: '#3175f9',
success: async (e) => {
if (e.confirm) {
try{
try {
uni.showLoading({
title:'合同发送中',
title: '合同发送中',
mask: true
})
let res = await Draftingcontracts({
@ -176,9 +192,9 @@
uni.hideLoading();
Toast('合同已发送');
// this.navTo('/subpkg/submit/submit');
}catch(e){
} catch (e) {
uni.hideLoading();
Toast(e.msg||'合同发送失败');
Toast(e.msg || '合同发送失败');
}
}
}
@ -205,7 +221,7 @@
}
},
// 定时器
startTimer(time=60){
startTimer(time = 60) {
this.timerCount = time.toFixed(0);
this.timer = setInterval(() => {
this.timerCount--;
@ -231,7 +247,8 @@
<style lang="scss">
.need_contract {
padding-bottom: 30rpx;
.title{
.title {
font-size: 35rpx;
font-weight: 500;
color: #333333;

2
subpkg/companyUnsign/companyUnsign.vue
View File

@ -182,7 +182,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.cards_head {
padding: 28rpx;

10
subpkg/contract/contract.vue
View File

@ -10,7 +10,8 @@
</view>
</view> -->
<view class="contract_list">
<view class="item" v-for="(item,index) in list" :key="item.id" @click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">
<view class="item" v-for="(item,index) in list" :key="item.id"
@click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">
<view class="personnel_list">
<view class="cards">
<view class="cards_head">
@ -25,7 +26,8 @@
<view class="">
<text>乙方 :</text>
<text v-if="item.party_b_info">{{item.party_b_info.company_name}}</text>
<text v-else-if="item.party_b==$store.state.app.userInfo.id">{{$store.state.app.userInfo.nickname}}</text>
<text
v-else-if="item.party_b==$store.state.app.userInfo.id">{{$store.state.app.userInfo.nickname}}</text>
</view>
<view class="">
<text>合同类型 :</text>
@ -153,7 +155,7 @@
url: url
}) : Toast('暂未开放')
},
navToContract (contract_no) {
navToContract(contract_no) {
download_file({
applyNo: contract_no
}).then(res => {
@ -250,7 +252,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.cards_head {
padding: 28rpx;

4
subpkg/finance/finance.vue
View File

@ -202,7 +202,7 @@
// console.log(this.userInfo);
if (this.user_id == 0) {
// this.userInfo = this.$store.state.app.userInfo;
userInfo().then((res)=>{
userInfo().then((res) => {
this.$store.commit('setUserInfo', res.data);
this.userInfo = res.data;
})
@ -299,7 +299,7 @@
// background-color: red;
display: flex;
justify-content: space-between;
vertical-align: bottom;
width: 24vw;
line-height: 44px;
}

4
subpkg/personnel/personnel.vue
View File

@ -58,7 +58,7 @@
<view class="personnel_list">
<view class="card" v-for="(item, index) in userList" :key="item.id">
<view class="card_head">
<text style="font-size: 32rpx;">创建时间: {{creTime(item.create_time)}}
<text>创建时间: {{creTime(item.create_time)}}
</text>
<text @click="navTo('/subpkg/finance/finance?id='+item.id)">财务查看</text>
<text @click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">信息查看</text>
@ -223,7 +223,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.card_head {
padding: 28rpx;

374
subpkg/personnelDetails/personnelDetails.vue
View File

@ -1,31 +1,22 @@
<template>
<view class="page">
<view class="basic">
<u-skeleton
:loading="skeleton"
:animate="true"
title
rows="1"
rows-width="100%"
rowsHeight="56"
>
<u-skeleton :loading="skeleton" :animate="true" title rows="1" rows-width="100%" rowsHeight="56">
</u-skeleton>
<block v-if="!skeleton">
<view class="title">人员基本信息</view>
<view class="tit">人员基本信息</view>
<view class="card">
<view class="basic_top">
<image class="avatar" :src="userInfo.avatar"></image>
<view class="text">
<view class="basic_name">
<view class="name">{{ userInfo.name }}</view>
<image
class="icon"
:src="
<image class="icon" :src="
userInfo.sex == 1
? '../../static/icons/man.png'
: '../../static/icons/woman.png'
"
>
">
</image>
<!-- <view class="role" v-if="userInfo.roles">{{userInfo.roles[0]}}</view> -->
</view>
@ -38,32 +29,16 @@
<view class="phone"> 联系电话：{{ userInfo.phone }} </view>
</view>
</view>
<view
class="bottom"
style="margin-bottom: 10rpx; display: flex; align-items: center"
>
<view class="bottom" style="margin-bottom: 10rpx; display: flex; align-items: center">
是否为小队长：
<u-radio-group
v-model="userInfo.is_captain"
style="margin-left: 16rpx"
disabled
>
<u-radio
:customStyle="{ marginRight: '16px' }"
v-for="(item, index) in [
<u-radio-group v-model="userInfo.is_captain" style="margin-left: 16rpx" disabled>
<u-radio :customStyle="{ marginRight: '16px' }" v-for="(item, index) in [
{ value: 1, label: '是' },
{ value: 0, label: '否' },
]"
:key="index"
:label="item.label"
:name="item.value"
>
]" :key="index" :label="item.label" :name="item.value">
</u-radio>
</u-radio-group>
<view
class="update"
@click="updateShow(userInfo.is_captain, 'is_captain')"
>
<view class="update" @click="updateShow(userInfo.is_captain, 'is_captain')">
<uni-icons type="compose" color="#F9AA32"></uni-icons>
</view>
</view>
@ -79,20 +54,11 @@
<view class="p_title">修改信息</view>
<view class="p_body">
是否为小队长：
<u-radio-group
v-model="updateForm.is_captain"
style="margin: 16rpx"
>
<u-radio
:customStyle="{ marginRight: '16px' }"
v-for="(item, index) in [
<u-radio-group v-model="updateForm.is_captain" style="margin: 16rpx">
<u-radio :customStyle="{ marginRight: '16px' }" v-for="(item, index) in [
{ value: 1, label: '是' },
{ value: 0, label: '否' },
]"
:key="index"
:label="item.label"
:name="item.value"
>
]" :key="index" :label="item.label" :name="item.value">
</u-radio>
</u-radio-group>
</view>
@ -106,15 +72,8 @@
<view class="popup">
<view class="p_title">修改信息</view>
<u--form style="padding: 0 28rpx">
<u-form-item
label="身份证号:"
labelWidth="auto"
labelPosition="top"
>
<u--input
style="border: 1px solid #3175f9"
v-model="updateForm.id_card"
></u--input>
<u-form-item label="身份证号:" labelWidth="auto" labelPosition="top">
<u--input style="border: 1px solid #3175f9" v-model="updateForm.id_card"></u--input>
</u-form-item>
</u--form>
<view class="p_button">
@ -127,29 +86,15 @@
</block>
</view>
<view class="certification">
<u-skeleton
:loading="skeleton"
:animate="true"
title
rows="3"
rows-width="100%"
rowsHeight="56"
>
<u-skeleton :loading="skeleton" :animate="true" title rows="3" rows-width="100%" rowsHeight="56">
</u-skeleton>
<block v-if="!skeleton">
<view class="title">资质信息</view>
<view class="tit">资质信息</view>
<view class="c_item">
<uni-section
style="background-color: transparent"
title="身份证"
titleFontSize="32rpx"
type="line"
>
<uni-section style="background-color: transparent" title="身份证" titleFontSize="32rpx" type="line">
</uni-section>
<view class="card_box">
<image
:src="userInfo.qualification && userInfo.qualification.id_card"
@click="
<image :src="userInfo.qualification && userInfo.qualification.id_card" @click="
previewImg(
[
userInfo.qualification && userInfo.qualification.id_card,
@ -157,12 +102,9 @@
],
0
)
"
>
">
</image>
<image
:src="userInfo.qualification && userInfo.qualification.id_card_b"
@click="
<image :src="userInfo.qualification && userInfo.qualification.id_card_b" @click="
previewImg(
[
userInfo.qualification && userInfo.qualification.id_card,
@ -170,25 +112,17 @@
],
1
)
"
>
">
</image>
</view>
</view>
<view class="c_item">
<uni-section
style="background-color: transparent"
title="银行卡照片"
titleFontSize="32rpx"
type="line"
>
<uni-section style="background-color: transparent" title="银行卡照片" titleFontSize="32rpx" type="line">
</uni-section>
<view class="card_box">
<image
:src="
<image :src="
userInfo.qualification && userInfo.qualification.bank_account
"
@click="
" @click="
previewImg(
[
userInfo.qualification &&
@ -198,14 +132,11 @@
],
0
)
"
>
">
</image>
<image
:src="
<image :src="
userInfo.qualification && userInfo.qualification.bank_account_b
"
@click="
" @click="
previewImg(
[
userInfo.qualification &&
@ -215,30 +146,19 @@
],
1
)
"
>
">
</image>
</view>
</view>
<view
class="c_item"
v-if="
<view class="c_item" v-if="
(userInfo.qualification && userInfo.qualification.car_card) ||
(userInfo.qualification && userInfo.qualification.car_card)
"
>
<uni-section
style="background-color: transparent"
title="驾驶证"
titleFontSize="32rpx"
type="line"
>
">
<uni-section style="background-color: transparent" title="驾驶证" titleFontSize="32rpx" type="line">
</uni-section>
<view class="card_box">
<image
v-if="userInfo.qualification && userInfo.qualification.car_card"
:src="userInfo.qualification && userInfo.qualification.car_card"
@click="
<image v-if="userInfo.qualification && userInfo.qualification.car_card"
:src="userInfo.qualification && userInfo.qualification.car_card" @click="
previewImg(
[
userInfo.qualification && userInfo.qualification.car_card,
@ -246,13 +166,10 @@
],
0
)
"
>
">
</image>
<image
v-if="userInfo.qualification && userInfo.qualification.car_card"
:src="userInfo.qualification && userInfo.qualification.car_card_b"
@click="
<image v-if="userInfo.qualification && userInfo.qualification.car_card"
:src="userInfo.qualification && userInfo.qualification.car_card_b" @click="
previewImg(
[
userInfo.qualification && userInfo.qualification.car_card,
@ -260,69 +177,39 @@
],
1
)
"
>
">
</image>
</view>
</view>
</block>
</view>
<view class="contract">
<u-skeleton
:loading="skeleton"
:animate="true"
title
rows="2"
rows-width="100%"
rowsHeight="56"
>
<u-skeleton :loading="skeleton" :animate="true" title rows="2" rows-width="100%" rowsHeight="56">
</u-skeleton>
<block v-if="!skeleton">
<view class="title">电子合同</view>
<view
v-if="
<view class="tit">电子合同</view>
<view v-if="
userInfo.contract &&
userInfo.is_contract &&
userInfo.contract.status
"
class="card"
>
<uni-section
style="background-color: transparent"
:title="userInfo.name"
titleFontSize="32rpx"
type="line"
></uni-section>
<view class="c_text"
>性别：{{ userInfo.sex == 1 ? "男" : "女" }}</view
>
" class="card" style="font-size: 17px;">
<uni-section style="background-color: transparent" :title="userInfo.name" titleFontSize="32rpx"
type="line"></uni-section>
<view class="c_text">性别：{{ userInfo.sex == 1 ? "男" : "女" }}</view>
<view class="c_text">身份证号码：{{ userInfo.id_card }}</view>
<view class="c_text">联系电话：{{ userInfo.phone }}</view>
<view class="c_text"
>合同类型：{{
<view class="c_text">合同类型：{{
userInfo.contract && userInfo.contract.contract_type_name
}}</view
>
<view class="c_text"
>合同编号：{{
}}</view>
<view class="c_text">合同编号：{{
userInfo.contract && userInfo.contract.contract_no
}}</view
>
<u-line
v-if="userInfo.contract && userInfo.contract.file"
color="#999999FF"
style="margin: 31rpx 0"
>
}}</view>
<u-line v-if="userInfo.contract && userInfo.contract.file" color="#999999FF"
style="margin: 31rpx 0">
</u-line>
<view
v-if="userInfo.contract && userInfo.contract.file"
class="contract_box"
>
<view v-if="userInfo.contract && userInfo.contract.file" class="contract_box">
<view class="left">
<image
class="contract_img"
src="../../static/img/contract/pdf.png"
></image>
<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
<view class="text">
<view class="name">{{
userInfo.contract.contract_type_name || "合同"
@ -334,44 +221,30 @@
</view>
</view>
</view>
<view
class="right"
@click="naviToContract(userInfo.contract.contract_no)"
>
<view class="right" @click="naviToContract(userInfo.contract.contract_no)">
<!-- <image class="icon"></image> -->
<uni-icons type="paperclip" color="#3274F9"></uni-icons>
<view>查看</view>
</view>
</view>
</view>
<picker
v-if="
<picker v-if="
(!userInfo.is_contract && !userInfo.contract) ||
(userInfo.contract && userInfo.contract.check_status == 0)
"
:range="contractTypeList"
range-key="name"
@change="changeType"
>
" :range="contractTypeList" range-key="name" @change="changeType">
<button class="btn">生成合同</button>
</picker>
<view v-if="userInfo.contract && userInfo.contract.check_status == 1">
<button class="btn tips_center">合同已生成,请等待审核</button>
</view>
<view
v-if="
<view v-if="
!userInfo.is_contract &&
userInfo.contract &&
userInfo.contract.check_status == 2
"
class="card"
>
" class="card">
<view class="contract_box send">
<view class="left">
<image
class="contract_img"
src="../../static/img/contract/pdf.png"
></image>
<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
<view class="text">
<view class="name">{{
userInfo.contract.contract_type_name || "合同"
@ -383,10 +256,7 @@
</view>
</view>
</view>
<view
class="right"
@click="naviToContract(userInfo.contract.contract_no)"
>
<view class="right" @click="naviToContract(userInfo.contract.contract_no)">
<!-- <image class="icon"></image> -->
<uni-icons type="paperclip" color="#3274F9"></uni-icons>
<view>查看</view>
@ -394,11 +264,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="addContract" v-if="timerCount == 0">
发送合同
</button>
<button class="send_btn tips_center" v-else>
@ -406,20 +272,14 @@
</button>
</view>
</view>
<view
v-if="
<view v-if="
!userInfo.is_contract &&
userInfo.contract &&
userInfo.contract.check_status == 3
"
class="card"
>
" class="card">
<view class="contract_box send">
<view class="left">
<image
class="contract_img"
src="../../static/img/contract/pdf.png"
></image>
<image class="contract_img" src="../../static/img/contract/pdf.png"></image>
<view class="text">
<view class="name">{{
userInfo.contract.contract_type_name
@ -431,10 +291,7 @@
</view>
</view>
</view>
<view
class="right"
@click="naviToContract(userInfo.contract.contract_no)"
>
<view class="right" @click="naviToContract(userInfo.contract.contract_no)">
<!-- <image class="icon"></image> -->
<uni-icons type="paperclip" color="#3274F9"></uni-icons>
<view>查看</view>
@ -456,27 +313,29 @@
</template>
<script>
import {
import {
Toast
} from '@/libs/uniApi.js'
import {
} from '@/libs/uniApi.js'
import {
companyUserDetail
} from "@/api/company.js"
import {
} from "@/api/company.js"
import {
loginSetInfo,
userDraftingcontracts,
userInitiateContract,
userPostsms
} from "@/api/oaUser.js"
import {
} from "@/api/oaUser.js"
import {
dictDataLists
} from "@/api/oaPbulic.js"
import {
} from "@/api/oaPbulic.js"
import {
download_file
} from "@/api/junziqian.js"
import {personnerContractType} from "@/static/server/contract.js";
export default {
data () {
} from "@/api/junziqian.js"
import {
personnerContractType
} from "@/static/server/contract.js";
export default {
data() {
return {
id: '',
skeleton: true,
@ -499,7 +358,7 @@ export default {
contractTypeList: []
}
},
onLoad (options) {
onLoad(options) {
if (options.id) this.id = options.id;
this.initContractTypeList();
this.loadUserDetail();
@ -508,17 +367,17 @@ export default {
this.startTimer((time - Date.now()) / 1000);
}
},
onUnload () {
onUnload() {
if (this.timerCount > 0) uni.setStorageSync('time' + this.id, this.timerCount * 1000 + Date.now());
},
computed: {
cTimerCount () {
cTimerCount() {
return this.timerCount;
}
},
methods: {
// 查看合同
naviToContract (contract_no) {
naviToContract(contract_no) {
if (this.userInfo.is_contract) {
download_file({
applyNo: contract_no
@ -534,18 +393,18 @@ export default {
url: `/subpkg/pdfView/pdfView?url=${this.userInfo?.contract?.file}`
})
},
navTo (url) {
navTo(url) {
url ?
uni.navigateTo({
url: url,
}) : Toast('暂未开放')
},
updateShow (value, type) {
updateShow(value, type) {
this.updateForm[type] = value;
this.show[type] = true;
},
// 更新信息
async updateInfo (type) {
async updateInfo(type) {
try {
let form = {
user_id: this.userInfo.id,
@ -559,7 +418,7 @@ export default {
Toast(e.msg || '更新失败')
}
},
changeType (e) {
changeType(e) {
// console.log(this.contractTypeList[e.detail.value]);
this.createContract({
party_b: this.userInfo.id,
@ -568,17 +427,17 @@ export default {
})
},
// 初始化合同类型
async initContractTypeList () {
async initContractTypeList() {
let res = await dictDataLists({
type_id: 7
})
res.data = res.data.filter(item=>{
return personnerContractType.find(t=>item.id==t);
res.data = res.data.filter(item => {
return personnerContractType.find(t => item.id == t);
})
this.contractTypeList = res.data;
},
// 生成合同
createContract (data) {
createContract(data) {
uni.showModal({
content: '请检查信息无误后再生成合同',
confirmText: '确认无误',
@ -604,7 +463,7 @@ export default {
})
},
// 发送合同
async addContract (data) {
async addContract(data) {
uni.showModal({
content: '请检查合同无误后再发送',
confirmText: '确认无误',
@ -634,7 +493,7 @@ export default {
})
},
// 发送短信
async getPostsms () {
async getPostsms() {
try {
uni.showLoading({
title: '发送中',
@ -655,7 +514,7 @@ export default {
}
},
// 定时器
startTimer (time = 60) {
startTimer(time = 60) {
this.timerCount = time.toFixed(0);
this.timer = setInterval(() => {
this.timerCount--;
@ -665,7 +524,7 @@ export default {
}
}, 1000);
},
loadUserDetail () {
loadUserDetail() {
if (!this.id) return;
companyUserDetail({
id: this.id
@ -674,41 +533,48 @@ export default {
this.skeleton = false;
})
},
previewImg (urls, index = 0) {
previewImg(urls, index = 0) {
uni.previewImage({
urls: urls,
current: index
})
}
},
onPullDownRefresh () {
onPullDownRefresh() {
uni.stopPullDownRefresh()
}
}
}
</script>
<style lang="scss">
.page {
.page {
display: flex;
flex-direction: column;
align-items: center;
}
}
.title {
.tit {
font-size: 35rpx;
font-weight: 500;
color: #333333;
margin-bottom: 21rpx;
}
color: white;
// margin-bottom: 21rpx;
padding: 28rpx;
background-color: $theme-oa-color;
border-radius: 14rpx 14rpx 0 0;
.card {
.c_text {
// margin: 200rpx 0;
}
}
.card {
width: 694rpx;
background: #ffffff;
border-radius: 14rpx 14rpx 14rpx 14rpx;
padding: 28rpx;
}
}
.basic {
.basic {
margin: 28rpx 0;
.card {
@ -816,9 +682,9 @@ export default {
}
}
}
}
}
.certification {
.certification {
margin-bottom: 28rpx;
.title {
@ -841,9 +707,9 @@ export default {
}
}
}
}
}
.contract {
.contract {
margin-bottom: 28rpx;
.title {
@ -949,5 +815,5 @@ export default {
background-color: #666;
color: #eee;
}
}
}
</style>

18
test.vue
View File

@ -26,14 +26,8 @@
<view class="left">
<view class="cir">
<u--image
class="u_avatar"
:showLoading="true"
:src="'../../static/img/public/man.png'"
width="112.28rpx"
height="112.28rpx"
shape="circle"
></u--image>
<u--image class="u_avatar" :showLoading="true" :src="'../../static/img/public/man.png'"
width="112.28rpx" height="112.28rpx" shape="circle"></u--image>
</view>
</view>
</view>
@ -44,8 +38,7 @@
</template>
<style lang="scss">
.personnel_list {
.personnel_list {
padding: 28rpx 0;
margin-bottom: 130rpx;
@ -57,7 +50,7 @@
border-radius: 30rpx;
opacity: 1;
overflow: hidden;
box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
// box-shadow: 2px 2px 4px rgba(0, 0, 0, 0.6);
.cards_head {
padding: 28rpx;
@ -114,6 +107,5 @@
transform: translate(-50%, -50%);
}
}
}
}
</style>