Hooke / temple_material_request

Go to a project
Toggle navigation Toggle navigation pinning
hookehuyr
7d040e98 1 parent 55e76549

✨ feat(use_time相关页面): 使用时间不要传了，客户要求的

Inline Side-by-side
Showing 2 changed files with 11 additions and 11 deletions
1 <!-- 1 <!--
2 * @Date: 2024-07-23 10:50:38 2 * @Date: 2024-07-23 10:50:38
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-07-29 17:38:42 4 + * @LastEditTime: 2024-08-03 13:11:22
5 * @FilePath: /temple_material_request/src/views/material_list.vue 5 * @FilePath: /temple_material_request/src/views/material_list.vue
6 * @Description: 物资情况页面 6 * @Description: 物资情况页面
7 --> 7 -->
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <div class="item-title van-ellipsis" :style="{ color: styleColor.baseColor }" @click="onClickTitle(item)">{{ item.product_name }} / {{ item.spec }}</div> 21 <div class="item-title van-ellipsis" :style="{ color: styleColor.baseColor }" @click="onClickTitle(item)">{{ item.product_name }} / {{ item.spec }}</div>
22 <div class="item-attr"> 22 <div class="item-attr">
23 <div v-for="(x, index) in item.order_list" :key="index"> 23 <div v-for="(x, index) in item.order_list" :key="index">
24 - 申领人:{{ x.contact_name }}&nbsp;{{ x.use_time }}&nbsp;使用 24 + 申领人:{{ x.contact_name }}&nbsp;{{ x.create_date }}&nbsp;使用
25 </div> 25 </div>
26 </div> 26 </div>
27 </van-col> 27 </van-col>
......
1 <!-- 1 <!--
2 * @Date: 2024-07-23 12:53:15 2 * @Date: 2024-07-23 12:53:15
3 * @LastEditors: hookehuyr hookehuyr@gmail.com 3 * @LastEditors: hookehuyr hookehuyr@gmail.com
4 - * @LastEditTime: 2024-07-31 10:48:57 4 + * @LastEditTime: 2024-08-02 23:04:47
5 * @FilePath: /temple_material_request/src/views/material_pre_request.vue 5 * @FilePath: /temple_material_request/src/views/material_pre_request.vue
6 * @Description: 待申领物资页面 6 * @Description: 待申领物资页面
7 --> 7 -->
...@@ -61,13 +61,12 @@ ...@@ -61,13 +61,12 @@
61 </div> 61 </div>
62 <van-empty v-if="!list.length" image="error" description="待申领物资为空" /> 62 <van-empty v-if="!list.length" image="error" description="待申领物资为空" />
63 <div style="height: 10rem;"></div> 63 <div style="height: 10rem;"></div>
64 - <div style="position: fixed; left: 0; right: 0; bottom:4.5rem; padding: 1rem; background-color: white;"> 64 + <div style="position: fixed; left: 0; right: 0; bottom:4.5rem; padding: 1rem 1.6rem; background-color: white;">
65 <van-button icon="plus" type="primary" :color="styleColor.baseColor" plain block :disabled="disabled_btn" @click="addMore">添加更多</van-button> 65 <van-button icon="plus" type="primary" :color="styleColor.baseColor" plain block :disabled="disabled_btn" @click="addMore">添加更多</van-button>
66 </div> 66 </div>
67 </div> 67 </div>
68 <div class="control-bar"> 68 <div class="control-bar">
69 - <!-- --> 69 + <!-- <div style="display: flex; justify-content: space-between; align-items: center;">
70 - <div style="display: flex; justify-content: space-between; align-items: center;">
71 <div style="display: flex; align-items: center;" @click="showPicker = true"> 70 <div style="display: flex; align-items: center;" @click="showPicker = true">
72 <div style="font-size: 0.85rem; color: #202020;">使用时间:</div>&nbsp;&nbsp; 71 <div style="font-size: 0.85rem; color: #202020;">使用时间:</div>&nbsp;&nbsp;
73 <div style="border: 1px solid #f0f0f0; border-radius: 5px; padding: 0.5rem 0.35rem 0.5rem 1rem; min-width: 6rem; font-size: 0.85rem; display: flex; align-items: center; justify-content: space-between;">{{ use_time }}&nbsp;&nbsp;<van-icon name="notes-o" size="1rem" :color="styleColor.baseColor" /></div> 72 <div style="border: 1px solid #f0f0f0; border-radius: 5px; padding: 0.5rem 0.35rem 0.5rem 1rem; min-width: 6rem; font-size: 0.85rem; display: flex; align-items: center; justify-content: space-between;">{{ use_time }}&nbsp;&nbsp;<van-icon name="notes-o" size="1rem" :color="styleColor.baseColor" /></div>
...@@ -75,7 +74,8 @@ ...@@ -75,7 +74,8 @@
75 <div style="display: flex; align-items: center;"> 74 <div style="display: flex; align-items: center;">
76 <van-button type="primary" :color="styleColor.baseColor" :disabled="disabled_btn" @click="onConfirmRequest">确定申领</van-button> 75 <van-button type="primary" :color="styleColor.baseColor" :disabled="disabled_btn" @click="onConfirmRequest">确定申领</van-button>
77 </div> 76 </div>
78 - </div> 77 + </div> -->
78 + <van-button type="primary" block :color="styleColor.baseColor" :disabled="disabled_btn" @click="onConfirmRequest">确定申领</van-button>
79 </div> 79 </div>
80 </div> 80 </div>
81 81
...@@ -379,10 +379,10 @@ const onConfirmRequest = () => { // 确定申领回调 ...@@ -379,10 +379,10 @@ const onConfirmRequest = () => { // 确定申领回调
379 showToast('请先添加申领物资'); 379 showToast('请先添加申领物资');
380 return; 380 return;
381 } 381 }
382 - if (!use_time.value) { 382 + // if (!use_time.value) {
383 - showToast('请选择使用日期'); 383 + // showToast('请选择使用日期');
384 - return; 384 + // return;
385 - } 385 + // }
386 let sum = list.value.some((item) => { return +item.apply_number > 0 }); // 判断是否有一个值不等于0 386 let sum = list.value.some((item) => { return +item.apply_number > 0 }); // 判断是否有一个值不等于0
387 if (!sum) { 387 if (!sum) {
388 showToast('请检查申领物资的数量'); 388 showToast('请检查申领物资的数量');
......