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

src/components/DictTag/src/DictTag.vue

@@ -65,7 +65,7 @@ export default defineComponent({
         return (
           dictDataList.map(item => {
             return <ElTag
-                    style={item?.cssClass=='none'?'background-color: transparent;':item?.cssClass ? 'color: #fff' : ''}
+                    style={item?.cssClass=='none'?'background-color: transparent;':item?.cssClass=='purple_type'?'background-color: #f7ebf9;border-color: #ecd5ec;color: #e348e3;':item?.cssClass ? 'color: #fff' : ''}
                     type={item?.colorType}
                     color={
                       item?.cssClass && isHexColor(item?.cssClass)

src/views/wms/inventoryjobManage/containermanage/deliverContainerRecordMain/deliverContainerRecordMain.data.ts

@@ -27,12 +27,12 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       width: 200
     },
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    isSearch: true,
-  },
+  // {
+  //   label: '申请单号',
+  //   field: 'requestNumber',
+  //   sort: 'custom',
+  //   isSearch: true,
+  // },
   {
     label: '类型',
     field: 'type',
@@ -185,6 +185,7 @@ export const ContainerRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '操作',
     field: 'action',
     isForm: false,
+    isTable: false,
     table: {
       width: 150,
       fixed: 'right'

src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts

@@ -510,46 +510,46 @@ export const ContainerDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
   //     }
   //   }
   // },
-  // {
-  //   label: '从库存状态',
-  //   field: 'fromInventoryStatus',
-  //   dictType: DICT_TYPE.INVENTORY_STATUS,
-  //   dictClass: 'string',
-  //   isForm: false,
-  //   isTableForm: false,
-  //   isTable: false,
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  //   tableForm: {
-  //     disabled: true,
-  //     type: 'Select'
-  //   },
-  // },
-  // {
-  //   label: '从数量',
-  //   field: 'fromQty',
-  //   sort: 'custom',
-  //   tableForm: {
-  //     disabled: true,
-  //   },
-  // },
   {
     label: '库存状态',
-    field: 'toInventoryStatus',
+    field: 'fromInventoryStatus',
     dictType: DICT_TYPE.INVENTORY_STATUS,
     dictClass: 'string',
+    isForm: false,
+    isTableForm: false,
     isTable: true,
     sort: 'custom',
     table: {
       width: 150
     },
     tableForm: {
-      type: 'Select',
-      disabled: true
+      disabled: true,
+      type: 'Select'
     },
   },
+  // {
+  //   label: '从数量',
+  //   field: 'fromQty',
+  //   sort: 'custom',
+  //   tableForm: {
+  //     disabled: true,
+  //   },
+  // },
+  // {
+  //   label: '库存状态',
+  //   field: 'toInventoryStatus',
+  //   dictType: DICT_TYPE.INVENTORY_STATUS,
+  //   dictClass: 'string',
+  //   isTable: true,
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm: {
+  //     type: 'Select',
+  //     disabled: true
+  //   },
+  // },
   {
     label: '数量',
     field: 'toQty',

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue

@@ -483,10 +483,11 @@ const submitForm = async (formType, submitData) => {
   //   formRef.value.formLoading = false
   //   return message.warning('包装号1重复')
   // }
-  if (duplicateItems.length>0) {
-    formRef.value.formLoading = false
-    return message.warning('物料代码重复')
-  }
+  // if (duplicateItems.length>0) {
+  //   formRef.value.formLoading = false
+  //   return message.warning('物料代码重复')
+
+  // }
   data.subList.forEach(obj => {
     if(obj.toQty == 0){
       message.error(`到数量不能为0!`)

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

@@ -653,13 +653,11 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     form: {
       component: 'InputNumber',
       componentProps: {
-        min: 0,
         precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
-      min: 0,
       precision: 6
     }
   },