From 47d8cea8db52f3f4dad11a2c74cfbbce11197eca Mon Sep 17 00:00:00 2001
From: siontion <siontion_2000@163.com>
Date: Mon, 22 Jan 2024 14:28:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=85=A5=E5=BA=93=20=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

出入库 验证
---
 .../src/views/heli/storage/StorageForm.vue      | 17 ++++++++++++-----
 .../src/views/heli/storage/StorageOut.vue       | 17 ++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
index a529b66d..d82473aa 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageForm.vue
@@ -154,9 +154,14 @@
                     </template>
                   </el-table-column>
                   <el-table-column prop="storageOkQty" width="120" label="入库数量" required>
+
                     <template #default="scope">
-                      <el-input v-model="scope.row.storageOkQty" />
+                      <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty"
+                        class="mb-0px!">
+                        <el-input v-model="scope.row.storageOkQty" />
+                      </el-form-item>
                     </template>
+
                   </el-table-column>
                   <el-table-column prop="lotNo" width="120" label="批次号">
                     <template #default="scope">
@@ -362,6 +367,7 @@ const subFormRules = reactive({
   matId: [{ required: true, message: '物料不能为空', trigger: 'blur' }],
   rgId: [{ required: true, message: '库区不能为空', trigger: 'blur' }],
   pnId: [{ required: true, message: '库位不能为空', trigger: 'blur' }],
+  storageOkQty: [{ required: true, message: '入库数量不能为空', trigger: 'blur' }],
 })
 const handleStatus = (async (num) => {
 
@@ -448,7 +454,7 @@ const handleDeleteAttachment = async (index, type) => {
 }
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  if(url){
+  if (url) {
     const data = await downloadFile(url)
     download.any(data, name);
   }
@@ -492,7 +498,7 @@ const submitForm = async () => {
     const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
     await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
 
-    if(formData.value.matItemDOList.length>0){
+    if (formData.value.matItemDOList.length > 0) {
       //附件信息保存
       matUploadData.value.businessId = storageid
       matUploadRef.value!.submit()
@@ -638,7 +644,7 @@ onMounted(async () => {
 
   dialogTitle.value = t('action.' + query.type)
 
-  dialogTitle.value = query.type === 'review'?'查看':dialogTitle.value
+  dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
 
   isShow.value = query.type == "create" ? false : true
 
@@ -743,4 +749,5 @@ onMounted(async () => {
 a {
   color: #409eff;
   text-decoration: none;
-}</style>
+}
+</style>
diff --git a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
index 2d2b6dbb..4aa88463 100644
--- a/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
+++ b/mes-ui/mes-ui-admin-vue3/src/views/heli/storage/StorageOut.vue
@@ -100,7 +100,7 @@
                   <el-table-column prop="matId" label="物料名称" :width="150">
                     <template #default="scope">
                       <el-form-item :prop="`${scope.$index}.matId`" :rules="subFormRules.matId" class="mb-0px!">
-                        <el-select v-model="scope.row.matId" placeholder="物料编码" :remote-method="remoteMatCodeSearch"
+                        <el-select v-model="scope.row.matId" placeholder="物料名称" :remote-method="remoteMatCodeSearch"
                           remote-show-suffix remote clearable reserve-keyword filterable :loading="matSelectLoading"
                           @change="(val) => handleMatCode(scope, val)" class="!w-180px">
                           <el-option v-for="item in matList" :key="item.id" :label="item.name" :value="item.id" />
@@ -145,9 +145,14 @@
                   </el-table-column>
                   <el-table-column prop="matRest" label="库存数量" />
                   <el-table-column prop="storageOkQty" width="120" label="出库数量" required>
+
                     <template #default="scope">
-                      <el-input v-model="scope.row.storageOkQty" />
+                      <el-form-item :prop="`${scope.$index}.storageOkQty`" :rules="subFormRules.storageOkQty"
+                        class="mb-0px!">
+                        <el-input v-model="scope.row.storageOkQty" />
+                      </el-form-item>
                     </template>
+
                   </el-table-column>
                   <el-table-column prop="lotNo" width="120" label="批次号" />
                   <el-table-column prop="description" width="150" label="备注">
@@ -328,6 +333,7 @@ const formData = ref({
   matItemDOList: [],
   attachments: []
 })
+
 const formRules = reactive({
   // name: [{ required: true, message: '模具类型不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '启用状态不能为空', trigger: 'blur' }],
@@ -342,6 +348,7 @@ const subFormRules = reactive({
   matId: [{ required: true, message: '物料不能为空', trigger: 'blur' }],
   rgId: [{ required: true, message: '库区不能为空', trigger: 'blur' }],
   pnId: [{ required: true, message: '库位不能为空', trigger: 'blur' }],
+  storageOkQty: [{ required: true, message: '出库数量不能为空', trigger: 'blur' }],
 })
 const handleStatus = (async (num) => {
 
@@ -426,7 +433,7 @@ const handleDeleteAttachment = async (index, type) => {
 }
 // 下载文件
 const downloadAttachment = async (name, url) => {
-  if(url){
+  if (url) {
     const data = await downloadFile(url)
     download.any(data, name);
   }
@@ -486,7 +493,7 @@ const submitForm = async () => {
     const dataMats = formData.value.matItemDOList as unknown as StorageMatApi.StorageMatVO[]
     await StorageMatApi.createStorageMatBatch(dataMats, storageid.value)
 
-    if(formData.value.matItemDOList.length>0){
+    if (formData.value.matItemDOList.length > 0) {
       //附件信息保存
       matUploadData.value.businessId = storageid
       matUploadRef.value!.submit()
@@ -663,7 +670,7 @@ onMounted(async () => {
 
 
   dialogTitle.value = t('action.' + query.type)
-  dialogTitle.value = query.type === 'review'?'查看':dialogTitle.value
+  dialogTitle.value = query.type === 'review' ? '查看' : dialogTitle.value
 
   isShow.value = query.type == "create" ? false : true