Merge remote-tracking branch 'remotes/origin/intex_online20250528' into intex

src/api/wms/demandforecastingDetail/index.ts

@@ -18,7 +18,8 @@ export interface DemandforecastingDetailVO {
 }
 
 // 要货预测-列表和头部请求参数
-const getPageParams = (params)=>{
+const getPageParams = (par) => {
+  const params = { ...par }
   // 到货日期
   if(params.dueDate&&params.dueDate.length>0){
     if(isString(params.dueDate[0])){

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

@@ -412,6 +412,7 @@ const updateDemandforecaste = async ()=>{
     let res = await DemandforecastingMainApi.updateDemandforecaste(submitData)
     console.log('更新结果',res)
     message.success(t('更新成功'))
+    getList()
   } finally{
     tableObject.loading = false
   }

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

@@ -84,7 +84,7 @@
           <el-input v-model="tableDataSearch.itemCode" placeholder="请输入品番" clearable @change="changeTableDataSearch"/>
         </el-form-item>
         <el-form-item label="背番">
-          <el-input v-model="tableDataSearch.backNumber" placeholder="请输入品番" clearable @change="changeTableDataSearch"/>
+          <el-input v-model="tableDataSearch.backNumber" placeholder="请输入背番" clearable @change="changeTableDataSearch"/>
         </el-form-item>
       </el-form>
      </div>
@@ -901,6 +901,7 @@ const handleSelectionPublish = async ()=>{
   }
   
   const changeTableDataSearch = ()=>{
+    debugger
     let filterList = tableData.value
     if(tableDataSearch.value['itemCode']){
       filterList = tableData.value.filter(item => {
@@ -909,7 +910,12 @@ const handleSelectionPublish = async ()=>{
     }
     if(tableDataSearch.value['backNumber']){
       filterList = filterList.filter(item => {
-        return item['backNumber'].includes(tableDataSearch.value['backNumber'])
+        //return item['backNumber'].includes(tableDataSearch.value['backNumber'])
+      // 如果 backNumber 为空（null/undefined/''），直接过滤掉
+    if (!item['backNumber']) return false;
+    
+    // 否则检查是否包含搜索值
+    return item['backNumber'].includes(tableDataSearch.value['backNumber']);
       })
     }
     showTableData.value = filterList

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

@@ -180,8 +180,8 @@
   <!-- 标签打印 -->
   <SearchTable width="905px" ref="searchTableRef" sureText="打印所选" @searchTableSuccess="searchTableSuccess1">
     <template #actionsOther>
-<!--      <el-button type="primary" @click="printAllClick">打印全部</el-button>-->
-      <el-button type="primary" :loading="printAllLoading" @click="handlePrintAllExport">打印全部</el-button>
+      <el-button type="primary" @click="printAllClick">打印全部</el-button>
+<!--      <el-button type="primary" :loading="printAllLoading" @click="handlePrintAllExport">打印全部</el-button>-->
 
     </template> 
   </SearchTable>