diff --git a/src/api/label/index.ts b/src/api/label/index.ts
index 95ebf2b..223680c 100644
--- a/src/api/label/index.ts
+++ b/src/api/label/index.ts
@@ -73,7 +73,7 @@ export function getSdkList(data: any) {
export function getUnitList(data: any) {
return request({
- url: '/api/label/getUnitData',
+ url: '/api/api/label/getUnitData',
method: 'post',
data: data,
});
diff --git a/src/views/stockIn/NChargeStockIn/index.vue b/src/views/stockIn/NChargeStockIn/index.vue
index 80d6d82..81f93dc 100644
--- a/src/views/stockIn/NChargeStockIn/index.vue
+++ b/src/views/stockIn/NChargeStockIn/index.vue
@@ -89,25 +89,25 @@
:value="item.ENUMVALUE" />
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -270,18 +270,18 @@ onMounted(() => {
// width: '100px',
hide: false
},
- {
- header: '规格',
- field: 'SDK_ID',
- width: '100px',
- hide: false
- },
- {
- header: '阶段',
- field: 'PHASE',
- // width: '100px',
- hide: false
- },
+ // {
+ // header: '规格',
+ // field: 'SDK_ID',
+ // width: '100px',
+ // hide: false
+ // },
+ // {
+ // header: '阶段',
+ // field: 'PHASE',
+ // // width: '100px',
+ // hide: false
+ // },
{
header: '数量',
field: 'MATERIALQUANTITY',
@@ -363,31 +363,32 @@ function getpows() {
})
return
}
- // if('1' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1) || '2' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1)){
- if ('6' == state.queryParam.MATERIALSPECNAME.slice(0, 1)) {
- if ('' == state.queryParam.PHASE) {
- ElMessageBox.alert('请输入阶段', {
- confirmButtonText: 'OK'
- })
- return
- }
- } else if (
- '3' == state.queryParam.MATERIALSPECNAME.slice(0, 1) ||
- '4' == state.queryParam.MATERIALSPECNAME.slice(0, 1)
- ) {
- if ('' == state.queryParam.sdkid) {
- ElMessageBox.alert('请输入规格', {
- confirmButtonText: 'OK'
- })
- return
- }
- if ('' == state.queryParam.PHASE) {
- ElMessageBox.alert('请输入阶段', {
- confirmButtonText: 'OK'
- })
- return
- }
- }
+ //SAP阶段没有SDK规格和阶段
+ // // if('1' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1) || '2' != state.queryParam.materialreceiveAct.MATERIALSPECNAME.slice(0,1)){
+ // if ('6' == state.queryParam.MATERIALSPECNAME.slice(0, 1)) {
+ // if ('' == state.queryParam.PHASE) {
+ // ElMessageBox.alert('请输入阶段', {
+ // confirmButtonText: 'OK'
+ // })
+ // return
+ // }
+ // } else if (
+ // '3' == state.queryParam.MATERIALSPECNAME.slice(0, 1) ||
+ // '4' == state.queryParam.MATERIALSPECNAME.slice(0, 1)
+ // ) {
+ // if ('' == state.queryParam.sdkid) {
+ // ElMessageBox.alert('请输入规格', {
+ // confirmButtonText: 'OK'
+ // })
+ // return
+ // }
+ // if ('' == state.queryParam.PHASE) {
+ // ElMessageBox.alert('请输入阶段', {
+ // confirmButtonText: 'OK'
+ // })
+ // return
+ // }
+ // }
// if ('NaN-NaN-NaN' == state.queryParam.MAKEDATE) {
// ElMessageBox.alert('请输入生产日期', {
// confirmButtonText: 'OK'