Merge remote-tracking branch 'origin/master'

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue

@@ -76,6 +76,7 @@
   const searchTableSuccess = (formField, searchField, val, formRef, type, row) => {
     nextTick(async () => {
       if (type == 'tableForm') {
+         
         // 明细查询页赋值
         row[formField] = val[0][searchField]
         row['itemCode'] = val[0]['code']
@@ -83,13 +84,16 @@
         row['poLine'] = val[0]['lineNumber']
         await PurchaseDetailApi.getPurchaseDetailPage({
           number: row['poNumber'],
-          lineNumber: row['poLine'],
+          poLine: row['lineNumber'],
         }).then(res => {
           if (res.list.length == 1) {
             row['itemCode'] = res.list[0].itemCode
+            row['poLine'] = res.list[0].lineNumber
+            row['uom'] = res.list[0].uom
           }
         })
       } else {
+        console.log(456)
         const setV = {}
         setV[formField] = val[0][searchField]
         formRef.setValues(setV)

src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts

@@ -295,48 +295,17 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
    table: {
      width: 150
    },
-    tableForm: {
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择订单行',
-      searchField: 'lineNumber',
-      searchTitle: '采购订单信息',
-      searchAllSchemas: PurchaseDetail.allSchemas,
-      searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-      searchCondition: [{
-        key: 'number',
-        value: 'number',
-        isMainValue: true
-      },
-      {
-        key: 'available',
-        value: 'TRUE',
-        isMainValue: false
-      }]
-    },
    form: {
-      // labelMessage: '信息提示说明！！！',
      componentProps: {
-        isSearchList: true,
-        searchListPlaceholder: '请选择订单行',
-        searchField: 'lineNumber',
-        searchTitle: '采购订单信息',
-        searchAllSchemas: PurchaseDetail.allSchemas,
-        searchPage: PurchaseDetailApi.getPurchaseDetailPage,
-        searchCondition: [{
-          key: 'number',
-          value: 'poNumber',
-          isMainValue: true
-        },
-        {
-          key: 'available',
-          value: 'TRUE',
-          isMainValue: false
-        }]
+       disabled: true
      }
+   },
+   tableForm: {
+     disabled: true
    }
   },
   {
-    label: '单据号',
+    label: '单据号11',
     field: 'number',
     sort: 'custom',
     isTableForm: false,