Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

zs

2025-05-13 0cd95d98fdf7ed22d53398242feb2a3ca185cf09

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/templatedemo_web/src/widgets/WmsMaterial/Controllers/WmsMaterialDrawer.tsx

@@ -14,6 +14,10 @@
import isEqual from 'lodash/isEqual' 
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox' 
import { cloneDeep } from 'lodash' 
// å¼•å…¥å…¬å…±é€‰é¡¹é…ç½®  
import {   
  BOOLEAN_OPTIONS_AddEdit  
} from '@/utils/commonOptionConstants';  
 
export const useWmsMaterialDrawer = (props: any, ctx?: any) => { 
  const wmsMaterialDrawer = injectModel<WmsMaterialDrawer>('wmsMaterialDrawer') 
@@ -91,7 +95,7 @@
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                 options: BOOLEAN_OPTIONS_AddEdit 
                }, 
                { 
                   label: '是否自产', 
@@ -99,7 +103,7 @@
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入是否自产', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                 options: BOOLEAN_OPTIONS_AddEdit 
                }, 
                { 
                   label: '数量', 
@@ -162,6 +166,7 @@
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   clearable:true, 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
@@ -171,6 +176,7 @@
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   clearable:true, 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
@@ -252,6 +258,7 @@
                   label: '是否为主支管', 
                   prop: 'isMainBranch', 
                   el: 'select', 
                   clearable:true, 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入是否为主支管', 
@@ -298,55 +305,6 @@
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '删除时间', 
                   prop: 'deletionTime', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(datePicker, {  
                       ...props,  
                       clearable: true,  
                       ...attrs,  
                     })  
                   },
                   width: '100%',
                   //disabled: disabled, 
                   placeholder: '请输入删除时间', 
                }, 
                { 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入删除备注', 
                }, 
                { 
                   label: '扩展字段1', 
                   prop: 'extraField1', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段1', 
                }, 
                { 
                   label: '扩展字段2', 
                   prop: 'extraField2', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段2', 
                }, 
                { 
                   label: '扩展字段3', 
                   prop: 'extraField3', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入扩展字段3', 
                },  
  ]) 
  /** 
@@ -404,13 +362,7 @@
redundantField1: formData.value.redundantField1, 
redundantField2: formData.value.redundantField2, 
redundantField3: formData.value.redundantField3, 
remark: formData.value.remark, 
deletionTime: formData.value.deletionTime, 
operationRemark: formData.value.operationRemark, 
deleteRemark: formData.value.deleteRemark, 
extraField1: formData.value.extraField1, 
extraField2: formData.value.extraField2, 
extraField3: formData.value.extraField3,  
remark: formData.value.remark,  
    } 
    if (!current.value) { 
      await wmsMaterialDrawer.addWmsMaterial(data) 
@@ -486,13 +438,7 @@
redundantField1: res.redundantField1, 
redundantField2: res.redundantField2, 
redundantField3: res.redundantField3, 
remark: res.remark, 
deletionTime: res.deletionTime, 
operationRemark: res.operationRemark, 
deleteRemark: res.deleteRemark, 
extraField1: res.extraField1, 
extraField2: res.extraField2, 
extraField3: res.extraField3,  
remark: res.remark,  
        id: res.id, 
      } 
      disabled.value = true