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

src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue

@@ -60,6 +60,7 @@
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
     @tableFormSelectOnBlur="tableFormSelectOnBlur"
+    @clearSearchInput="clearSearchInput"
   />
 
   <!-- 详情 -->
@@ -109,7 +110,16 @@ const tableColumns = ref([...UnplannedissueRequestMain.allSchemas.tableColumns,.
 const updataTableColumns = (val) => {
   tableColumns.value = val
 }
-
+const clearSearchInput = (field)=>{
+  console.log('field',field)
+  if('costCenterCode' == field){
+    //成本中心代码
+    formRef.value.formRef.setValues({
+      reasonCodeRequisition: '',
+      costCenterType: ''
+    })
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(() => {

src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@@ -176,6 +176,9 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       }else if('productionLineCode'==formField){
         //生产线
         setV['workStationCode'] = ''
+      }else if('workStationCode'==formField){
+        //工位代码
+        setV['productionLineCode1'] = val[0]['productionLineCode']//用于没选生产线代码，给后端用
       }
       formRef.setValues(setV)
     }
@@ -446,6 +449,9 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  if(!data.productionLineCode){
+    data.productionLineCode = data.productionLineCode1
+  }
   data.subList = tableData.value // 拼接子表数据参数
   data.subList.forEach(item=>{
     item['workStationCode'] = data['workStationCode']