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

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

@@ -269,7 +269,19 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
         key: 'available',
         value: 'TRUE',
         isMainValue: false
-      }]
+      },{
+        key: 'supplierCode',
+        value: 'supplierCode',
+        isMainValue: true
+      }
+      ,{
+        key: 'status',
+        value: 2,
+        isMainValue: false
+      }
+      
+      
+      ]
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -305,7 +317,7 @@ export const PurchasePlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
    }
   },
   {
-    label: '单据号11',
+    label: '单据号',
     field: 'number',
     sort: 'custom',
     isTableForm: false,

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

@@ -109,9 +109,10 @@
        
        if(formField=='ppNumber'){
          // 获取子表数据 getBomDisassemble
-        PurchasePlanDetailApi.getPurchasePlanDetailList({
          poNumber: val[0]['number']}).then(res => {
            if (res) tableData.value = res;
            tableData.value.forEach(item=>{
              item.batch = item.toBatch
            })
          }).catch(err => {
            console.log(err)
          })
+        PurchasePlanDetailApi.getPurchasePlanDetailList({
          number: val[0]['number']}).then(res => {
            if (res) tableData.value = res;
            tableData.value.forEach(item=>{
              item.batch = item.toBatch
+              item.qty = 1
+            })
          }).catch(err => {
            console.log(err)
          })
        }
-        
         formRef.setValues(setV)
       }
     })

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

@@ -470,6 +470,9 @@ export const SupplierdeliverRequestMainRules = reactive({
   supplierCode: [
     { required: true, message: '请输入供应商代码', trigger: 'blur' }
   ],
+  ppNumber: [
+    { required: true, message: '请输入要货计划单号', trigger: 'blur' }
+  ],
   // fromWarehouseCode: [
   //   { required: true, message: '请输入从仓库代码', trigger: 'blur' }
   // ],
@@ -1022,4 +1025,4 @@ export const SupplierdeliverRequestDetailRules = reactive({
   itemCode: [
     { required: true, message: '请选择物品代码', trigger: 'change' }
   ],
-})
+})