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

src/views/wms/productionManage/productscrap/productscrapRequestMain/index.vue

@@ -62,6 +62,7 @@
     @inputNumberChange="inputNumberChange"
     @submitForm="submitForm"
     @buttonOperationClick="buttonOperationClick"
+    @clearSearchInput="clearSearchInput"
   />
 
   <!-- 详情 -->
@@ -108,9 +109,8 @@
   >
   <template #TableFormHead>
     <el-form inline>
-      <!-- @input="row[headerItem.field] = row[headerItem.field].replace(/[^\d\.-]/g, '')" -->
       <el-form-item label="物料代码">
-        <el-input v-model="bomSearchData" clearable placeholder="请输入物料代码"/>
+        <el-input v-model="bomSearchData" @input="bomSearchData = bomSearchData.replace(/，/g, ',')" clearable placeholder="请输入物料代码"/>
       </el-form-item>
       <el-form-item>
         <el-button type="info" plain @click="bomSearchClick"><Icon class="mr-5px" icon="ep:search" />{{ t('common.query') }}</el-button>
@@ -272,7 +272,18 @@ const banchBomPage = async (fromLocationCode,item) => {
   return obj
   
 }
-
+const clearSearchInput = (formField) => {
+  if(formField=='workshopCode'){
+    //车间
+    formRef.value.formRef.setValues({
+      productionLineCode:'',//生产线代码
+    })
+    tableData.value = []
+  }else if(formField=='productionLineCode'){
+    //生产线代码
+    tableData.value = []
+  }
+}
 // 新增 tableform 按钮
 const buttonOperationClick = async (row, label, index,isSave = false)=> {
   console.log('buttonOperationClick',row, label, index)
@@ -342,6 +353,8 @@ const buttonOperationClick = async (row, label, index,isSave = false)=> {
         item.tableForm.disabled = false
       }
     })
+    bomSearchData.value = ''
+    bomTableList.value = detatableDataBom.tableList
     detailBomRef.value.open('create', row, null,'viewDetail')//查看明细数据
   }
 }