From 322af162105eaef2eecfe0e203c968f8f60249e4 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Mon, 15 Apr 2024 09:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B4=A8=E9=87=8F=E6=8A=A5?=
 =?UTF-8?q?=E5=91=8A=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  4 +--
 .../supplierdeliverInspectionDetail.data.ts   | 27 +++++++------------
 .../supplierdeliverRequestMain/index.vue      | 20 +++++++-------
 .../supplierdeliverRequestMain.data.ts        |  2 +-
 4 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/.env.development b/.env.development
index 78976cddd..81e0d3dfb 100644
--- a/.env.development
+++ b/.env.development
@@ -4,10 +4,10 @@ NODE_ENV=development
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://localhost:12080'
+VITE_BASE_URL='http://192.168.0.113:12080'
 
 # 上传路径
-VITE_UPLOAD_URL='http://localhost:12080/admin-api/infra/file/upload'
+VITE_UPLOAD_URL='http://192.168.0.113:12080/admin-api/infra/file/upload'
 
 # 接口前缀
 VITE_API_BASEPATH=/dev-api
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index 0f5cf23aa..ae04dccf8 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -18,8 +18,16 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
   {
     label: '计量单位',
     field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
     sort: 'custom',
-    isSearch: true,
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select'
+    }
   },
   {
     label: '批次',
@@ -60,22 +68,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
     field: 'extraProperties',
     sort: 'custom',
     isSearch: true,
-  },
-  {
-    label: '并发乐观锁',
-    field: 'concurrencyStamp',
-    sort: 'custom',
-    isSearch: true,
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
-  {
-    label: '地点ID',
-    field: 'siteId',
-    sort: 'custom',
-    isSearch: true,
+    isForm: false,
   },
   {
     label: '操作',
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index fe75c0ccb..f1a92a5c1 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -77,7 +77,7 @@
     :annexTable="[{
       label: '质检明细',
       prop: 'uploadFile',
-      tableName:'UploadQualityReport',
+      tableName:'SupplierdeliverInspectionDetail',
       hasSubDetail:true, // 附件中是否展示明细表
       //明细表数据
       subDetailTableData:{
@@ -86,7 +86,7 @@
           rowField:'id'
         }], // 查询参数
         getSubList:SupplierdeliverInspectionDetailApi.getSupplierdeliverInspectionDetailPage,//请求接口
-        tableColumns:UploadQualityReport.allSchemas.tableColumns,
+        tableColumns:SupplierdeliverInspectionDetail.allSchemas.tableColumns,
         tableList:[],//表格数据
         total:1,
         pageSize:10,
@@ -132,15 +132,15 @@
   <BasicForm
     ref="ploadQualityReportRef"
     @success="getList"
-    :formAllSchemas="UploadQualityReport.allSchemas"
-    :tableAllSchemas="UploadQualityReport.allSchemas"
+    :formAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
+    :tableAllSchemas="SupplierdeliverInspectionDetail.allSchemas"
     :tableData="ploadQualityReportTableData"
     @handleAddTable="SupplierdeliverInspectionDetailApi.createSupplierdeliverInspectionDetail"
     @handleDeleteTable="SupplierdeliverInspectionDetailApi.deleteSupplierdeliverInspectionDetail"
     @submitForm="submitFormUploadQualityReport"
     :isShowReduceButton="true"
   >
-    <template #UploadQualityReport>
+    <template #SupplierdeliverInspectionDetail>
       <span>1111</span>
     </template>
   </BasicForm>
@@ -157,9 +157,9 @@ import {
   SupplierdeliverRequestMainRules,
   SupplierdeliverRequestDetail,
   SupplierdeliverRequestDetailRules,
-  SupplierdeliverRequestDetailLabel,
-  UploadQualityReport
+  SupplierdeliverRequestDetailLabel
 } from './supplierdeliverRequestMain.data'
+import {    SupplierdeliverInspectionDetail} from '../supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data'
 import * as SupplierdeliverRequestMainApi from '@/api/wms/supplierdeliverRequestMain'
 import * as SupplierdeliverRequestDetailApi from '@/api/wms/supplierdeliverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
@@ -592,14 +592,14 @@ const ploadQualityReportRef = ref()
 const ploadQualityReportTableData = ref([])
 /** 上传质量报告 */
 const handleUploadQualityReport  = async (row) => {
-  console.log('UploadQualityReport',UploadQualityReport.allSchemas)
-  const uploadFile = UploadQualityReport.allSchemas.formSchema.find(item=>item.field=='uploadFile')
+  console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas)
+  const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(item=>item.field=='uploadFile')
   if(uploadFile){
     uploadFile['componentProps']['upData']['tableId'] = row.id
   }
   ploadQualityReportRef.value.open('create', null, {masterId:row.id},'上传质量报告')//创建标签页面 createLabel 标题
   const tableFormKeys  = {}
-  UploadQualityReport.allSchemas.tableFormColumns.forEach((item) => {
+  SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
   })
   ploadQualityReportTableData.value = [tableFormKeys]
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
index 3f7c03068..8a6b79cdd 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts
@@ -1630,7 +1630,7 @@ export const UploadQualityReport = useCrudSchemas(reactive<CrudSchema[]>([
   },
   {
     label: '数量',
-    field: 'orderQty',
+    field: 'planQty',
     table: {
       width: 150
     },