Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/views/wms/deliversettlementManage/stockup/stockupMainRecord/stockupMainRecord.data.ts

@@ -29,7 +29,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '申请单号',
     field: 'requestNumber',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 180
     },
@@ -39,7 +39,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '任务单号',
     field: 'jobNumber',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 180
     },
@@ -102,7 +102,7 @@ export const StockupMainRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区代码范围',
     field: 'fromAreaCodes',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     isTable: false,
     table: {
       width: 180
@@ -313,7 +313,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 180
     },
@@ -343,7 +343,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从器具号',
     field: 'fromContainerNumber',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -371,7 +371,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物品描述1',
     field: 'itemDesc1',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -382,7 +382,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物品描述2',
     field: 'itemDesc2',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -393,7 +393,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -403,7 +403,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '数量',
     field: 'qty',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -435,7 +435,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -445,7 +445,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库位',
     field: 'fromLocationCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -454,7 +454,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库位组代码',
     field: 'fromLocationGroupCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -464,7 +464,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从库区代码',
     field: 'fromAreaCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -474,7 +474,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -484,7 +484,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到器具号',
     field: 'toContainerNumber',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -494,7 +494,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到库位',
     field: 'toLocationCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 150
     },
@@ -503,7 +503,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到库位组代码',
     field: 'toLocationGroupCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     hiddenInMain: true,
     table: {
       width: 150
@@ -513,7 +513,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到库区代码',
     field: 'toAreaCode',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     hiddenInMain: true,
     table: {
       width: 150
@@ -523,7 +523,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单价',
     field: 'singlePrice',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     hiddenInMain: true,
     table: {
       width: 150
@@ -533,7 +533,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '金额',
     field: 'amount',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     hiddenInMain: true,
     table: {
       width: 150
@@ -577,7 +577,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'createTime',
     sort: 'custom',
     formatter: dateFormatter,
-    isSearch: true,
+    // isSearch: true,
     table: {
       width: 180
     },
@@ -596,7 +596,7 @@ export const StockupDetailRecord = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
-    isSearch: true,
+    // isSearch: true,
     hiddenInMain: true,
     table: {
       width: 150

src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/purchasereceiptRecordMain.data.ts

@@ -403,7 +403,7 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     isDetail: false,
     isForm: false,
     table: {
-      width: 300,
+      width: 400,
       fixed: 'right'
     },
   },
@@ -1877,4 +1877,4 @@ export const PurchasereceiptRecordDetailPackingNumber = useCrudSchemas(reactive<
       disabled: true,
     }
   }
-]))
+]))

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRecordMain/index.vue

@@ -178,7 +178,7 @@ const searchFormClick = (searchData) => {
 const changeTabs = (data) =>{
   if(data.prop == 'receiptDetail'){
   console.log(data)
-    apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPage
+    apiPage.value = PurchasereceiptRecordDetailApi.getPurchasereceiptRecordDetailPageSpare
     detailAllSchemas.value = PurchasereceiptRecordDetail.allSchemas    
   }else if(data.prop == 'scarceGoodsDetail'){
     apiPage.value = PurchasereceiptRecordDetailApi.getScarceGoodsDetailPage