From c56e67c77e2a36c894346830c1ab1e6df36fe935 Mon Sep 17 00:00:00 2001
From: 819527061@qq.com <123456>
Date: 星期五, 01 十二月 2023 16:55:02 +0800
Subject: [PATCH] 测试bug调整
---
pages/home/home.vue | 19 +++++++--
pages/jihua/jihua.vue | 87 +++++++++++++++++++++++++++++++------------
utils/api.js | 4 ++
pages/new-application/new-application.vue | 2
pages/payment-form-data/payment-form-data.vue | 1
5 files changed, 84 insertions(+), 29 deletions(-)
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 3179178..5a5a717 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -420,8 +420,14 @@
// dataSeletText: '璇烽�夋嫨鐘舵��',
// 椹冲洖璇锋眰
rejectForm: {
- procInstIds: '',
- comment: ''
+ id: "",
+ procInstId: "",
+ comment: "",
+ type: 0,
+ backTaskKey: "-1",
+ sendMessage: true,
+ sendSms: true,
+ sendEmail: true,
},
modalType: 0,
// 鍒犻櫎鐢宠妯℃�佹
@@ -684,15 +690,20 @@
},
// 椹冲洖
rejectClick(v) {
+ console.log('椹冲洖====',v)
this.modalType = 1;
this.rejectModalShow = true;
- this.rejectForm.procInstIds = v.procInstId;
+ this.rejectForm.procInstId = v.procInstId;
+ this.rejectForm.id = v.id;
+ this.rejectForm.procDefId = v.procDefId;
+ this.rejectForm.priority = v.priority;
+ this.rejectForm.type = 1;
},
// 椹冲洖妯℃�佹
rejectModalConfirm() {
this.rejectModalShow = false;
- this.$reqPost('backAll', this.rejectForm).then(res => {
+ this.$reqPost('back', this.rejectForm).then(res => {
if (res.code == 0) {
this.$u.toast('鎿嶄綔鎴愬姛锛�');
} else {
diff --git a/pages/jihua/jihua.vue b/pages/jihua/jihua.vue
index 97e5d14..4c28ca2 100644
--- a/pages/jihua/jihua.vue
+++ b/pages/jihua/jihua.vue
@@ -27,11 +27,19 @@
<view class="main-flex">
<view class="carNum-box">
<view>璁″垝杞︽暟锛�</view>
- <!-- <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputChange" @focus="faYunPlanCarsFocus(item)"></u--input> -->
- <view class="planCars" :style="{color:item.numPlan ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)">
- <text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text>
- <view class="cursor" v-if="isCursor && fayunPlanFocusId == item.orderId"><image src="@/static/cursor.gif" mode=""><image></view>
- </view>
+ <u--input
+ placeholder="璇疯緭鍏ュ彂杩愯溅鏁�"
+ border="surround"
+ v-model="item.numPlan"
+ @change="inputChange(item)"
+ @focus="faYunPlanCarsFocus(item)"
+ type="number" pattern="[0-9]*"></u--input>
+
+ <!-- <view class="planCars" :style="{color:item.numPlan ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)">
+ <text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text>
+ <!– <text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text>–>
+ <view class="cursor" v-if="isCursor && fayunPlanFocusId == item.orderId"><image src="@/static/cursor.gif" mode=""><image></view>
+ </view>-->
</view>
<view style="margin-right:10px">瀹為檯鍙戣溅鏁帮細{{ item.numReal || '鏆傛棤' }}</view>
</view>
@@ -70,18 +78,24 @@
<view class="main-flex">
<view class="carNum-box">
<view>璁″垝杞︽暟锛�</view>
- <!-- <u--input placeholder="璇疯緭鍏ュ彂杩愯溅鏁�" border="surround" v-model="item.numPlan" @change="inputTotalChange(item)" @focus="faYunPlanCarsFocus(item)"></u--input> -->
- <view class="planCars" :style="{color:item.numPlan ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)">
+ <u--input
+ placeholder="璇疯緭鍏ュ彂杩愯溅鏁�"
+ border="surround"
+ v-model="item.numPlan"
+ @change="inputTotalChange(item)"
+ @focus="faYunPlanCarsFocus(item)"
+ type="number" pattern="[0-9]*"></u--input>
+<!-- <view class="planCars" :style="{color:item.numPlan ? '#111':'#ccc'}" @click="faYunPlanCarsFocus(item)">
<text v-model="item.numPlan">{{ item.numPlan || '鐐瑰嚮杈撳叆鏁伴噺' }}</text>
<view class="cursor" v-if="isCursor && fayunPlanFocusId == item.orderId">
<image src="@/static/cursor.gif" mode="" />
</view>
- </view>
+ </view>-->
</view>
<view style="margin-right:10px">瀹為檯鍙戣溅鏁帮細{{ item.numReal == null ? '鏆傛棤' : item.numReal }}</view>
</view>
</view>
- <u-keyboard
+<!-- <u-keyboard
@change="valChange"
@backspace="backspace"
@confirm="keyBoardConfirm"
@@ -94,7 +108,7 @@
:closeOnClickOverlay="false"
:dotDisabled="true"
zIndex="100000"
- ></u-keyboard>
+ ></u-keyboard>-->
</view>
</view>
</view>
@@ -104,7 +118,7 @@
<u-popup :show="editPopupShow" @close="editPopupClose" @open="editPopupOpen" mode="top" round="10">
<view class="editPopup">
<view class="editPopup__title"><text>璁″垝杞︽暟</text></view>
- <view class="editPopup__input"><u--input v-model="keyBoardValue" @change="change" placeholder="璇疯緭鍏ュ唴瀹�" type="number" border="surround"></u--input></view>
+ <view class="editPopup__input"><u--input v-model="keyBoardValue" placeholder="璇疯緭鍏ュ唴瀹�" type="number" border="surround"></u--input></view>
<!-- <view class="editPopup__btn"><u-button text="纭畾" type="primary" @click="popupDetermineClick"></u-button></view> -->
</view>
</u-popup>
@@ -119,6 +133,7 @@
import popupMenu from '@/components/common/popup-menu/popup-menu.vue';
import tool from '@/utils/tool.js';
import { TrackOpTypes } from "vue";
+import row from "../../uni_modules/uview-ui/libs/config/props/row";
export default {
components: {
popupMenu
@@ -372,16 +387,33 @@
duration: 300
});
},
- inputChange(val) {
- console.log('鍏ㄩ儴璁″垝', val);
+ inputChange(item) {
+ if(item.numPlan) {
+ let total = Math.floor(item.order.executiveSurplus / Number(34));
+ let max = total + (item.numReal ? item.numReal : 0) + 1
+ if(item.numPlan > max) {
+ this.$nextTick(() => {
+ item.numPlan = max
+ this.$set(item,'numPlan',max)
+ })
+ uni.showToast({
+ title:`璇ヨ鍗曟渶澶ц缃溅鏁颁负锛�${max}`,
+ icon:'none',
+ duration:1000
+ })
+ }
+ }
},
+ changeIn(val) {
+ console.log(val,'val=====')
+ },
inputTotalChange(val) {
console.log(val, 'val2=======val2,宸茶缃鍒�');
this.editRow = val;
},
// input鑾峰彇鐒︾偣
faYunPlanCarsFocus(item) {
- this.keyBoardShow = true;
+ console.log(item,'鍙戣繍杞︽暟璁″垝------------===========')
this.fayunPlanFocusId = item.orderId;
this.keyBoardValue = item.numPlan + '';
if(this.isTomJihua == '宸茶缃殑璁″垝'){
@@ -391,14 +423,14 @@
}
// 鏍规嵁鍒楄〃涓嬫爣锛屼娇灞忓箷婊氬姩鍒扮浉搴斿彲瑙嗕綅缃�
- for(let i = 0;i<this.fyData.length;i++){
- if(this.fyData[i].orderId == item.orderId){
- uni.pageScrollTo({
- scrollTop: i*144,
- duration: 300
- });
- }
- }
+ // for(let i = 0;i<this.fyData.length;i++){
+ // if(this.fyData[i].orderId == item.orderId){
+ // uni.pageScrollTo({
+ // scrollTop: i*144,
+ // duration: 300
+ // });
+ // }
+ // }
},
// 閿洏
@@ -472,8 +504,15 @@
}
};
</script>
-
+<style>
+input{-webkit-appearance: none;}
+</style>
<style lang="scss" scoped>
+.ceshi-box{
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+}
::v-deep {
.u-tabs__wrapper__nav {
padding-left: vww(75.5);
@@ -583,7 +622,7 @@
.main-block-box {
box-shadow: 0px 0px 8px 0px rgba(216, 218, 238, 0.8);
- height: vww(120);
+ //height: vww(120);
padding: vww(10);
box-sizing: border-box;
margin-top: vww(12);
diff --git a/pages/new-application/new-application.vue b/pages/new-application/new-application.vue
index 201f39a..cf51a50 100644
--- a/pages/new-application/new-application.vue
+++ b/pages/new-application/new-application.vue
@@ -44,7 +44,7 @@
<view class="card">
<view class="card-left">
<view class="card-left_bottom">
- <text>娣诲姞鏀舵鏄庣粏</text>
+ <text>鏂板鏀舵</text>
</view>
</view>
<view class="card-right">
diff --git a/pages/payment-form-data/payment-form-data.vue b/pages/payment-form-data/payment-form-data.vue
index 501c440..13f2b62 100644
--- a/pages/payment-form-data/payment-form-data.vue
+++ b/pages/payment-form-data/payment-form-data.vue
@@ -73,6 +73,7 @@
@click="handleCustomerNameOpen(2)"
>
<u--input
+ readonly
v-model="dataForm.customerAddressName"
border="none"
placeholder="璇烽�夋嫨鐢ㄧ叅瀹㈡埛"
diff --git a/utils/api.js b/utils/api.js
index 9e702f9..27a940a 100644
--- a/utils/api.js
+++ b/utils/api.js
@@ -201,6 +201,10 @@
url: '/oa/actTask/backAll',
method: "POST"
},
+ back: {
+ url: '/oa/actTask/back',
+ method: "POST"
+ },
deleteHistoric: {
url: '/oa/actTask/deleteHistoric',
method: "POST"
--
Gitblit v1.9.1