diff --git a/src/common/style/pdabasic.css b/src/common/style/pdabasic.css
index 7981b891..841653fc 100644
--- a/src/common/style/pdabasic.css
+++ b/src/common/style/pdabasic.css
@@ -253,6 +253,7 @@
font-size: 28rpx;
background: rgba(95, 203, 148, 0.2);
color: #22AF68;
+ padding: 10rpx 20rpx 10rpx 20rpx;
border-radius: 10rpx;
}
@@ -281,9 +282,8 @@
/* 关闭 */
.other {
- /* background-color: #808080; */
- color: #b4a5ff;
- font-size: 26rpx;
+ background-color: #808080;
+ color: #FFFFFF;
border-radius: 10rpx;
}
@@ -329,19 +329,16 @@
.inventory_status_insp {
color: #F9AE3D;
margin-right: 10rpx;
- font-size:26rpx
}
.inventory_status_ok {
color: #67C23A;
margin-right: 10rpx;
- font-size:26rpx
}
.inventory_status_nok {
color: #FF2424;
margin-right: 10rpx;
- font-size:26rpx
}
.inventory_status_hold {
@@ -483,9 +480,10 @@ export function getItemTypeStyle(val) {
.detail-list {
background-color: #fff;
- margin:20rpx 20rpx;
- padding:0px 20rpx;
- border-radius: 16rpx;
+ padding: 5rpx 10rpx;
+ /* margin: 20rpx; */
+ /* border-radius: 16rpx; */
+ /* overflow: hidden; */
}
.detail-content {
@@ -633,7 +631,7 @@ export function getItemTypeStyle(val) {
/* border-width: 0.5px;
border-style: solid;
border-color: #e5e5e5;
- border-radius: 5px;
+ border-radius: 5px;
background-color: rgb(248, 248, 248);
font-size: 18px;*/
font-size: .825rem;
@@ -723,44 +721,38 @@ page {
flex-direction: column;
width: 100%;
height: 100%;
- background-color: #f5f5f5;
+ /* background-color: #fff; */
}
.page-header {
- background-color: rgb(60, 156, 255) !important;
+ background-color: #3c9cff;
font-size: 35rpx;
- padding: 10rpx 20rpx 20rpx;
+ padding: 10rpx 20rpx;
}
+
.page-header .header-view {
display: flex;
flex-direction: column;
background-color: #fff;
font-size: 35rpx;
padding: 10rpx 20rpx;
- border-radius:4px;
+ border-radius: 4px;
}
-.page-header-box{
- background-color: #fff !important;
- padding:0px 20rpx 20rpx;
- border-radius: 12rpx;
-}
-
-.page-header .header_item {
+.page-header .header-view .header_item {
/* padding-left: 10rpx; */
- font-size:28rpx ;
- color:#777E94;
-}
-.page-header .header_item text{
- color:#011C43;
+ padding: 5rpx 10rpx;
+ font-size: 32rpx;
}
-.page-header .header_job_top {
- padding:5rpx 0rpx;
+.page-header .header-view .header_job_top {
+ padding: 5rpx 0rpx;
}
+
.page-main {
flex: 1;
position: relative;
+ background: #fff;
}
.page-main-scroll {
@@ -779,15 +771,10 @@ page {
}
-.choose-box1{
- background: white;
- padding:10rpx 20rpx
-}
-.choose-item1{
- border: 1px solid rgba(230, 230, 230, 1);
- padding: 20rpx;
- display: flex
-}
-.choose-text1{
- flex:1
-}
+.page-footer {
+ /* color: #fff; */
+ line-height: 100rpx;
+ /* 不放大不缩小固定100rpx */
+ flex: 0 0 100rpx;
+ /* background-color: #00AAFF; */
+}
\ No newline at end of file
diff --git a/src/pages.json b/src/pages.json
index 8c376964..bfab7353 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1103,7 +1103,6 @@
"enablePullDownRefresh": false
}
},
-
{
"path": "pages/productReceipt/record/productReceiptRecord",
"style": {
@@ -1145,7 +1144,14 @@
}
},
+ {
+ "path": "pages/productPutaway/record/productPutawayRecord",
+ "style": {
+ "navigationBarTitleText": "制品上架记录",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "pages/productPutaway/record/fgDirectPutaway",
"style": {
diff --git a/src/pages/fg/receiptByPlan.vue b/src/pages/fg/receiptByPlan.vue
index beef9007..507b1169 100644
--- a/src/pages/fg/receiptByPlan.vue
+++ b/src/pages/fg/receiptByPlan.vue
@@ -1,89 +1,99 @@
-
+
+
@@ -93,7 +103,7 @@ import { onLoad, onShow, onNavigationBarButtonTap, onReady, onBackPress, onReach
import { isCheckMesCode, planReceiptSubmit, createPutawayRequestByPlan, createInspectRequestByPlan, getPlanByNumber } from '@/api/request2.js'
import { calc } from '@/common/calc.js'
-import { getRemoveOption, deepCopyData, getCurrDateTime, compare } from '@/common/basic.js'
+import { getRemoveOption, deepCopyData, getCurrDateTime, compare,getSwitchInfoByCode } from '@/common/basic.js'
import winScanButton from '@/mycomponents/scan/winScanButton.vue'
import comBlankView from '@/mycomponents/common/comBlankView.vue'
import comReceiptPopup from '@/pages/fg/coms/comReceiptPopup.vue'
@@ -240,9 +250,14 @@ const commit = async () => {
throw new Error('提交失败')
}
- createPutawayRequestByPlan(list[0].requestNumber).then((res) => {
- createInspectRequestByPlan(list[0].requestNumber)
- })
+ //装配收货记录 生成后 创建 制品上架申请
+ let createProductputawaySwitch = getSwitchInfoByCode(
+ "CreateProductputawayRequestAfterProductreceiptRecordCreated")
+ if (createProductputawaySwitch) {
+ createPutawayRequestByPlan(list[0].requestNumber).then(res => {
+ createInspectRequestByPlan(list[0].requestNumber)
+ })
+ }
const queryParams = {
filters: [
diff --git a/src/pages/fg/receiptNoPlan.vue b/src/pages/fg/receiptNoPlan.vue
index b813bd62..0e1526e5 100644
--- a/src/pages/fg/receiptNoPlan.vue
+++ b/src/pages/fg/receiptNoPlan.vue
@@ -7,7 +7,7 @@