From ce114e1f7e349559c1abd106b83d7595d8646393 Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期五, 29 七月 2022 11:17:28 +0800
Subject: [PATCH] '日计划'
---
pages/home/home.vue | 1651 +++++++++++++++++++++++++++-------------------------
components/common/combination-card/combination-card.vue | 133 ++-
pages/jihua/jihua.vue | 34
project.private.config.json | 10
4 files changed, 958 insertions(+), 870 deletions(-)
diff --git a/components/common/combination-card/combination-card.vue b/components/common/combination-card/combination-card.vue
index 143ab27..0a8d76f 100644
--- a/components/common/combination-card/combination-card.vue
+++ b/components/common/combination-card/combination-card.vue
@@ -1,61 +1,74 @@
-<template>
- <!-- 缁勫悎鍗＄墖 -->
- <view class="combination-card">
- <view class="combination-card_wrapper">
- <view class="combination-card_top">
- <view class="combination-card_top__content">
- <slot name="top"></slot>
- </view>
- </view>
- <view class="combination-card_content">
- <slot name="center"></slot>
- </view>
- <view class="combination-card_bottom">
- <slot name="bottom" a="$slots.name"></slot>
- </view>
- </view>
- </view>
-</template>
-
-<script>
-export default {
- data() {
- return {};
- },
- methods: {}
-};
-</script>
-
-<style lang="scss" scoped>
-.combination-card {
- width: 91%;
- // height: vww(196);
- border: 1px solid #dddddd;
- margin: 0 auto vww(16) ;
- .combination-card_wrapper {
- font-size:vww(13);
- .combination-card_top {
- // height: vww(16);
- padding:vww(8);
- background-color: #f5f5f5;
- border-bottom:1px solid #dddddd;
- .combination-card_top__content{
- display:flex;
- align-items: center;
- }
- }
- .combination-card_content {
- // height: vww(98);
- padding:vww(16);
- }
- .combination-card_bottom {
- height: vww(16);
- padding:vww(8);
- background-color: #f5f5f5;
- border-top:1px solid #dddddd;
- display:flex;
- justify-content: center;
- }
- }
-}
+<template>
+ <!-- 缁勫悎鍗＄墖 -->
+ <view class="combination-card">
+ <view class="combination-card_wrapper">
+ <view class="combination-card_top" v-show="showTop">
+ <view class="combination-card_top__content">
+ <slot name="top"></slot>
+ </view>
+ </view>
+ <view class="combination-card_content">
+ <slot name="center"></slot>
+ </view>
+ <view class="combination-card_bottom" v-show="showBottom">
+ <slot name="bottom" a="$slots.name"></slot>
+ </view>
+ </view>
+ </view>
+</template>
+
+<script>
+export default {
+ props: {
+ showTop: {
+ type: Boolean,
+ default: true
+ },
+ showBottom: {
+ type: Boolean,
+ default: true
+ }
+ },
+ data() {
+ return {};
+ },
+ methods: {},
+ mounted() {
+ console.log(this.showTop,'showTop--------')
+ }
+};
+</script>
+
+<style lang="scss" scoped>
+.combination-card {
+ width: 91%;
+ // height: vww(196);
+ border: 1px solid #dddddd;
+ margin: 0 auto vww(16) ;
+ .combination-card_wrapper {
+ font-size:vww(13);
+ .combination-card_top {
+ // height: vww(16);
+ padding:vww(8);
+ background-color: #f5f5f5;
+ border-bottom:1px solid #dddddd;
+ .combination-card_top__content{
+ display:flex;
+ align-items: center;
+ }
+ }
+ .combination-card_content {
+ // height: vww(98);
+ padding:vww(16);
+ }
+ .combination-card_bottom {
+ height: vww(16);
+ padding:vww(8);
+ background-color: #f5f5f5;
+ border-top:1px solid #dddddd;
+ display:flex;
+ justify-content: center;
+ }
+ }
+}
</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 0012985..7016248 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,798 +1,853 @@
-<template>
- <view class="home">
- <!-- 杞挱鍥� -->
- <view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view>
- <!-- 鎴戠殑鐢宠 -->
- <combined-title title="鎴戠殑鐢宠" detailsPath="/pages/my-application/my-application"></combined-title>
- <combination-card v-for="(item, index) in shenqingData" index="index">
- <template v-slot:top>
- <view>
- <text>{{ item.title }}</text>
- </view>
- </template>
- <template v-slot:center>
- <view class="center-container">
- <view class="center-content__one center-margin">
- <view class="">
- <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
- </view>
- <view class="">
- <text>瀹℃壒鐜妭锛歿{ item.currTaskName }}</text>
- </view>
- </view>
- <view class="center-content__two center-margin">
- <view class="">
- 鐘舵�侊細
- <text :style="{ color: statusColor[item.status] }">{{ status[item.status] }}</text>
- </view>
- <view class="">
- 缁撴灉锛�
- <text :style="{ color: resultColor[item.result] }">{{ result[item.result] }}</text>
- </view>
- </view>
- <view class="center-content__three center-margin">
- <text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
- </view>
- <view class="center-content__four">
- <text>鎻愪氦鐢宠鏃堕棿锛歿{ item.applyTime }}</text>
- </view>
- </view>
- </template>
- <template v-slot:bottom>
- <view class="bottom-container">
- <!-- 鎸夐挳鍖哄煙 -->
- <view class="bottom-content__chulizhong bottom-content__item">
- <view @click="withDrawClick(item.id)" v-if="item.status == 1">
- <image src="@/static/home/cehui.png" mode=""></image>
- <view>鎾ゅ洖</view>
- </view>
- <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">
- <image src="@/static/home/biaodan.png" mode=""></image>
- <view>琛ㄥ崟鏁版嵁</view>
- </view>
- <view @click="apply(item)" v-if="item.status == 3">
- <image src="@/static/home/history.png" mode=""></image>
- <view>閲嶆柊鐢宠</view>
- </view>
- <view @click="editMyApplication(item)" v-if="item.status == 3">
- <image src="@/static/home/history.png" mode=""></image>
- <view>缂栬緫</view>
- </view>
- <view @click="approvalHistoryClick(item.procInstId)" v-if="item.status == 2 || item.status == 3">
- <image src="@/static/home/history.png" mode=""></image>
- <view>瀹℃壒鍘嗗彶</view>
- </view>
- </view>
- <!-- 宸茬粨鏉熷皬缁勬寜閽� -->
- <!-- <view class="bottom-content__chulizhong bottom-content__item" v-if="item.status == 2">
- <view @click="theFormDataClick">
- <image src="@/static/home/biaodan.png" mode=""></image>
- <view>琛ㄥ崟鏁版嵁</view>
- </view>
-
- </view> -->
- </view>
- </template>
- </combination-card>
-
- <!-- 鎴戠殑寰呭姙 -->
- <combined-title title="鎴戠殑寰呭姙" detailsPath="/pages/my-todo/my-todo"></combined-title>
- <combination-card v-for="(item, index) in daibanData" index="index">
- <template v-slot:top>
- <view>
- <text>{{ item.actBusiness.title }}</text>
- </view>
- </template>
- <template v-slot:center>
- <view class="center-container">
- <view class="center-content__one center-margin">
- <view class="">
- <text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
- </view>
- <view class="">
- <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
- </view>
- </view>
- <view class="center-content__two center-margin">
- <text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
- </view>
-
- <view class="center-content__three">
- <text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
- </view>
- </view>
- </template>
- <template v-slot:bottom>
- <view class="bottom-container">
- <!-- 寰呭姙鎸夐挳 -->
- <view class="bottom-content__item">
- <!-- <view @click="theFormDataClick">
- <image src="@/static/home/jindu.png" mode=""></image>
- <view>鐢宠璇︽儏</view>
- </view> -->
- <view @click="adopClick(item)">
- <image src="@/static/home/tongguo.png" mode=""></image>
- <view>閫氳繃</view>
- </view>
- <view @click="rejectClick(item)">
- <image src="@/static/home/bohui.png" mode=""></image>
- <view>椹冲洖</view>
- </view>
- <view @click="approvalHistoryClick(item.procInstId)">
- <image src="@/static/home/history.png" mode=""></image>
- <view>鍘嗗彶</view>
- </view>
- </view>
- </view>
- </template>
- </combination-card>
-
- <!-- 鎴戠殑宸插姙 -->
- <combined-title title="鎴戠殑宸插姙 " detailsPath="/pages/my-have-todo/my-have-todo"></combined-title>
- <combination-card v-for="(item, index) in yibanData" index="index">
- <template v-slot:top>
- <view>
- <text>{{ item.actBusiness.title }}</text>
- </view>
- </template>
- <template v-slot:center>
- <view class="center-container">
- <view class="center-content__one center-margin">
- <view>
- <text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
- </view>
- <view>
- <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
- </view>
- </view>
- <view class="center-content__two center-margin">
- <view>
- <text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
- </view>
- <view>
- <text>瀹℃壒鎿嶄綔锛歿{ item.deleteReason }}</text>
- </view>
- </view>
- <view class="center-content__three center-margin">
- <view class="">
- <text>瀹℃壒鎰忚锛歿{ item.comment }}</text>
- </view>
- <view class="">
- <text>
- 鑰楁椂锛歿{
- item.duration >= 86400000
- ? parseInt(item.duration / 86400000 + '澶�' + parseInt(item.duration % 86400000) / 3600000 + '鏃�' + parseInt(item.duration % 3600000) / 60000 + '鍒�')
- : item.duration >= 3600000
- ? parseInt(item.duration / 3600000) + '鏃�' + parseInt((item.duration / 3600000) % 3600000) + '鍒�'
- : parseInt(item.duration / 60000) + '鍒�'
- }}
- </text>
- </view>
- </view>
- <view class="center-content__four">
- <text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
- </view>
- </view>
- </template>
- <template v-slot:bottom>
- <view class="bottom-container">
- <!-- 宸插姙鎸夐挳 -->
- <view class="bottom-content__item">
- <view @click="theFormDataClick(item.tableId)">
- <image src="@/static/home/biaodan.png" mode=""></image>
- <view>琛ㄥ崟鏁版嵁</view>
- </view>
- <view @click="approvalHistoryClick(item.procInstId)">
- <image src="@/static/home/history.png" mode=""></image>
- <view>瀹℃壒鍘嗗彶</view>
- </view>
- <view @click="deleteApplicationClick(item.id)">
- <image src="@/static/home/delete.png" mode=""></image>
- <view>鍒犻櫎</view>
- </view>
- </view>
- </view>
- </template>
- </combination-card>
-
- <!-- 鎾ゅ洖妯℃�佹 -->
- <view class="wodeshenqingMotai">
- <u-modal width="684rpx" :show="withDrawShow" title="鎾ゅ洖鍘熷洜" :showCancelButton="true" @confirm="withDrawConfirm" @cancel="withDrawCancel">
- <view class="slot-content"><u--textarea v-model="withDrawData.reason" placeholder="璇疯緭鍏ユ挙鍥炲師鍥�"></u--textarea></view>
- </u-modal>
- </view>
-
- <!-- 閫氳繃妯℃�佹 -->
- <view class="adoptModal">
- <u-modal width="684rpx" :show="adoptModalShow" title="瀹℃壒閫氳繃" :showCancelButton="true" @confirm="adoptModalConfirm" @cancel="adoptModalCancel">
- <view class="slot-content">
- <view class="rejectMesaage">
- <u-icon name="info-circle-fill" color="#0307ff"></u-icon>
- <text>{{ modalType == 0 ? '娉ㄦ剰锛氬皢榛樿鍒嗛厤缁欒妭鐐硅瀹氱殑鎵�鏈夊彲瀹℃壒鐢ㄦ埛' : '娉ㄦ剰锛氭墍鏈夋祦绋嬪皢椹冲洖鑷冲彂璧蜂汉' }}</text>
- </view>
- <u--textarea v-model="adoptForm.comment" placeholder="璇疯緭鍏ュ鎵规剰瑙�"></u--textarea>
- </view>
- </u-modal>
- </view>
-
- <!-- 椹冲洖妯℃�佹 -->
- <view class="rejectModal">
- <u-modal width="684rpx" :show="rejectModalShow" title="椹冲洖" :showCancelButton="true" @confirm="rejectModalConfirm" @cancel="rejectModalCancel">
- <view class="slot-content">
- <view class="rejectMesaage">
- <u-icon name="info-circle-fill" color="#0307ff"></u-icon>
- <text>{{ modalType == 0 ? '娉ㄦ剰锛氬皢榛樿鍒嗛厤缁欒妭鐐硅瀹氱殑鎵�鏈夊彲瀹℃壒鐢ㄦ埛' : '娉ㄦ剰锛氭墍鏈夋祦绋嬪皢椹冲洖鑷冲彂璧蜂汉' }}</text>
- </view>
- <u--textarea v-model="rejectForm.comment" placeholder="璇疯緭鍏ュ鎵规剰瑙�"></u--textarea>
- <!-- <view class="rejectBack">
- <view class="rejectBack-title"><text>椹冲洖鑷�</text></view>
- <view class="data-selet" @click="statusSeletShow = true">
- <view class="content">
- <text>{{ dataSeletText }}</text>
- </view>
- <view class="uni-select__icon"><image src="@/static/icon/select.png" mode="鍔犺浇澶辫触"></image></view>
- </view>
- </view> -->
- </view>
- </u-modal>
- </view>
-
- <!-- 鍒犻櫎宸插姙鐢宠妯℃�佹 -->
- <view class="deleteApplicationModal">
- <u-modal
- :show="deleteApplicationModalShow"
- title="鎻愮ず"
- content="纭畾鍒犻櫎璇ョ敵璇凤紵"
- :showCancelButton="true"
- @confirm="deleteApplicationModalConfirm"
- @cancel="deleteApplicationModalCancel"
- ></u-modal>
- </view>
-
- <!-- 閫夋嫨鍣� -->
- <!-- <u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker> -->
-
- <!-- 鑿滃崟鏍� -->
- <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
- </view>
-</template>
-
-<script>
-import { timeConsuming } from '@/utils/nowDate.js';
-import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
-import combinedTitle from '@/components/common/combined-title/combined-title.vue';
-import combinationCard from '@/components/common/combination-card/combination-card.vue';
-import { setAccessToken } from '@/utils/status.js';
-export default {
- name: 'home',
- data() {
- return {
- // menuShow:false,// 鑿滃崟鏄剧ず
- status: ['鑽夌', '澶勭悊涓�', '宸茬粨鏉�', '宸叉挙鍥�'],
- statusColor: ['#dd8b8c', '#FF9900', '#007AFF', '#06BE00'],
- result: ['鏈彁浜�', '澶勭悊涓�', '閫氳繃', '椹冲洖'],
- resultColor: ['#dd8b8c', '#FF9900', '#06BE00', '#be2b2d'],
- list3: ['https://cdn.uviewui.com/uview/swiper/swiper3.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper1.png'],
- // 鎾ゅ洖妯℃�佹
- withDrawShow: false,
- withDrawData: {
- reason: '',
- id: '', // 鎾ゅ洖鐢宠ID
- procInstId: ''
- },
- withDrawContent: '',
- // 閲嶆柊鐢宠
- form: {
- sendMessage: true,
- sendSms: true,
- sendEmail: true,
- procDefId: '',
- assignees: [],
- priority: '0'
- },
- assigneeList: [],
- showAssign: false,
- isGateway: false,
- isCustom: false,
- // 閫氳繃妯℃�佹
- adoptModalShow: false,
- // 閫氳繃璇锋眰
- adoptForm: {
- ids: '',
- comment: ''
- },
- // 椹冲洖妯℃�佹
- rejectModalShow: false,
- rejectModalContent: '',
- // dataSeletText: '璇烽�夋嫨鐘舵��',
- // 椹冲洖璇锋眰
- rejectForm: {
- procInstIds: '',
- comment: ''
- },
- modalType: 0,
- // 鍒犻櫎鐢宠妯℃�佹
- deleteApplicationModalShow: false,
- procInstId:'',
- // 閫夋嫨鍣�
- statusSeletShow: false,
- statusList: [['涓浗', '缇庡浗', '鏃ユ湰']],
- // data
- shenqingData: [],
- daibanData: [],
- daibanData: [],
- yibanData: [],
- menuShow: false,
- // 鐢宠
- myApplicationParams: {
- status: '',
- result: '',
- pageNumber: 1,
- pageSize: 2,
- sort: 'createTime',
- order: 'desc'
- },
- // 寰呭姙
- todoParams: {
- pageNumber: 1,
- pageSize: 2
- },
- haveTodoParams: {
- pageNumber: 1,
- pageSize: 2,
- sort: 'createTime',
- order: 'desc'
- }
- };
- },
- // 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
- onNavigationBarButtonTap(e) {
- console.log(e);
- this.$refs.menuRef.menuClick();
- },
- onShow() {
- if (this.menuShow == true) {
- this.$refs.menuRef.menuClick();
- }
- this.init();
- },
- components: {
- combinedTitle,
- combinationCard,
- popupMenu
- },
- methods: {
- getUserInfo() {
- this.$reqGet('getUserInfo').then(res => {
- if (res.code == 0) {
- uni.setStorageSync('userInfo', res.data.sysUser);
- }
- });
- },
- init() {
- this.getUserInfo();
- this.getProcessDataList(); // 鐢宠鍒楄〃
- this.todoList(); // 鎴戠殑寰呭姙
- this.doneList(); // 鎴戠殑宸插姙
- },
- getProcessDataList() {
- this.$reqGet('getProcessDataList', this.myApplicationParams).then(res => {
- if (res.code === 0) {
- // console.log('鐢宠', res);
- this.shenqingData = res.data.records;
- }
- });
- },
- todoList() {
- this.$reqGet('todoList', this.todoParams).then(res => {
- if (res.code === 0) {
- // console.log('寰呭姙', res);
- this.daibanData = res.data.content;
- }
- });
- },
- doneList() {
- uni.showLoading({
- title:'鍔犺浇涓�...'
- })
- this.$reqGet('doneList', this.haveTodoParams).then(res => {
- uni.hideLoading();
- if (res.code === 0) {
- // console.log('宸插姙', res);
- this.yibanData = res.data.content;
- }
- });
- },
- menushow(e) {
- this.menuShow = e;
- },
- // 鎾ゅ洖妯℃�佹
- withDrawClick(id) {
- this.withDrawShow = true;
- this.withDrawData.id = id;
- },
- withDrawConfirm() {
- this.shenqingData.forEach(i => {
- if (i.id == this.withDrawData.id) {
- this.withDrawData.procInstId = i.procInstId;
- }
- });
- if (this.withDrawData.reason.length >= 2) {
- this.$reqPost('withDraw', this.withDrawData, 'form').then(res => {
- this.withDrawShow = false;
- if (res.code == 0) {
- uni.showToast({
- title: res.data,
- duration: 2000
- });
- }
- this.getProcessDataList();
- });
- } else {
- uni.showToast({
- title: '璇疯鑼冭緭鍏�',
- duration: 2000
- });
- }
- },
- // 閫氳繃
- adopClick(v) {
- console.log('閫氳繃鐐瑰嚮', v);
- this.adoptModalShow = true;
- this.adoptForm.ids = v.id;
- this.modalType = 0;
- // let urlparam = v.procDefId+'/'+v.key;
- // this.$reqGet('getNextNode',{},urlparam).then(res=>{
- // console.log('閫氳繃娆茶姹�');
- // })
- },
- // 閫氳繃妯℃�佹
- adoptModalConfirm() {
- this.adoptModalShow = false;
- this.adoptForm.comment = this.adoptModalContent;
-
- this.$reqPost('passAll', this.adoptForm, 'form').then(res => {
- if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛!');
- } else {
- this.$u.toast('娣诲姞澶辫触!!');
- }
- });
- },
- adoptModalCancel() {
- this.adoptModalShow = false;
- },
- // 椹冲洖
- rejectClick(v) {
- this.modalType = 1;
- this.rejectModalShow = true;
- this.rejectForm.procInstIds = v.procInstId;
- },
- // 椹冲洖妯℃�佹
- rejectModalConfirm() {
- this.rejectModalShow = false;
-
- this.$reqPost('backAll', this.rejectForm, 'form').then(res => {
- if (res.code == 0) {
- this.$u.toast('鎿嶄綔鎴愬姛锛�');
- } else {
- this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�');
- }
- this.todoList(); // 鎴戠殑寰呭姙
- });
- },
- rejectModalCancel() {
- this.rejectModalShow = false;
- },
- withDrawCancel() {
- this.withDrawShow = false;
- },
- // 鍒犻櫎鐢宠妯℃�佹
- deleteApplicationModalConfirm() {
- this.deleteApplicationModalShow = false;
- this.$reqPost('deleteHistoric',{ids:this.procInstId},'form').then(res=>{
- if(res.code == 0){
- this.$u.toast('鎿嶄綔鎴愬姛锛�')
- this.yibanData = [];
- this.doneList(); // 鎴戠殑宸插姙
- } else {
- this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�')
- }
- })
-
- },
- deleteApplicationModalCancel() {
- this.deleteApplicationModalShow = false;
- },
- // 鏌ョ湅杩涘害
- checkTheScheduleClick(v) {
- uni.navigateTo({
- url: `/pages/check-the-schedule/check-the-schedule?index=${v}`
- });
- },
- // 琛ㄥ崟鏁版嵁
- theFormDataClick(v) {
- uni.navigateTo({
- url: `/pages/the-form-data/the-form-data?index=${v}`
- });
- },
- // 閲嶆柊鐢宠
- apply(v){
- if (!v.procDefId || v.procDefId == 'null') {
- this.$u.toast('娴佺▼瀹氫箟涓虹┖');
- return;
- }
- this.form.id = v.id;
- this.form.procDefId = v.procDefId;
- this.form.title = v.title;
- // 鍔犺浇瀹℃壒浜�
- // this.userLoading = true;
- uni.showLoading({
- title: '瀹℃壒浜哄姞杞戒腑'
- });
- // getFirstNode(v.procDefId).then((res) => {
- this.$reqGet('getFirstNode', {}, v.procDefId).then(res => {
- // this.userLoading = false;
- console.log('瀹℃壒浜�', res);
- uni.hideLoading();
- if (res.data) {
- this.error = '';
- if (res.data.type == 3 || res.data.type == 4) {
- this.isGateway = true;
- this.form.firstGateway = true;
- this.showAssign = false;
- this.isCustom = false;
- return;
- }
- if (res.data.type == 5) {
- this.isCustom = true;
- this.isGateway = false;
- this.form.firstGateway = false;
- this.showAssign = false;
- return;
- }
- if (res.data.type == 1) {
- this.showAssign = true;
- this.isGateway = false;
- this.form.firstGateway = false;
- this.isCustom = false;
- if (res.data.users && res.data.users.length > 0) {
- this.assigneeList = res.data.users;
- // 榛樿鍕鹃��
- let ids = [];
- res.data.users.forEach(e => {
- ids.push(e.userId);
- });
- this.form.assignees = ids;
- this.showAssign = true;
- // 鑾峰彇琛ㄥ崟鍐呭锛岄噸鏂板垱寤虹敵璇�
- this.$reqPost('apply',this.form,'form').then(res=>{
- console.log('閲嶆柊鎻愪氦鐢宠',res);
- if(res.code == 0){
- uni.showToast({
- title:res.data,
- icon:'success',
- duration:2000
- });
- }
- // 鍒濆鍖栫敵璇峰垪琛�
- // this.myApplication.pageNumber = 1;
- // this.shenqingData = [];
- // this.getMoreNews();
- this.getProcessDataList();
- })
- } else {
- this.form.assignees = [];
- this.showAssign = true;
- this.error = '璇疯繘鍏�"娴佺▼绠＄悊"涓哄鎵硅妭鐐瑰垎閰嶅�欓�夊鎵逛汉鍛�';
- }
- }
- }
- console.log(this.form);
- });
-
- this.modalVisible = true;
- },
- // 淇敼
- editMyApplication(v){
- console.log('淇敼鐢宠');
- uni.navigateTo({
- url: `/pages/edit-my-application/edit-my-application?index=${v.tableId}`
- });
- },
- // 瀹℃壒鍘嗗彶
- approvalHistoryClick(v) {
- uni.navigateTo({
- url: `/pages/approval-history/approval-history?index=${v}`
- });
- },
- // 鍒犻櫎鐢宠
- deleteApplicationClick(id) {
- this.deleteApplicationModalShow = true;
- this.procInstId = id;
- console.log(id);
- }
- }
-};
-</script>
-
-<style lang="scss" scoped>
-::v-deep.home {
- height: 100%;
- width: 100%;
- .home_swipe {
- width: 100%;
- height: vww(160);
- .u-swiper {
- height: vww(160) !important;
- .u-swiper__wrapper {
- height: vww(160) !important;
- .uni-swiper-slides {
- .u-swiper__wrapper__item {
- .u-swiper__wrapper__item__wrapper {
- .u-swiper__wrapper__item__wrapper__image {
- height: vww(160) !important;
- }
- }
- }
- }
- }
- }
- }
-
- // 鍗＄墖涓棿
- .center-container {
- display: flex;
- flex-direction: column;
- .center-content__one {
- display: flex;
- view {
- width: 50%;
- }
- }
- .center-content__two {
- display: flex;
- // margin: vww(10) 0;
- view {
- width: 50%;
- }
- }
- .center-content__three {
- display: flex;
- view {
- width: 50%;
- }
- }
- .center-content__four {
- }
- }
- // 涓棿閮ㄥ垎鏍峰紡
- .center-margin {
- margin-bottom: vww(16);
- }
-
- // 鍗＄墖搴曢儴
- .bottom-container {
- .bottom-content__item {
- display: flex;
- justify-content: space-around;
- view {
- display: flex;
- justify-content: center;
- align-content: center;
- margin-right: vww(10);
- view {
- display: inline-block;
- }
- image {
- width: vww(16);
- height: vww(16);
- margin-right: vww(4);
- }
- }
- }
- }
-
- // 妯℃�佹
- .wodeshenqingMotai {
- // width:100%;
- // height:vww(244);
- .slot-content {
- .u-textarea {
- width: vww(280);
- height: vww(90) !important;
- .uni-textarea-wrapper {
- height: vww(90) !important;
- }
- }
- }
- }
-
- // 閫氳繃妯℃�佹
- .adoptModal {
- // width:100%;
- // height:vww(244);
- .slot-content {
- .rejectMesaage {
- display: flex;
- padding: vww(3);
- border: 1px solid #0307ff;
- border-radius: vww(4);
- font-size: 13px;
- text {
- margin-left: vww(5);
- }
- }
- .u-textarea {
- margin-top: vww(10);
- width: vww(280);
- height: vww(90) !important;
- .uni-textarea-wrapper {
- height: vww(90) !important;
- }
- }
- }
- }
-
- // 椹冲洖妯℃�佹
- .rejectModal {
- .slot-content {
- display: inline-block;
- .rejectMesaage {
- display: flex;
- padding: vww(3);
- border: 1px solid #0307ff;
- border-radius: vww(4);
- font-size: 13px;
- text {
- margin-left: vww(5);
- }
- }
- .u-textarea {
- margin-top: vww(10);
- width: vww(280);
- height: vww(90) !important;
- .uni-textarea-wrapper {
- height: vww(90) !important;
- }
- }
-
- .rejectBack {
- margin-top: vww(24);
- .rejectBack-title {
- font-size: vww(13);
- }
- // 涓嬫媺鑿滃崟
- .data-selet {
- border: 1px solid #d1d1d1;
- border-radius: 4px;
- width: vww(300);
- height: 40px;
- display: flex;
- align-items: center;
- font-size: 13px;
- color: #666;
- margin-top: vww(8);
- .uni-select__icon {
- display: flex;
- align-content: center;
- margin: 0 10px;
- image {
- width: 10px;
- height: 5.5px;
- }
- }
- .content {
- margin-left: vww(8);
- width: vww(280);
- }
- }
- }
- }
- }
-}
-</style>
+<template>
+ <view class="home">
+ <!-- 杞挱鍥� -->
+ <view class="home_swipe"><u-swiper :list="list3" indicator indicatorMode="line" circular></u-swiper></view>
+ <!-- 鎴戠殑鐢宠 -->
+ <combined-title title="鎴戠殑鐢宠" detailsPath="/pages/my-application/my-application"></combined-title>
+ <combination-card v-for="(item, index) in shenqingData" index="index">
+ <template v-slot:top>
+ <view>
+ <text>{{ item.title }}</text>
+ </view>
+ </template>
+ <template v-slot:center>
+ <view class="center-container">
+ <view class="center-content__one center-margin">
+ <view class="">
+ <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+ </view>
+ <view class="">
+ <text>瀹℃壒鐜妭锛歿{ item.currTaskName }}</text>
+ </view>
+ </view>
+ <view class="center-content__two center-margin">
+ <view class="">
+ 鐘舵�侊細
+ <text :style="{ color: statusColor[item.status] }">{{ status[item.status] }}</text>
+ </view>
+ <view class="">
+ 缁撴灉锛�
+ <text :style="{ color: resultColor[item.result] }">{{ result[item.result] }}</text>
+ </view>
+ </view>
+ <view class="center-content__three center-margin">
+ <text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
+ </view>
+ <view class="center-content__four">
+ <text>鎻愪氦鐢宠鏃堕棿锛歿{ item.applyTime }}</text>
+ </view>
+ </view>
+ </template>
+ <template v-slot:bottom>
+ <view class="bottom-container">
+ <!-- 鎸夐挳鍖哄煙 -->
+ <view class="bottom-content__chulizhong bottom-content__item">
+ <view @click="withDrawClick(item.id)" v-if="item.status == 1">
+ <image src="@/static/home/cehui.png" mode=""></image>
+ <view>鎾ゅ洖</view>
+ </view>
+ <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">
+ <image src="@/static/home/biaodan.png" mode=""></image>
+ <view>琛ㄥ崟鏁版嵁</view>
+ </view>
+ <view @click="apply(item)" v-if="item.status == 3">
+ <image src="@/static/home/history.png" mode=""></image>
+ <view>閲嶆柊鐢宠</view>
+ </view>
+ <view @click="editMyApplication(item)" v-if="item.status == 3">
+ <image src="@/static/home/history.png" mode=""></image>
+ <view>缂栬緫</view>
+ </view>
+ <view @click="approvalHistoryClick(item.procInstId)" v-if="item.status == 2 || item.status == 3">
+ <image src="@/static/home/history.png" mode=""></image>
+ <view>瀹℃壒鍘嗗彶</view>
+ </view>
+ </view>
+ <!-- 宸茬粨鏉熷皬缁勬寜閽� -->
+ <!-- <view class="bottom-content__chulizhong bottom-content__item" v-if="item.status == 2">
+ <view @click="theFormDataClick">
+ <image src="@/static/home/biaodan.png" mode=""></image>
+ <view>琛ㄥ崟鏁版嵁</view>
+ </view>
+
+ </view> -->
+ </view>
+ </template>
+ </combination-card>
+
+ <!-- 鎴戠殑寰呭姙 -->
+ <combined-title title="鎴戠殑寰呭姙" detailsPath="/pages/my-todo/my-todo"></combined-title>
+ <combination-card v-for="(item, index) in daibanData" index="index">
+ <template v-slot:top>
+ <view>
+ <text>{{ item.actBusiness.title }}</text>
+ </view>
+ </template>
+ <template v-slot:center>
+ <view class="center-container">
+ <view class="center-content__one center-margin">
+ <view class="">
+ <text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
+ </view>
+ <view class="">
+ <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+ </view>
+ </view>
+ <view class="center-content__two center-margin">
+ <text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
+ </view>
+
+ <view class="center-content__three">
+ <text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
+ </view>
+ </view>
+ </template>
+ <template v-slot:bottom>
+ <view class="bottom-container">
+ <!-- 寰呭姙鎸夐挳 -->
+ <view class="bottom-content__item">
+ <!-- <view @click="theFormDataClick">
+ <image src="@/static/home/jindu.png" mode=""></image>
+ <view>鐢宠璇︽儏</view>
+ </view> -->
+ <view @click="adopClick(item)">
+ <image src="@/static/home/tongguo.png" mode=""></image>
+ <view>閫氳繃</view>
+ </view>
+ <view @click="rejectClick(item)">
+ <image src="@/static/home/bohui.png" mode=""></image>
+ <view>椹冲洖</view>
+ </view>
+ <view @click="approvalHistoryClick(item.procInstId)">
+ <image src="@/static/home/history.png" mode=""></image>
+ <view>鍘嗗彶</view>
+ </view>
+ </view>
+ </view>
+ </template>
+ </combination-card>
+
+ <!-- 鎴戠殑宸插姙 -->
+ <combined-title title="鎴戠殑宸插姙 " detailsPath="/pages/my-have-todo/my-have-todo"></combined-title>
+ <combination-card v-for="(item, index) in yibanData" index="index">
+ <template v-slot:top>
+ <view>
+ <text>{{ item.actBusiness.title }}</text>
+ </view>
+ </template>
+ <template v-slot:center>
+ <view class="center-container">
+ <view class="center-content__one center-margin">
+ <view>
+ <text>浠诲姟鍚嶇О锛歿{ item.name }}</text>
+ </view>
+ <view>
+ <text>鎵�灞炴祦绋嬶細{{ item.processName }}</text>
+ </view>
+ </view>
+ <view class="center-content__two center-margin">
+ <view>
+ <text>鍙戣捣浜猴細{{ item.actBusiness.createByName }}</text>
+ </view>
+ <view>
+ <text>瀹℃壒鎿嶄綔锛歿{ item.deleteReason }}</text>
+ </view>
+ </view>
+ <view class="center-content__three center-margin">
+ <view class="">
+ <text>瀹℃壒鎰忚锛歿{ item.comment }}</text>
+ </view>
+ <view class="">
+ <text>
+ 鑰楁椂锛歿{
+ item.duration >= 86400000
+ ? parseInt(item.duration / 86400000 + '澶�' + parseInt(item.duration % 86400000) / 3600000 + '鏃�' + parseInt(item.duration % 3600000) / 60000 + '鍒�')
+ : item.duration >= 3600000
+ ? parseInt(item.duration / 3600000) + '鏃�' + parseInt((item.duration / 3600000) % 3600000) + '鍒�'
+ : parseInt(item.duration / 60000) + '鍒�'
+ }}
+ </text>
+ </view>
+ </view>
+ <view class="center-content__four">
+ <text>鍒涘缓鏃堕棿锛歿{ item.createTime }}</text>
+ </view>
+ </view>
+ </template>
+ <template v-slot:bottom>
+ <view class="bottom-container">
+ <!-- 宸插姙鎸夐挳 -->
+ <view class="bottom-content__item">
+ <view @click="theFormDataClick(item.tableId)">
+ <image src="@/static/home/biaodan.png" mode=""></image>
+ <view>琛ㄥ崟鏁版嵁</view>
+ </view>
+ <view @click="approvalHistoryClick(item.procInstId)">
+ <image src="@/static/home/history.png" mode=""></image>
+ <view>瀹℃壒鍘嗗彶</view>
+ </view>
+ <view @click="deleteApplicationClick(item.id)">
+ <image src="@/static/home/delete.png" mode=""></image>
+ <view>鍒犻櫎</view>
+ </view>
+ </view>
+ </view>
+ </template>
+ </combination-card>
+ <combined-title title="鏃ュ彂杩愯鍒�" detailsPath="/pages/jihua/jihua"></combined-title>
+ <combination-card>
+ <template v-slot:top :showTop="false"></template>
+ <template v-slot:center>
+ <view class="main-block-box" v-for="(item,index) in fyData" :key="item.id">
+ <view class="jihua-main-line">
+ <view class="name">瀹㈡埛鍚嶇О锛歿{item.customerName || ''}}</view>
+ </view>
+ <view class="jihua-main-line">
+ <view class="main-flex">
+ <view>鐓ょ锛歿{item.order.coalName || ''}}</view>
+ <view>鍓╀綑閲忥細{{item.order.executiveSurplus || ''}}</view>
+ </view>
+ </view>
+ <view class="jihua-main-line">
+ <view class="main-flex">
+ <view class="carNum-box">
+ <view>璁″垝杞︽暟锛�</view>
+ <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan"
+ @change="inputTotalChange(item)"></u--input>
+ </view>
+ <view>瀹為檯鍙戣溅鏁帮細{{item.order.numReal || ''}}</view>
+ </view>
+ </view>
+ </view>
+ </template>
+ <template v-slot:bottom :showBottom="false"></template>
+ </combination-card>
+
+ <!-- 鎾ゅ洖妯℃�佹 -->
+ <view class="wodeshenqingMotai">
+ <u-modal width="684rpx" :show="withDrawShow" title="鎾ゅ洖鍘熷洜" :showCancelButton="true" @confirm="withDrawConfirm" @cancel="withDrawCancel">
+ <view class="slot-content"><u--textarea v-model="withDrawData.reason" placeholder="璇疯緭鍏ユ挙鍥炲師鍥�"></u--textarea></view>
+ </u-modal>
+ </view>
+
+ <!-- 閫氳繃妯℃�佹 -->
+ <view class="adoptModal">
+ <u-modal width="684rpx" :show="adoptModalShow" title="瀹℃壒閫氳繃" :showCancelButton="true" @confirm="adoptModalConfirm" @cancel="adoptModalCancel">
+ <view class="slot-content">
+ <view class="rejectMesaage">
+ <u-icon name="info-circle-fill" color="#0307ff"></u-icon>
+ <text>{{ modalType == 0 ? '娉ㄦ剰锛氬皢榛樿鍒嗛厤缁欒妭鐐硅瀹氱殑鎵�鏈夊彲瀹℃壒鐢ㄦ埛' : '娉ㄦ剰锛氭墍鏈夋祦绋嬪皢椹冲洖鑷冲彂璧蜂汉' }}</text>
+ </view>
+ <u--textarea v-model="adoptForm.comment" placeholder="璇疯緭鍏ュ鎵规剰瑙�"></u--textarea>
+ </view>
+ </u-modal>
+ </view>
+
+ <!-- 椹冲洖妯℃�佹 -->
+ <view class="rejectModal">
+ <u-modal width="684rpx" :show="rejectModalShow" title="椹冲洖" :showCancelButton="true" @confirm="rejectModalConfirm" @cancel="rejectModalCancel">
+ <view class="slot-content">
+ <view class="rejectMesaage">
+ <u-icon name="info-circle-fill" color="#0307ff"></u-icon>
+ <text>{{ modalType == 0 ? '娉ㄦ剰锛氬皢榛樿鍒嗛厤缁欒妭鐐硅瀹氱殑鎵�鏈夊彲瀹℃壒鐢ㄦ埛' : '娉ㄦ剰锛氭墍鏈夋祦绋嬪皢椹冲洖鑷冲彂璧蜂汉' }}</text>
+ </view>
+ <u--textarea v-model="rejectForm.comment" placeholder="璇疯緭鍏ュ鎵规剰瑙�"></u--textarea>
+ <!-- <view class="rejectBack">
+ <view class="rejectBack-title"><text>椹冲洖鑷�</text></view>
+ <view class="data-selet" @click="statusSeletShow = true">
+ <view class="content">
+ <text>{{ dataSeletText }}</text>
+ </view>
+ <view class="uni-select__icon"><image src="@/static/icon/select.png" mode="鍔犺浇澶辫触"></image></view>
+ </view>
+ </view> -->
+ </view>
+ </u-modal>
+ </view>
+
+ <!-- 鍒犻櫎宸插姙鐢宠妯℃�佹 -->
+ <view class="deleteApplicationModal">
+ <u-modal
+ :show="deleteApplicationModalShow"
+ title="鎻愮ず"
+ content="纭畾鍒犻櫎璇ョ敵璇凤紵"
+ :showCancelButton="true"
+ @confirm="deleteApplicationModalConfirm"
+ @cancel="deleteApplicationModalCancel"
+ ></u-modal>
+ </view>
+
+ <!-- 閫夋嫨鍣� -->
+ <!-- <u-picker @cancel="statusSeletShow = false" @confirm="statusConfirm" :show="statusSeletShow" :columns="statusList"></u-picker> -->
+
+ <!-- 鑿滃崟鏍� -->
+ <popup-menu @menuShow="menushow" ref="menuRef"></popup-menu>
+ </view>
+</template>
+
+<script>
+import { timeConsuming } from '@/utils/nowDate.js';
+import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
+import combinedTitle from '@/components/common/combined-title/combined-title.vue';
+import combinationCard from '@/components/common/combination-card/combination-card.vue';
+import { setAccessToken } from '@/utils/status.js';
+export default {
+ name: 'home',
+ data() {
+ return {
+ // menuShow:false,// 鑿滃崟鏄剧ず
+ status: ['鑽夌', '澶勭悊涓�', '宸茬粨鏉�', '宸叉挙鍥�'],
+ statusColor: ['#dd8b8c', '#FF9900', '#007AFF', '#06BE00'],
+ result: ['鏈彁浜�', '澶勭悊涓�', '閫氳繃', '椹冲洖'],
+ resultColor: ['#dd8b8c', '#FF9900', '#06BE00', '#be2b2d'],
+ list3: ['https://cdn.uviewui.com/uview/swiper/swiper3.png', 'https://cdn.uviewui.com/uview/swiper/swiper2.png', 'https://cdn.uviewui.com/uview/swiper/swiper1.png'],
+ // 鎾ゅ洖妯℃�佹
+ withDrawShow: false,
+ fyData: [],
+ withDrawData: {
+ reason: '',
+ id: '', // 鎾ゅ洖鐢宠ID
+ procInstId: ''
+ },
+ withDrawContent: '',
+ // 閲嶆柊鐢宠
+ form: {
+ sendMessage: true,
+ sendSms: true,
+ sendEmail: true,
+ procDefId: '',
+ assignees: [],
+ priority: '0'
+ },
+ assigneeList: [],
+ showAssign: false,
+ isGateway: false,
+ isCustom: false,
+ // 閫氳繃妯℃�佹
+ adoptModalShow: false,
+ // 閫氳繃璇锋眰
+ adoptForm: {
+ ids: '',
+ comment: ''
+ },
+ // 椹冲洖妯℃�佹
+ rejectModalShow: false,
+ rejectModalContent: '',
+ // dataSeletText: '璇烽�夋嫨鐘舵��',
+ // 椹冲洖璇锋眰
+ rejectForm: {
+ procInstIds: '',
+ comment: ''
+ },
+ modalType: 0,
+ // 鍒犻櫎鐢宠妯℃�佹
+ deleteApplicationModalShow: false,
+ procInstId:'',
+ // 閫夋嫨鍣�
+ statusSeletShow: false,
+ statusList: [['涓浗', '缇庡浗', '鏃ユ湰']],
+ // data
+ shenqingData: [],
+ daibanData: [],
+ daibanData: [],
+ yibanData: [],
+ menuShow: false,
+ // 鐢宠
+ myApplicationParams: {
+ status: '',
+ result: '',
+ pageNumber: 1,
+ pageSize: 2,
+ sort: 'createTime',
+ order: 'desc'
+ },
+ // 寰呭姙
+ todoParams: {
+ pageNumber: 1,
+ pageSize: 2
+ },
+ haveTodoParams: {
+ pageNumber: 1,
+ pageSize: 2,
+ sort: 'createTime',
+ order: 'desc'
+ }
+ };
+ },
+ // 鐐瑰嚮瀵艰埅鏍忚彍鍗曞悗
+ onNavigationBarButtonTap(e) {
+ console.log(e);
+ this.$refs.menuRef.menuClick();
+ },
+ onShow() {
+ if (this.menuShow == true) {
+ this.$refs.menuRef.menuClick();
+ }
+ this.init();
+ },
+ components: {
+ combinedTitle,
+ combinationCard,
+ popupMenu
+ },
+ methods: {
+ getUserInfo() {
+ this.$reqGet('getUserInfo').then(res => {
+ if (res.code == 0) {
+ uni.setStorageSync('userInfo', res.data.sysUser);
+ }
+ });
+ },
+ init() {
+ this.getUserInfo();
+ this.getProcessDataList(); // 鐢宠鍒楄〃
+ this.todoList(); // 鎴戠殑寰呭姙
+ this.doneList(); // 鎴戠殑宸插姙
+ this.xscarshippingdayplan(); //鏃ヨ鍒�
+ },
+ xscarshippingdayplan(allList) { //宸茬粡璁剧疆鐨�
+ console.log(allList,'allList==========')
+ let params = {
+ current: 1,
+ size: 2,
+ shippingDate: this.todayDate()
+ }
+ this.$reqGet('xscarshippingdayplan', params).then(res => {
+ if (res.code == 0) {
+ this.fyData = res.data.records
+ uni.hideLoading();
+ }
+ }).catch(e => {
+ uni.hideLoading();
+ })
+ },
+ todayDate() {
+ let yes = new Date().getTime()
+ let date = new Date(yes)
+ let y = date.getFullYear()
+ let m = date.getMonth() + 1
+ m = m < 10 ? ('0' + m) : m
+ let d = date.getDate()
+ d = d < 10 ? ('0' + d) : d
+ const time = y + '-' + m + '-' + d
+ console.log('todayDate---------', time)
+ return time
+ },
+ getProcessDataList() {
+ this.$reqGet('getProcessDataList', this.myApplicationParams).then(res => {
+ if (res.code === 0) {
+ // console.log('鐢宠', res);
+ this.shenqingData = res.data.records;
+ }
+ });
+ },
+ todoList() {
+ this.$reqGet('todoList', this.todoParams).then(res => {
+ if (res.code === 0) {
+ // console.log('寰呭姙', res);
+ this.daibanData = res.data.content;
+ }
+ });
+ },
+ doneList() {
+ uni.showLoading({
+ title:'鍔犺浇涓�...'
+ })
+ this.$reqGet('doneList', this.haveTodoParams).then(res => {
+ uni.hideLoading();
+ if (res.code === 0) {
+ // console.log('宸插姙', res);
+ this.yibanData = res.data.content;
+ }
+ });
+ },
+ menushow(e) {
+ this.menuShow = e;
+ },
+ // 鎾ゅ洖妯℃�佹
+ withDrawClick(id) {
+ this.withDrawShow = true;
+ this.withDrawData.id = id;
+ },
+ withDrawConfirm() {
+ this.shenqingData.forEach(i => {
+ if (i.id == this.withDrawData.id) {
+ this.withDrawData.procInstId = i.procInstId;
+ }
+ });
+ if (this.withDrawData.reason.length >= 2) {
+ this.$reqPost('withDraw', this.withDrawData, 'form').then(res => {
+ this.withDrawShow = false;
+ if (res.code == 0) {
+ uni.showToast({
+ title: res.data,
+ duration: 2000
+ });
+ }
+ this.getProcessDataList();
+ });
+ } else {
+ uni.showToast({
+ title: '璇疯鑼冭緭鍏�',
+ duration: 2000
+ });
+ }
+ },
+ // 閫氳繃
+ adopClick(v) {
+ console.log('閫氳繃鐐瑰嚮', v);
+ this.adoptModalShow = true;
+ this.adoptForm.ids = v.id;
+ this.modalType = 0;
+ // let urlparam = v.procDefId+'/'+v.key;
+ // this.$reqGet('getNextNode',{},urlparam).then(res=>{
+ // console.log('閫氳繃娆茶姹�');
+ // })
+ },
+ // 閫氳繃妯℃�佹
+ adoptModalConfirm() {
+ this.adoptModalShow = false;
+ this.adoptForm.comment = this.adoptModalContent;
+
+ this.$reqPost('passAll', this.adoptForm, 'form').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛!');
+ } else {
+ this.$u.toast('娣诲姞澶辫触!!');
+ }
+ });
+ },
+ adoptModalCancel() {
+ this.adoptModalShow = false;
+ },
+ // 椹冲洖
+ rejectClick(v) {
+ this.modalType = 1;
+ this.rejectModalShow = true;
+ this.rejectForm.procInstIds = v.procInstId;
+ },
+ // 椹冲洖妯℃�佹
+ rejectModalConfirm() {
+ this.rejectModalShow = false;
+
+ this.$reqPost('backAll', this.rejectForm, 'form').then(res => {
+ if (res.code == 0) {
+ this.$u.toast('鎿嶄綔鎴愬姛锛�');
+ } else {
+ this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�');
+ }
+ this.todoList(); // 鎴戠殑寰呭姙
+ });
+ },
+ rejectModalCancel() {
+ this.rejectModalShow = false;
+ },
+ withDrawCancel() {
+ this.withDrawShow = false;
+ },
+ // 鍒犻櫎鐢宠妯℃�佹
+ deleteApplicationModalConfirm() {
+ this.deleteApplicationModalShow = false;
+ this.$reqPost('deleteHistoric',{ids:this.procInstId},'form').then(res=>{
+ if(res.code == 0){
+ this.$u.toast('鎿嶄綔鎴愬姛锛�')
+ this.yibanData = [];
+ this.doneList(); // 鎴戠殑宸插姙
+ } else {
+ this.$u.toast('鎿嶄綔澶辫触锛侊紒锛�')
+ }
+ })
+
+ },
+ deleteApplicationModalCancel() {
+ this.deleteApplicationModalShow = false;
+ },
+ // 鏌ョ湅杩涘害
+ checkTheScheduleClick(v) {
+ uni.navigateTo({
+ url: `/pages/check-the-schedule/check-the-schedule?index=${v}`
+ });
+ },
+ // 琛ㄥ崟鏁版嵁
+ theFormDataClick(v) {
+ uni.navigateTo({
+ url: `/pages/the-form-data/the-form-data?index=${v}`
+ });
+ },
+ // 閲嶆柊鐢宠
+ apply(v){
+ if (!v.procDefId || v.procDefId == 'null') {
+ this.$u.toast('娴佺▼瀹氫箟涓虹┖');
+ return;
+ }
+ this.form.id = v.id;
+ this.form.procDefId = v.procDefId;
+ this.form.title = v.title;
+ // 鍔犺浇瀹℃壒浜�
+ // this.userLoading = true;
+ uni.showLoading({
+ title: '瀹℃壒浜哄姞杞戒腑'
+ });
+ // getFirstNode(v.procDefId).then((res) => {
+ this.$reqGet('getFirstNode', {}, v.procDefId).then(res => {
+ // this.userLoading = false;
+ console.log('瀹℃壒浜�', res);
+ uni.hideLoading();
+ if (res.data) {
+ this.error = '';
+ if (res.data.type == 3 || res.data.type == 4) {
+ this.isGateway = true;
+ this.form.firstGateway = true;
+ this.showAssign = false;
+ this.isCustom = false;
+ return;
+ }
+ if (res.data.type == 5) {
+ this.isCustom = true;
+ this.isGateway = false;
+ this.form.firstGateway = false;
+ this.showAssign = false;
+ return;
+ }
+ if (res.data.type == 1) {
+ this.showAssign = true;
+ this.isGateway = false;
+ this.form.firstGateway = false;
+ this.isCustom = false;
+ if (res.data.users && res.data.users.length > 0) {
+ this.assigneeList = res.data.users;
+ // 榛樿鍕鹃��
+ let ids = [];
+ res.data.users.forEach(e => {
+ ids.push(e.userId);
+ });
+ this.form.assignees = ids;
+ this.showAssign = true;
+ // 鑾峰彇琛ㄥ崟鍐呭锛岄噸鏂板垱寤虹敵璇�
+ this.$reqPost('apply',this.form,'form').then(res=>{
+ console.log('閲嶆柊鎻愪氦鐢宠',res);
+ if(res.code == 0){
+ uni.showToast({
+ title:res.data,
+ icon:'success',
+ duration:2000
+ });
+ }
+ // 鍒濆鍖栫敵璇峰垪琛�
+ // this.myApplication.pageNumber = 1;
+ // this.shenqingData = [];
+ // this.getMoreNews();
+ this.getProcessDataList();
+ })
+ } else {
+ this.form.assignees = [];
+ this.showAssign = true;
+ this.error = '璇疯繘鍏�"娴佺▼绠＄悊"涓哄鎵硅妭鐐瑰垎閰嶅�欓�夊鎵逛汉鍛�';
+ }
+ }
+ }
+ console.log(this.form);
+ });
+
+ this.modalVisible = true;
+ },
+ // 淇敼
+ editMyApplication(v){
+ console.log('淇敼鐢宠');
+ uni.navigateTo({
+ url: `/pages/edit-my-application/edit-my-application?index=${v.tableId}`
+ });
+ },
+ // 瀹℃壒鍘嗗彶
+ approvalHistoryClick(v) {
+ uni.navigateTo({
+ url: `/pages/approval-history/approval-history?index=${v}`
+ });
+ },
+ // 鍒犻櫎鐢宠
+ deleteApplicationClick(id) {
+ this.deleteApplicationModalShow = true;
+ this.procInstId = id;
+ console.log(id);
+ }
+ }
+};
+</script>
+
+<style lang="scss" scoped>
+::v-deep.home {
+ height: 100%;
+ width: 100%;
+ .home_swipe {
+ width: 100%;
+ .u-swiper {
+ height: vww(160) !important;
+ .u-swiper__wrapper {
+ height: vww(160) !important;
+ .u-swiper__wrapper__item {
+ .u-swiper__wrapper__item__wrapper {
+ .u-swiper__wrapper__item__wrapper__image {
+ height: vww(160) !important;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // 鍗＄墖涓棿
+ .center-container {
+ display: flex;
+ flex-direction: column;
+ .center-content__one {
+ display: flex;
+ view {
+ width: 50%;
+ }
+ }
+ .center-content__two {
+ display: flex;
+ // margin: vww(10) 0;
+ view {
+ width: 50%;
+ }
+ }
+ .center-content__three {
+ display: flex;
+ view {
+ width: 50%;
+ }
+ }
+ .center-content__four {
+ }
+ }
+ // 涓棿閮ㄥ垎鏍峰紡
+ .center-margin {
+ margin-bottom: vww(16);
+ }
+
+ // 鍗＄墖搴曢儴
+ .bottom-container {
+ .bottom-content__item {
+ display: flex;
+ justify-content: space-around;
+ view {
+ display: flex;
+ justify-content: center;
+ align-content: center;
+ margin-right: vww(10);
+ view {
+ display: inline-block;
+ }
+ image {
+ width: vww(16);
+ height: vww(16);
+ margin-right: vww(4);
+ }
+ }
+ }
+ }
+
+ // 妯℃�佹
+ .wodeshenqingMotai {
+ // width:100%;
+ // height:vww(244);
+ .slot-content {
+ .u-textarea {
+ width: vww(280);
+ height: vww(90) !important;
+ .uni-textarea-wrapper {
+ height: vww(90) !important;
+ }
+ }
+ }
+ }
+
+ // 閫氳繃妯℃�佹
+ .adoptModal {
+ // width:100%;
+ // height:vww(244);
+ .slot-content {
+ .rejectMesaage {
+ display: flex;
+ padding: vww(3);
+ border: 1px solid #0307ff;
+ border-radius: vww(4);
+ font-size: 13px;
+ text {
+ margin-left: vww(5);
+ }
+ }
+ .u-textarea {
+ margin-top: vww(10);
+ width: vww(280);
+ height: vww(90) !important;
+ .uni-textarea-wrapper {
+ height: vww(90) !important;
+ }
+ }
+ }
+ }
+
+ // 椹冲洖妯℃�佹
+ .rejectModal {
+ .slot-content {
+ display: inline-block;
+ .rejectMesaage {
+ display: flex;
+ padding: vww(3);
+ border: 1px solid #0307ff;
+ border-radius: vww(4);
+ font-size: 13px;
+ text {
+ margin-left: vww(5);
+ }
+ }
+ .u-textarea {
+ margin-top: vww(10);
+ width: vww(280);
+ height: vww(90) !important;
+ .uni-textarea-wrapper {
+ height: vww(90) !important;
+ }
+ }
+
+ .rejectBack {
+ margin-top: vww(24);
+ .rejectBack-title {
+ font-size: vww(13);
+ }
+ // 涓嬫媺鑿滃崟
+ .data-selet {
+ border: 1px solid #d1d1d1;
+ border-radius: 4px;
+ width: vww(300);
+ height: 40px;
+ display: flex;
+ align-items: center;
+ font-size: 13px;
+ color: #666;
+ margin-top: vww(8);
+ .uni-select__icon {
+ display: flex;
+ align-content: center;
+ margin: 0 10px;
+ image {
+ width: 10px;
+ height: 5.5px;
+ }
+ }
+ .content {
+ margin-left: vww(8);
+ width: vww(280);
+ }
+ }
+ }
+ }
+ }
+}
+</style>
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index 66ad5a9..cea9f01 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -283,6 +283,15 @@
height: vww(16);
width: vww(100);
}
+ .u-button{
+ position: fixed!important;
+ left: 50%;
+ bottom: vww(20);
+ width: vww(200)!important;
+ transform: translateX(-50%);
+ border-radius: vww(20);
+ z-index: 9999;
+ }
.u-radio-group--row {
height: 100%;
width: 100%;
@@ -291,9 +300,12 @@
}
.u-radio__icon-wrap {
- width: vww(14) !important;
- height: vww(14) !important;
- ;
+ width: vww(18) !important;
+ height: vww(18) !important;
+ }
+ .u-icon__icon{
+ font-size: vww(12)!important;
+ line-height: vww(12)!important;
}
}
@@ -315,14 +327,14 @@
display: flex;
flex-direction: column;
- .xiugai-btn {
- position: fixed;
- left: 50%;
- bottom: vww(20);
- width: vww(200);
- transform: translateX(-50%);
- border-radius: vww(20);
- }
+ // .xiugai-btn {
+ // position: absolute;
+ // left: 50%;
+ // bottom: vww(20);
+ // width: vww(200);
+ // transform: translateX(-50%);
+ // border-radius: vww(20);
+ // }
}
.jihua-main {
diff --git a/project.private.config.json b/project.private.config.json
index a95925f..d13cc56 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -2,7 +2,8 @@
"description": "椤圭洰绉佹湁閰嶇疆鏂囦欢銆傛鏂囦欢涓殑鍐呭灏嗚鐩� project.config.json 涓殑鐩稿悓瀛楁銆傞」鐩殑鏀瑰姩浼樺厛鍚屾鍒版鏂囦欢涓�傝瑙佹枃妗ｏ細https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
"projectname": "group-app",
"setting": {
- "compileHotReLoad": true
+ "compileHotReLoad": true,
+ "urlCheck": false
},
"condition": {
"miniprogram": {
@@ -20,6 +21,13 @@
"query": "",
"launchMode": "default",
"scene": null
+ },
+ {
+ "name": "",
+ "pathName": "pages/home/home",
+ "query": "",
+ "launchMode": "default",
+ "scene": null
}
]
}
--
Gitblit v1.9.1