测试bug调整

819527061@qq.com

2023-12-01 c56e67c77e2a36c894346830c1ab1e6df36fe935

测试bug调整

 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 {


 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>

                  &lt;!&ndash;                    <text v-model="item.numPlan">{{ item.numPlan || '点击输入数量' }}</text>&ndash;&gt;

                                      <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);


 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">

 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="请选择用煤客户"

 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"