Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Hooke
/
temple_material_request
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
hookehuyr
2024-08-03 13:15:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7d040e98d907bbb80e9303faac50ee8052bd4245
7d040e98
1 parent
55e76549
✨ feat(use_time相关页面): 使用时间不要传了,客户要求的
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
src/views/material_list.vue
src/views/material_pre_request.vue
src/views/material_list.vue
View file @
7d040e9
<!--
* @Date: 2024-07-23 10:50:38
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2024-0
7-29 17:38:4
2
* @LastEditTime: 2024-0
8-03 13:11:2
2
* @FilePath: /temple_material_request/src/views/material_list.vue
* @Description: 物资情况页面
-->
...
...
@@ -21,7 +21,7 @@
<div class="item-title van-ellipsis" :style="{ color: styleColor.baseColor }" @click="onClickTitle(item)">{{ item.product_name }} / {{ item.spec }}</div>
<div class="item-attr">
<div v-for="(x, index) in item.order_list" :key="index">
申领人:{{ x.contact_name }} {{ x.
use_tim
e }} 使用
申领人:{{ x.contact_name }} {{ x.
create_dat
e }} 使用
</div>
</div>
</van-col>
...
...
src/views/material_pre_request.vue
View file @
7d040e9
<!--
* @Date: 2024-07-23 12:53:15
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2024-0
7-31 10:48:5
7
* @LastEditTime: 2024-0
8-02 23:04:4
7
* @FilePath: /temple_material_request/src/views/material_pre_request.vue
* @Description: 待申领物资页面
-->
...
...
@@ -61,13 +61,12 @@
</div>
<van-empty v-if="!list.length" image="error" description="待申领物资为空" />
<div style="height: 10rem;"></div>
<div style="position: fixed; left: 0; right: 0; bottom:4.5rem; padding: 1rem; background-color: white;">
<div style="position: fixed; left: 0; right: 0; bottom:4.5rem; padding: 1rem
1.6rem
; background-color: white;">
<van-button icon="plus" type="primary" :color="styleColor.baseColor" plain block :disabled="disabled_btn" @click="addMore">添加更多</van-button>
</div>
</div>
<div class="control-bar">
<!-- -->
<div style="display: flex; justify-content: space-between; align-items: center;">
<!-- <div style="display: flex; justify-content: space-between; align-items: center;">
<div style="display: flex; align-items: center;" @click="showPicker = true">
<div style="font-size: 0.85rem; color: #202020;">使用时间:</div>
<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 }} <van-icon name="notes-o" size="1rem" :color="styleColor.baseColor" /></div>
...
...
@@ -75,7 +74,8 @@
<div style="display: flex; align-items: center;">
<van-button type="primary" :color="styleColor.baseColor" :disabled="disabled_btn" @click="onConfirmRequest">确定申领</van-button>
</div>
</div>
</div> -->
<van-button type="primary" block :color="styleColor.baseColor" :disabled="disabled_btn" @click="onConfirmRequest">确定申领</van-button>
</div>
</div>
...
...
@@ -379,10 +379,10 @@ const onConfirmRequest = () => { // 确定申领回调
showToast('请先添加申领物资');
return;
}
if (!use_time.value) {
showToast('请选择使用日期');
return;
}
//
if (!use_time.value) {
//
showToast('请选择使用日期');
//
return;
//
}
let sum = list.value.some((item) => { return +item.apply_number > 0 }); // 判断是否有一个值不等于0
if (!sum) {
showToast('请检查申领物资的数量');
...
...
Please
register
or
login
to post a comment