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-10 14:13:35 +08:00
parent 5fe5efabc5
commit 8776f8e1fb
21 changed files with 86 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/company/company.vue
View File

@ -50,7 +50,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="right" @click="naviTo(contract.contract_no)"> <view class="right" @click="navTo(contract.contract_no)">
<!-- <image class="icon"></image> --> <!-- <image class="icon"></image> -->
<uni-icons type="paperclip" color="#3274F9"></uni-icons> <uni-icons type="paperclip" color="#3274F9"></uni-icons>
<view>查看</view> <view>查看</view>
@ -164,7 +164,7 @@
this.initContract(this.$props.id, this.$props.type || null); this.initContract(this.$props.id, this.$props.type || null);
}, },
methods: { methods: {
naviTo(contract_no) { navTo(contract_no) {
download_file({ applyNo: contract_no }).then(res => { download_file({ applyNo: contract_no }).then(res => {
if (res.code != 1) { if (res.code != 1) {
Toast(res.msg) Toast(res.msg)

8
components/companyFinance/companyFinance.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<view class="c_card"> <view class="c_card">
<view class="f_card"> <view class="f_card">
<view class="item" @click="naviTo('/subpkg/topUp/topUp')"> <view class="item" @click="navTo('/subpkg/topUp/topUp')">
<view>公司账户余额(元)</view> <view>公司账户余额(元)</view>
<view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view> <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
<view class="price" v-else>0.00</view> <view class="price" v-else>0.00</view>
</view> </view>
<view class="item" @click="naviTo('/subpkg/withdrawDeposit/withdrawDeposit')"> <view class="item" @click="navTo('/subpkg/withdrawDeposit/withdrawDeposit')">
<view>公司收益金额(元)</view> <view>公司收益金额(元)</view>
<view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view> <view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view>
<view class="price" v-else>0.00</view> <view class="price" v-else>0.00</view>
@ -17,7 +17,7 @@
<view class="right"> <view class="right">
<view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">日账单</view> <view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">日账单</view>
<view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view> <view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view>
<view class="btn" @click="naviTo('/subpkg/companyFinance/companyFinance')">更多</view> <view class="btn" @click="navTo('/subpkg/companyFinance/companyFinance')">更多</view>
</view> </view>
</view> </view>
<view class="f_list"> <view class="f_list">
@ -72,7 +72,7 @@
}) })
}, },
methods:{ methods:{
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url, url: url,

4
components/task/index.vue
View File

@ -6,7 +6,7 @@
<uni-segmented-control :current="current" :values="['全部','已完成', '未完成']" styleType="text" @clickItem="changeCurrent" activeColor="#3274F9"></uni-segmented-control> <uni-segmented-control :current="current" :values="['全部','已完成', '未完成']" styleType="text" @clickItem="changeCurrent" activeColor="#3274F9"></uni-segmented-control>
</u-sticky> </u-sticky>
<view class="c_task_index_list"> <view class="c_task_index_list">
<view v-for="item in 10" @click="naviTo('/subpkg/dispatching/dispatching')" :key="item"> <view v-for="item in 10" @click="navTo('/subpkg/dispatching/dispatching')" :key="item">
<taskItem></taskItem> <taskItem></taskItem>
</view> </view>
</view> </view>
@ -44,7 +44,7 @@
}; };
}, },
methods: { methods: {
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url

6
components/task/taskItem.vue
View File

@ -52,7 +52,7 @@ import { Toast } from '../../libs/uniApi';
}; };
}, },
methods:{ methods:{
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url, url: url,
@ -61,8 +61,8 @@ import { Toast } from '../../libs/uniApi';
clickTask(){ clickTask(){
console.log('点击'); console.log('点击');
if(this.$props.datas.type==1){ if(this.$props.datas.type==1){
this.naviTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr)) this.navTo('/subpkg/fileTask/fileTask?id=' + JSON.stringify(this.$props.datas?.extend?.informationg?.arr))
}else this.naviTo(''); }else this.navTo('');
} }
} }
} }

5
pages.json
View File

@ -25,7 +25,7 @@
"path": "pages/business/business", "path": "pages/business/business",
"style": { "style": {
"navigationBarTitleText": "商机信息", "navigationBarTitleText": "商机信息",
"enablePullDownRefresh": false, "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#3175f9", "navigationBarBackgroundColor": "#3175f9",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
} }
@ -43,6 +43,7 @@
"path": "pages/oaExamine/oaExamine", "path": "pages/oaExamine/oaExamine",
"style": { "style": {
"navigationBarTitleText": "审批", "navigationBarTitleText": "审批",
"enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#3175f9", "navigationBarBackgroundColor": "#3175f9",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
} }
@ -318,7 +319,7 @@
"path": "noticeList/noticeList", "path": "noticeList/noticeList",
"style": { "style": {
"navigationBarTitleText": "公告列表", "navigationBarTitleText": "公告列表",
"enablePullDownRefresh": false, "enablePullDownRefresh": true,
"navigationBarBackgroundColor": "#3175f9", "navigationBarBackgroundColor": "#3175f9",
"navigationBarTextStyle": "white" "navigationBarTextStyle": "white"
} }

12
pages/oaMy/oaMy.vue
View File

@ -34,25 +34,25 @@
</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="navTo()">
<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">
<view class="cent_item" @click="naviTo('/subpkg/finance/finance')"> <view class="cent_item" @click="navTo('/subpkg/finance/finance')">
<!-- <view class="num">{{ oaUserInfo.achievements_money }}</view> --> <!-- <view class="num">{{ oaUserInfo.achievements_money }}</view> -->
<view class="num" v-if="!$store.state.app.token">*</view> <view class="num" v-if="!$store.state.app.token">*</view>
<view class="num" v-else-if="eyeType">{{oaUserInfo.user_money||'0.00'}}</view> <view class="num" v-else-if="eyeType">{{oaUserInfo.user_money||'0.00'}}</view>
<view class="num" v-if="!eyeType">****</view> <view class="num" v-if="!eyeType">****</view>
<view class="name">账户余额(元)</view> <view class="name">账户余额(元)</view>
</view> </view>
<!-- <view class="cent_item" @click="naviTo('/subpkg/finance/finance')"> <!-- <view class="cent_item" @click="navTo('/subpkg/finance/finance')">
<view class="num">0.00</view> <view class="num">0.00</view>
<view class="name">冻结金额</view> <view class="name">冻结金额</view>
</view> --> </view> -->
<view class="cent_item" @click="naviTo('/subpkg/finance/finance')"> <view class="cent_item" @click="navTo('/subpkg/finance/finance')">
<!-- <view class="num">{{ oaUserInfo.company_money }}</view> --> <!-- <view class="num">{{ oaUserInfo.company_money }}</view> -->
<view class="num" v-if="!$store.state.app.token">*</view> <view class="num" v-if="!$store.state.app.token">*</view>
<view class="num" v-else-if="eyeType">{{oaUserInfo.income||'0.00'}}</view> <view class="num" v-else-if="eyeType">{{oaUserInfo.income||'0.00'}}</view>
@ -65,7 +65,7 @@
</view> </view>
<view class="other_guide"> <view class="other_guide">
<block v-for="(item,i) in myOaData" :key="i"> <block v-for="(item,i) in myOaData" :key="i">
<view class="other_item flex_a_c_j_sb" @click="naviTo(item.url)"> <view class="other_item flex_a_c_j_sb" @click="navTo(item.url)">
<view class="flex_a_c left"> <view class="flex_a_c left">
<!-- <view class="iconfont2" :class="item.icon"></view> --> <!-- <view class="iconfont2" :class="item.icon"></view> -->
<image :src="item.icon"></image> <image :src="item.icon"></image>
@ -142,7 +142,7 @@
const res = await userInfo(); const res = await userInfo();
this.$store.commit('setUserInfo', res.data); this.$store.commit('setUserInfo', res.data);
}, },
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url, url: url,

4
pages/office_app/oaMy/oaMy.vue
View File

@ -45,7 +45,7 @@
</view> </view>
<view class="other_guide"> <view class="other_guide">
<block v-for="(item,i) in myOaData" :key="i"> <block v-for="(item,i) in myOaData" :key="i">
<view class="other_item flex_a_c_j_sb" @click="naviTo(item.url)"> <view class="other_item flex_a_c_j_sb" @click="navTo(item.url)">
<view class="flex_a_c"> <view class="flex_a_c">
<view class="iconfont2" :class="item.icon"></view> <view class="iconfont2" :class="item.icon"></view>
<view class="text">{{ item.name }}</view> <view class="text">{{ item.name }}</view>
@ -91,7 +91,7 @@
console.log(res,'111'); console.log(res,'111');
this.oaUserInfo = res this.oaUserInfo = res
}, },
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url

4
subpkg/blockTransaction/blockTransaction.vue
View File

@ -19,7 +19,7 @@
<view class="right"> <view class="right">
<!-- <view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">日账单</view> <!-- <view class="btn" :class="current==0?'active':''" @click="current=0;initLoad()">日账单</view>
<view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view> --> <view class="btn" :class="current==1?'active':''" @click="current=1;initLoad()">月账单</view> -->
<view class="btn" @click="naviTo('/subpkg/companyFinance/companyFinance')">历史账单</view> <view class="btn" @click="navTo('/subpkg/companyFinance/companyFinance')">历史账单</view>
</view> </view>
</view> </view>
<view class="list"> <view class="list">
@ -69,7 +69,7 @@
onLoad() {}, onLoad() {},
onShow() {}, onShow() {},
methods: { methods: {
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url, url: url,

6
subpkg/companyInfo/companyInfo.vue
View File

@ -10,7 +10,7 @@
</view> </view>
<view class="company_list" v-show="current==1"> <view class="company_list" v-show="current==1">
<view class="info_card" v-for="item in companyList" :key="item.id"> <view class="info_card" v-for="item in companyList" :key="item.id">
<view class="top" @click="naviTo('/subpkg/companySign/companySign?id='+item.id)"> <view class="top" @click="navTo('/subpkg/companySign/companySign?id='+item.id)">
<view> <view>
<view class="info_name" :class="item.is_contract?'have':'no'">{{item.company_name}}</view> <view class="info_name" :class="item.is_contract?'have':'no'">{{item.company_name}}</view>
<view class="info_type">{{item.company_type_name}}</view> <view class="info_type">{{item.company_type_name}}</view>
@ -39,7 +39,7 @@
</view> </view>
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" <u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText"
:loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" /> :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
<mybtn text="新建签约" @click="naviTo('/subpkg/companyUnsign/companyUnsign')"></mybtn> <mybtn text="新建签约" @click="navTo('/subpkg/companyUnsign/companyUnsign')"></mybtn>
</view> </view>
<view class="company_info" v-show="current==2"> <view class="company_info" v-show="current==2">
<companyFinance></companyFinance> <companyFinance></companyFinance>
@ -119,7 +119,7 @@
} }
this.companyList = [...this.companyList, ...res.data?.data] this.companyList = [...this.companyList, ...res.data?.data]
}, },
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url

6
subpkg/companySign/companySign.vue
View File

@ -140,7 +140,7 @@
} }
uni.hideLoading(); uni.hideLoading();
Toast('合同已发送'); Toast('合同已发送');
this.naviTo('/subpkg/submit/submit'); this.navTo('/subpkg/submit/submit');
}catch(e){ }catch(e){
uni.hideLoading(); uni.hideLoading();
Toast('发送失败'); Toast('发送失败');
@ -161,10 +161,10 @@
id: this.id id: this.id
}) })
Toast('短信已发送'); Toast('短信已发送');
this.naviTo('/subpkg/submit/submit'); this.navTo('/subpkg/submit/submit');
} }
}, },
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url

4
subpkg/companyUnsign/companyUnsign.vue
View File

@ -2,7 +2,7 @@
<view class=""> <view class="">
<view class="company_list"> <view class="company_list">
<view class="info_card" v-for="item in companyList" :key="item.id"> <view class="info_card" v-for="item in companyList" :key="item.id">
<view class="top" @click="naviTo('/subpkg/companySign/companySign?id='+item.id)"> <view class="top" @click="navTo('/subpkg/companySign/companySign?id='+item.id)">
<view> <view>
<view class="info_name" :class="item.is_contract?'have':'no'">{{item.company_name}}</view> <view class="info_name" :class="item.is_contract?'have':'no'">{{item.company_name}}</view>
<view class="info_type">{{item.company_type_name}}</view> <view class="info_type">{{item.company_type_name}}</view>
@ -77,7 +77,7 @@ export default {
} }
this.companyList = [...this.companyList, ...res.data?.data] this.companyList = [...this.companyList, ...res.data?.data]
}, },
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url

4
subpkg/contract/contract.vue
View File

@ -40,7 +40,7 @@
<view class="bottom"> <view class="bottom">
<view class="left">已签订</view> <view class="left">已签订</view>
<!-- <view class="left red">已到期</view> --> <!-- <view class="left red">已到期</view> -->
<button class="right" @click="naviTo('/subpkg/contractDetail/contractDetail?id='+item.id)">详情</button> <button class="right" @click="navTo('/subpkg/contractDetail/contractDetail?id='+item.id)">详情</button>
</view> </view>
</view> </view>
</view> </view>
@ -79,7 +79,7 @@
}) })
}, },
methods: { methods: {
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url

2
subpkg/contractDetail/contractDetail.vue
View File

@ -25,7 +25,7 @@
}, },
onShow() {}, onShow() {},
methods: { methods: {
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url

10
subpkg/finance/finance.vue
View File

@ -2,7 +2,7 @@
<view class=""> <view class="">
<view class="finance_head"> <view class="finance_head">
<view class="top"> <view class="top">
<view class="left" @click="naviTo()"> <view class="left" @click="navTo()">
<view v-if="user_id==0"> <view v-if="user_id==0">
<u--image :showLoading="true" :src="userInfo.avatar||'../../static/img/public/man.png'" width="44px" height="44px" shape="circle"></u--image> <u--image :showLoading="true" :src="userInfo.avatar||'../../static/img/public/man.png'" width="44px" height="44px" shape="circle"></u--image>
<view class="name">{{userInfo.nickname}}</view> <view class="name">{{userInfo.nickname}}</view>
@ -12,7 +12,7 @@
<view class="name">{{userInfo.nickname}}</view> <view class="name">{{userInfo.nickname}}</view>
</view> </view>
</view> </view>
<!-- <view class="right" @click="naviTo('/subpkg/topUp/topUp')"> <!-- <view class="right" @click="navTo('/subpkg/topUp/topUp')">
账户充值 账户充值
</view> --> </view> -->
</view> </view>
@ -28,7 +28,7 @@
<view class="text" v-show="!eyeType">可提现金额****元</view> <view class="text" v-show="!eyeType">可提现金额****元</view>
</view> </view>
</view> </view>
<view class="bottom" @click="naviTo('/subpkg/orderDetail/orderDetail')"> <view class="bottom" @click="navTo('/subpkg/orderDetail/orderDetail')">
<view class="item"> <view class="item">
<view>账户余额(元)</view> <view>账户余额(元)</view>
<view class="num" v-show="eyeType">{{userInfo.user_money||0.00}}</view> <view class="num" v-show="eyeType">{{userInfo.user_money||0.00}}</view>
@ -93,7 +93,7 @@
<u-loadmore status="nomore" nomore-text="仅展示一年数据" /> <u-loadmore status="nomore" nomore-text="仅展示一年数据" />
</view> </view>
<!-- <button class="btn" @click="naviTo('/subpkg/withdrawDeposit/withdrawDeposit')">提现余额</button> --> <!-- <button class="btn" @click="navTo('/subpkg/withdrawDeposit/withdrawDeposit')">提现余额</button> -->
</view> </view>
</view> </view>
</template> </template>
@ -149,7 +149,7 @@ export default {
}, },
methods: { methods: {
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url

4
subpkg/fixedAssets/fixedAssets.vue
View File

@ -50,7 +50,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="right" @click="naviTo(contract.contract_no)"> <view class="right" @click="navTo(contract.contract_no)">
<!-- <image class="icon"></image> --> <!-- <image class="icon"></image> -->
<uni-icons type="paperclip" color="#3274F9"></uni-icons> <uni-icons type="paperclip" color="#3274F9"></uni-icons>
<view>查看</view> <view>查看</view>
@ -72,7 +72,7 @@
onLoad() {}, onLoad() {},
onShow() {}, onShow() {},
methods: { methods: {
naviTo(contract_no) { navTo(contract_no) {
download_file({ applyNo: contract_no }).then(res => { download_file({ applyNo: contract_no }).then(res => {
if (res.code != 1) { if (res.code != 1) {
Toast(res.msg) Toast(res.msg)

38
subpkg/noticeList/noticeList.vue
View File

@ -1,7 +1,8 @@
<template> <template>
<view class=""> <view class="">
<view class="task_box"> <view class="task_box">
<u-search shape="round" v-model="searchText" @change="changeSearch" placeholder="搜索公告" :showAction="false"></u-search> <u-search shape="round" v-model="searchText" @change="changeSearch" placeholder="搜索公告"
:showAction="false"></u-search>
<view class="screening" @click="reSearch">搜索</view> <view class="screening" @click="reSearch">搜索</view>
</view> </view>
<view class="notice_list"> <view class="notice_list">
@ -42,49 +43,49 @@
}, },
} }
}, },
onLoad() {}, onLoad() {
onShow() {
this.initConfig() this.initConfig()
this.loadNotice()
}, },
onShow() {},
methods: { methods: {
initConfig() { initConfig() {
this.list = []; this.list = [];
this.loadConfig.page = 1; this.loadConfig.page = 1;
this.loadConfig.status = 'loadmore'; this.loadConfig.status = 'loadmore';
this.loadNotice();
}, },
async loadNotice() { async loadNotice() {
if(this.loadConfig.status=="nomore")return; if (this.loadConfig.status == "nomore") return;
this.loadConfig.status="loading" this.loadConfig.status = "loading"
const res = await noticeList({ const res = await noticeList({
sort: 'new', sort: 'new',
keyword: this.searchText, keyword: this.searchText,
page_no: this.loadConfig.page, page_no: this.loadConfig.page,
page_size: this.loadConfig.limit page_size: this.loadConfig.limit
}) })
this.loadConfig.status="loadmore" this.loadConfig.status = "loadmore"
if(res.data.lists.length<this.loadConfig.limit){ if (res.data.lists.length < this.loadConfig.limit) {
this.loadConfig.status="nomore" this.loadConfig.status = "nomore"
}else { } else {
this.loadConfig.page++; this.loadConfig.page++;
} }
this.list = [...this.list, ...res.data.lists]; this.list = [...this.list, ...res.data.lists];
}, },
clickNotice(e){ clickNotice(e) {
uni.navigateTo({ uni.navigateTo({
url: `/pages/oaNews/oaNews?id=${e}` url: `/pages/oaNews/oaNews?id=${e}`
}) })
}, },
changeSearch: debounce(function(e){ changeSearch: debounce(function(e) {
this.reSearch() this.reSearch()
}, 500), }, 500),
reSearch(){ reSearch() {
this.initConfig() this.initConfig()
this.loadNotice()
} }
}, },
onPullDownRefresh() { onPullDownRefresh() {
uni.stopPullDownRefresh() this.initConfig();
this.$u.sleep(500).then(()=>{uni.stopPullDownRefresh()})
} }
} }
</script> </script>
@ -118,6 +119,7 @@
color: #fff; color: #fff;
} }
} }
.notice_list { .notice_list {
padding: 28rpx; padding: 28rpx;
@ -148,6 +150,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
/* 使用省略号表示被截断的文本 */ /* 使用省略号表示被截断的文本 */
overflow: hidden; overflow: hidden;
&::before { &::before {
content: '公告'; content: '公告';
display: inline-block; display: inline-block;
@ -160,13 +163,14 @@
} }
} }
.bottom{ .bottom {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
font-size: 25rpx; font-size: 25rpx;
margin-top: 10rpx; margin-top: 10rpx;
color: #99a3bd; color: #99a3bd;
.click{
.click {
display: flex; display: flex;
align-items: center; align-items: center;
} }

14
subpkg/personnel/personnel.vue
View File

@ -45,8 +45,8 @@
</view> --> </view> -->
<u-line color="#999999FF"></u-line> <u-line color="#999999FF"></u-line>
<view class="bottom" style="margin-top: 28rpx;float: right;"> <view class="bottom" style="margin-top: 28rpx;float: right;">
<button class="look sign" v-if="item.is_contract==1">已签约</button> <button class="look sign" v-if="item.is_contract==1" @click="changeSign(item)">已签约</button>
<button class="look red" v-else>未签约</button> <button class="look red" v-else @click="changeSign(item)">未签约</button>
<button class="look" @click="navTo('/subpkg/finance/finance?id='+item.id)">财务查看</button> <button class="look" @click="navTo('/subpkg/finance/finance?id='+item.id)">财务查看</button>
<button class="look" @click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">信息查看</button> <button class="look" @click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">信息查看</button>
</view> </view>
@ -112,6 +112,16 @@
this.loadConfig.page++; this.loadConfig.page++;
} }
this.userList = [...this.userList, ...res.data?.data] 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() { onPullDownRefresh() {

6
subpkg/personnelDetails/personnelDetails.vue
View File

@ -255,7 +255,7 @@
}) })
}) })
}, },
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url, url: url,
@ -328,7 +328,7 @@
} }
uni.hideLoading(); uni.hideLoading();
Toast('合同已发送'); Toast('合同已发送');
this.naviTo('/subpkg/submit/submit'); this.navTo('/subpkg/submit/submit');
}catch(e){ }catch(e){
uni.hideLoading(); uni.hideLoading();
Toast('合同发送失败'); Toast('合同发送失败');
@ -349,7 +349,7 @@
id: this.userInfo.id id: this.userInfo.id
}) })
Toast('短信已发送'); Toast('短信已发送');
this.naviTo('/subpkg/submit/submit'); this.navTo('/subpkg/submit/submit');
} }
}, },
loadUserDetail() { loadUserDetail() {

4
subpkg/submit/submit.vue
View File

@ -7,7 +7,7 @@
<view>您的签约请求已提交，正在生成合同。</view> <view>您的签约请求已提交，正在生成合同。</view>
<view>请耐心等待，合同生成完毕后将会以短信方式通知您。</view> <view>请耐心等待，合同生成完毕后将会以短信方式通知您。</view>
</view> </view>
<button class="btn" @click="naviTo">确定</button> <button class="btn" @click="navTo">确定</button>
</view> </view>
</view> </view>
</template> </template>
@ -22,7 +22,7 @@ export default {
onLoad() {}, onLoad() {},
onShow() {}, onShow() {},
methods: { methods: {
naviTo(){ navTo(){
uni.navigateBack(); uni.navigateBack();
} }
}, },

4
subpkg/taskAdmin/taskAdmin.vue
View File

@ -11,7 +11,7 @@
</view> </view>
<view class="task_list"> <view class="task_list">
<uni-section class="title" titleFontSize="32rpx" :title="'任务清单 '+ nowYMD" type="line"></uni-section> <uni-section class="title" titleFontSize="32rpx" :title="'任务清单 '+ nowYMD" type="line"></uni-section>
<view v-for="item in 5" :key="item" @click="naviTo('/subpkg/fileTask/fileTask')"> <view v-for="item in 5" :key="item" @click="navTo('/subpkg/fileTask/fileTask')">
<taskItem></taskItem> <taskItem></taskItem>
</view> </view>
<!-- <u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty> --> <!-- <u-empty icon="/static/img/empty/data.png" text="没有任务"></u-empty> -->
@ -78,7 +78,7 @@
let m = e.detail.value.split('-')[1]; let m = e.detail.value.split('-')[1];
this.nowDate.m = m < 10 ? +m : m; this.nowDate.m = m < 10 ? +m : m;
}, },
naviTo(url) { navTo(url) {
url ? url ?
uni.navigateTo({ uni.navigateTo({
url: url url: url