采购订单-bug修改

src/views/publicComponents/SelectSaleOrderModal.vue

@@ -128,7 +128,7 @@
     import { filterObj, getFileAccessHttpUrl } from '/@/utils/common/compUtils';
     import { JDictSelectTag} from '/@/components/Form';
     import JSelectInput from '/@/components/Form/src/jeecg/components/JSelectInput.vue';
-    const emit = defineEmits([ 'selectQuotation']); //定义emit
+    const emit = defineEmits([ 'selectSaleOrder']); //定义emit
     let classOption = ref([])
     var visible = ref(false)
     var fatherProject = ref('')
@@ -319,9 +319,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);
     }
@@ -399,9 +399,27 @@
         }
     }
     function handleCancel(){
-      visible.value = false
-      selectedRowKeys.value = []
-      selectedRows.value=[]
+        visible.value = false
+        selectedRowKeys.value = []
+        selectedRows.value=[]
+        billDate.value = []
+        queryParams.value = {
+            billCode:'',
+            project:'',
+            projectName:'',
+            productionClass:'',
+            priority:'',
+            customer:'',
+            customerName:'',
+            headModel:'',
+            englishName:'',
+            productCode:'',
+            childModel:'',
+            billDate_begin:'',
+            billDate_end:'',
+            saleDepartment:'',
+            salesman:'',
+        }
     }
     function getTable(formData){
         visible.value = true

src/views/publicComponents/SelectSupplierQuotationModal.vue

@@ -291,7 +291,7 @@
         if(fatherProject.value&&fatherProject.value!==''){
             queryParams.value.quotationProject = fatherProject.value
         }else {
-            queryParams.value.quotationProject = ''
+            queryParams.value.quotationProject = params.quotationProject
         }
         return filterObj(params);
     }
@@ -369,6 +369,21 @@
       visible.value = false
       selectedRowKeys.value = []
       selectedRows.value=[]
+      billDate.value = []
+      queryParams.value = {
+        billCode:'',
+        quotationProject:'',
+        projectName:'',
+        productionClass:'',
+        priority:'',
+        quotationSuppiler:'',
+        suppilerName:'',
+        headModel:'',
+        productCode:'',
+        childModel:'',
+        billDate_begin:'',
+        billDate_end:'',
+       }
     }
     function getTable(formData){
         visible.value = true

src/views/purchase/purchaseOrder/components/PurchaseOrderFormForm.vue

@@ -502,8 +502,13 @@
         }
       }
       function addProject(data){
-        formData.project = data[0].id
-        formData.projectName = data[0].name
+        if(data.lenght==0){
+          formData.projectName = ''
+          formData.projectName = ''
+        }else{
+          formData.project = data[0].id
+          formData.projectName = data[0].name
+        } 
       }
        //查看配件信息
        function viewAccessory(prop){