diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index 096d7af..4e510f0 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -494,7 +494,7 @@ export default {
title: '操作成功',
icon: 'none'
})
- if("done"==this.nowChooseOperate || "check"==this.nowChooseOperate || "callCus"==this.nowChooseOperate){
+ if("done"==this.nowChooseOperate || "check"==this.nowChooseOperate || "callCus"==this.nowChooseOperate || "out"==this.nowChooseOperate){
//移交总检需要返回| 总检拍照后需要返回
setTimeout(() => {
uni.navigateBack()
diff --git a/pages-warehouse/home/home.vue b/pages-warehouse/home/home.vue
index 31412e0..141c256 100644
--- a/pages-warehouse/home/home.vue
+++ b/pages-warehouse/home/home.vue
@@ -95,7 +95,8 @@ import {
getToken,
getUserInfo,
getStrData,
- getTenantId
+ getTenantId,
+ setJSONData
} from '@/utils/auth'
import {getDictTextByCodeAndValue,formatDate,formatTimestamp} from "@/utils/utils";
@@ -167,10 +168,7 @@ export default {
})
} else {
//直接取缓存中的用户信息
- this.userInfo = getUserInfo() || {
- nickname: '用户',
- roleNames: '角色'
- }
+ this.userInfo = getUserInfo()
this.onRefresherrefresh()
this.getNoReadNum()
this.getNoticeList()
@@ -255,10 +253,11 @@ export default {
/**
* 配件出库
*/
- inOutWareHouse(formData,isBack){
- formData.isBack = isBack
+ inOutWareHouse(formData,isReceive){
+ formData.isReceive = isReceive
+ setJSONData("applyWaresForm",formData)
uni.navigateTo({
- url: '/pages-warehouse/inOutWarehouse/inOutWarehouse?formData='+encodeURIComponent(JSON.stringify(formData))
+ url: '/pages-warehouse/inOutWarehouse/inOutWarehouse'
})
},
@@ -658,7 +657,7 @@ export default {
background: #FFFFFF;
border-radius: 8rpx 8rpx 8rpx 8rpx;
padding: 0 30rpx 30rpx;
-
+ margin-bottom: 20rpx;
.order-top {
padding: 30rpx 0;
display: flex;
diff --git a/pages-warehouse/inOutWarehouse/inOutWarehouse.vue b/pages-warehouse/inOutWarehouse/inOutWarehouse.vue
index 62107c4..58998bf 100644
--- a/pages-warehouse/inOutWarehouse/inOutWarehouse.vue
+++ b/pages-warehouse/inOutWarehouse/inOutWarehouse.vue
@@ -12,25 +12,34 @@
{{ item.waresName }}
单位:
- {{ item.unitStr }}
+ {{ item.wares.unit }}
- 库存:
- {{ item.wares.stock }}
+ 申请数量:
+ {{ item.waresCount }}
- {{ item.waresCount }}
+ {{ item.thisNum }}
+
+ 库存:
+ {{ item.wares.stock }}
+
+ 已领取:
+ {{ item.waresAlreadyCount }}
+
+
+
@@ -38,6 +47,9 @@
+
diff --git a/uni_modules/uni-section/package.json b/uni_modules/uni-section/package.json
new file mode 100644
index 0000000..0a31fb5
--- /dev/null
+++ b/uni_modules/uni-section/package.json
@@ -0,0 +1,87 @@
+{
+ "id": "uni-section",
+ "displayName": "uni-section 标题栏",
+ "version": "0.0.1",
+ "description": "标题栏组件",
+ "keywords": [
+ "uni-ui",
+ "uniui",
+ "标题栏"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": ""
+ },
+ "directories": {
+ "example": "../../temps/example_temps"
+ },
+ "dcloudext": {
+ "category": [
+ "前端组件",
+ "通用组件"
+ ],
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+ },
+ "uni_modules": {
+ "dependencies": [
+ "uni-scss"
+ ],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-section/readme.md b/uni_modules/uni-section/readme.md
new file mode 100644
index 0000000..d47faab
--- /dev/null
+++ b/uni_modules/uni-section/readme.md
@@ -0,0 +1,8 @@
+## Section 标题栏
+> **组件名:uni-section**
+> 代码块: `uSection`
+
+uni-section 组件主要用于文章、列表详情等标题展示
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-section)
+#### 如使用过程中有任何问题,或者您对uni-ui有一些好的建议,欢迎加入 uni-ui 交流群:871950839