Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-03-13 31e47cebb043a65c838a23c517848f1afdab778c

 src/views/business/rawMaterialInspection/index.vue

@@ -563,6 +563,9 @@
      if(null != this.componentData.date){
        this.componentData.beginDeclareDate = this.componentData.date[0]
        this.componentData.endDeclareDate = this.componentData.date[1]
      } else {
        this.componentData.beginDeclareDate = ''
        this.componentData.endDeclareDate = ''
      }
      getIfsByFinish({ ...this.componentData, ...this.page1 }).then(res => {
        this.tableLoading1 = false
@@ -580,6 +583,9 @@
      if(null != this.componentData.date){
        this.componentData.beginDeclareDate = this.componentData.date[0]
        this.componentData.endDeclareDate = this.componentData.date[1]
      } else {
        this.componentData.beginDeclareDate = ''
        this.componentData.endDeclareDate = ''
      }
      getIfsByAll({ ...this.componentData, ...this.page1 }).then(res => {
        this.tableLoading1 = false