Merge branch 'master_hella' into hella_zhaoxuebing

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -967,6 +967,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
         value: 'in',
         isMainValue: false
         }],
+      isRepeat:true,
       verificationParams: [{
         key: 'code',
         action: '==',

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -1427,7 +1427,7 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
   },
   {
     label: '标签供应商代码',
-    field: 'supplierItemCode',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/issueManage/productionreturn/productionreturnRequestMainNo/productionreturnRequestMainNo.data.ts

@@ -767,7 +767,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
   },
   {
     label: '供应商代码',
-    field: 'supplierItemCode',
+    field: 'supplierCode',
     sort: 'custom',
     table: {
       width: 150

src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue

@@ -61,6 +61,7 @@
     @submitForm="submitForm"
     @formFormDateChange="formFormDateChange"
     @onEnter="onEnter"
+    @clearSearchInput="clearSearchInput"
   >
   <template  v-slot="{row}">
     <el-date-picker v-bind:modelValue="row['expireTime']?addDay(row['produceDate'],row['expireTime']):dayjs('2099-12-31').valueOf()"
@@ -224,6 +225,16 @@ const onEnter = async (field,value)=>{
   formRef.value.setDefaultBlurValue(field,value)
   // getSearchTableData(value,true)
 }
+const clearSearchInput = (field)=>{
+  console.log('field',field)
+  if('poNumber' == field){
+    //从库位代码
+    formRef.value.formRef.setValues({
+      supplierCode: ''
+    })
+    tableData.value = []
+  }
+}
 const updateTableData = async (tableList)=>{
   console.log('tableList',tableList)
   let itemCodes = tableList.filter(item=>tableData.value.find(item1=>item1['poNumber']==item['number']&&item1['supplierCode']==item['supplierCode']&&item1['poLine']==item['lineNumber']&&item1['itemCode']==item['itemCode']))

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

@@ -514,10 +514,11 @@ const getSearchTableData = async (number,formField,searchField)=>{
   const detailOpenForm = (type, row) => {
     
     PurchasePlanDetail.allSchemas.formSchema.forEach(item=>{
-      if(item.field == 'planQty'){
-        //计划数量
-        item.componentProps.disabled = row.available=="FALSE"
-      }
+      // 可以修改数量
+      //if(item.field == 'planQty'){
+      //  //计划数量
+      //  item.componentProps.disabled = row.available=="FALSE"
+      //}
     })
   }
   const handleDetailSubmitForm = async (formType, data)=>{