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

更新

Browse Source
This commit is contained in:
shengchanzhe 2023-07-25 08:11:50 +08:00
parent 26c47df461
commit 5f60a93ff0
11 changed files with 99 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
androidPrivacy.json Normal file
View File

@ -0,0 +1,3 @@
{
"prompt" : "template"
}

13
components/company/company.vue
View File

@ -127,7 +127,6 @@
},
props: ['id','type'],
mounted() {
// console.log(this.$props.type, this.$props.id);
this.initContract(this.$props.id, this.$props.type||null);
},
methods: {
@ -148,8 +147,16 @@
async initContract(id, type="contract") {
let res;
//判断是合同还是公司
if(id&&(type=="contract"||type==null)) res = await contractView({ id });
else res = await companyView();
if(id&&(type=="contract"||type==null)){
res = await contractView({ id });
} else{
if(id>0){
res = await companyView({id});
}else{
res = await companyView();
}
}
this.company = res.data.company;
this.user = res.data.user;
this.contract = res.data.contract;

43
manifest.json
View File

@ -1,5 +1,5 @@
{
"name" : "nk-oa",
"name" : "供销综合平台",
"appid" : "__UNI__3A527D1",
"description" : "",
"versionName" : "1.0.0",
@ -18,7 +18,9 @@
},
/* 模块配置 */
"modules" : {
"Payment" : {}
"Payment" : {},
"Barcode" : {},
"Camera" : {}
},
/* 应用发布信息 */
"distribute" : {
@ -52,12 +54,47 @@
"sdkConfigs" : {
"payment" : {
"weixin" : {
"__platform__" : [ "android" ],
"__platform__" : [ "ios", "android" ],
"appid" : "wx9d68c92b550ddd1e",
"UniversalLinks" : ""
}
},
"ad" : {}
},
"splashscreen" : {
"useOriginalMsgbox" : true
},
"icons" : {
"android" : {
"hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi" : "unpackage/res/icons/192x192.png"
},
"ios" : {
"appstore" : "unpackage/res/icons/1024x1024.png",
"ipad" : {
"app" : "unpackage/res/icons/76x76.png",
"app@2x" : "unpackage/res/icons/152x152.png",
"notification" : "unpackage/res/icons/20x20.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x" : "unpackage/res/icons/167x167.png",
"settings" : "unpackage/res/icons/29x29.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png"
},
"iphone" : {
"app@2x" : "unpackage/res/icons/120x120.png",
"app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x" : "unpackage/res/icons/120x120.png"
}
}
}
}
},

4
pages/oaExamine/oaExamine.vue
View File

@ -35,6 +35,8 @@
getHandleListAPI,
getCopyOfMyListAPI
} from '@/api/oaApi.js'
import { Toast } from '@/libs/uniApi.js'
// import tabbar from '../components/tabbar'
export default {
components: {
@ -114,6 +116,8 @@
}
},
click(item) {
Toast('开发中')
return
this.myEventList = []
this.params.page = '1'
switch (item.index) {

14
pages/oaMy/oaMy.vue
View File

@ -40,7 +40,7 @@
</view>
<view v-if="$store.state.app.token" class="compile" @click="naviTo()">
<view class="iconfont icon-bianji"></view>
<view class="">编辑</view>
<!-- <view class="">编辑</view> -->
</view>
</view>
<view class="assess">
@ -76,6 +76,13 @@
</view>
<view class="iconfont icon-you"></view>
</view>
<view class="other_item flex_a_c_j_sb" @click="naviTwo('/pages/oaManager/oaManager')">
<view class="flex_a_c">
<view class="iconfont2" ></view>
<view class="text">片区经理</view>
</view>
<view class="iconfont icon-you"></view>
</view>
</block>
</view>
<view class="log_out" v-if="$store.state.app.token" @click="logout">退出登录</view>
@ -154,6 +161,11 @@
url: url
}) : Toast('暂未开放')
},
naviTwo(url){
uni.switchTab({
url: url
})
},
alterMyInfo() {
uni.navigateTo({
url: '/pages/views/personal_center'

4
pages/oaTask/oaTask.vue
View File

@ -58,6 +58,8 @@
<script>
import { getTaskListApi } from '@/api/oa'
import { Toast } from '@/libs/uniApi.js'
// import tabbar from '../components/tabbar'
export default {
components: {
@ -137,6 +139,8 @@
},
//选中筛选字段
getInfo(val, status) {
Toast('开发中')
return
this.eventData = []
this.params = {
page: '1',

22
static/server/server.js
View File

@ -357,19 +357,19 @@ export const myOaData = [
{
name: '流水详情',
icon: 'custom-icongongzi',
// url: '/pages/views/personal_center_two'
},
{
name: '管理后台',
icon: 'custom-icongongzi',
// url: '/pages/views/personal_center_two'
},
{
name: '片区经理',
icon: 'custom-icongongzi',
// url: '/pages/views/personal_center_two'
url: '/subpkg/finance/finance'
},
// {
// name: '管理后台',
// icon: 'custom-icongongzi',
// // url: '/pages/views/personal_center_two'
// },
// {
// name: '片区经理',
// icon: 'custom-icongongzi',
// url: '/pages/oaManager/oaManager'
// },
// {
// name: '工资详情',
// icon: 'custom-icongongzi',
// url: '/pages/views/personal_center_two'

2
subpkg/companyInfo/companyInfo.vue
View File

@ -12,7 +12,7 @@
<view class="top">
<view>
<view class="info_name">{{item.company_name}}</view>
<view class="info_type">{{item.company_type}}</view>
<view class="info_type">{{item.company_type_name}}</view>
</view>
<view class="btn" @click="naviTo('/subpkg/companySign/companySign?id='+item.id)">详情<uni-icons type="forward" color="#666666"></uni-icons></view>
</view>

12
subpkg/personnel/personnel.vue
View File

@ -16,7 +16,7 @@
<view class="right">
<view class="info_top">
<view class="info_name">{{item.name}}</view>
<view>{{item.company}}</view>
<view>{{item.company.company_name}}</view>
</view>
<view class="info_bottom">
<view class="item phone">
@ -41,10 +41,10 @@
<view><image :src="item.qualification&&item.qualification.bank_account?'../../static/icons/ok.png':'../../static/icons/err.png'"></image>银行卡</view>
</view>
</view>
<u-line color="#999999FF"></u-line>
<!-- <u-line color="#999999FF"></u-line>
<view class="bottom" style="margin-top: 28rpx;">
<button class="look" @click="navTo('/subpkg/personnelDetails/personnelDetails?id='+item.id)">查看</button>
</view>
</view> -->
</view>
</block>
<u-loadmore :status="loadConfig.status" :loading-text="loadConfig.loadingText" :loadmore-text="loadConfig.loadmoreText" :nomore-text="loadConfig.nomoreText" />
@ -75,7 +75,8 @@ export default {
userList: []
}
},
onLoad() {},
onLoad() {
},
onShow() {
this.loadUserList()
},
@ -92,7 +93,8 @@ export default {
this.loadConfig.status="loading"
let res = await companyUser({
page: this.loadConfig.page,
limit: this.loadConfig.limit
limit: this.loadConfig.limit,
company_id:this.$store.state.app.userInfo.admin.company_id
})
this.loadConfig.status="loadmore"
if(res.data.data.length<this.loadConfig.limit){

6
subpkg/topUp/topUp.vue
View File

@ -19,11 +19,11 @@
<input v-if="priceList[changeMoney]=='自定义'" class="input" type="digit" placeholder="输入充值金额(元)" v-model="payMoney.money" />
<button class="btn" @click="pay">充值</button>
</view>
<view class="tip">
<!-- <view class="tip">
<view class="title">注意事项</view>
<view class="text">充值后帐户的金额不能提现，可用于商城消费使用佣金导入账户之后不能再次导出、不可提现账户充值出现问题可联系商城客服，也可拨打商城客服热线<text @click="copyPhone('4008888888')">4008888888</text>
</view>
</view>
</view> -->
</view>
</template>
@ -35,7 +35,7 @@
export default {
data() {
return {
priceList: ['50元', '100元', '200元', '500元', '1000元', '自定义'],
priceList: ['10元','50元','100元','500','1000元','5000','10000元', '自定义'],
changeMoney: -1,
payMoney: {
money: ''

6
subpkg/withdrawDeposit/withdrawDeposit.vue
View File

@ -24,11 +24,11 @@
v-model="payMoney.money" />
<button class="btn" @click="pay">申请提现</button>
</view>
<view class="tip">
<!-- <view class="tip">
<view class="title">备注</view>
<view class="text">提现后将会由后台审核,审核通过后会直接往您所上传的银行卡汇款,请耐心等待,如由疑问也可拨打商城客服热线<text
@click="copyPhone('4008888888')">4008888888</text></view>
</view>
</view> -->
</view>
</template>
@ -40,7 +40,7 @@
export default {
data() {
return {
priceList: ['50元', '100元', '200元', '500元', '全部', '自定义'],
priceList: ['10元','50元','100元','500','1000元','5000','全部', '自定义'],
changeMoney: -1,
payMoney: {
money: ''