| pages/home/home.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/jihua/jihua.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/login/login.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/my-application/my-application.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/my-have-todo/my-have-todo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/my-todo/my-todo.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/new-application/new-application.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| pages/payment-form-data/payment-form-data.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| store/index.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| utils/jihua.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| utils/request.js | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
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 = ‘Offsetting’ 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 = ‘Offsetting’ 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%; pages/jihua/jihua.vue
@@ -274,9 +274,10 @@ 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){ this.fyList(); setTimeout(()=>{ uni.showToast({ title:'更新成功！', @@ -284,7 +285,6 @@ duration:1000 }) },0) this.fyList(); } }); }, pages/login/login.vue
@@ -272,6 +272,7 @@ } }, saveUserInfo(response) { console.log(response,'response=====') uni.hideLoading(); this.show = false; if (response.statusCode === 200) { @@ -353,4 +354,3 @@ } } </style>
@@ -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 = ‘Offsetting’ 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}` }); 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> @@ -374,15 +374,23 @@ // console.log(a) // }, // 表单数据 theFormDataClick(v) { theFormDataClick(item) { if(item?.actBusiness?.actType == 'Offsetting') { //收款 actType = ‘Offsetting’ uni.navigateTo({ url: `/pages/the-form-data/the-form-data?index=${v}` }); 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}` }); } } 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) { theFormDataClick(item) { if(item?.actBusiness?.actType == 'Offsetting') { //收款 actType = ‘Offsetting’ uni.navigateTo({ url: `/pages/the-form-data/the-form-data?index=${v}` }); 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) { pages/new-application/new-application.vue
@@ -15,7 +15,11 @@ </view> --> <combined-title title="申请模板"></combined-title> <!-- 卡片区域 --> <view class="newApplicationCard" @click="toNewApplicationDetails" v-for="(item, index) in newApplicationData" :key="index"> <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"> @@ -31,7 +35,12 @@ </view> </view> </view> <view class="newApplicationCard shoukuanDetailCard" @click="ToPaymentForm"> </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"> @@ -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) { 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 { 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) => { @@ -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,6 +73,9 @@ commit('ISHAS_RIJIHUA',response.data) }) } }, getters: { permissions:state => state.permissions } })
@@ -34,7 +34,7 @@ // }, // /yunxiao/xscarshippingdayplan addObj: { xscarshippingdayplanAddObj: { url: '/yunxiao/xscarshippingdayplan', method: 'POST' }, 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'; // 飞哥
