From 1c7b86f984498eab66968c8d9e9ece42634b96bb Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期二, 28 十一月 2023 14:10:48 +0800
Subject: [PATCH] 收款明细页面及对接接口、详情页面 测试bug调整
---
pages/home/home.vue | 61 ++++++----
utils/jihua.js | 16 +-
utils/request.js | 5
pages/login/login.vue | 10
pages/jihua/jihua.vue | 46 +++---
pages/my-have-todo/my-have-todo.vue | 30 +++-
pages/new-application/new-application.vue | 50 +++++---
pages/my-todo/my-todo.vue | 19 ++-
pages/payment-form-data/payment-form-data.vue | 41 ++++++
pages/my-application/my-application.vue | 14 +
store/index.js | 17 ++
11 files changed, 201 insertions(+), 108 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3d73838..3179178 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -19,7 +19,7 @@
</view>
</template>
<template v-slot:center>
- <view class="center-container" @click="() => shenqingDetail(item)">
+ <view class="center-container">
<view class="center-content__one center-margin">
<view class="">
<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
@@ -54,11 +54,11 @@
<image src="@/static/home/cehui.png" mode=""></image>
<view>鎾ゅ洖</view>
</view> -->
- <view @click="checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">
+ <view @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">
<image src="@/static/home/jindu.png" mode=""></image>
<view>鏌ョ湅杩涘害</view>
</view>
- <view @click="theFormDataClick(item.tableId)" v-if="(item.status == 1 || item.status == 2 || item.status == 3) && item.processName == '鍙戣繍閫氱煡鍗�'">
+ <view @click="() => shenqingDetail(item)" v-if="item.actType == 'Offsetting' || item.actType == 'XsWaybill'">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
@@ -70,7 +70,7 @@
<image src="@/static/home/history.png" mode=""></image>
<view>缂栬緫</view>
</view> -->
- <view @click="approvalHistoryClick(item.procInstId)" v-if="item.status == 2 || item.status == 3">
+ <view @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status !== 1">
<image src="@/static/home/history.png" mode=""></image>
<view>瀹℃壒鍘嗗彶</view>
</view>
@@ -96,13 +96,13 @@
<combined-title title="鎴戠殑寰呭姙" detailsPath="/pages/my-todo/my-todo"></combined-title>
<view class="card-group">
<combination-card class="card" v-for="(item, index) in daibanData" index="index">
- <template v-slot:top>
+ <template slot="top">
<view>
<text>{{ item.actBusiness.title }}</text>
</view>
</template>
- <template v-slot:center>
- <view class="center-container" @click="() => daibanDetail(item)">
+ <template slot="center">
+ <view class="center-container">
<view class="center-content__one center-margin">
<view class="">
<text>浠诲姟鍚嶇О锛歿{ item.name || '' }}</text>
@@ -120,23 +120,23 @@
</view>
</view>
</template>
- <template v-slot:bottom>
+ <template slot="bottom">
<view class="bottom-container">
<!-- 寰呭姙鎸夐挳 -->
<view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)">
+ <view @click="() => daibanDetail(item)" v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">
<image src="@/static/home/jindu.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
- <view @click="adopClick(item)">
+ <view @click="() => adopClick(item)">
<image src="@/static/home/tongguo.png" mode=""></image>
<view>閫氳繃</view>
</view>
- <view @click="rejectClick(item)">
+ <view @click="() => rejectClick(item)">
<image src="@/static/home/bohui.png" mode=""></image>
<view>椹冲洖</view>
</view>
- <view @click="approvalHistoryClick(item.procInstId)">
+ <view @click="() => checkTheScheduleClick(item.procInstId)">
<image src="@/static/home/history.png" mode=""></image>
<view>鍘嗗彶</view>
</view>
@@ -198,11 +198,15 @@
<view class="bottom-container">
<!-- 宸插姙鎸夐挳 -->
<view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)" v-if="item.processName == '鍙戣繍閫氱煡鍗�'">
+ <view @click="() => shenqingDetail(item)" v-if="item.processName == '鍙戣繍閫氱煡鍗�'">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>琛ㄥ崟鏁版嵁</view>
</view>
- <view @click="approvalHistoryClick(item.procInstId)">
+ <view @click="() => daibanDetail(item)" v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">
+ <image src="@/static/home/jindu.png" mode=""></image>
+ <view>璇︽儏</view>
+ </view>
+ <view @click="() => checkTheScheduleClick(item.procInstId)">
<image src="@/static/home/history.png" mode=""></image>
<view>瀹℃壒鍘嗗彶</view>
</view>
@@ -448,8 +452,8 @@
haveTodoParams: {
pageNumber: 1,
pageSize: 2,
- sort: 'createTime',
- order: 'desc'
+ // sort: 'createTime',
+ // order: 'desc'
}
};
},
@@ -493,12 +497,13 @@
},
//浠ｅ姙璇︽儏
daibanDetail(item) {
+ console.log(item,'item=====------000000')
if(item?.actBusiness?.actType == 'Offsetting') { //鏀舵 actType = 鈥極ffsetting鈥�
uni.navigateTo({
url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
})
- }else if(item?.actBusiness?.actType == 'WAY_BILL') {
+ }else if(item?.actBusiness?.actType == 'XsWaybill') {
uni.navigateTo({
url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
})
@@ -506,12 +511,13 @@
},
//浠ｅ姙璇︽儏
shenqingDetail(item) {
+ console.log(item,'item====寰呭姙===璇︽儏')
if(item.actType == 'Offsetting') { //鏀舵 actType = 鈥極ffsetting鈥�
uni.navigateTo({
url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
})
- }else if(item.actType == 'WAY_BILL') {
+ }else if(item.actType == 'XsWaybill') {
uni.navigateTo({
url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
})
@@ -519,8 +525,11 @@
},
getUserInfo() {
this.$reqGet('getUserInfo').then(res => {
+ console.log(res,'res=====绯荤粺鐧诲綍===')
if (res.code == 0) {
uni.setStorageSync('userInfo', res.data.sysUser);
+ this.$store.commit('SET_PERMISSIONS',res.data.permissions)
+ //uni.setStorageSync('permissions', res.data.permissions);
this.userId = res.data.sysUser.userId;
this.$nextTick(() => {
this.coalbunker();
@@ -659,7 +668,7 @@
// 閫氳繃妯℃�佹
adoptModalConfirm() {
this.adoptModalShow = false;
- this.adoptForm.comment = this.adoptModalContent;
+ this.adoptForm.comment = this.adoptModalContent || '';
this.$reqPost('passAll', this.adoptForm).then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛!');
@@ -725,11 +734,13 @@
});
},
// 琛ㄥ崟鏁版嵁
- theFormDataClick(v) {
- uni.navigateTo({
- url: `/pages/the-form-data/the-form-data?index=${v}`
- });
- },
+ // theFormDataClick(item) {
+ // console.log(item,'鐢宠杩樻槸-----item')
+ // // uni.navigateTo({
+ // // url: `/pages/the-form-data/the-form-data?index=${v}`
+ // // });
+ //
+ // },
// 鍒犻櫎鎾ゅ洖鐢宠
deleteWithDrawApplication(id) {
this.deleteWithDrawApplicationGlobal(id)
@@ -889,7 +900,7 @@
// echarts鍥捐〃
.charts-box {
width: 91%;
- height: vww(330);
+ height: vww(270);
margin: 0 auto;
.u-empty {
height: 100%;
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index bfe7338..97e5d14 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -36,7 +36,7 @@
<view style="margin-right:10px">瀹為檯鍙戣溅鏁帮細{{ item.numReal || '鏆傛棤' }}</view>
</view>
</view>
- <u-keyboard
+ <u-keyboard
@change="valChange"
@backspace="backspace"
@confirm="keyBoardConfirm"
@@ -48,7 +48,7 @@
:overlay="false"
:closeOnClickOverlay="false"
:dotDisabled="true"
- zIndex="100000"
+ zIndex="100000"
></u-keyboard>
</view>
@@ -99,7 +99,7 @@
</view>
</view>
</view>
-
+
<!-- 淇敼寮瑰嚭妗� -->
<u-popup :show="editPopupShow" @close="editPopupClose" @open="editPopupOpen" mode="top" round="10">
<view class="editPopup">
@@ -118,7 +118,7 @@
<script>
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
import tool from '@/utils/tool.js';
-import { TrackOpTypes } from "vue";
+import { TrackOpTypes } from "vue";
export default {
components: {
popupMenu
@@ -127,7 +127,7 @@
return {
radioValue: '鍏ㄩ儴',
tabList: [
- {
+ {
name: '浠婃棩鍙戣繍璁″垝'
},
{
@@ -218,7 +218,7 @@
fyList() {
this.overlayShow = true;
//鍒楄〃鏌ヨ
- uni.showLoading({
+ uni.showLoading({
title: '姝ｅ湪鍔犺浇...'
});
let compId = uni.getStorageSync('userInfo').compId;
@@ -274,17 +274,17 @@
e.shippingDate = this.info.shippingDate
}
});
- this.$reqPost('addObj', this.fyData).then(res => {
+ this.$reqPost('xscarshippingdayplanAddObj', this.fyData).then(res => {
uni.hideLoading();
if(res.code == 0){
- setTimeout(()=>{
- uni.showToast({
- title:'鏇存柊鎴愬姛锛�',
- icon:'none',
- duration:1000
- })
- },0)
this.fyList();
+ setTimeout(()=>{
+ uni.showToast({
+ title:'鏇存柊鎴愬姛锛�',
+ icon:'none',
+ duration:1000
+ })
+ },0)
}
});
},
@@ -378,7 +378,7 @@
inputTotalChange(val) {
console.log(val, 'val2=======val2,宸茶缃鍒�');
this.editRow = val;
- },
+ },
// input鑾峰彇鐒︾偣
faYunPlanCarsFocus(item) {
this.keyBoardShow = true;
@@ -389,7 +389,7 @@
} else{
this.isCursor = true;
}
-
+
// 鏍规嵁鍒楄〃涓嬫爣锛屼娇灞忓箷婊氬姩鍒扮浉搴斿彲瑙嗕綅缃�
for(let i = 0;i<this.fyData.length;i++){
if(this.fyData[i].orderId == item.orderId){
@@ -399,7 +399,7 @@
});
}
}
-
+
},
// 閿洏
valChange(val) {
@@ -418,7 +418,7 @@
item.numPlan = val;
this.keyBoardValue = item.numPlan;
}
- }
+ }
});
},
backspace() {
@@ -495,7 +495,7 @@
width: vww(100);
z-index: 1;
}
-
+
.u-radio-group--row {
height: 100%;
width: 100%;
@@ -556,7 +556,7 @@
// transform: translateX(-50%);
// border-radius: vww(20);
// }
-
+
}
.jihua-main {
@@ -621,8 +621,8 @@
border: 1px solid #dddddd;
border-radius: vww(4);
padding: vww(1) vww(10);
-
-
+
+
// 杈撳叆鐒︾偣鍥剧墖
.cursor {
// float: left;
@@ -675,4 +675,4 @@
// }
// }
}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index da9de09..aafb629 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -201,7 +201,7 @@
}
</style>
-->
-
+
<template>
<view class="login">
<u-overlay :show="show" @click="show = false"></u-overlay>
@@ -219,7 +219,7 @@
</view>
</view>
</template>
-
+
<script>
import { setAccessToken, setTokenType, setRefreshToken, setClientId, setScope, redirectHome, redirectLogin } from '@/utils/status.js';
export default {
@@ -272,6 +272,7 @@
}
},
saveUserInfo(response) {
+ console.log(response,'response=====')
uni.hideLoading();
this.show = false;
if (response.statusCode === 200) {
@@ -302,7 +303,7 @@
}
};
</script>
-
+
<style lang="scss" scoped>
.login {
.background {
@@ -342,7 +343,7 @@
}
.loginBtn {
margin-top: vww(80);
-
+
button {
background-color: #007aff;
color: #ffffff;
@@ -353,4 +354,3 @@
}
}
</style>
-
\ No newline at end of file
diff --git a/pages/my-application/my-application.vue b/pages/my-application/my-application.vue
index 1ccea61..ca36364 100644
--- a/pages/my-application/my-application.vue
+++ b/pages/my-application/my-application.vue
@@ -55,7 +55,7 @@
</view>
</template>
<template v-slot:center>
- <view class="center-container" @click="() => shenqingDetail(item)">
+ <view class="center-container">
<view class="center-content__one center-margin">
<view class="">
<text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
@@ -90,14 +90,18 @@
<image src="@/static/home/cehui.png" mode=""></image>
<view>鎾ゅ洖</view>
</view> -->
- <view @click="checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">
+ <view @click="() => checkTheScheduleClick(item.procInstId)" v-if="item.status == 1">
<image src="@/static/home/jindu.png" mode=""></image>
<view>鏌ョ湅杩涘害</view>
</view>
- <view @click="theFormDataClick(item.tableId)" v-if="(item.status == 1 || item.status == 2 || item.status == 3 ) && (item.processName == '鍙戣繍閫氱煡鍗�')">
+ <view @click="() => shenqingDetail(item)" v-if="item.actType == 'Offsetting' || item.actType == 'XsWaybill'">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
+<!-- <view @click="() => shenqingDetail(item)" v-if="(item.status == 1 || item.status == 2 || item.status == 3 ) && (item.processName == '鍙戣繍閫氱煡鍗�')">-->
+<!-- <image src="@/static/home/biaodan.png" mode=""></image>-->
+<!-- <view>鐢宠璇︽儏</view>-->
+<!-- </view>-->
<!-- <view v-if="item.status == 3" @click="apply(item)">
<image src="@/static/home/history.png" mode=""></image>
<view>閲嶆柊鐢宠</view>
@@ -307,12 +311,13 @@
},
methods: {
shenqingDetail(item) { //璺宠浆璇︽儏椤甸潰
+ console.log(item,'item=====')
if(item.actType == 'Offsetting') { //鏀舵 actType = 鈥極ffsetting鈥�
uni.navigateTo({
url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
})
- }else if(item.actType == 'WAY_BILL') {
+ }else if(item.actType == 'XsWaybill') {
uni.navigateTo({
url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
})
@@ -559,6 +564,7 @@
},
// 鏌ョ湅杩涘害
checkTheScheduleClick(v) {
+ console.log(v,'v====鏌ョ湅杩涘害====')
uni.navigateTo({
url: `/pages/check-the-schedule/check-the-schedule?index=${v}`
});
diff --git a/pages/my-have-todo/my-have-todo.vue b/pages/my-have-todo/my-have-todo.vue
index 00280e5..9fef375 100644
--- a/pages/my-have-todo/my-have-todo.vue
+++ b/pages/my-have-todo/my-have-todo.vue
@@ -82,15 +82,15 @@
<view class="bottom-container">
<!-- 宸插姙鎸夐挳 -->
<view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)" v-if="item.processName == '鍙戣繍閫氱煡鍗�'">
+ <view @click="() => theFormDataClick(item)" v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">
<image src="@/static/home/biaodan.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
- <view @click="approvalHistoryClick(item.procInstId)">
+ <view @click="() => approvalHistoryClick(item.procInstId)">
<image src="@/static/home/history.png" mode=""></image>
<view>瀹℃壒鍘嗗彶</view>
</view>
- <view @click="deleteApplicationClick(item.id)">
+ <view @click="() => deleteApplicationClick(item.id)">
<image src="@/static/home/delete.png" mode=""></image>
<view>鍒犻櫎</view>
</view>
@@ -100,9 +100,9 @@
</combination-card>
</u-checkbox-group>
</view>
-
+
<view class="empty-placeH">
-
+
</view>
<!-- 搴曢儴鍏ㄩ�� -->
<view class="bottomTabbar">
@@ -374,15 +374,23 @@
// console.log(a)
// },
// 琛ㄥ崟鏁版嵁
- theFormDataClick(v) {
- uni.navigateTo({
- url: `/pages/the-form-data/the-form-data?index=${v}`
- });
+ theFormDataClick(item) {
+ if(item?.actBusiness?.actType == 'Offsetting') { //鏀舵 actType = 鈥極ffsetting鈥�
+ uni.navigateTo({
+ url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
+
+ })
+ }else if(item?.actBusiness?.actType == 'XsWaybill') {
+ uni.navigateTo({
+ url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
+ })
+ }
},
// 瀹℃壒鍘嗗彶
approvalHistoryClick(v) {
uni.navigateTo({
- url: `/pages/approval-history/approval-history?index=${v}`
+ //url: `/pages/approval-history/approval-history?index=${v}`
+ url: `/pages/check-the-schedule/check-the-schedule?index=${v}`
});
}
}
@@ -606,7 +614,7 @@
right: vww(20) !important;
}
}
-
+
// 搴曢儴绔欎綅
.empty-placeH{
height:vww(5);
diff --git a/pages/my-todo/my-todo.vue b/pages/my-todo/my-todo.vue
index c58cdf1..af694e1 100644
--- a/pages/my-todo/my-todo.vue
+++ b/pages/my-todo/my-todo.vue
@@ -81,7 +81,7 @@
<view class="bottom-container">
<!-- 寰呭姙鎸夐挳 -->
<view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)" v-if="item.processName == '鍙戣繍閫氱煡鍗�'">
+ <view @click="theFormDataClick(item)" v-if="item.actBusiness.actType == 'Offsetting' || item.actBusiness.actType == 'XsWaybill'">
<image src="@/static/home/jindu.png" mode=""></image>
<view>鐢宠璇︽儏</view>
</view>
@@ -410,10 +410,17 @@
console.log('totalSelect', n);
},
// 琛ㄥ崟鏁版嵁
- theFormDataClick(v) {
- uni.navigateTo({
- url: `/pages/the-form-data/the-form-data?index=${v}`
- });
+ theFormDataClick(item) {
+ if(item?.actBusiness?.actType == 'Offsetting') { //鏀舵 actType = 鈥極ffsetting鈥�
+ uni.navigateTo({
+ url: `/pages/payment-form-data/payment-form-data?id=${item.tableId}`,
+
+ })
+ }else if(item?.actBusiness?.actType == 'XsWaybill') {
+ uni.navigateTo({
+ url: `/pages/new-application-form-data/new-application-form-data?id=${item.tableId}`
+ })
+ }
},
// 瀹℃壒鍘嗗彶
approvalHistoryClick(v) {
@@ -492,7 +499,7 @@
rejectModalCancel() {
this.rejectModalShow = false;
},
-
+
batchRejectClick() {
if (this.checkBoxValue.length != 0) {
this.rejectModalShow = true;
diff --git a/pages/new-application/new-application.vue b/pages/new-application/new-application.vue
index bb029e0..201f39a 100644
--- a/pages/new-application/new-application.vue
+++ b/pages/new-application/new-application.vue
@@ -15,23 +15,32 @@
</view> -->
<combined-title title="鐢宠妯℃澘"></combined-title>
<!-- 鍗＄墖鍖哄煙 -->
- <view class="newApplicationCard" @click="toNewApplicationDetails" v-for="(item, index) in newApplicationData" :key="index">
- <view class="card">
- <view class="card-left">
- <view class="card-left_top">
- <text>{{ item.description }}</text>
- </view>
- <view class="card-left_bottom">
- <text>鐗堟湰锛歷{{ item.version }}</text>
- <text>鎵�灞炲垎绫伙細{{ item.categoryTitle|| '' }}</text>
- </view>
- </view>
- <view class="card-right">
- <view class="icon"><image src="@/static/groupAppTotalImg/back_1.png" mode=""></image></view>
- </view>
- </view>
- </view>
- <view class="newApplicationCard shoukuanDetailCard" @click="ToPaymentForm">
+ <template v-if="permissions.yunxiao_xswaybill_add">
+ <view
+ class="newApplicationCard"
+ @click="toNewApplicationDetails"
+ v-for="(item, index) in newApplicationData" :key="index">
+ <view class="card">
+ <view class="card-left">
+ <view class="card-left_top">
+ <text>{{ item.description }}</text>
+ </view>
+ <view class="card-left_bottom">
+ <text>鐗堟湰锛歷{{ item.version }}</text>
+ <text>鎵�灞炲垎绫伙細{{ item.categoryTitle|| '' }}</text>
+ </view>
+ </view>
+ <view class="card-right">
+ <view class="icon"><image src="@/static/groupAppTotalImg/back_1.png" mode=""></image></view>
+ </view>
+ </view>
+ </view>
+ </template>
+
+ <view
+ v-if="permissions.yunxiao_gatheringbill_add"
+ class="newApplicationCard shoukuanDetailCard"
+ @click="ToPaymentForm">
<view class="card">
<view class="card-left">
<view class="card-left_bottom">
@@ -43,7 +52,7 @@
</view>
</view>
</view>
-
+
<!-- 閫夋嫨鍣� -->
<u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker>
@@ -56,8 +65,12 @@
<script>
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
import combinedTitle from '@/components/common/combined-title/combined-title.vue';
+import {mapGetters} from 'vuex'
export default {
name: 'new-application',
+ computed:{
+ ...mapGetters(['permissions']),
+ },
data() {
return {
searchData: '',
@@ -85,7 +98,6 @@
this.init();
},
getCurrentPages(e) {
- console.log(e);
},
// 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
onNavigationBarButtonTap(e) {
diff --git a/pages/payment-form-data/payment-form-data.vue b/pages/payment-form-data/payment-form-data.vue
index 07d7420..501c440 100644
--- a/pages/payment-form-data/payment-form-data.vue
+++ b/pages/payment-form-data/payment-form-data.vue
@@ -33,6 +33,7 @@
v-model="dataForm.ledgerName"
placeholder="璇烽�夋嫨璐﹀"
border="none"
+ readonly
></u--input>
</u-form-item>
<u-form-item
@@ -409,6 +410,13 @@
checkboxDM:false,
ledgerList:[],
rules: {
+ ledgerName: [
+ {
+ required: true,
+ message: '璇烽�夋嫨璐﹀',
+ trigger: ['blur', 'change']
+ }
+ ],
inputDate: [
{
required: true,
@@ -462,6 +470,8 @@
},
init() {
this.payType() //鏀舵绫诲瀷
+ this.getCustomer()
+ this.fetchCompTree()
//璐﹀閫夋嫨
let compId = uni.getStorageSync('userInfo').compId;
this.$reqGet('getLedgerList',{compId:compId}).then(res => {
@@ -539,11 +549,10 @@
this.selCustomerType = t
this.selectLevelShow = false;
this.selectCustomerCompShow = false;
- uni.showLoading({
- title: '鍔犺浇涓�...'
- });
this.selectCustomerShow = true;
this.selectCustomerData.current = 1;
+ },
+ getCustomer() { //鑾峰彇瀹㈡埛淇℃伅
this.$reqGet('customer', this.selectCustomerData).then(res => {
uni.hideLoading();
if (res.code == 0) {
@@ -589,6 +598,23 @@
this.searchCustomerForm.compName = '';
this.searchCustomerForm.levelText = '';
this.selectCustomer();
+ },
+ // 閫夋嫨瀹㈡埛
+ selectCustomer() {
+ this.selectLevelShow = false;
+ this.selectCustomerCompShow = false;
+ uni.showLoading({
+ title: '鍔犺浇涓�...'
+ });
+ this.selectCustomerShow = true;
+ this.selectCustomerData.current = 1;
+ this.$reqGet('customer', this.selectCustomerData).then(res => {
+ uni.hideLoading();
+ if (res.code == 0) {
+ this.customerData = res.data.records;
+ this.customerDataAllNum = res.data.total;
+ }
+ });
},
selectCustomerOpen() {
@@ -654,6 +680,15 @@
width: 100%;
padding: 0 vww(10);
box-sizing: border-box;
+ ::v-deep{
+ .u-checkbox__icon-wrap{
+ width: vww(16)!important;
+ height: vww(16)!important;
+ }
+ .u-checkbox{
+ margin-bottom: 0!important;
+ }
+ }
// 閫夋嫨瀹㈡埛寮规
.selectCustomerPopup {
diff --git a/store/index.js b/store/index.js
index b230483..03ea9c7 100644
--- a/store/index.js
+++ b/store/index.js
@@ -9,6 +9,7 @@
state: {
shenqingMenu: uni.getStorageSync('shenqingMenu') || false, //鐢宠鑿滃崟
rijihuaMenu: uni.getStorageSync('rijihuaMenu') || false, //鏃ヨ鍒掕彍鍗�
+ permissions: uni.getStorageSync('permissions') || [] //鏉冮檺淇℃伅
},
mutations: {
ISHAS_SHENQING: (state, data) => {
@@ -31,7 +32,7 @@
state.shenqingMenu = false
uni.setStorageSync('shenqingMenu',state.shenqingMenu)
}
-
+
},
ISHAS_RIJIHUA: (state, data) => {
let labelArry = []
@@ -53,6 +54,15 @@
state.rijihuaMenu = false
uni.setStorageSync('rijihuaMenu',state.rijihuaMenu)
}
+ },
+ SET_PERMISSIONS: (state,permissions) => {
+ let list = {}
+ for(let i=0;i<permissions.length;i++) {
+ list[permissions[i]] = true
+ }
+ state.permissions = list
+ console.log(list,'list======----')
+ uni.setStorageSync('permissions', list);
}
},
actions: {
@@ -63,7 +73,10 @@
commit('ISHAS_RIJIHUA',response.data)
})
}
+ },
+ getters: {
+ permissions:state => state.permissions
}
})
-export default store
\ No newline at end of file
+export default store
diff --git a/utils/jihua.js b/utils/jihua.js
index 9fdb15c..8f080eb 100644
--- a/utils/jihua.js
+++ b/utils/jihua.js
@@ -5,7 +5,7 @@
method: 'GET'
},
// 鍙戣繍鍒楄〃
-
+
/**
* 閫欐槸鏈塨ug鐨勬帴鍙�
*/
@@ -13,7 +13,7 @@
// url: '/yunxiao/contractorder/fyList',
// method: 'GET'
// },
-
+
/**
* 閫欐槸姝ｇ⒑鐨�
*/
@@ -21,20 +21,20 @@
url:'/yunxiao/xscarshippingdayplan/fyList',
method:'GET'
},
-
-
+
+
xscarshippingdayplan: {
url: '/yunxiao/xscarshippingdayplan/page',
method: 'GET'
},
-
+
// xscarshippingdayplan: {
// url: '/yunxiao/contractorder/page',
// method: 'GET'
// },
-
+
// /yunxiao/xscarshippingdayplan
- addObj: {
+ xscarshippingdayplanAddObj: {
url: '/yunxiao/xscarshippingdayplan',
method: 'POST'
},
@@ -48,4 +48,4 @@
url: '/admin/menu',
method: 'GET'
}
-}
\ No newline at end of file
+}
diff --git a/utils/request.js b/utils/request.js
index 0977ae1..91402b3 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -6,6 +6,7 @@
jihua
} from './jihua.js';
+
// 鎴愬姛
const responseOK = (response) => {
const {
@@ -82,8 +83,8 @@
500: responseError
}
- let BaseUrl = 'http://192.168.0.159:9999';
-// const BaseUrl = 'https://mx.jzeg.cn:443/app';
+ //let BaseUrl = 'http://192.168.0.159:9999';
+const BaseUrl = 'https://mx.jzeg.cn:9998';
// let BaseUrl = 'http://192.168.0.114:9999';
// const BaseUrl = 'http://192.168.0.102:9999'; // 椋炲摜
--
Gitblit v1.9.1