Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/components/TableForm/src/TableForm.vue

@@ -561,8 +561,8 @@ const initSelectOptions = (headerItem, row) => {
   if (row[headerItem.field + 'InitOptions']) {
     return row[headerItem.field + 'InitOptions']
   } else {
-    return headerItem.dictType
-      ? getStrDictOptions(headerItem.dictType)
+    return headerItem?.tableForm?.initOptions?.length>0
+      ? headerItem.tableForm.initOptions 
       : headerItem.tableForm.initOptions
   }
 }

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

@@ -788,25 +788,25 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       }
     }
   },
-  {
-    label: '从库位代码',
-    field: 'fromLocationCode',
-    sort: 'custom',
-    isTable:false,
-    isForm:false,
-    isDetail:false,
-    table: {
-      width: 150
-    },
-    tableForm: {
-      disabled: true
-    },
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '从库位代码',
+  //   field: 'fromLocationCode',
+  //   sort: 'custom',
+  //   isTable:false,
+  //   isForm:false,
+  //   isDetail:false,
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     disabled: true
+  //   },
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '到库位代码',
     field: 'toLocationCode',
@@ -900,7 +900,7 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
   {
     label: '到库存状态',
     field: 'toInventoryStatus',
-    // dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
     isTable: true,
     sort: 'custom',