到货单-bug修改

src/views/publicComponents/SelectProjectModal.vue

@@ -57,13 +57,13 @@
   
   function handleCancel() {
     visible.value = false;
+    emit('selectProject',rowSelection.selectedRows)
     selectedRowKeys.value = []
   }
   function handleOk() {
         if(selectedRowKeys.value.length!==1){
           message.warning('请选择一条数据数据')
         }else{
-            emit('selectProject',rowSelection.selectedRows)
             handleCancel()
         }  
     }

src/views/publicComponents/SelectPurchaseOrderModal.vue

@@ -289,9 +289,9 @@
         params.pageNo = pagination.value.current;
         params.pageSize = pagination.value.pageSize;
         if(fatherProject.value&&fatherProject.value!==''){
-            queryParams.value.quotationProject = fatherProject.value
+            queryParams.value.project = fatherProject.value
         }else {
-            queryParams.value.quotationProject = ''
+            queryParams.value.project = params.project
         }
         return filterObj(params);
     }
@@ -370,8 +370,25 @@
       visible.value = false
       selectedRowKeys.value = []
       selectedRows.value=[]
+      queryParams.value = {
+            billCode:'',
+            project:'',
+            projectName:'',
+            productionClass:'',
+            priority:'',
+            supplier:'',
+            supplierName:'',
+            headModel:'',
+            productCode:'',
+            billDate_begin:'',
+            billDate_end:'',
+            saleDepartment:'',
+            salesman:'',
+        }
     }
     function getTable(formData){
+        debugger
+
         visible.value = true
         if(formData.projectName&&formData.projectName!==''){
             fatherProject.value = formData.project

src/views/purchase/arrivedGoods/components/ArriveGoodsFormForm.vue

@@ -366,8 +366,14 @@
           })
       }
       function addProject(data){
-        formData.project = data[0].id
-        formData.projectName = data[0].name
+        if(data.length==0){
+          formData.project = ''
+          formData.projectName = ''
+        }else{
+          formData.project = data[0].id
+          formData.projectName = data[0].name
+        }
+        
       }
        //查看配件信息
        function viewAccessory(prop){
@@ -378,22 +384,11 @@
         var newArray = [...arriveDetailsFormProductTable.dataSource]
         newArray.splice(prop.rowIndex, 1)
         arriveDetailsFormProductTable.dataSource = newArray  
-        if( arriveDetailsFormProductTable.dataSource.length!==0){
-          var arr=[]
-          arriveDetailsFormProductTable.dataSource.map(item=>{
-            if(item.sourceId&&item.sourceId!==''){
-              arr.push(item.sourceId)
-            }
-          })
-          if(arr.length==0){
-            formData.sourceCode = ''
-            notAllowEdit.value=false
-          }
+        if(arriveDetailsFormProductTable.dataSource.length!==0){
+          notAllowEdit.value = true
         }else{
-           notAllowEdit.value=false
-           formData.sourceCode = ''
-        }
-        
+          notAllowEdit.value = false
+        }        
       }
       function addAddiveGoods(data){
         debugger