From ce759f0a6f4f67460b011fb54d8d4a7187c04342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=B4=E8=BE=89?= <lixinghui-b7@boe.com.cn>
Date: Thu, 20 Mar 2025 20:17:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E6=89=B9=E6=AC=A1=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/label/index.ts                     |   2 +-
 src/views/stockIn/NChargeStockIn/index.vue | 109 +++++++++++----------
 2 files changed, 56 insertions(+), 55 deletions(-)

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" />
             </el-select>
           </el-form-item>
-          <el-form-item label="选择阶段" prop="PHASE">
-            <el-select v-model="queryParam.PHASE" placeholder="选择阶段">
-              <el-option label="" value="" />
-              <el-option label="C" value="C" />
-              <el-option label="D" value="D" />
-              <el-option label="S" value="S" />
-            </el-select>
-          </el-form-item>
+<!--          <el-form-item label="选择阶段" prop="PHASE">-->
+<!--            <el-select v-model="queryParam.PHASE" placeholder="选择阶段">-->
+<!--              <el-option label="" value="" />-->
+<!--              <el-option label="C" value="C" />-->
+<!--              <el-option label="D" value="D" />-->
+<!--              <el-option label="S" value="S" />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
         <el-form-item label="料号" prop="MATERIALSPECNAME">
-            <el-input v-model="queryParam.MATERIALSPECNAME" placeholder="请输入料号" @change="getSdkInfo"/>
-          </el-form-item>
-          <el-form-item label="选择SDK规格" prop="sdkid" >
-            <el-select filterable v-model="queryParam.sdkid" placeholder="选择SDK规格" @click="getMATERIALSPECNAME"  :filter-method="locatioNFilter"
-                       style="width: 300px">
-              <!--                       @change="GetERPLocationForList">-->
-              <el-option v-for="item in state.sdkList" :key="item.text" :label="item.text" lwhlslsk
-                         :value="item.value" />
-            </el-select>
+            <el-input v-model="queryParam.MATERIALSPECNAME" placeholder="请输入料号" />
           </el-form-item>
+<!--          <el-form-item label="选择SDK规格" prop="sdkid" >-->
+<!--            <el-select filterable v-model="queryParam.sdkid" placeholder="选择SDK规格" @click="getMATERIALSPECNAME"  :filter-method="locatioNFilter"-->
+<!--                       style="width: 300px">-->
+<!--              &lt;!&ndash;                       @change="GetERPLocationForList">&ndash;&gt;-->
+<!--              <el-option v-for="item in state.sdkList" :key="item.text" :label="item.text" lwhlslsk-->
+<!--                         :value="item.value" />-->
+<!--            </el-select>-->
+<!--          </el-form-item>-->
           <el-form-item label="实际规格">
             <el-input v-model="queryParam.TRUEGG" placeholder="填写实际规格" />
           </el-form-item>
@@ -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'