From f9790cc1fa5345770ec4be6a44786e0a9af18696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Tue, 30 Jul 2024 14:04:21 +0800
Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionQ1/index.vue          |  6 +-
 src/views/qms/inspectionQ2/index.vue          | 40 +++++---
 .../qms/inspectionQ2/inspectionQ2.data.ts     | 91 +++++++++++--------
 src/views/qms/inspectionQ3/index.vue          | 24 +++--
 .../qms/inspectionQ3/inspectionQ3.data.ts     | 73 ++++++++-------
 5 files changed, 139 insertions(+), 95 deletions(-)

diff --git a/src/views/qms/inspectionQ1/index.vue b/src/views/qms/inspectionQ1/index.vue
index cacbbaacf..92ee8d1b2 100644
--- a/src/views/qms/inspectionQ1/index.vue
+++ b/src/views/qms/inspectionQ1/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index 59644abb8..5c3cd909c 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -84,21 +84,27 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
     nextTick(() => {
     const setV = {}
     if(formField == 'itemCode'){
-      console.log(val);
       setV['uom'] = val[0]['supplierUom']
       }
-      if (formField == 'q1Number') {
-          console.log(123)
-      setV['q1Number'] = val[0]['number']
+      // if (formField == 'q1Number') {
+      //     console.log(123)
+      // setV['q1Number'] = val[0]['number']
+      // }
+if (formField == 'purchaseReceiptNumber') {
+      setV['wmsQty'] = val[0]['qty']
       }
-// if (formField == 'supplierCode') {
-//           console.log(123)
-//       setV['supplierCode'] = val[0]['code']
-//       }
-      
-    
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+    if(formField == 'q1Number'){
+      //Q1通知单号
+      let list = []
+      val.forEach(item=>{
+        list.push(item[searchField])
+      })
+      setV[formField] = list.join(',')
+      formRef.setValues(setV)
+    }else{
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
    })
 }
 
@@ -214,6 +220,10 @@ const formsSuccess = async (formType, data) => {
       return;
     }
   }
+  if (data.qty>data.wmsQty) { 
+message.error('数量不能大于记录中的收货数量')
+      return;
+  }
   if(data.activeTime==0)data.activeTime = null;
   if(data.expireTime==0)data.expireTime = null;
   if (formType === 'create') {
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index d2fc1ffe9..9ac2a2e21 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -14,7 +14,7 @@ import * as SupplierApi from '@/api/wms/supplier'
 import { Supplier } from '@/views/wms/basicDataManage/supplierManage/supplier/supplier.data'
 
 import * as PurchasereceiptRecordDetailApi from '@/api/wms/purchasereceiptRecordDetail'
-import { PurchasereceiptRecordMain1 } from '@/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data'
+import { PurchasereceiptRecordDetail } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data'
 
 import { useUserStore } from '@/store/modules/user'
 const userStore = useUserStore()
@@ -60,6 +60,7 @@ export const Q2 = useCrudSchemas(
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           enterSearch: true,
+          multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
@@ -78,14 +79,16 @@ export const Q2 = useCrudSchemas(
               isMainValue: false
             }
           ],
-          verificationParams: [{
-            key: 'number',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       },
       isSearch: true
@@ -132,14 +135,16 @@ export const Q2 = useCrudSchemas(
               isMainValue: false
             }
           ],
-          verificationParams: [{
-            key: 'code',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       }
     },
@@ -221,8 +226,8 @@ export const Q2 = useCrudSchemas(
           searchListPlaceholder: '请选择采购收货记录单号', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
           searchTitle: '采购收货记录', // 查询弹窗标题
-          searchAllSchemas: PurchasereceiptRecordMain1.allSchemas, // 查询弹窗所需类
-          searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageReturn, // 查询弹窗所需分页方法
+          searchAllSchemas: PurchasereceiptRecordDetail.allSchemas, // 查询弹窗所需类
+          searchPage: PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage, // 查询弹窗所需分页方法
           searchCondition: [
             {
               key: 'supplierCode',
@@ -235,17 +240,29 @@ export const Q2 = useCrudSchemas(
               isMainValue: true
             }
           ],
-          verificationParams: [{
-            key: 'number',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       }
     },
+
+    {
+      label: '采购收货数量',
+      field: 'wmsQty',
+      sort: 'custom',
+      isSearch: false,
+      isForm: false,
+      isTable: false,
+      isDetail: false
+    },
     {
       label: '数量',
       field: 'qty',
@@ -328,7 +345,7 @@ export const Q2 = useCrudSchemas(
       form: {
         // labelMessage: '信息提示说明！！！',
         componentProps: {
-          enterSearch:true,
+          enterSearch: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择成本中心', // 输入框占位文本
           searchField: 'costcentreCode', // 查询弹窗赋值字段
@@ -342,14 +359,16 @@ export const Q2 = useCrudSchemas(
               isMainValue: false
             }
           ],
-          verificationParams: [{
-            key: 'costcentreCode',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'costcentreCode',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       }
     },
diff --git a/src/views/qms/inspectionQ3/index.vue b/src/views/qms/inspectionQ3/index.vue
index 712d58db7..bbc4fd735 100644
--- a/src/views/qms/inspectionQ3/index.vue
+++ b/src/views/qms/inspectionQ3/index.vue
@@ -27,9 +27,9 @@
       v-model:currentPage="tableObject.currentPage"
       v-model:sort="tableObject.sort"
     >
-      <template #code="{row}">
-        <el-button type="primary" link @click="openDetail(row, '代码', row.code)">
-          <span>{{ row.code }}</span>
+      <template #number="{row}">
+        <el-button type="primary" link @click="openDetail(row, '代码', row.number)">
+          <span>{{ row.number }}</span>
         </el-button>
       </template>
       <template #action="{ row }">
@@ -87,12 +87,18 @@ const searchTableSuccess = (formField, searchField, val, formRef) => {
       console.log(val);
       setV['uom'] = val[0]['uom']
       }
-     if (formField == 'q1Number') {
-          console.log(123)
-      setV['q1Number'] = val[0]['number']
-      }
-    setV[formField] = val[0][searchField]
-    formRef.setValues(setV)
+    if(formField == 'q1Number'){
+      //Q1通知单号
+      let list = []
+      val.forEach(item=>{
+        list.push(item[searchField])
+      })
+      setV[formField] = list.join(',')
+      formRef.setValues(setV)
+    }else{
+      setV[formField] = val[0][searchField]
+      formRef.setValues(setV)
+    }
    })
 }
 
diff --git a/src/views/qms/inspectionQ3/inspectionQ3.data.ts b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
index 57311e003..38d02113a 100644
--- a/src/views/qms/inspectionQ3/inspectionQ3.data.ts
+++ b/src/views/qms/inspectionQ3/inspectionQ3.data.ts
@@ -54,6 +54,7 @@ export const Q3 = useCrudSchemas(
         // labelMessage: '信息提示说明！！！',
         componentProps: {
           enterSearch: true,
+          multiple: true,
           isSearchList: true, // 开启查询弹窗
           searchListPlaceholder: '请选择Q1通知单', // 输入框占位文本
           searchField: 'number', // 查询弹窗赋值字段
@@ -72,14 +73,16 @@ export const Q3 = useCrudSchemas(
               isMainValue: false
             }
           ],
-          verificationParams: [{
-            key: 'number',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'number',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       },
       isSearch: true
@@ -125,14 +128,16 @@ export const Q3 = useCrudSchemas(
             isMainValue: false
           }
         ],
-        verificationParams: [{
-          key: 'code',
-          action: '==',
-          value: '',
-          isMainValue: false,
-          isSearch: true,
-          isFormModel: true,
-        }], // 失去焦点校验参数
+        verificationParams: [
+          {
+            key: 'code',
+            action: '==',
+            value: '',
+            isMainValue: false,
+            isSearch: true,
+            isFormModel: true
+          }
+        ] // 失去焦点校验参数
       },
       form: {
         // labelMessage: '信息提示说明！！！',
@@ -151,14 +156,16 @@ export const Q3 = useCrudSchemas(
               isMainValue: false
             }
           ],
-          verificationParams: [{
-            key: 'code',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'code',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       }
     },
@@ -311,14 +318,16 @@ export const Q3 = useCrudSchemas(
               isMainValue: false
             }
           ],
-          verificationParams: [{
-            key: 'costcentreCode',
-            action: '==',
-            value: '',
-            isMainValue: false,
-            isSearch: true,
-            isFormModel: true,
-          }], // 失去焦点校验参数
+          verificationParams: [
+            {
+              key: 'costcentreCode',
+              action: '==',
+              value: '',
+              isMainValue: false,
+              isSearch: true,
+              isFormModel: true
+            }
+          ] // 失去焦点校验参数
         }
       }
     },