From 55ea3d5de0c128d82bbc85551b3f52b917abbd68 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 八月 2025 20:58:18 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/jinkuai
---
small-program/pages/packaging-worker/packaging-worker.vue | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index deb0d78..55137c7 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -84,10 +84,14 @@
<view :class="form.carType === item.id ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in settlementType" :key="index" @click="clickType(item.id)">{{item.name}}</view>
</view>
<view class="list-item-row">
- <view class="list-item-row-label">澶╂暟</view>
+ <view class="list-item-row-label" v-if="form.carType === 0">澶╂暟</view>
+ <view class="list-item-row-label" v-if="form.carType === 1">灏忔椂鏁�</view>
+ <view class="list-item-row-label" v-if="form.carType === 2">閲嶉噺</view>
<view class="list-item-row-val">
- <input v-model="form.priceNum1" disabled @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
- <text>澶�</text>
+ <input v-model="form.priceNum1" :disabled="form.carType === 0" @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
+ <text v-if="form.carType === 0">澶�</text>
+ <text v-if="form.carType === 1">灏忔椂</text>
+ <text v-if="form.carType === 2">鏂�</text>
</view>
</view>
<view class="list-item-row">
@@ -143,6 +147,7 @@
:show="show"
color="#00BC12"
mode="range"
+ :allowSameDay="true"
@close="show = false"
@confirm="confirmDate" />
@@ -198,11 +203,12 @@
},
settlementType: [
{ name: '鎸夊ぉ浠樿垂', id: 0 },
- { name: '鎸夋浠樿垂', id: 1 },
+ { name: '鎸夊皬鏃朵粯璐�', id: 1 },
{ name: '鎸夐噸閲忎粯璐�', id: 2 }
],
cateList: [],
- viewStatus: false
+ viewStatus: false,
+ workDays: 0
};
},
onLoad(option) {
@@ -269,7 +275,7 @@
uni.showToast({ title: '缂栬緫鎴愬姛', icon: 'success', mask: true, duration: 2000 })
setTimeout(() => {
uni.navigateBack({ delta: 1 });
- uni.$emit('refresh')
+ // uni.$emit('refresh')
}, 1500)
}
}
@@ -296,7 +302,11 @@
confirmDate(e) {
this.form.startDate = e[0]
this.form.endDate = e[e.length - 1]
- this.form.priceNum1 = e.length;
+ let time = this.form.startDate == this.form.endDate ? 1 : 0
+ this.workDays = e.length - time;
+ if (this.form.carType === 0) {
+ this.form.priceNum1 = e.length - time;
+ }
this.show = false
this.getPrice()
},
@@ -313,8 +323,13 @@
this.form.carType = id
if (id === 0) {
this.form.priceUnit = '鍏�/浜�/澶�'
- } else {
+ this.form.priceNum1 = this.workDays
+ } else if (id === 1) {
this.form.priceUnit = '鍏�/浜�/灏忔椂'
+ this.form.priceNum1 = ''
+ } else {
+ this.form.priceUnit = '鍏�/鏂�'
+ this.form.priceNum1 = ''
}
},
confirmCategary(e) {
--
Gitblit v1.9.3