Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui 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/issueManage/productionreturn/productionreturnRecordMain/productionreturnRecordMain.data.ts

@@ -453,9 +453,6 @@ export const ProductionreturnRecordDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 150
     },
-    form: {
-      component: 'InputNumber',
-    }
   },
   {
     label: '物料描述1',

src/views/wms/issueManage/productionscrap/productionscrapRecordMain/productionscrapRecordMain.data.ts

@@ -664,7 +664,7 @@ export const ProductionscrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
-    hiddenInMain: true,
+    hiddenInMain: false,
     form: {
       component: 'InputNumber',
     }

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -25,6 +25,9 @@ const queryParams = {
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
+import {
+  BalanceShow
+} from "@/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data";
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -589,7 +592,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
+      searchAllSchemas: BalanceShow.allSchemas,
       searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
@@ -599,7 +602,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchListPlaceholder: '请选择从包装号',
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
+        searchAllSchemas: BalanceShow.allSchemas,
         searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainHOLDWIP/inventorymoveRequestMain.data.ts

@@ -25,6 +25,9 @@ const queryParams = {
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
+import {
+  BalanceShow
+} from "@/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data";
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -588,7 +591,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
+      searchAllSchemas: BalanceShow.allSchemas,
       searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
@@ -598,7 +601,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchListPlaceholder: '请选择从包装号',
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
+        searchAllSchemas: BalanceShow.allSchemas,
         searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainMOVE/inventorymoveRequestMain.data.ts

@@ -25,6 +25,9 @@ const queryParams = {
  // 获取当前操作人的部门
  import { useUserStore } from '@/store/modules/user'
  import { TableColumn } from '@/types/table'
+import {
+  BalanceShow
+} from "@/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data";
  const userStore = useUserStore()
  const userDept = userStore.userSelfInfo.dept
  // id 转str 否则form回显匹配不到
@@ -588,7 +591,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchListPlaceholder: '请选择从包装号',
       searchField: 'packingNumber',
       searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
+      searchAllSchemas: BalanceShow.allSchemas,
       searchPage: BalanceApi.selectLocationTypeToBalance,
     },
     form: {
@@ -598,7 +601,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchListPlaceholder: '请选择从包装号',
         searchField: 'packingNumber',
         searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
+        searchAllSchemas: BalanceShow.allSchemas,
         searchPage: BalanceApi.selectLocationTypeToBalance,
       }
     }

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

@@ -540,6 +540,26 @@ export const BalanceShow = useCrudSchemas(
       },
       isSearch: true
     },
+    {
+      label: '物料名称',
+      field: 'itemName',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      isSearch: true
+    },
+    {
+      label: '库存数量',
+      field: 'qty',
+      sort: 'custom',
+      table: {
+        width: 150
+      },
+      form: {
+        component: 'InputNumber'
+      }
+    },
     {
       label: '批次',
       field: 'batch',
@@ -580,17 +600,6 @@ export const BalanceShow = useCrudSchemas(
         width: 180
       }
     },
-    {
-      label: '库存数量',
-      field: 'qty',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      form: {
-        component: 'InputNumber'
-      }
-    },
     {
       label: '库位代码',
       field: 'locationCode',
@@ -611,15 +620,6 @@ export const BalanceShow = useCrudSchemas(
         width: 150
       }
     },
-    {
-      label: '物料名称',
-      field: 'itemName',
-      sort: 'custom',
-      table: {
-        width: 150
-      },
-      isSearch: true
-    },
     {
       label: '物料描述1',
       field: 'itemDesc1',

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']