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,35 +95,18 @@
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                 options: BOOLEAN_OPTIONS_AddEdit 
                }, 
                { 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
              rules: [{required: true, message: '物料名称不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '数量', 
                   label: '是否自产', 
                   prop: 'isSelfMade', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入数量', 
                 options: [{label: '是',value: true}, {label: '否',value: false}] 
                   placeholder: '请输入是否自产', 
                 options: BOOLEAN_OPTIONS_AddEdit 
                }, 
                { 
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
              rules: [{required: true, message: '采购类型（枚举值）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '是否有效物料', 
                   label: '数量', 
                   prop: 'num', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
@@ -132,17 +119,8 @@
                   step: 1,
                   precision: 0, 
                   //disabled: disabled, 
                   placeholder: '请输入是否有效物料', 
              rules: [{required: true, message: '是否有效物料不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
              rules: [{required: true, message: '物料类型（枚举值）不能为空', trigger: 'blur' }], 
                   placeholder: '请输入数量', 
              rules: [{required: true, message: '数量不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '自有数量', 
@@ -161,21 +139,15 @@
                   placeholder: '请输入自有数量', 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
                   prop: 'primaryUnit', 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入主单位（如：kg、m、个）', 
                   placeholder: '请输入物料名称', 
              rules: [{required: true, message: '物料名称不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '规格/标准（如：GB/T 8163-2018）', 
                   prop: 'standard', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                }, 
                { 
                   label: '', 
                   label: '可空长度', 
                   prop: 'nullLength', 
                   el: (props: any, { attrs }: SetupContext) => { 
                     return h(inputNumber, {  
@@ -188,7 +160,41 @@
                   step: 0.01,
                   precision: 2, 
                   //disabled: disabled, 
                   placeholder: '请输入', 
                   placeholder: '请输入可空长度', 
                }, 
                { 
                   label: '采购类型（枚举值）', 
                   prop: 'purchaseType', 
                   el: 'select', 
                   clearable:true, 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入采购类型（枚举值）', 
              rules: [{required: true, message: '采购类型（枚举值）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '物料类型（枚举值）', 
                   prop: 'materialType', 
                   el: 'select', 
                   clearable:true, 
                   options: [], 
                   //disabled: disabled, 
                   placeholder: '请输入物料类型（枚举值）', 
              rules: [{required: true, message: '物料类型（枚举值）不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '主单位（如：kg、m、个）', 
                   prop: 'primaryUnit', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入主单位（如：kg、m、个）', 
                }, 
                { 
                   label: '规格/标准（如：GB/T 8163-2018）', 
                   prop: 'standard', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入规格/标准（如：GB/T 8163-2018）', 
                }, 
                { 
                   label: '外径（单位：mm）', 
@@ -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: 'creatorName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入创建人', 
                }, 
                { 
                   label: '修改人', 
                   prop: 'lastModifierName', 
                   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', 
                }, 
                { 
                   label: '操作备注', 
                   prop: 'operationRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入操作备注', 
                }, 
                { 
                   label: '删除备注', 
                   prop: 'deleteRemark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入删除备注', 
                },  
  ]) 
  /** 
@@ -385,15 +343,15 @@
    const data = { 
      materialCode: formData.value.materialCode, 
isValid: formData.value.isValid, 
materialName: formData.value.materialName, 
isSelfMade: formData.value.isSelfMade, 
purchaseType: formData.value.purchaseType, 
num: formData.value.num, 
materialType: formData.value.materialType, 
selfNum: formData.value.selfNum, 
materialName: formData.value.materialName, 
nullLength: formData.value.nullLength, 
purchaseType: formData.value.purchaseType, 
materialType: formData.value.materialType, 
primaryUnit: formData.value.primaryUnit, 
standard: formData.value.standard, 
nullLength: formData.value.nullLength, 
outerDiameter: formData.value.outerDiameter, 
wallThickness: formData.value.wallThickness, 
materialQuality: formData.value.materialQuality, 
@@ -404,14 +362,7 @@
redundantField1: formData.value.redundantField1, 
redundantField2: formData.value.redundantField2, 
redundantField3: formData.value.redundantField3, 
remark: formData.value.remark, 
creatorName: formData.value.creatorName, 
lastModifierName: formData.value.lastModifierName, 
extraField1: formData.value.extraField1, 
extraField2: formData.value.extraField2, 
extraField3: formData.value.extraField3, 
operationRemark: formData.value.operationRemark, 
deleteRemark: formData.value.deleteRemark,  
remark: formData.value.remark,  
    } 
    if (!current.value) { 
      await wmsMaterialDrawer.addWmsMaterial(data) 
@@ -468,15 +419,15 @@
      formData.value = { 
        materialCode: res.materialCode, 
isValid: res.isValid, 
materialName: res.materialName, 
isSelfMade: res.isSelfMade, 
purchaseType: res.purchaseType, 
num: res.num, 
materialType: res.materialType, 
selfNum: res.selfNum, 
materialName: res.materialName, 
nullLength: res.nullLength, 
purchaseType: res.purchaseType, 
materialType: res.materialType, 
primaryUnit: res.primaryUnit, 
standard: res.standard, 
nullLength: res.nullLength, 
outerDiameter: res.outerDiameter, 
wallThickness: res.wallThickness, 
materialQuality: res.materialQuality, 
@@ -487,14 +438,7 @@
redundantField1: res.redundantField1, 
redundantField2: res.redundantField2, 
redundantField3: res.redundantField3, 
remark: res.remark, 
creatorName: res.creatorName, 
lastModifierName: res.lastModifierName, 
extraField1: res.extraField1, 
extraField2: res.extraField2, 
extraField3: res.extraField3, 
operationRemark: res.operationRemark, 
deleteRemark: res.deleteRemark,  
remark: res.remark,  
        id: res.id, 
      } 
      disabled.value = true