添加语言提示，暂存列表倒序

src/api/index.ts

@@ -97,8 +97,10 @@ class RequestHttp {
         }
         // * 全局错误信息拦截（防止下载文件得时候返回数据流，没有code，直接报错）
         if (data.Code && data.Code !== ResultEnum.SUCCESS) {
-          ElMessage.error(data.Msg)
-          return Promise.reject(data)
+			if (data.Code!=1201){
+				ElMessage.error(data.Msg)
+				return Promise.reject(data)
+			}
         }
         // * 成功请求（在页面上除非特殊情况，否则不用在页面处理失败逻辑）
         return data

src/views/storehouse/ValidationTool/validation.vue

@@ -162,13 +162,19 @@ const extractSN = (fullSN: string): string => {
 }
 
 const submitInStorageForm = () => {
-  inStorageFormRef.value?.validate((valid: boolean) => {
+  inStorageFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       const extractedSN = extractSN(inStorageForm.T_sn)
       if (pendingItems.value.some((item: any) => item.T_sn === extractedSN)) {
         ElMessage.warning('已存在相同的SN，不能添加')
         return
       }
+      const result: any = await readvaildation({ sn: extractedSN })
+      if ((result.Code==200)&&(result.Data.T_state == 2)) {
+        //1-已出库 2-待使用  3-待维修
+        ElMessage.warning('当前SN已入库不能重复入库')
+        return
+      }
       pendingItems.value.unshift({ ...inStorageForm, T_sn: extractedSN })
       inStorageForm.T_sn = ''
       inStorageForm.Validationnumber = ''
@@ -197,10 +203,15 @@ const submitRepaidForm = () => {
         ElMessage.warning('当前SN未入库不能归还')
         return
       }
+      if (result.Data.T_state != 1) {
+        //1-已出库 2-待使用  3-待维修
+        ElMessage.warning('当前SN未出库不能归还')
+        return
+      }
 
-		pendingItems.value.unshift({ ...inStorageForm, T_sn: extractedSN })
+      pendingItems.value.unshift({ ...inStorageForm, T_sn: extractedSN })
 
-		inStorageForm.T_sn = ''
+      inStorageForm.T_sn = ''
       inStorageForm.Validationnumber = ''
       inStorageForm.T_remark = ''
       ElMessage.success('已添加到待提交列表')
@@ -279,6 +290,7 @@ const lendRules = reactive({
 })
 
 const submitLendForm = () => {
+  console.log()
   lendFormRef.value?.validate(async (valid: boolean) => {
     if (valid) {
       const extractedSN = extractSN(lendForm.T_sn)
@@ -291,7 +303,10 @@ const submitLendForm = () => {
         ElMessage.warning('当前SN未入库不能借出')
         return
       }
-
+      if (result.Data.T_state != 2) {
+        ElMessage.warning('当前SN未入库不能借出')
+        return
+      }
       pendingLendItems.value.unshift({
         T_sn: extractedSN,
         Validationnumber: lendForm.Validationnumber,
@@ -588,7 +603,7 @@ onMounted(() => {
     <template #footer>
       <span class="dialog-footer">
         <el-button @click="showInStorageForm = false">取消</el-button>
-        <el-button type="primary" @click="submitInStorageForm">添加到暂存</el-button>
+        <el-button type="primary" @click="submitInStorageForm">添加到暂存11</el-button>
         <!-- 新增提交按钮 -->
         <el-button type="primary" @click="submitInStoragePendingItems">提交</el-button>
       </span>