Skip to content

M
mocp-uniapp
Commit af969a4d by pangchong
Options

feat: 收费单优化

parent 96e7742d
Showing with 243 additions and 72 deletions
components.d.ts
......@@ -23,6 +23,7 @@ declare module 'vue' {
GlobalField: typeof import('./src/mocp/components/global-field/global-field.vue')['default']
GlobalIcon: typeof import('./src/mocp/components/global-icon/global-icon.vue')['default']
GlobalNavbar: typeof import('./src/mocp/components/global-navbar/global-navbar.vue')['default']
GlobalNumberInput: typeof import('./src/mocp/components/global-number-input/global-number-input.vue')['default']
GlobalPage: typeof import('./src/mocp/components/global-page/global-page.vue')['default']
GlobalPageSwiper: typeof import('./src/mocp/components/global-page-swiper/global-page-swiper.vue')['default']
GlobalPageSwiperItem: typeof import('./src/mocp/components/global-page-swiper-item/global-page-swiper-item.vue')['default']
......
src/mocp/components/global-number-input/global-number-input.vue 0 → 100644
<template>
<!-- 数字输入框 -->
<up-input
v-model="inputVal"
type="number"
:inputAlign="inputAlign"
:border="border"
:placeholder="placeholder"
:clearable="clearable"
@change="change"
@blur="blur"
></up-input>
</template>
<script setup>
import { ref, watch } from 'vue'
const es = defineEmits(['update:modelValue', 'change'])
const ps = defineProps({
modelValue: {
type: [Number, String],
default: null
},
inputAlign: {
type: String,
default: 'right'
},
border: {
type: String,
default: 'none'
},
placeholder: {
type: String,
default: '请输入'
},
clearable: {
type: Boolean,
default: true
},
precision: {
type: Number,
default: 0
},
min: {
type: Number,
default: 0
},
max: {
type: Number,
default: Infinity
},
// 大于
greater: {
type: Number,
default: -Infinity
}
})
const inputVal = ref(ps.modelValue)
watch(
() => ps.modelValue,
(newValue) => {
inputVal.value = newValue
}
)
const change = (value) => {
if (value.includes('.')) {
if (ps.precision === 0) {
value = value.replace('.', '')
} else {
const nums = String(value).split('.')
if (nums[1].length >= ps.precision) {
value = nums[0] + '.' + nums[1].substring(0, ps.precision)
}
}
}
let val = value ? parseFloat(value) : ''
if (val < ps.min || val > ps.max) {
val = Math.min(Math.max(val, ps.min), ps.max)
}
setTimeout(() => {
inputVal.value = val
es('update:modelValue', val)
}, 10)
}
const blur = (value) => {
if (parseFloat(value) <= ps.greater) {
setTimeout(() => {
inputVal.value = ''
es('update:modelValue', '')
}, 10)
}
}
</script>
<style lang="scss" scoped></style>
src/pages/modules/mocp/panel/electronicBill/deicing/add.vue
......@@ -76,9 +76,19 @@
</up-form-item>
<up-form-item label="自定义混合比" prop="deicingMix" :borderBottom="true" v-if="formData.deicingMix == 'Other'">
<view style="display: flex; align-items: center">
<up-input type="number" v-model="formData.deicingMix1" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.deicingMix1"
placeholder="请输入"
inputAlign="left"
border="surround"
></global-number-input>
<text style="margin: 0 20rpx">:</text>
<up-input type="number" v-model="formData.deicingMix2" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.deicingMix2"
placeholder="请输入"
inputAlign="left"
border="surround"
></global-number-input>
</view>
</up-form-item>
<view class="sample-table">
......@@ -104,7 +114,13 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.deicingQuantity1" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.deicingQuantity1"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -121,7 +137,13 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.deicingQuantity2" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.deicingQuantity2"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -138,7 +160,13 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.deicingQuantity3" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.deicingQuantity3"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -155,7 +183,13 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.deicingQuantity4" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.deicingQuantity4"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -212,9 +246,19 @@
</up-form-item>
<up-form-item label="自定义混合比" prop="antiicingMix" :borderBottom="true" v-if="formData.antiicingMix == 'Other'">
<view style="display: flex; align-items: center">
<up-input type="number" v-model="formData.antiicingMix1" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.antiicingMix1"
placeholder="请输入"
inputAlign="left"
border="surround"
></global-number-input>
<text style="margin: 0 20rpx">:</text>
<up-input type="number" v-model="formData.antiicingMix2" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.antiicingMix2"
placeholder="请输入"
inputAlign="left"
border="surround"
></global-number-input>
</view>
</up-form-item>
<view class="sample-table">
......@@ -240,7 +284,13 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.antiicingQuantity1" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.antiicingQuantity1"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -257,7 +307,13 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.antiicingQuantity2" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.antiicingQuantity2"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -274,7 +330,13 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.antiicingQuantity3" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.antiicingQuantity3"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -291,7 +353,13 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.antiicingQuantity4" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.antiicingQuantity4"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......
src/pages/modules/mocp/panel/electronicBill/nonRoutineWork/add.vue
......@@ -57,11 +57,22 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.number1" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.number1"
:greater="0"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.workingHours1" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.workingHours1"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -74,11 +85,22 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.number2" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.number2"
:greater="0"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.workingHours2" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.workingHours2"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -91,11 +113,22 @@
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.number3" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.number3"
:greater="0"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
<up-input type="number" v-model="formData.workingHours3" placeholder="请输入" clearable></up-input>
<global-number-input
v-model="formData.workingHours3"
:greater="0"
:precision="2"
inputAlign="left"
border="surround"
></global-number-input>
</view>
<view class="spacer"></view>
<view class="sample-tbody-td">
......@@ -108,77 +141,49 @@
<view class="mocp-title">特种车辆、设备、工具租用记录</view>
<view class="mocp-form">
<up-form-item label="牵引车(单位/次)" prop="tractor" :borderBottom="true">
<up-input type="number" v-model="formData.tractor" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.tractor"></global-number-input>
</up-form-item>
<up-form-item label="气源车(单位/次)" prop="asu" :borderBottom="true">
<up-input type="number" v-model="formData.asu" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.asu"></global-number-input>
</up-form-item>
<up-form-item label="电源车(单位/小时)" prop="gpu" :borderBottom="true">
<up-input type="number" v-model="formData.gpu" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.gpu"></global-number-input>
</up-form-item>
<up-form-item label="空调车(单位/小时)" prop="acu" :borderBottom="true">
<up-input type="number" v-model="formData.acu" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.acu"></global-number-input>
</up-form-item>
<up-form-item label="充氧车(单位/次)" prop="oxygenCharging" :borderBottom="true">
<up-input
type="number"
v-model="formData.oxygenCharging"
inputAlign="right"
border="none"
placeholder="请输入"
clearable
></up-input>
<global-number-input v-model="formData.oxygenCharging"></global-number-input>
</up-form-item>
<up-form-item label="高空作业车(单位/小时)" prop="cherryPicker" :borderBottom="true">
<up-input
type="number"
v-model="formData.cherryPicker"
inputAlign="right"
border="none"
placeholder="请输入"
clearable
></up-input>
<global-number-input v-model="formData.cherryPicker"></global-number-input>
</up-form-item>
<up-form-item label="轮胎充气(单位/次)" prop="tireCharging" :borderBottom="true">
<up-input
type="number"
v-model="formData.tireCharging"
inputAlign="right"
border="none"
placeholder="请输入"
clearable
></up-input>
<global-number-input v-model="formData.tireCharging"></global-number-input>
</up-form-item>
<up-form-item label="减震支柱充气(单位/次)" prop="shockStrutCharging" :borderBottom="true">
<up-input
type="number"
v-model="formData.shockStrutCharging"
inputAlign="right"
border="none"
placeholder="请输入"
clearable
></up-input>
<global-number-input v-model="formData.shockStrutCharging"></global-number-input>
</up-form-item>
<up-form-item label="工作梯(单位/小时)" prop="ladder" :borderBottom="true">
<up-input type="number" v-model="formData.ladder" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.ladder"></global-number-input>
</up-form-item>
<up-form-item label="千斤顶(单位/小时)" prop="jackscrew" :borderBottom="true">
<up-input type="number" v-model="formData.jackscrew" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.jackscrew"></global-number-input>
</up-form-item>
<up-form-item label="动力设备工具(单位/次)" prop="powerTool" :borderBottom="true">
<up-input type="number" v-model="formData.powerTool" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.powerTool"></global-number-input>
</up-form-item>
<up-form-item label="非动力设备工具(单位/次)" prop="tools" :borderBottom="true">
<up-input type="number" v-model="formData.tools" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.tools"></global-number-input>
</up-form-item>
<up-form-item label="充电瓶(单位/次)" prop="charger" :borderBottom="true">
<up-input type="number" v-model="formData.charger" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.charger"></global-number-input>
</up-form-item>
<up-form-item label="尾撑(单位/小时)" prop="tails" :borderBottom="true">
<up-input type="number" v-model="formData.tails" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.tails"></global-number-input>
</up-form-item>
<up-form-item label="机库(单位/小时)" prop="hanger" :borderBottom="true">
<up-input type="number" v-model="formData.hanger" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.hanger"></global-number-input>
</up-form-item>
</view>
</up-form>
......@@ -192,6 +197,7 @@ import { formData, rules } from './constants/add.compositions'
import { navigateTo } from 'mocp/utils/jump'
import { ref } from 'vue'
import { changeAcreg } from './constants/add.functionals'
import { validateParameters } from 'mocp/utils/tool'
const baseStore = useBaseStore()
const electronicBillStore = useElectronicBillStore()
......@@ -202,6 +208,15 @@ const {
const formRef = ref()
const handleFooterClick = async () => {
await formRef.value?.validate()
if (!validateParameters(formData.number1, formData.workingHours1)) {
return uni.$mocpMessage.warning('请同时填写第1条非例行工作的人数和工时')
}
if (!validateParameters(formData.number2, formData.workingHours2)) {
return uni.$mocpMessage.warning('请同时填写第2条非例行工作的人数和工时')
}
if (!validateParameters(formData.number3, formData.workingHours3)) {
return uni.$mocpMessage.warning('请同时填写第3条非例行工作的人数和工时')
}
navigateTo('/panel/electronicBill/nonRoutineWork/sign')
}
</script>
......
src/pages/modules/mocp/panel/electronicBill/routineWork/add.vue
......@@ -72,23 +72,16 @@
<view class="mocp-title">设备使用记录</view>
<view class="mocp-form">
<up-form-item label="电源车(单位/小时)" prop="groundPower" :borderBottom="true">
<up-input type="number" v-model="formData.groundPower" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.groundPower"></global-number-input>
</up-form-item>
<up-form-item label="气源车(单位/次)" prop="airStarter" :borderBottom="true">
<up-input type="number" v-model="formData.airStarter" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.airStarter"></global-number-input>
</up-form-item>
<up-form-item label="牵引车(单位/次)" prop="towPus" :borderBottom="true">
<up-input type="number" v-model="formData.towPus" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
<global-number-input v-model="formData.towPus"></global-number-input>
</up-form-item>
<up-form-item label="空调车(单位/小时)" prop="airConditioning" :borderBottom="true">
<up-input
type="number"
v-model="formData.airConditioning"
inputAlign="right"
border="none"
placeholder="请输入"
clearable
></up-input>
<global-number-input v-model="formData.airConditioning"></global-number-input>
</up-form-item>
<up-form-item label="其他" prop="others1" :borderBottom="true">
<up-input v-model="formData.others1" inputAlign="right" border="none" placeholder="请输入" clearable></up-input>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment