发运明细-列表筛选问题

src/views/shipment-details/referOrderDataModal.vue

@@ -564,7 +564,7 @@ export default {
          this.loading = false
           // this.referOrderDataModVis = false;
            this.$message.success('添加成功')
-           this.$emit('close',this.queryParam.flourOrGarment,res.result.id )
+           this.$emit('close',this.queryParam.flourOrGarment,res.result.id,this.range )
             this.close()
           }else {
            this.$message.error('res.message')

src/views/shipment-details/shipmentList.vue

@@ -630,7 +630,7 @@ export default {
            if(this.queryParam.flourOrGarment == '1'){
              this.exportButton ='0'
              this.exportButton1 = '1'
-           }else {
+           }else {judageAdd
              this.exportButton ='1'
              this.exportButton1 = '0'
            }
@@ -737,33 +737,34 @@ export default {
 
     //判断是否是新增的数据-刷新数据
    async judageAdd(){
-       if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
-          this.queryParam ={}
-          this.queryParam.id =  this.returnId
-          this.queryParam.flourOrGarment =this.returnFlourOrGarment
-          await this.getShipmentList()
-          this.queryParam = {}
-          this.defalutDate()
-        }else{
-          await this.getShipmentList()
-        }
+     await this.getShipmentList()
+      //  if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
+      //     // this.queryParam ={}
+      //     this.queryParam.id =  this.returnId
+      //     this.queryParam.flourOrGarment =this.returnFlourOrGarment
+      //     await this.getShipmentList()
+      //     // this.queryParam = {}
+      //     // this.defalutDate()
+      //   }else{
+      //     await this.getShipmentList()
+      //   }
     },
     
 
     // 导出
     handleExportXls(fileName) {
-       if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
-          this.queryParam ={}
-          this.queryParam.id =  this.returnId
-          this.queryParam.flourOrGarment =this.returnFlourOrGarment
-        }
+      //  if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
+      //     this.queryParam ={}
+      //     this.queryParam.id =  this.returnId
+      //     this.queryParam.flourOrGarment =this.returnFlourOrGarment
+      //   }
       exportXls(this.queryParam).then(res =>{
         if(res.success==false){
           this.$message.error(res.message)
         }else{
           downFile('/shippingDetails/syShippingDetails/exportXls',this.queryParam).then(data => {
-            this.queryParam = {}
-            this.defalutDate()
+            // this.queryParam = {}
+            // this.defalutDate()
             if (!data) {
               this.$message.warning('文件下载失败')
               return
@@ -790,14 +791,14 @@ export default {
 
     //明细导出
     async exportXlsShipment(fileName){
-      if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
-          this.queryParam ={}
-          this.queryParam.id =  this.returnId
-          this.queryParam.flourOrGarment =this.returnFlourOrGarment
-        }
+      // if(!this.queryParam.flourOrGarment || this.queryParam.flourOrGarment == ''){
+      //     this.queryParam ={}
+      //     this.queryParam.id =  this.returnId
+      //     this.queryParam.flourOrGarment =this.returnFlourOrGarment
+      //   }
       downFile('/shippingDetails/syShippingDetails/exportXlsShipping',this.queryParam).then(data => {
-          this.queryParam = {}
-          this.defalutDate()
+          // this.queryParam = {}
+          // this.defalutDate()
         if (!data) {
           this.$message.warning('文件下载失败')
           return
@@ -826,7 +827,7 @@ export default {
           // console.log('编辑对象', res.result)
           this.$refs.editShipDetDrawer.editShipDet = res.result
           res.result.syShippingDetailsItemList.map(item =>{
-            item.manualYarnFlag =  res.result.syShippingDetailsItemList[0].manualYarnFlag
+            item.manualYarnFlag =  res.result.syShippingDetailsItemList[0].mjudageAddanualYarnFlag
             item.customsDeclarationUnitPrice = item.salesUnitPrice - item.ymoney
             if(item.manualYarnFlag === 0){
                item.manualYarnUnitPrice = null
@@ -878,7 +879,6 @@ export default {
             console.log('提交成功，单据状态改为【已提交】')
             this.shipmentListData.submitStatus = '1'
             this.selectedRowKeys =[]
-            //判断是否是新增的数据
              this.judageAdd()
              // 渲染 发运明细列表
             this.$message.success('提交成功')
@@ -996,10 +996,12 @@ export default {
             if(timeInterval > 60){
              this.$message.error('预发货时间区间超过60天，请重新选择！');
             }else { 
+              this.queryParam.id = ''
              this.getShipmentList() 
              
            }       
          }else{
+          this.queryParam.id = ''
            this.getShipmentList() 
          }
          
@@ -1029,16 +1031,19 @@ export default {
     },
 
     //关闭新增弹窗
-    async closeAdd(data,id){   
+    async closeAdd(data,id,range){   
       this.queryParam ={}
       this.queryParam.flourOrGarment = data
       this.queryParam.id = id
+      this.preDeliveryDate=range
+      this.queryParam.preDeliveryDateB = this.preDeliveryDate[0].format('YYYY-MM-DD'); 
+      this.queryParam.preDeliveryDateE = this.preDeliveryDate[1].format('YYYY-MM-DD'); 
       //其他地方使用
       this.returnId = id
       this.returnFlourOrGarment = data
      await this.getShipmentList()
-      this.queryParam = {}
-      this.defalutDate()
+      // this.queryParam = {}
+      // this.defalutDate()
     },
     async closeAddEdit(){
        this.judageAdd()